Changeset 623 for trunk

Timestamp:

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

Author:

Nicholas Riley

Message:

Date autocomplete: replace a bunch of hacks with easier-to-read, less buggy code now we control the field editor.

Still need to move autocompletion into PSTimeDateEditor and fix one small autocomplete bug.

Location:

trunk/Cocoa/Pester/Source

Files:

• PSAlarmSetController.m (modified) (2 diffs)
• PSDateFieldEditor.m (modified) (1 diff)

trunk/Cocoa/Pester/Source/PSAlarmSetController.m

@@ -627 +627 @@
 @end
 
-
 @implementation PSAlarmSetController (NSWindowNotifications)
 
@@ -664 +663 @@
 }
 
-static BOOL completingTimeDate = NO;
-static NSString *lastTimeDateString = nil;
-
-- (void)controlTextDidBeginEditing:(NSNotification *)notification;
-{
-    NSControl *control = [notification object];
-    
-    if (control != timeOfDay)
-        return;
-    
-    [lastTimeDateString release];
-    lastTimeDateString = [[[[notification userInfo] objectForKey:@"NSFieldEditor"] string] copy];
-}
-
 - (void)controlTextDidChange:(NSNotification *)notification;
 {
     // NSLog(@"UPDATING FROM controlTextDidChange: %@", [notification object]);
-    if ([notification object] == timeDate) {
-        if (!completingTimeDate) {
-            NSText *fieldEditor = [[notification userInfo] objectForKey:@"NSFieldEditor"];
-            NSString *editingString = [fieldEditor string];
-            if ([editingString length] > [lastTimeDateString length])
-                completingTimeDate = YES;
-            [lastTimeDateString release];
-            lastTimeDateString = [editingString copy];
-            if (completingTimeDate) {
-                [fieldEditor complete: nil];
-                completingTimeDate = NO;
-            }
-        }
-    }
     [self update: [notification object]];
-}
-
-- (BOOL)control:(NSControl *)control textView:(NSTextView *)textView doCommandBySelector:(SEL)commandSelector;
-{
-    if (control != timeDate)
-        return NO;
-    
-    if (commandSelector == @selector(moveDown:)) {
-        completingTimeDate = YES;
-        [textView complete: nil];
-        completingTimeDate = NO;
-        return YES;
-    }
-    
-    return NO;
 }
 

trunk/Cocoa/Pester/Source/PSDateFieldEditor.m

@@ -11 +11 @@
 
 @implementation PSDateFieldEditor
+
+- (void)insertText:(id)insertString;
+{
+    [super insertText: insertString];
+    [self complete: nil];
+    // XXX if we *do* successfully complete, need to delete remainder
+    // XXX example: in "today", select "t" then retype it
+}
+
+- (void)moveDown:(id)sender;
+{
+    [self deleteToEndOfLine: sender];
+    [self complete: sender];
+}
+
+@end
+
+@implementation PSDateFieldEditor (NSCompletion)
 
 - (NSRange)rangeForUserCompletion;