Changeset 572

Timestamp:

07/20/09 06:03:42 (15 years ago)

Author:

Nicholas Riley

Message:

Support tabbing in preferences panel.

Location:

trunk/Cocoa/Pester/Source

Files:

• English.lproj/Preferences.nib/classes.nib (modified) (3 diffs)
• English.lproj/Preferences.nib/info.nib (modified) (2 diffs)
• English.lproj/Preferences.nib/keyedobjects.nib (modified) ( previous)
• NJRHotKeyField.m (modified) (3 diffs)
• PSPreferencesController.m (modified) (1 diff)

trunk/Cocoa/Pester/Source/English.lproj/Preferences.nib/classes.nib

@@ -20 +20 @@
                 <dict>
                         <key>CLASS</key>
+                        <string>NSObject</string>
+                        <key>LANGUAGE</key>
+                        <string>ObjC</string>
+                </dict>
+                <dict>
+                        <key>CLASS</key>
                         <string>FirstResponder</string>
                         <key>LANGUAGE</key>
@@ -25 +31 @@
                         <key>SUPERCLASS</key>
                         <string>NSObject</string>
-                </dict>
-                <dict>
-                        <key>CLASS</key>
-                        <string>NSObject</string>
-                        <key>LANGUAGE</key>
-                        <string>ObjC</string>
                 </dict>
                 <dict>
@@ -50 +50 @@
                         <string>NSWindowController</string>
                 </dict>
+                <dict>
+                        <key>CLASS</key>
+                        <string>NSWindow</string>
+                        <key>LANGUAGE</key>
+                        <string>ObjC</string>
+                        <key>SUPERCLASS</key>
+                        <string>NSResponder</string>
+                </dict>
         </array>
         <key>IBVersion</key>

trunk/Cocoa/Pester/Source/English.lproj/Preferences.nib/info.nib

@@ -4 +4 @@
 <dict>
         <key>IBFramework Version</key>
-        <string>629</string>
+        <string>677</string>
         <key>IBLastKnownRelativeProjectPath</key>
-        <string>../../Pester.xcodeproj</string>
+        <string>../Pester.xcodeproj</string>
         <key>IBOldestOS</key>
         <integer>5</integer>
@@ -14 +14 @@
         </array>
         <key>IBSystem Version</key>
-        <string>9B18</string>
+        <string>9J61</string>
         <key>targetFramework</key>
         <string>IBCocoaFramework</string>

trunk/Cocoa/Pester/Source/NJRHotKeyField.m

@@ -111 +111 @@
 }
 
+- (void)textDidEndEditing:(NSNotification *)notification;
+{
+    [self showKeyEquivalentAttributedStringFinalized: YES];
+    [super textDidEndEditing: notification];
+}
+
 #pragma mark event handling
 
@@ -125 +131 @@
         id delegate = [self delegate];
         NSString *message = nil;
-        if (delegate != nil && ![delegate hotKeyField: self shouldAcceptCharacter: [characters characterAtIndex: 0] modifierFlags: modifierFlags rejectionMessage: &message]) {
+        unichar character = [characters characterAtIndex: 0];
+        if (character == NSTabCharacter || character == NSBackTabCharacter)
+            return;
+        if (delegate != nil && ![delegate hotKeyField: self shouldAcceptCharacter: character modifierFlags: modifierFlags rejectionMessage: &message]) {
             [self showStatus: message != nil ? message : @"key is unavailable for use"];
         } else {
@@ -137 +146 @@
 - (BOOL)performKeyEquivalent:(NSEvent *)theEvent;
 {
-    [self keyUp: theEvent];
+    if ([[self window] firstResponder] == self)
+        [self keyUp: theEvent];
     return [super performKeyEquivalent: theEvent];
 }

trunk/Cocoa/Pester/Source/PSPreferencesController.m

@@ -83 +83 @@
         [set formUnionWithCharacterSet: [NSCharacterSet whitespaceAndNewlineCharacterSet]];
         [set formUnionWithCharacterSet: [NSCharacterSet punctuationCharacterSet]];
-        [set addCharactersInString: @"\t\r\e\x7f\x03\x19"]; // tab, CR, escape, delete, enter, backtab
+        [set addCharactersInString: @"\r\e\x7f\x03"]; // CR, escape, delete, enter
         [set addCharactersInRange: NSMakeRange(0xF700, 0x1FF)]; // reserved function key range
         [set removeCharactersInRange: NSMakeRange(NSF1FunctionKey, 15)]; // F1-F15