Skip to content

V
vlc-2-2
Commit c0e7149a authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

macosx: re-written hotkey preferences

parent 095ad3e1
Expand all Show whitespace changes
Inline Side-by-side
Showing with 70 additions and 100 deletions
modules/gui/macosx/simple_prefs.h
View file @ c0e7149a
...@@ -155,14 +155,15 @@ ...@@ -155,14 +155,15 @@
NSOpenPanel *o_selectFolderPanel; NSOpenPanel *o_selectFolderPanel;
NSArray *o_hotkeyDescriptions; NSArray *o_hotkeyDescriptions;
NSArray *o_hotkeyNames;
NSArray *o_hotkeysNonUseableKeys; NSArray *o_hotkeysNonUseableKeys;
NSMutableArray *o_hotkeySettings; NSMutableArray *o_hotkeySettings;
NSNumber *o_keyInTransition; NSString *o_keyInTransition;
intf_thread_t *p_intf; intf_thread_t *p_intf;
} }
+ (VLCSimplePrefs *)sharedInstance; + (VLCSimplePrefs *)sharedInstance;
- (NSString *)OSXKeyToString:(int)val; - (NSString *)OSXStringKeyToString:(NSString *)theString;
/* toolbar */ /* toolbar */
- (NSToolbarItem *) toolbar: (NSToolbar *)o_toolbar - (NSToolbarItem *) toolbar: (NSToolbar *)o_toolbar
...@@ -209,7 +210,7 @@ ...@@ -209,7 +210,7 @@
- (void)showHotkeySettings; - (void)showHotkeySettings;
- (int)numberOfRowsInTableView:(NSTableView *)aTableView; - (int)numberOfRowsInTableView:(NSTableView *)aTableView;
- (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(int)rowIndex; - (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(int)rowIndex;
- (BOOL)changeHotkeyTo: (int)i_theNewKey; - (BOOL)changeHotkeyTo: (NSString *)theKey;
@end @end
......
modules/gui/macosx/simple_prefs.m
View file @ c0e7149a
This diff is collapsed.
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