Skip to content

V
vlc
Commit 032f1e34 authored by Derk-Jan Hartman's avatar Derk-Jan Hartman
Browse files
Options

macosx: Fix configurability of some of the hotkeys 

This partly fixes #2815, but the conflict of "Reveal in Finder" and "Record" has not yet been fixed.
parent 4db53934
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 9 deletions
modules/gui/macosx/intf.m
View file @ 032f1e34
......@@ -463,6 +463,18 @@ static VLCMain *_o_sharedMainInstance = nil;
i_key = config_GetInt( p_intf, "key-snapshot" );
[o_mi_snapshot setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
[o_mi_snapshot setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
i_key = config_GetInt( p_intf, "key-random" );
[o_mi_random setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
[o_mi_random setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
i_key = config_GetInt( p_intf, "key-zoom-half" );
[o_mi_half_window setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
[o_mi_half_window setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
i_key = config_GetInt( p_intf, "key-zoom-original" );
[o_mi_normal_window setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
[o_mi_normal_window setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
i_key = config_GetInt( p_intf, "key-zoom-double" );
[o_mi_double_window setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
[o_mi_double_window setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
var_Create( p_intf, "intf-change", VLC_VAR_BOOL );
......
src/libvlc-module.c
View file @ 032f1e34
......@@ -2117,15 +2117,10 @@ vlc_module_begin ()
* open network KEY_MODIFIER_COMMAND|'n'
* open capture KEY_MODIFIER_COMMAND|'r'
* save playlist KEY_MODIFIER_COMMAND|'s'
* playlist random KEY_MODIFIER_COMMAND|'z'
* playlist repeat all KEY_MODIFIER_COMMAND|'l'
* playlist repeat KEY_MODIFIER_COMMAND|'r'
* video half size KEY_MODIFIER_COMMAND|'0'
* video normal size KEY_MODIFIER_COMMAND|'1'
* video double size KEY_MODIFIER_COMMAND|'2'
* video fit to screen KEY_MODIFIER_COMMAND|'3'
* minimize window KEY_MODIFIER_COMMAND|'m'
* quit application KEY_MODIFIER_COMMAND|'q'
* close window KEY_MODIFIER_COMMAND|'w'
* streaming wizard KEY_MODIFIER_COMMAND|KEY_MODIFIER_SHIFT|'w'
* show controller KEY_MODIFIER_COMMAND|KEY_MODIFIER_SHIFT|'c'
......@@ -2193,7 +2188,7 @@ vlc_module_begin ()
# define KEY_SNAPSHOT KEY_MODIFIER_COMMAND|KEY_MODIFIER_ALT|'s'
# define KEY_ZOOM 'z'
# define KEY_UNZOOM KEY_MODIFIER_SHIFT|'z'
# define KEY_RANDOM 'r'
# define KEY_RANDOM KEY_MODIFIER_COMMAND|'z'
# define KEY_LOOP KEY_MODIFIER_SHIFT|'l'
# define KEY_CROP_TOP KEY_MODIFIER_ALT|'i'
......@@ -2207,9 +2202,9 @@ vlc_module_begin ()
/* the macosx-interface already has bindings */
# define KEY_ZOOM_QUARTER KEY_UNSET
# define KEY_ZOOM_HALF KEY_UNSET
# define KEY_ZOOM_ORIGINAL KEY_UNSET
# define KEY_ZOOM_DOUBLE KEY_UNSET
# define KEY_ZOOM_HALF KEY_MODIFIER_COMMAND|'0'
# define KEY_ZOOM_ORIGINAL KEY_MODIFIER_COMMAND|'1'
# define KEY_ZOOM_DOUBLE KEY_MODIFIER_COMMAND|'2'
# define KEY_SET_BOOKMARK1 KEY_MODIFIER_COMMAND|KEY_F1
# define KEY_SET_BOOKMARK2 KEY_MODIFIER_COMMAND|KEY_F2
......
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