Index: /trunk/Cocoa/Pester/Source/English.lproj/Preferences.nib/classes.nib
===================================================================
--- /trunk/Cocoa/Pester/Source/English.lproj/Preferences.nib/classes.nib (revision 571)
+++ /trunk/Cocoa/Pester/Source/English.lproj/Preferences.nib/classes.nib (revision 572)
@@ -20,4 +20,10 @@
CLASS
+ NSObject
+ LANGUAGE
+ ObjC
+
+
+ CLASS
FirstResponder
LANGUAGE
@@ -25,10 +31,4 @@
SUPERCLASS
NSObject
-
-
- CLASS
- NSObject
- LANGUAGE
- ObjC
@@ -50,4 +50,12 @@
NSWindowController
+
+ CLASS
+ NSWindow
+ LANGUAGE
+ ObjC
+ SUPERCLASS
+ NSResponder
+
IBVersion
Index: /trunk/Cocoa/Pester/Source/English.lproj/Preferences.nib/info.nib
===================================================================
--- /trunk/Cocoa/Pester/Source/English.lproj/Preferences.nib/info.nib (revision 571)
+++ /trunk/Cocoa/Pester/Source/English.lproj/Preferences.nib/info.nib (revision 572)
@@ -4,7 +4,7 @@
IBFramework Version
- 629
+ 677
IBLastKnownRelativeProjectPath
- ../../Pester.xcodeproj
+ ../Pester.xcodeproj
IBOldestOS
5
@@ -14,5 +14,5 @@
IBSystem Version
- 9B18
+ 9J61
targetFramework
IBCocoaFramework
Index: /trunk/Cocoa/Pester/Source/NJRHotKeyField.m
===================================================================
--- /trunk/Cocoa/Pester/Source/NJRHotKeyField.m (revision 571)
+++ /trunk/Cocoa/Pester/Source/NJRHotKeyField.m (revision 572)
@@ -111,4 +111,10 @@
}
+- (void)textDidEndEditing:(NSNotification *)notification;
+{
+ [self showKeyEquivalentAttributedStringFinalized: YES];
+ [super textDidEndEditing: notification];
+}
+
#pragma mark event handling
@@ -125,5 +131,8 @@
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,5 +146,6 @@
- (BOOL)performKeyEquivalent:(NSEvent *)theEvent;
{
- [self keyUp: theEvent];
+ if ([[self window] firstResponder] == self)
+ [self keyUp: theEvent];
return [super performKeyEquivalent: theEvent];
}
Index: /trunk/Cocoa/Pester/Source/PSPreferencesController.m
===================================================================
--- /trunk/Cocoa/Pester/Source/PSPreferencesController.m (revision 571)
+++ /trunk/Cocoa/Pester/Source/PSPreferencesController.m (revision 572)
@@ -83,5 +83,5 @@
[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