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

Timestamp:

11/28/07 01:29:26 (16 years ago)

Author:

Nicholas Riley

Message:

English.lproj/Alarms.nib: Specify alternating row coloring in the nib,
now we're 10.4+.

English.lproj/InfoPlist.strings: Updated for 1.1b6.

English.lproj/Localizable.strings: Quote alarm message in pretty
description (used in tooltip). Change voice error now it no longer
incorporates OSStatus.

English.lproj/MainMenu.nib: Add speech prefs again; turn repetitions
field into a NJRValidatingField and hook up its delegate.

Info-Pester.plist: Updated for 1.1b6.

NJRHotKey.m: Switch to new Objective-C exception style.

NJRIntervalField.[hm]: Now a subclass of NJRValidatingField.

NJRTableDelegate.m: Get rid of our own tooltip support as NSTableView
now supports them (though with a minor visual glitch on the first
tooltip).

NJRTableView.[hm]: Remove tooltip support. Remove alternating row
coloring support.

NJRValidatingField.[hm]: Contains validation sheet stuff from
NJRIntervalField.

NJRVoicePopUpButton.[hm]: Switch to NSSpeechSynthesizer.

PSAlarm.m: Quote alarm message in pretty description (used in
tooltip). Fix repeating alarms not restoring as repeating if they
didn't expire while Pester was not running. No longer set timer on
Pester 1.0 alarm import, to help make importing atomic.

PSAlarmSetController.[hm]: Use NJRValidatingField for repetitions
field. Switch to new Objective-C exception style. Fix validation
issues on in/at changing. Temporary changes to restore speech support
and allow the sound popup to be removed entirely from the nib (rather
than being dragged out of the visible area, as it was in 1.1b5).
Changes for NSSpeechSynthesizer, which uses different voice names.

PSAlarms.m: Switch to new Objective-C exception style. Fix
duplication and error handling in Pester 1.0 alarm import, making
atomic.

PSAlarmsController.m: Use new tooltip support (since it's implemented
in the delegate rather than the data source, we have to proxy it).

PSAlerts.m: Wrap initialization in exception block so we don't leak.

PSApplication.m: Switch to new Objective-C exception style.

PSMediaAlert.m: Clamp repetitions at 1..99 so the user can't type an
invalid value, then quit and have it saved.

PSSpeechAlert.[hm]: Switch to NSSpeechSynthesizer. Throw an
intelligible exception if the voice is unavailable.

PSTimer.m: Switch to new Objective-C exception style.

Pester.xcodeproj: Remove VERSION generation; rename targets to be more
understandable.

Read Me.rtfd: Updated for 1.1b6.

SUSpeaker.[hm]: Gone in switch to NSSpeechSynthesizer.

VERSION: Gone - we use agvtool for everything now.

Updates/release-notes.html: Updated for 1.1b6.

Updates/updates.xml: Updated for 1.1b6.

package-Pester.sh: Use agvtool to get version. Atomically update
file on Web server to avoid partial downloads.

File:

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

trunk/Cocoa/Pester/Source/PSAlarm.m

@@ -357 +357 @@
 
     [string appendAttributedString:
-        [[NSString stringWithFormat: NSLocalizedString(@"At alarm time for %@:\n", "Alert list title in pretty description, %@ replaced with message"), [self message]] small]];
+        [[NSString stringWithFormat: NSLocalizedString(@"At alarm time for '%@':\n", "Alert list title in pretty description, %@ replaced with message"), [self message]] small]];
     if (alertList != nil) {
         [string appendAttributedString: alertList];
@@ -415 +415 @@
         // 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]) {
+        if ([self setTimer]) {
+            // alarm is set, but not repeating - and the interval is wrong because it was computed from the date
+            alarmInterval = savedInterval;
+            [self setRepeating: YES];
+        } else {
+            // alarm is now invalid: expired in the past, so we start the timer over again
+            // We could potentially start counting from the expiration date (or expiration date + n * interval), but this doesn't match our existing behavior.
             alarmType = PSAlarmInterval;
             [self setInterval: savedInterval];
@@ -563 +569 @@
         }
         [self setMessage: [coder decodeObject]];
-        if (alarmType == PSAlarmSet) {
+        if (alarmType == PSAlarmSet)
             alarmType = PSAlarmDate;
-            [self setTimer];
-        }
+        // Note: the timer is not set here, so these alarms are inert.
+        // This helps make importing atomic (see -[PSAlarms importVersion1Alarms])
     }
     return self;