Commit 1b2a1c83 authored by David Fuhrmann's avatar David Fuhrmann

macosx: implement double click for hotkey prefs

(cherry picked from commit d6d75822)
Signed-off-by: default avatarDavid Fuhrmann <david.fuhrmann@googlemail.com>
parent 5eaed79f
...@@ -12,10 +12,11 @@ ...@@ -12,10 +12,11 @@
</object> </object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<integer value="2311"/> <integer value="2265"/>
<integer value="2668"/>
<integer value="2440"/> <integer value="2440"/>
<integer value="2311"/>
<integer value="2562"/> <integer value="2562"/>
<integer value="2265"/>
</object> </object>
<object class="NSArray" key="IBDocument.PluginDependencies"> <object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
...@@ -3707,7 +3708,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> ...@@ -3707,7 +3708,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string key="NSExtension">NSResponder</string> <string key="NSExtension">NSResponder</string>
</object> </object>
<object class="NSCustomView" id="48286561"> <object class="NSCustomView" id="48286561">
<nil key="NSNextResponder"/> <reference key="NSNextResponder"/>
<int key="NSvFlags">256</int> <int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews"> <object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
...@@ -3827,7 +3828,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> ...@@ -3827,7 +3828,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object> </object>
<int key="NSResizingMask">3</int> <int key="NSResizingMask">3</int>
<bool key="NSIsResizeable">YES</bool> <bool key="NSIsResizeable">YES</bool>
<bool key="NSIsEditable">YES</bool>
<reference key="NSTableView" ref="807091610"/> <reference key="NSTableView" ref="807091610"/>
</object> </object>
<object class="NSTableColumn" id="804468624"> <object class="NSTableColumn" id="804468624">
...@@ -3853,7 +3853,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> ...@@ -3853,7 +3853,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object> </object>
<int key="NSResizingMask">3</int> <int key="NSResizingMask">3</int>
<bool key="NSIsResizeable">YES</bool> <bool key="NSIsResizeable">YES</bool>
<bool key="NSIsEditable">YES</bool>
<reference key="NSTableView" ref="807091610"/> <reference key="NSTableView" ref="807091610"/>
</object> </object>
</object> </object>
...@@ -3935,6 +3934,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> ...@@ -3935,6 +3934,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object> </object>
</object> </object>
<string key="NSFrameSize">{570, 415}</string> <string key="NSFrameSize">{570, 415}</string>
<reference key="NSSuperview"/>
<object class="NSMutableString" key="NSClassName"> <object class="NSMutableString" key="NSClassName">
<characters key="NS.bytes">NSView</characters> <characters key="NS.bytes">NSView</characters>
</object> </object>
...@@ -9181,7 +9181,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> ...@@ -9181,7 +9181,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<boolean value="YES"/> <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/> <boolean value="YES"/>
<string>{{340, 947}, {570, 415}}</string> <string>{{340, 591}, {570, 415}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/> <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
......
...@@ -140,6 +140,9 @@ static VLCSimplePrefs *_o_sharedInstance = nil; ...@@ -140,6 +140,9 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
[o_intf_nativefullscreen_ckb setEnabled:NO]; [o_intf_nativefullscreen_ckb setEnabled:NO];
#endif #endif
[o_hotkeys_listbox setTarget:self];
[o_hotkeys_listbox setDoubleAction:@selector(hotkeyTableDoubleClick:)];
/* setup useful stuff */ /* setup useful stuff */
o_hotkeysNonUseableKeys = [[NSArray arrayWithObjects: @"Command-c", @"Command-x", @"Command-v", @"Command-a", @"Command-," , @"Command-h", @"Command-Alt-h", @"Command-Shift-o", @"Command-o", @"Command-d", @"Command-n", @"Command-s", @"Command-z", @"Command-l", @"Command-r", @"Command-3", @"Command-m", @"Command-w", @"Command-Shift-w", @"Command-Shift-c", @"Command-Shift-p", @"Command-i", @"Command-e", @"Command-Shift-e", @"Command-b", @"Command-Shift-m", @"Command-Ctrl-m", @"Command-?", @"Command-Alt-?", nil] retain]; o_hotkeysNonUseableKeys = [[NSArray arrayWithObjects: @"Command-c", @"Command-x", @"Command-v", @"Command-a", @"Command-," , @"Command-h", @"Command-Alt-h", @"Command-Shift-o", @"Command-o", @"Command-d", @"Command-n", @"Command-s", @"Command-z", @"Command-l", @"Command-r", @"Command-3", @"Command-m", @"Command-w", @"Command-Shift-w", @"Command-Shift-c", @"Command-Shift-p", @"Command-i", @"Command-e", @"Command-Shift-e", @"Command-b", @"Command-Shift-m", @"Command-Ctrl-m", @"Command-?", @"Command-Alt-?", nil] retain];
} }
...@@ -1228,6 +1231,13 @@ static inline void save_module_list( intf_thread_t * p_intf, id object, const ch ...@@ -1228,6 +1231,13 @@ static inline void save_module_list( intf_thread_t * p_intf, id object, const ch
[self showSettingsForCategory: o_input_view]; [self showSettingsForCategory: o_input_view];
} }
- (void)hotkeyTableDoubleClick:(id)object
{
// -1 is header
if( [o_hotkeys_listbox clickedRow] >= 0 )
[self hotkeySettingChanged:o_hotkeys_listbox];
}
- (IBAction)hotkeySettingChanged:(id)sender - (IBAction)hotkeySettingChanged:(id)sender
{ {
if( sender == o_hotkeys_change_btn || sender == o_hotkeys_listbox ) if( sender == o_hotkeys_change_btn || sender == o_hotkeys_listbox )
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment