Changeset 621 for trunk

Timestamp:

03/02/10 08:03:59 (15 years ago)

Author:

Nicholas Riley

Message:

Date autocomplete (rough).

File:

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

trunk/Cocoa/Pester/Source/PSAlarmSetController.m

@@ -583 +583 @@
 }
 
+- (NSArray *)control:(NSControl *)control textView:(NSTextView *)textView completions:(NSArray *)words forPartialWordRange:(NSRange)charRange indexOfSelectedItem:(int *)idx;
+{
+    if (control != timeDate)
+        return nil;
+
+    NSString *partialMatch = [textView string];
+    unsigned partialLength = [partialMatch length];
+    NSMutableArray *completions = [[timeDateCompletions itemTitles] mutableCopy];
+    for (int i = [completions count] - 1 ; i >= 0 ; i--) {
+        NSString *completion = [completions objectAtIndex: i];
+        unsigned length = [completion length];
+        if (partialLength == 0) {
+            if (length > 0)
+                continue;
+        } else if (length >= partialLength &&
+            [partialMatch compare:
+             [completion substringToIndex: partialLength] options:NSCaseInsensitiveSearch] == NSOrderedSame) {
+            continue;
+        }
+        
+        [completions removeObjectAtIndex: i];
+    }
+    NSLog(@"%@ %d %@", partialMatch, partialLength, completions);
+    return [completions autorelease];
+}
+
 @end
 
@@ -603 +629 @@
 - (void)controlTextDidEndEditing:(NSNotification *)notification;
 {
-    if ([notification object] != timeOfDay)
+    NSControl *control = [notification object];
+
+    if (control != timeOfDay)
         return;
-
+    
     // if date is today and we've picked a time before now, set the date for tomorrow
     NSDate *dateTime = [NSCalendarDate dateWithDate: [timeDate objectValue] atTime: [timeOfDay objectValue]];
@@ -621 +649 @@
 }
 
+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]];
+}
+
+// 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;
+{
+    if (control != timeDate)
+        return NO;
+    
+    if (commandSelector == @selector(moveDown:)) {
+        completingTimeDate = YES;
+        [textView complete: nil];
+        completingTimeDate = NO;
+        return YES;
+    }
+    
+    return NO;
 }