From: Kent Sutherland <ksuther@ithinksw.com>
Date: Sun, 15 Dec 2002 14:46:55 +0000 (+0000)
Subject: Hotkeys do not show in the hotkey chooser if they don't have a modifier key.
X-Git-Tag: v1.0~257
X-Git-Url: http://git.ithinksw.org/MenuTunes.git/commitdiff_plain/2d9409ab3de16736f5ec5fae6ec0eb6c15fe6c4a

Hotkeys do not show in the hotkey chooser if they don't have a modifier key.
---

diff --git a/English.lproj/Preferences.nib/info.nib b/English.lproj/Preferences.nib/info.nib
index 3f55daf..28f5f51 100755
--- a/English.lproj/Preferences.nib/info.nib
+++ b/English.lproj/Preferences.nib/info.nib
@@ -19,6 +19,7 @@
 	<key>IBOpenObjects</key>
 	<array>
 		<integer>6</integer>
+		<integer>115</integer>
 	</array>
 	<key>IBSystem Version</key>
 	<string>6F21</string>
diff --git a/English.lproj/Preferences.nib/objects.nib b/English.lproj/Preferences.nib/objects.nib
index 837bf6e..0d547ec 100755
Binary files a/English.lproj/Preferences.nib/objects.nib and b/English.lproj/Preferences.nib/objects.nib differ
diff --git a/KeyBroadcaster.m b/KeyBroadcaster.m
index 7b47d83..724c7a2 100755
--- a/KeyBroadcaster.m
+++ b/KeyBroadcaster.m
@@ -16,7 +16,9 @@
     modifiers = [event modifierFlags];
     
     modifiers = [KeyBroadcaster cocoaToCarbonModifiers:modifiers];
-    [self _broadcastKeyCode:keyCode andModifiers:modifiers];
+    if (modifiers > 0) {
+        [self _broadcastKeyCode:keyCode andModifiers:modifiers];
+    }
 }
 
 - (BOOL)performKeyEquivalent:(NSEvent *)event
diff --git a/PreferencesController.m b/PreferencesController.m
index b4cba9e..3a9ecd3 100755
--- a/PreferencesController.m
+++ b/PreferencesController.m
@@ -237,15 +237,7 @@
 
 - (IBAction)okHotKey:(id)sender
 {
-    NSString *string;
-    if (([combo modifiers] <= 0) && ([combo keyCode] >= 0)) {
-        [window setLevel:NSNormalWindowLevel];
-        NSRunAlertPanel(@"Bad Key Combo", @"Please enter a valid key combo. A valid combo must have a modifier key in it. (Command, option, shift, control).", @"OK", nil, nil, nil);
-        [window setLevel:NSStatusWindowLevel];
-        return;
-    }
-    
-    string = [combo userDisplayRep];
+    NSString *string = [combo userDisplayRep];
     
     if (string == nil) {
         string = @"None";