Updating branch refs/heads/jeromeg/keyboard-shortcuts to 128a25d53a689896f29a0936d0d686478c107aa7 (commit) from 0d2c165aeff3da0268276cbc75f9470bfc349e4b (commit)
commit 128a25d53a689896f29a0936d0d686478c107aa7 Author: Jérôme Guelfucci <jero...@xfce.org> Date: Wed Dec 19 14:56:06 2012 +0100 Use <Primary> instead of <Control> (bug #8200). While <Control> works fine now for grabbing / detecting, shortcut comparison is broken because the strings are different. This only deals with the default shortcuts, we need to migrate the custom shortcuts. libxfce4kbd-private/xfce4-keyboard-shortcuts.xml | 66 +++++++++++----------- 1 files changed, 33 insertions(+), 33 deletions(-) diff --git a/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml b/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml index cf1978d..2b1507e 100644 --- a/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml +++ b/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml @@ -10,10 +10,10 @@ <property name="<Alt>F3" type="string" value="xfce4-appfinder"> <property name="startup-notify" type="bool" value="true"/> </property> - <property name="<Control><Alt>Delete" type="string" value="xflock4"/> + <property name="<Primary><Alt>Delete" type="string" value="xflock4"/> <property name="XF86Display" type="string" value="xfce4-display-settings --minimal"/> <property name="<Super>p" type="string" value="xfce4-display-settings --minimal"/> - <property name="<Control>Escape" type="string" value="xfdesktop --menu"/> + <property name="<Primary>Escape" type="string" value="xfdesktop --menu"/> <property name="XF86WWW" type="string" value="exo-open --launch WebBrowser"/> <property name="XF86Mail" type="string" value="exo-open --launch MailReader"/> </property> @@ -29,8 +29,8 @@ <property name="<Alt>Tab" type="string" value="cycle_windows_key"/> <property name="<Alt><Shift>Tab" type="string" value="cycle_reverse_windows_key"/> <property name="<Alt>Delete" type="string" value="del_workspace_key"/> - <property name="<Control><Alt>Down" type="string" value="down_workspace_key"/> - <property name="<Control><Alt>Left" type="string" value="left_workspace_key"/> + <property name="<Primary><Alt>Down" type="string" value="down_workspace_key"/> + <property name="<Primary><Alt>Left" type="string" value="left_workspace_key"/> <property name="<Shift><Alt>Page_Down" type="string" value="lower_window_key"/> <property name="<Alt>F4" type="string" value="close_window_key"/> <property name="<Alt>F6" type="string" value="stick_window_key"/> @@ -40,38 +40,38 @@ <property name="<Alt>F10" type="string" value="maximize_window_key"/> <property name="<Alt>F11" type="string" value="fullscreen_key"/> <property name="<Alt>F12" type="string" value="above_key"/> - <property name="<Control><Shift><Alt>Left" type="string" value="move_window_left_key"/> - <property name="<Alt><Control>End" type="string" value="move_window_next_workspace_key"/> - <property name="<Alt><Control>Home" type="string" value="move_window_prev_workspace_key"/> - <property name="<Control><Shift><Alt>Right" type="string" value="move_window_right_key"/> - <property name="<Control><Shift><Alt>Up" type="string" value="move_window_up_key"/> - <property name="<Alt><Control>KP_1" type="string" value="move_window_workspace_1_key"/> - <property name="<Alt><Control>KP_2" type="string" value="move_window_workspace_2_key"/> - <property name="<Alt><Control>KP_3" type="string" value="move_window_workspace_3_key"/> - <property name="<Alt><Control>KP_4" type="string" value="move_window_workspace_4_key"/> - <property name="<Alt><Control>KP_5" type="string" value="move_window_workspace_5_key"/> - <property name="<Alt><Control>KP_6" type="string" value="move_window_workspace_6_key"/> - <property name="<Alt><Control>KP_7" type="string" value="move_window_workspace_7_key"/> - <property name="<Alt><Control>KP_8" type="string" value="move_window_workspace_8_key"/> - <property name="<Alt><Control>KP_9" type="string" value="move_window_workspace_9_key"/> + <property name="<Primary><Shift><Alt>Left" type="string" value="move_window_left_key"/> + <property name="<Alt><Primary>End" type="string" value="move_window_next_workspace_key"/> + <property name="<Alt><Primary>Home" type="string" value="move_window_prev_workspace_key"/> + <property name="<Primary><Shift><Alt>Right" type="string" value="move_window_right_key"/> + <property name="<Primary><Shift><Alt>Up" type="string" value="move_window_up_key"/> + <property name="<Alt><Primary>KP_1" type="string" value="move_window_workspace_1_key"/> + <property name="<Alt><Primary>KP_2" type="string" value="move_window_workspace_2_key"/> + <property name="<Alt><Primary>KP_3" type="string" value="move_window_workspace_3_key"/> + <property name="<Alt><Primary>KP_4" type="string" value="move_window_workspace_4_key"/> + <property name="<Alt><Primary>KP_5" type="string" value="move_window_workspace_5_key"/> + <property name="<Alt><Primary>KP_6" type="string" value="move_window_workspace_6_key"/> + <property name="<Alt><Primary>KP_7" type="string" value="move_window_workspace_7_key"/> + <property name="<Alt><Primary>KP_8" type="string" value="move_window_workspace_8_key"/> + <property name="<Alt><Primary>KP_9" type="string" value="move_window_workspace_9_key"/> <property name="<Alt>space" type="string" value="popup_menu_key"/> <property name="<Shift><Alt>Page_Up" type="string" value="raise_window_key"/> - <property name="<Control><Alt>Right" type="string" value="right_workspace_key"/> - <property name="<Control><Alt>d" type="string" value="show_desktop_key"/> - <property name="<Control><Alt>Up" type="string" value="up_workspace_key"/> + <property name="<Primary><Alt>Right" type="string" value="right_workspace_key"/> + <property name="<Primary><Alt>d" type="string" value="show_desktop_key"/> + <property name="<Primary><Alt>Up" type="string" value="up_workspace_key"/> <property name="<Super>Tab" type="string" value="switch_window_key"/> - <property name="<Control>F1" type="string" value="workspace_1_key"/> - <property name="<Control>F2" type="string" value="workspace_2_key"/> - <property name="<Control>F3" type="string" value="workspace_3_key"/> - <property name="<Control>F4" type="string" value="workspace_4_key"/> - <property name="<Control>F5" type="string" value="workspace_5_key"/> - <property name="<Control>F6" type="string" value="workspace_6_key"/> - <property name="<Control>F7" type="string" value="workspace_7_key"/> - <property name="<Control>F8" type="string" value="workspace_8_key"/> - <property name="<Control>F9" type="string" value="workspace_9_key"/> - <property name="<Control>F10" type="string" value="workspace_10_key"/> - <property name="<Control>F11" type="string" value="workspace_11_key"/> - <property name="<Control>F12" type="string" value="workspace_12_key"/> + <property name="<Primary>F1" type="string" value="workspace_1_key"/> + <property name="<Primary>F2" type="string" value="workspace_2_key"/> + <property name="<Primary>F3" type="string" value="workspace_3_key"/> + <property name="<Primary>F4" type="string" value="workspace_4_key"/> + <property name="<Primary>F5" type="string" value="workspace_5_key"/> + <property name="<Primary>F6" type="string" value="workspace_6_key"/> + <property name="<Primary>F7" type="string" value="workspace_7_key"/> + <property name="<Primary>F8" type="string" value="workspace_8_key"/> + <property name="<Primary>F9" type="string" value="workspace_9_key"/> + <property name="<Primary>F10" type="string" value="workspace_10_key"/> + <property name="<Primary>F11" type="string" value="workspace_11_key"/> + <property name="<Primary>F12" type="string" value="workspace_12_key"/> </property> </property> </channel> _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits