Changeset 34 for trunk/Cocoa

Timestamp:

10/29/02 22:20:58 (22 years ago)

Author:

Nicholas Riley

Message:

Changes for Pester 1.1d1.

Location:

trunk/Cocoa/Pester/Source

Files:

• BDAlias.h (added)
• BDAlias.m (added)
• NJRFSObjectSelector.h (added)
• NJRFSObjectSelector.m (added)
• NJRSoundPopUpButton.h (added)
• NJRSoundPopUpButton.m (added)
• NJRTableDelegate.h (added)
• NJRTableDelegate.m (added)
• NJRVoicePopUpButton.h (added)
• NJRVoicePopUpButton.m (added)
• NSImage-NJRExtensions.h (added)
• NSImage-NJRExtensions.m (added)
• NSMovie-NJRExtensions.h (added)
• NSMovie-NJRExtensions.m (added)
• NSTableView-NJRExtensions.h (modified) (1 diff)
• NSTableView-NJRExtensions.m (modified) (2 diffs)
• PSAlarm.h (modified) (3 diffs)
• PSAlarm.m (modified) (3 diffs)
• PSAlarmAlertController.h (added)
• PSAlarmAlertController.m (added)
• PSAlarmNotifierController.h (modified) (1 diff)
• PSAlarmNotifierController.m (modified) (4 diffs)
• PSAlarmSetController.h (modified) (3 diffs)
• PSAlarmSetController.m (modified) (8 diffs)
• PSAlarms.h (modified) (1 diff)
• PSAlarmsController.m (modified) (1 diff)
• PSAlert.h (added)
• PSAlert.m (added)
• PSApplication.h (modified) (1 diff)
• PSApplication.m (modified) (3 diffs)
• PSBeepAlert.h (added)
• PSBeepAlert.m (added)
• PSDockBounceAlert.h (added)
• PSDockBounceAlert.m (added)
• PSMovieAlert.h (added)
• PSMovieAlert.m (added)
• PSMovieAlertController.h (added)
• PSMovieAlertController.m (added)
• PSNotifierAlert.h (added)
• PSNotifierAlert.m (added)
• PSScriptAlert.h (added)
• PSScriptAlert.m (added)
• PSSpeechAlert.h (added)
• PSSpeechAlert.m (added)
• SUSpeaker.h (added)
• SUSpeaker.m (added)
• SoundFileManager.h (added)

trunk/Cocoa/Pester/Source/NSTableView-NJRExtensions.h

@@ -1 +1 @@
 //
 //  NSTableView-NJRExtensions.h
-//  HostLauncher
+//  Pester
 //
-//  Created by Nicholas Riley on Mon Apr 22 2002.
+//  Created by Nicholas Riley on Sun Oct 27 2002.
 //  Copyright (c) 2002 Nicholas Riley. All rights reserved.
 //
 
-#import <Cocoa/Cocoa.h>
+#import <AppKit/AppKit.h>
 
 
 @interface NSTableView (NJRExtensions)
 
++ (NSImage *)ascendingSortIndicator;
++ (NSImage *)descendingSortIndicator;
+
 - (float)cellHeight;
 
+- (NSArray *)selectedRowIndices;
+
 @end

trunk/Cocoa/Pester/Source/NSTableView-NJRExtensions.m

@@ -1 +1 @@
 //
 //  NSTableView-NJRExtensions.m
-//  HostLauncher
+//  Pester
 //
-//  Created by Nicholas Riley on Mon Apr 22 2002.
+//  Created by Nicholas Riley on Sun Oct 27 2002.
 //  Copyright (c) 2002 Nicholas Riley. All rights reserved.
 //
@@ -10 +10 @@
 
 
+@interface NSTableView (PumaPrivate)
+// Declarations of 10.1 private methods, just to make the compiler happy.
++ (id) _defaultTableHeaderReverseSortImage;
++ (id) _defaultTableHeaderSortImage;
+@end
+
 @implementation NSTableView (NJRExtensions)
+
++ (NSImage *)ascendingSortIndicator;
+{
+    NSImage *result = [NSImage imageNamed: @"NSAscendingSortIndicator"];
+    if (result == nil && [[NSTableView class] respondsToSelector: @selector(_defaultTableHeaderSortImage)])
+        result = [NSTableView _defaultTableHeaderSortImage];
+    return result;
+}
+
++ (NSImage *)descendingSortIndicator;
+{
+    NSImage *result = [NSImage imageNamed:@"NSDescendingSortIndicator"];
+    if (result == nil && [[NSTableView class] respondsToSelector:@selector(_defaultTableHeaderReverseSortImage)])
+        result = [NSTableView _defaultTableHeaderReverseSortImage];
+    return result;
+}
+
+- (NSArray *)selectedRowIndices;
+{
+    NSEnumerator *theEnum = [self selectedRowEnumerator];
+    NSNumber *rowNumber;
+    NSMutableArray *rowNumberArray = [NSMutableArray arrayWithCapacity: [self numberOfSelectedRows]];
+
+    while (nil != (rowNumber = [theEnum nextObject]) )
+        [rowNumberArray addObject: rowNumber];
+
+    return rowNumberArray;
+}
 
 - (float)cellHeight;

