revert 11507 which switched to use <Primary> for keybindings (this will not work on anything other than the absoute latest release of GTK(2 or 3)

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@11628 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2012-03-09 16:58:22 +00:00
parent ed2a5723fe
commit b7954b963a
1 changed files with 18 additions and 5 deletions

View File

@ -425,15 +425,28 @@ my_subst_dict = { }
keybindings_dict = { }
keybindings_dict['%PRIMARY%'] = 'Primary'
keybindings_dict['%SECONDARY%'] = 'Alt'
keybindings_dict['%TERTIARY%'] = 'Shift'
keybindings_dict['%WINDOW%'] = 'Alt'
if gtkardour['GTKOSX']:
#
# Command(Meta), Alt(Mod1), Ctrl, Shift
# **** as of november 18th 2011, OUR VERSION OF *****
# Gtk/Quartz maps:
# NSCommand (aka "Command" aka "Apple" aka "Cauliflower") -> Mod2
# NSAlternate (aka "Option") -> Mod1
#
keybindings_dict['%PRIMARY%'] = 'Mod2'
keybindings_dict['%SECONDARY%'] = 'Mod1'
keybindings_dict['%TERTIARY%'] = 'Shift'
keybindings_dict['%LEVEL4%'] = 'Ctrl'
keybindings_dict['%WINDOW%'] = 'Mod1'
else:
#
# Ctrl, Alt, Shift, Mod4(Super/Windows/Hyper)
#
keybindings_dict['%PRIMARY%'] = 'Ctrl'
keybindings_dict['%SECONDARY%'] = 'Alt'
keybindings_dict['%TERTIARY%'] = 'Shift'
keybindings_dict['%LEVEL4%'] = env['WINDOWS_KEY']
keybindings_dict['%WINDOW%'] = 'Alt'
for b in [ 'SAE-de-keypad', 'SAE-de-nokeypad', 'SAE-us-keypad', 'SAE-us-nokeypad', 'mnemonic-us', 'ergonomic-us' ]:
target_file = b + '.bindings'