Changeset 61 for trunk/Cocoa/Pester/Source/PSAlarm.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/PSAlarm.m (modified) (4 diffs)

trunk/Cocoa/Pester/Source/PSAlarm.m

@@ -10 +10 @@
 #import "PSAlert.h"
 #import "PSAlerts.h"
+#import "PSTimer.h"
 #import "NJRDateFormatter.h"
 #import "NSCalendarDate-NJRExtensions.h"
@@ -143 +144 @@
 }
 
-- (void)_timerExpired:(NSTimer *)aTimer;
+- (void)_timerExpired:(PSTimer *)aTimer;
 {
     NSLog(@"expired: %@; now %@", [[aTimer fireDate] description], [[NSDate date] description]);
@@ -198 +199 @@
     NSAssert(alarmType == PSAlarmExpired, @"CanÕt snooze an alarm that hasnÕt expired");
     alarmType = PSAlarmSnooze;
+}
+
+- (void)setWakeUp:(BOOL)doWake;
+{
+    [timer setWakeUp: doWake];
 }
 
@@ -379 +385 @@
         return NO;
     }
-    timer = [NSTimer scheduledTimerWithTimeInterval: (alarmType == PSAlarmSnooze ? snoozeInterval : alarmInterval) target: self selector: @selector(_timerExpired:) userInfo: nil repeats: NO];
+    timer = [PSTimer scheduledTimerWithTimeInterval: (alarmType == PSAlarmSnooze ? snoozeInterval : alarmInterval) target: self selector: @selector(_timerExpired:) userInfo: nil repeats: NO];
     if (timer == nil) return NO;
     [timer retain];
     alarmType = PSAlarmSet;
+    [alerts prepareForAlarm: self];
+
     [[NSNotificationCenter defaultCenter] postNotificationName: PSAlarmTimerSetNotification object: self];
     // NSLog(@"set: %@; now %@; remaining %@", [[timer fireDate] description], [[NSDate date] description], [self timeRemainingString]);