trunk/Cocoa/Pester/Source/PSAlarm.h

@@ -16 +16 @@
 extern NSString * const PSAlarmTimerExpiredNotification;
 
+// XXX figure out how to support reading old alarms
+
+@class PSAlert;
+
 @interface PSAlarm : NSObject <NSCoding> {
     PSAlarmType alarmType;
@@ -23 +27 @@
     NSString *invalidMessage;
     NSTimer *timer;
+    NSMutableArray *alerts;
 }
 
@@ -29 +34 @@
 - (void)setForDate:(NSDate *)date atTime:(NSDate *)time;
 - (void)setMessage:(NSString *)aMessage;
+- (void)addAlert:(PSAlert *)alert;
+- (void)removeAlerts;
 
 - (NSCalendarDate *)date;
 - (NSTimeInterval)interval;
 - (NSString *)message;
+- (NSArray *)alerts;
 
 - (NSString *)shortDateString;

trunk/Cocoa/Pester/Source/PSAlarm.m

@@ -8 +8 @@
 
 #import "PSAlarm.h"
+#import "PSAlert.h"
 
 NSString * const PSAlarmTimerSetNotification = @"PSAlarmTimerSetNotification";
 NSString * const PSAlarmTimerExpiredNotification = @"PSAlarmTimerExpiredNotification";
+
+// XXX need to reset pending alarms after sleep, they "freeze" and never expire.
 
 @implementation PSAlarm
@@ -22 +25 @@
     [invalidMessage release]; invalidMessage = nil;
     [timer invalidate]; [timer release]; timer = nil;
+    [alerts release]; alerts = nil;
     [super dealloc];
 }
@@ -224 +228 @@
 {
     return [[self date] compare: [otherAlarm date]];
+}
+
+- (void)addAlert:(PSAlert *)alert;
+{
+    if (alerts == nil) alerts = [[NSMutableArray alloc] initWithCapacity: 4];
+    [alerts addObject: alert];
+}
+
+- (void)removeAlerts;
+{
+    [alerts removeAllObjects];
+}
+
+- (NSArray *)alerts;
+{
+    return [[alerts copy] autorelease];
 }
 

trunk/Cocoa/Pester/Source/PSAlarmNotifierController.h

@@ -16 +16 @@
 }
 
-+ (PSAlarmNotifierController *)controllerWithTimerExpiredNotification:(NSNotification *)notification;
-
 - (id)initWithAlarm:(PSAlarm *)alarm;
 

trunk/Cocoa/Pester/Source/PSAlarmNotifierController.m

@@ -8 +8 @@
 
 #import "PSAlarmNotifierController.h"
+#import "PSAlarmAlertController.h"
 #import "PSAlarm.h"
 
@@ -13 +14 @@
 
 // XXX should use NSNonactivatingPanelMask on 10.2
-
-+ (PSAlarmNotifierController *)controllerWithTimerExpiredNotification:(NSNotification *)notification;
-{
-    return [[self alloc] initWithAlarm: [notification object]];
-}
 
 - (id)initWithAlarm:(PSAlarm *)alarm;
@@ -25 +21 @@
         [messageField setStringValue: [alarm message]];
         [dateField setObjectValue: [alarm date]];
-        [NSApp requestUserAttention: NSInformationalRequest];
-        [NSApp activateIgnoringOtherApps: YES];
         [[self window] makeKeyAndOrderFront: nil];
         [[self window] orderFrontRegardless];
-        [NSApp cancelUserAttentionRequest: NSInformationalRequest];
-        NSBeep();
     }
     return self;
@@ -37 +29 @@
 - (IBAction)close:(id)sender;
 {
+    [PSAlarmAlertController stopAlerts: sender];
     [self close];
 }

trunk/Cocoa/Pester/Source/PSAlarmSetController.h

@@ -10 +10 @@
 #import "PSAlarm.h"
 
