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

Timestamp:

11/10/02 11:14:59 (22 years ago)

Author:

Nicholas Riley

Message:

Pester 1.1a2.

English.lproj/Credits.html: Fixed some HTML formatting issues, added Ben Hines to credits (thanks for helping out with 1.1a1 testing!)

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

English.lproj/MainMenu.nib: Reconnected initialFirstResponder outlet on the window; somehow it became disconnected. Fixed keyboard navigation loop. Removed formatters from date/time fields which were causing crashes on launch on 10.2 (they're instantiated from code in any case). Removed text from date field because it didn't work without the formatter.

NJRDateFormatter: Workaround for 10.2 NSScanner bug [Ben Hines].

NJRQTMediaPopUpButton: Remove corrupt JPEG note, can no longer reproduce. Removed -validateRecentMedia invocation, debug code shouldn't have been left in.

PSAlarmSetController: Set alerts before setting alarm, otherwise alarm in bogus state remains. Set date to today in awakeFromNib, moved from the nib. Disconnect initial first responder to work around 10.1 bug so keyboard focus is set properly when the window opens.

Pester.pbproj: Added VERSION.

Read Me.rtfd: Updated for 1.1a2.

VERSION: Updated for 1.1a2.

File:

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

trunk/Cocoa/Pester/Source/PSAlarmSetController.m

@@ -83 +83 @@
         }
     }
+    [timeDate setObjectValue: [NSDate date]];
     [self inAtChanged: nil];
     [self playSoundChanged: nil];
@@ -91 +92 @@
     [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(playSoundChanged:) name: NJRQTMediaPopUpButtonMovieChangedNotification object: sound];
     [voice setDelegate: self];
+    if (floor(NSAppKitVersionNumber) <= NSAppKitVersionNumber10_1) {
+        // XXX workaround for 10.1.x bug which sets the first responder to the wrong field, but it works if I set the initial first responder to nil... go figure.
+        [[self window] setInitialFirstResponder: nil];
+    }
     [[self window] makeKeyAndOrderFront: nil];
 }
@@ -259 +264 @@
 - (IBAction)setAlarm:(NSButton *)sender;
 {
-    // set alarm
-    [self setAlarmDateAndInterval: sender];
-    [alarm setMessage: [messageField stringValue]];
-    if (![alarm setTimer]) {
-        [self setStatus: [@"Unable to set alarm.  " stringByAppendingString: [alarm invalidMessage]]];
-        return;
-    }
-
+    // set alerts before setting alarm...
     [alarm removeAlerts];
     // dock bounce alert
@@ -295 +293 @@
     if ([doSpeak intValue])
         [alarm addAlert: [PSSpeechAlert alertWithVoice: [voice titleOfSelectedItem]]];
+
+    // set alarm
+    [self setAlarmDateAndInterval: sender];
+    [alarm setMessage: [messageField stringValue]];
+    if (![alarm setTimer]) {
+        [self setStatus: [@"Unable to set alarm.  " stringByAppendingString: [alarm invalidMessage]]];
+        return;
+    }
     
     [self setStatus: [[alarm date] descriptionWithCalendarFormat: @"Alarm set for %x at %X" timeZone: nil locale: nil]];