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

Timestamp:

03/02/10 08:04:08 (14 years ago)

Author:

Nicholas Riley

Message:

Fix up date completion with field editor.

Still to do:

• autocomplete still doesn't trigger in some cases when it should
• move things into PSTimeDateEditor so they're usable in "until..."

File:

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

trunk/Cocoa/Pester/Source/PSAlarmSetController.m

@@ -25 +25 @@
 
 #import "PSAlerts.h"
+#import "PSDateFieldEditor.h"
 #import "PSDockBounceAlert.h"
 #import "PSScriptAlert.h"
@@ -113 +114 @@
     [voice setDelegate: self]; // XXX why don't we do this in IB?  It should use the accessor...
     [wakeUp setEnabled: [PSPowerManager autoWakeSupported]];
+    
+    dateFieldEditor = [[PSDateFieldEditor alloc] init];
+    [dateFieldEditor setFieldEditor: YES];
+    [dateFieldEditor setDelegate: timeDate];
     
     // XXX workaround for 10.1.x and 10.2.x bug which sets the first responder to the wrong field alternately, but it works if I set the initial first responder to nil... go figure.
@@ -605 +610 @@
         [completions removeObjectAtIndex: i];
     }
-    NSLog(@"%@ %d %@", partialMatch, partialLength, completions);
     return [completions autorelease];
 }
 
 @end
+
+@implementation PSAlarmSetController (NSWindowDelegate)
+
+- (id)windowWillReturnFieldEditor:(NSWindow *)sender toObject:(id)client;
+{
+    if (client == timeDate)
+        return dateFieldEditor;
+
+    return nil;
+}
+
+@end
+
 
 @implementation PSAlarmSetController (NSWindowNotifications)
@@ -629 +646 @@
 - (void)controlTextDidEndEditing:(NSNotification *)notification;
 {
-    NSControl *control = [notification object];
-
-    if (control != timeOfDay)
+    if ([notification object] != timeOfDay)
         return;
     
@@ -683 +698 @@
 }
 
-// XXX need to override NSTextView; when completing with space or tab, we don't get a selector, which causes usability problems with tab and bugs with space
 - (BOOL)control:(NSControl *)control textView:(NSTextView *)textView doCommandBySelector:(SEL)commandSelector;
 {