+@class NJRFSObjectSelector;
+@class NJRSoundPopUpButton;
+@class NJRVoicePopUpButton;
+
 @interface PSAlarmSetController : NSWindowController {
     IBOutlet NSTextField *messageField;
@@ -15 +19 @@
     IBOutlet NSTextField *timeInterval;
     IBOutlet NSPopUpButton *timeIntervalUnits;
+    IBOutlet NSButton *timeIntervalRepeats;
     IBOutlet NSTextField *timeOfDay;
     IBOutlet NSTextField *timeDate;
     IBOutlet NSPopUpButton *timeDateCompletions; // XXX should go away when bug preventing both formatters and popup menus from existing is fixed
+    IBOutlet NSButtonCell *displayMessage;
+    IBOutlet NSButton *bounceDockIcon;
+    IBOutlet NSButtonCell *playSound;
+    IBOutlet NJRSoundPopUpButton *sound;
+    IBOutlet NSTextField *soundRepetitions;
+    IBOutlet NSStepper *soundRepetitionStepper;
+    IBOutlet NSTextField *soundRepetitionsLabel;
+    IBOutlet NSButtonCell *doScript;
+    IBOutlet NJRFSObjectSelector *script;
+    IBOutlet NSButtonCell *doSpeak;
+    IBOutlet NJRVoicePopUpButton *voice;
+    IBOutlet NSButton *scriptSelectButton;
     IBOutlet NSTextField *timeSummary;
     IBOutlet NSButton *setButton;
@@ -29 +46 @@
 - (IBAction)dateCompleted:(NSPopUpButton *)sender;
 - (IBAction)inAtChanged:(id)sender;
+- (IBAction)playSoundChanged:(id)sender;
+- (IBAction)doScriptChanged:(id)sender;
+- (IBAction)doSpeakChanged:(id)sender;
 - (IBAction)setAlarm:(NSButton *)sender;
 
+- (IBAction)silence:(id)sender;
+
 @end

trunk/Cocoa/Pester/Source/PSAlarmSetController.m

@@ -8 +8 @@
 
 #import "PSAlarmSetController.h"
-#import "PSAlarmNotifierController.h"
+#import "PSAlarmAlertController.h"
 #import "NJRDateFormatter.h"
+#import "NJRFSObjectSelector.h"
+#import "NJRSoundPopUpButton.h"
+#import "NJRVoicePopUpButton.h"
+#import <Carbon/Carbon.h>
+
+#import "PSDockBounceAlert.h"
+#import "PSScriptAlert.h"
+#import "PSNotifierAlert.h"
+#import "PSBeepAlert.h"
+#import "PSMovieAlert.h"
+#import "PSSpeechAlert.h"
 
 /* Bugs to file:
@@ -48 +59 @@
     [[self window] center];
     [self inAtChanged: nil];
+    [self playSoundChanged: nil];
+    [self doScriptChanged: nil];
+    [self doSpeakChanged: nil];
+    [script setFileTypes: [NSArray arrayWithObjects: @"applescript", @"script", NSFileTypeForHFSTypeCode(kOSAFileType), NSFileTypeForHFSTypeCode('TEXT'), nil]];
+    [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(silence:) name: PSAlarmAlertStopNotification object: nil];
+    [voice setDelegate: self];
     [[self window] makeKeyAndOrderFront: nil];
 }
@@ -131 +148 @@
     [timeInterval setEnabled: isInterval];
     [timeIntervalUnits setEnabled: isInterval];
+    [timeIntervalRepeats setEnabled: isInterval];
     [timeOfDay setEnabled: !isInterval];
     [timeDate setEnabled: !isInterval];
@@ -140 +158 @@
 }
 
+- (IBAction)playSoundChanged:(id)sender;
+{
+    BOOL playSoundSelected = [playSound intValue];
+    [sound setEnabled: playSoundSelected];
+    [soundRepetitions setEnabled: playSoundSelected];
+    [soundRepetitionStepper setEnabled: playSoundSelected];
+    [soundRepetitionsLabel setTextColor: playSoundSelected ? [NSColor controlTextColor] : [NSColor disabledControlTextColor]];
+    if (playSoundSelected && sender != nil)
+        [[self window] makeFirstResponder: sound];
+}
+
+// XXX should check the 'Do script:' button when someone drops a script on the button
+
+- (IBAction)doScriptChanged:(id)sender;
+{
+    BOOL doScriptSelected = [doScript intValue];
+    [script setEnabled: doScriptSelected];
+    [scriptSelectButton setEnabled: doScriptSelected];
+    if (doScriptSelected && sender != nil)
+        [[self window] makeFirstResponder: scriptSelectButton];
+}
+
+- (IBAction)doSpeakChanged:(id)sender;
+{
+    BOOL doSpeakSelected = [doSpeak intValue];
+    [voice setEnabled: doSpeakSelected];
+    if (doSpeakSelected && sender != nil)
+        [[self window] makeFirstResponder: voice];
+}
+
 - (IBAction)dateCompleted:(NSPopUpButton *)sender;
 {
@@ -159 +207 @@
 - (IBAction)setAlarm:(NSButton *)sender;
 {
-    PSAlarmNotifierController *notifier = [PSAlarmNotifierController alloc];
-    if (notifier == nil) {
-        [self setStatus: @"Unable to set alarm."];
-        return;
-    }
+    // set alarm
     [self setAlarmDateAndInterval: sender];
     [alarm setMessage: [messageField stringValue]];
@@ -170 +214 @@
         return;
     }
+
+    [alarm removeAlerts];
+    // dock bounce alert
+    if ([bounceDockIcon state] == NSOnState)
+        [alarm addAlert: [PSDockBounceAlert alert]];
+    // script alert
+    if ([doScript intValue]) {
+        BDAlias *scriptFileAlias = [script alias];
+        if (scriptFileAlias == nil) {
+            [self setStatus: @"Unable to set script alert (no script specified?)"];
+            return;
+        }
+        [alarm addAlert: [PSScriptAlert alertWithScriptFileAlias: scriptFileAlias]];
+    }
+    // notifier alert
+    if ([displayMessage intValue])
+        [alarm addAlert: [PSNotifierAlert alert]];
+    // sound alerts
+    if ([playSound intValue]) {
+        BDAlias *soundAlias = [sound selectedAlias];
+        unsigned short numReps = [soundRepetitions intValue];
+        if (soundAlias == nil) // beep alert
+            [alarm addAlert: [PSBeepAlert alertWithRepetitions: numReps]];
+        else // movie alert
+            [alarm addAlert: [PSMovieAlert alertWithMovieFileAlias: soundAlias repetitions: numReps]];
+    }
+    // speech alert
+    if ([doSpeak intValue])
+        [alarm addAlert: [PSSpeechAlert alertWithVoice: [voice titleOfSelectedItem]]];
+    
     [self setStatus: [[alarm date] descriptionWithCalendarFormat: @"Alarm set for %x at %X" timeZone: nil locale: nil]];
     [[self window] close];
     [alarm release];
     alarm = [[PSAlarm alloc] init];
+}
+
+- (IBAction)silence:(id)sender;
+{
+    [sound stopSoundPreview: self];
+    [voice stopVoicePreview: self];
 }
 
@@ -206 +286 @@
 {
     // NSLog(@"stopping update timer");
+    [self silence: nil];
     [self _stopUpdateTimer];
 }
@@ -222 +303 @@
 
 @end
+
+@implementation PSAlarmSetController (NJRVoicePopUpButtonDelegate)
+
+- (NSString *)voicePopUpButton:(NJRVoicePopUpButton *)sender previewStringForVoice:(NSString *)voice;
+{
+    return [messageField stringValue];
+}
+
+@end

trunk/Cocoa/Pester/Source/PSAlarms.h

@@ -4 +4 @@
 //
 //  Created by Nicholas Riley on Fri Oct 11 2002.
-//  Copyright (c) 2002 __MyCompanyName__. All rights reserved.
+//  Copyright (c) 2002 Nicholas Riley. All rights reserved.
 //
 

trunk/Cocoa/Pester/Source/PSAlarmsController.m

@@ -122 +122 @@
 
 @end
-

trunk/Cocoa/Pester/Source/PSApplication.h

@@ -22 +22 @@
 - (IBAction)orderFrontSetAlarmPanel:(id)sender;
 - (IBAction)orderFrontAlarmsPanel:(id)sender;
+- (IBAction)stopAlerts:(id)sender;
 
 @end

trunk/Cocoa/Pester/Source/PSApplication.m

@@ -9 +9 @@
 #import "PSApplication.h"
 #import "PSAlarmSetController.h"
-#import "PSAlarmNotifierController.h"
+#import "PSAlarmAlertController.h"
 #import "PSAlarmsController.h"
 #import "PSAlarm.h"
@@ -19 +19 @@
 {
     appIconImage = [[NSImage imageNamed: @"NSApplicationIcon"] retain];
-    [[NSNotificationCenter defaultCenter] addObserver: [PSAlarmNotifierController class] selector: @selector(controllerWithTimerExpiredNotification:) name: PSAlarmTimerExpiredNotification object: nil];
+    [[NSNotificationCenter defaultCenter] addObserver: [PSAlarmAlertController class] selector: @selector(controllerWithTimerExpiredNotification:) name: PSAlarmTimerExpiredNotification object: nil];
     [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(nextAlarmDidChange:) name: PSAlarmsNextAlarmDidChangeNotification object: nil];
     [PSAlarms setUp];
@@ -30 +30 @@
     [[NSWorkspace sharedWorkspace] openFile: [[NSBundle mainBundle] pathForResource: @"Read Me" ofType: @"rtfd"]];
 }
+
+- (IBAction)stopAlerts:(id)sender;
+{
+    [PSAlarmAlertController stopAlerts: sender];
+}       
 
 - (IBAction)orderFrontSetAlarmPanel:(id)sender;