Changeset 113 for trunk/Cocoa/Pester/Source/PSAlarm.m

Timestamp:

03/10/03 05:48:21 (21 years ago)

Author:

Nicholas Riley

Message:

PSTimer.m: Fix bug 15, leaking PSTimer from NSInvocation argument retention.

Read Me.rtfd: Updated release notes.

PSAlarm.[hm]: Removed obsolete comment. Changed 1m-59m times to
display without `0h'. Moved code from deserialization to -resetTimer
to be used for alarm deletion undo - fix bug 14.

PSAlarmsController.m: Fix bug 14 - implement _restoreAlarms:,
_removeAlarms and _undoManager. Need to add localized string.

PSAlarmAlertController.m: Fix bug 17, move alert triggering from
constructor to -performAlertsForAlarm: to avoid nested notifications
delivering in wrong order.

PSAlarms.[hm]: Fix bug 14 - implement -restoreAlarms, invokes [PSAlarm
resetTimer]. Clarified a comment. Uncommented some debug logging.

package-Pester.sh: Implemented partition map-less disk image, saves a
few K on distribution. Removed obsolete comments. Added agvtool
bump.

File:

• trunk/Cocoa/Pester/Source/PSAlarm.m (modified) (4 diffs)

trunk/Cocoa/Pester/Source/PSAlarm.m

@@ -32 +32 @@
 static NSDictionary *locale;
 
-// XXX need to reset pending alarms after sleep, they "freeze" and never expire.
-
 @implementation PSAlarm
 
@@ -137 +135 @@
     if (interval == 0) return nil;
     if (interval < minute) return [NSString stringWithFormat: @"%us", (unsigned)interval];
+    if (interval < hour) return [NSString stringWithFormat: @"%um", (unsigned)(interval / minute)];
     if (interval < day) return [NSString stringWithFormat: @"%uh %um", (unsigned)(interval / hour), (unsigned)((interval % hour) / minute)];
     if (interval < 2 * day) return @"One day";
@@ -399 +398 @@
 {
     [timer invalidate]; [timer release]; timer = nil;
-    [self setRepeating: NO];
+}
+
+- (void)resetTimer;
+{
+    if (timer != nil || alarmType != PSAlarmSet)
+        return;
+
+    alarmType = PSAlarmDate;
+    if (![self isRepeating]) {
+        [self setTimer];
+    } else {
+        // don't want to put this logic in setTimer or isValid because it can cause invalid alarms to be set (consider when someone clicks the "repeat" checkbox, then switches to a [nonrepeating, by design] date alarm, and enters a date that has passed: we do -not- want the alarm to magically morph into a repeating interval alarm)
+        NSTimeInterval savedInterval = alarmInterval;
+        if (![self setTimer]) {
+            alarmType = PSAlarmInterval;
+            [self setInterval: savedInterval];
+            [self setTimer];
+        }
+    }
 }
 
@@ -489 +506 @@
         [self setAlerts: alarmAlerts];
         [alarmAlerts release];
-        if (alarmType == PSAlarmSet) {
-            alarmType = PSAlarmDate;
-            // don't want to put this logic in setTimer or isValid because it can cause invalid alarms to be set (consider when someone clicks the "repeat" checkbox, then switches to a [nonrepeating, by design] date alarm, and enters a date that has passed: we do -not- want the alarm to magically morph into a repeating interval alarm)
-            if (![self setTimer] && [self isRepeating]) {
-                alarmType = PSAlarmInterval;
-                [self setInterval: [[dict objectForRequiredKey: PLAlarmInterval] doubleValue]];
-                [self setTimer];
-            }
-        }
+        [self resetTimer];
         if (alarmType == PSAlarmExpired) {
             [self setTimer];