Changeset 364 for trunk/Cocoa/Pester/Source/PSAlarmSetController.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/PSAlarmSetController.m (modified) (9 diffs)

trunk/Cocoa/Pester/Source/PSAlarmSetController.m

@@ -18 +18 @@
 #import "NJRQTMediaPopUpButton.h"
 #import "NJRSoundManager.h"
+#import "NJRValidatingField.h"
 #import "NJRVoicePopUpButton.h"
 #import "NSString-NJRExtensions.h"
@@ -87 +88 @@
     {
         NSDictionary *plAlerts = [defaults dictionaryForKey: PSAlertsSelected];
-        PSAlerts *alerts;
+        PSAlerts *alerts = nil;
         if (plAlerts == nil) {
             alerts = [[PSAlerts alloc] initWithPesterVersion1Alerts];
         } else {
-            NS_DURING
+            @try {
                 alerts = [[PSAlerts alloc] initWithPropertyList: plAlerts];
-            NS_HANDLER
-                NSRunAlertPanel(@"Unable to restore alerts", @"Pester could not restore recent alert information for one or more alerts in the Set Alarm window.  The default set of alerts will be used instead.\n\n%@", nil, nil, nil, [localException reason]);
+            } @catch (NSException *exception) {
+                NSRunAlertPanel(@"Unable to restore alerts", @"Pester could not restore recent alert information for one or more alerts in the Set Alarm window.  The default set of alerts will be used instead.\n\n%@", nil, nil, nil, [exception reason]);
                 alerts = [[PSAlerts alloc] initWithPesterVersion1Alerts];
-            NS_ENDHANDLER
+            }
         }
         [self _readAlerts: alerts];
@@ -199 +200 @@
     old = [inAtMatrix cellWithTag: isInterval];
     NSAssert(new != old, @"in and at buttons should be distinct!");
+    
+    if (sender != nil) {
+        // XXX validation doesn't work properly for date/time, so we just universally cancel editing now
+        if (![[self window] makeFirstResponder: nil] && !isInterval) {
+            // This works fine synchronously only if you're using the keyboard shortcut to switch in/at.  Directly activating the button, a delayed invocation is necessary.
+            NSInvocation *i = [NSInvocation invocationWithMethodSignature:
+                               [inAtMatrix methodSignatureForSelector: @selector(selectCellWithTag:)]];
+            int tag = [old tag];
+            [i setSelector: @selector(selectCellWithTag:)];
+            [i setTarget: inAtMatrix];
+            [i setArgument: &tag atIndex: 2];
+            [NSTimer scheduledTimerWithTimeInterval: 0 invocation: i repeats: NO];
+            return;
+        }
+    }
+    
     [old setKeyEquivalent: [new keyEquivalent]];
     [old setKeyEquivalentModifierMask: [new keyEquivalentModifierMask]];
@@ -211 +228 @@
     [timeCalendarButton setEnabled: !isInterval];
     if (sender != nil)
-        [[self window] makeFirstResponder: isInterval ? (NSTextField *)timeInterval : timeOfDay];
-    if (!isInterval) { // need to do this every time the controls are enabled
+        [[self window] makeFirstResponder: isInterval ? (NSTextField *)timeInterval : timeOfDay];
+    if (!isInterval) // need to do this every time the controls are enabled
         [timeOfDay setNextKeyView: timeDate];
-    }
     // NSLog(@"UPDATING FROM inAtChanged");
     [self update: nil];
@@ -337 +353 @@
 {
     BOOL playSoundSelected = [playSound intValue];
-    BOOL canRepeat = playSoundSelected ? [sound canRepeat] : NO;
-    [sound setEnabled: NO]; //playSoundSelected]; // XXX temporary for 1.1b5
+    BOOL canRepeat = playSoundSelected; // ? [sound canRepeat] : NO; // XXX temporary for 1.1b6
+    [sound setEnabled: playSoundSelected];
     [soundRepetitions setEnabled: canRepeat];
     [soundVolumeButton setEnabled: canRepeat && [sound hasAudio]];
@@ -344 +360 @@
     [soundRepetitionsLabel setTextColor: canRepeat ? [NSColor controlTextColor] : [NSColor disabledControlTextColor]];
     if (playSoundSelected && sender == playSound) {
-        [[self window] makeFirstResponder: sound];
+        [[self window] makeFirstResponder: soundRepetitions]; // sound]; // XXX temporary for 1.1b6
     }
 }
@@ -437 +453 @@
     
     [alerts removeAlerts];
-    NS_DURING
+    @try {
         // dock bounce alert
         if ([bounceDockIcon state] == NSOnState)
@@ -467 +483 @@
         // speech alert
         if ([doSpeak intValue])
-            [alerts addAlert: [PSSpeechAlert alertWithVoice: [voice titleOfSelectedItem]]];
+            [alerts addAlert: [PSSpeechAlert alertWithVoice: [[voice selectedItem] representedObject]]];
         // wake alert
         if ([wakeUp intValue])
             [alerts addAlert: [PSWakeAlert alert]];
         [[NSUserDefaults standardUserDefaults] setObject: [alerts propertyListRepresentation] forKey: PSAlertsSelected];
-    NS_HANDLER
-        [self setStatus: [localException reason]];
-        NS_VALUERETURN(NO, BOOL);
-    NS_ENDHANDLER
+    } @catch (NSException *exception) {
+        [self setStatus: [exception reason]];
+        return NO;
+    }
     return YES;
 }
@@ -540 +556 @@
     if (control == timeInterval)
         [timeInterval handleDidFailToFormatString: string errorDescription: error label: @"alarm interval"];
+    else if (control == soundRepetitions)
+        [soundRepetitions handleDidFailToFormatString: string errorDescription: error label: @"alert repetitions"];
     return NO;
 }