From 2d9409ab3de16736f5ec5fae6ec0eb6c15fe6c4a Mon Sep 17 00:00:00 2001 From: Kent Sutherland Date: Sun, 15 Dec 2002 14:46:55 +0000 Subject: [PATCH] Hotkeys do not show in the hotkey chooser if they don't have a modifier key. --- English.lproj/Preferences.nib/info.nib | 1 + English.lproj/Preferences.nib/objects.nib | Bin 8642 -> 8718 bytes KeyBroadcaster.m | 4 +++- PreferencesController.m | 10 +--------- 4 files changed, 5 insertions(+), 10 deletions(-) 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 @@ IBOpenObjects 6 + 115 IBSystem Version 6F21 diff --git a/English.lproj/Preferences.nib/objects.nib b/English.lproj/Preferences.nib/objects.nib index 837bf6e728f8432e68b0d75a2fbff8837275ae91..0d547ecdfa9f4dcae3428fe73018e6dab0c29f41 100755 GIT binary patch literal 8718 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

VD1} zrhw2C7oDp%ql>y#{uH#r@)3Oc((;CL0sh0`>?6+p$U)uwiL-aTb69dVb~zXCan6i7 zT&m#gvNO5C=~bOQ!_KBX&bf!3m7L|V>I2Tc=^VTdPaksjZAXPH@ch_DTz-nY3b%j7 zH-6lHf;1Ahe?y9j+q)4b^F`c0=In8&Wt-Ff5MF-C*%P?E*$tA&wvIVl6ukZ)XHPoe zHBMcxvuu}h8)tv&Ed9E(0@;|;^fd=Fea?YN@^Au-)k_Yj;WM6oPVtRdNdxsv?mCY&G#fYBTXIcLbH}&zh literal 8642 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 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"; -- 2.20.1