Changeset 61 for trunk/Cocoa/Pester/Source/PSAlarmSetController.m

Timestamp:

01/06/03 13:05:29 (21 years ago)

Author:

Nicholas Riley

Message:

Pester 1.1b1.

PSPowerManager: Fixed delegate method selectors to better reflect what
is going on (Apple's docs in IOKit Fundamentals help with this; the
kIOMessage*Sleep constants are really poorly named).

VERSION: Updated for 1.1b1.

PSSpeechAlert.h: Fixed company name.

PSAlert.[hm]: Added -prepareForAlarm: to support PSWakeAlert.

PSTimer.[hm]: Replacement for NSTimer that works properly across
sleep/wake cycles and will schedule wake timers.

PSAlerts.[hm]: Added -prepareForAlarm: to support PSWakeAlert.

Read Me.rtfd: Updated for 1.1b1.

PSAlarm.[hm]: Added -setWakeUp:, invoke -[PSAlerts prepareForAlarm],
replaced alarm timer NSTimer with PSTimer.

PSApplication.[hm]: Replaced dock update timer NSTimer with PSTimer.
Uncovered some issues, need to fix later. Enable alarm discard for
beta release.

PSWakeAlert.[hm]: Shared alert implementation for wakeup. Doesn't do
anything at trigger time, but uses new preparation interface to work
at alarm set time (should work for repeating alarms too, but I didn't
bother to test...)

PSAlarmSetController.m: Added support for PSWakeAlert. Save default
alert information on quit. Removed debug statements on hide/unhide;
it works fine regardless of whether the app is explicitly hidden or
the window hides itself.

PSAlarms.m: PSTimer support - invoke +[PSTimer setUp] to initialize
timer list.

File:

• trunk/Cocoa/Pester/Source/PSAlarmSetController.m (modified) (6 diffs)

trunk/Cocoa/Pester/Source/PSAlarmSetController.m

@@ -27 +27 @@
 #import "PSMovieAlert.h"
 #import "PSSpeechAlert.h"
+#import "PSWakeAlert.h"
 
 /* Bugs to file:
@@ -124 +125 @@
     [notificationCenter addObserver: self selector: @selector(applicationWillHide:) name: NSApplicationWillHideNotification object: NSApp];
     [notificationCenter addObserver: self selector: @selector(applicationDidUnhide:) name: NSApplicationDidUnhideNotification object: NSApp];
+    [notificationCenter addObserver: self selector: @selector(applicationWillTerminate:) name: NSApplicationWillTerminateNotification object: NSApp];
     [voice setDelegate: self]; // XXX why don't we do this in IB?  It should use the accessor...
     [wakeUp setEnabled: [PSPowerManager autoWakeSupported]];
@@ -380 +382 @@
             [doSpeak setIntValue: YES];
             [voice setVoice: [(PSSpeechAlert *)alert voice]];
-        }
-    }
+        } else if ([alert isKindOfClass: [PSWakeAlert class]]) {
+            [wakeUp setIntValue: YES];
+        }
+}
 }
 
@@ -417 +421 @@
         if ([doSpeak intValue])
             [alerts addAlert: [PSSpeechAlert alertWithVoice: [voice titleOfSelectedItem]]];
+        // wake alert
+        if ([wakeUp intValue])
+            [alerts addAlert: [PSWakeAlert alert]];
         [[NSUserDefaults standardUserDefaults] setObject: [alerts propertyListRepresentation] forKey: PSAlertsSelected];
     NS_HANDLER
@@ -525 +532 @@
 @implementation PSAlarmSetController (NSApplicationNotifications)
 
+- (void)applicationWillTerminate:(NSNotification *)notification;
+{
+    [self _setAlerts];
+}
+
 - (void)applicationWillHide:(NSNotification *)notification;
 {
     if ([[self window] isVisible]) {
-        NSLog(@"hide");
         [self silence: nil];
         [self _stopUpdateTimer];
@@ -537 +548 @@
 {
     if ([[self window] isVisible]) {
-        NSLog(@"unhide");
         [self update: self];
     }