summaryrefslogtreecommitdiff
path: root/gtk2_ardour/SConscript
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2008-02-23 14:13:25 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2008-02-23 14:13:25 +0000
commit770c39dce16598835ae4c9e970c11fb6edfde348 (patch)
tree13aa3fbe60d405db018ee070cf1f5a54c28edc89 /gtk2_ardour/SConscript
parent33690d3e728d50335d0a0720020e15db29aa3815 (diff)
fix up meter thread management when JACK client starts/stops/is halted ; put focus in plugin search entry when plugin selector is shown ; add WINDOWS_KEY option to gtk2_ardour/SConscript, controlling what X modifier is used for LEVEL4 modifier/bindings ; fix up Keyboard object to properly support LEVEL4 bindings ; fix Playlist::partition_internal() to avoid acting on regions that should not be operated on given the range provided ; fix up more stuff relating to get_regions_for(), including cut/delete ops on edit range vs. regions
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3115 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/SConscript')
-rw-r--r--gtk2_ardour/SConscript4
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk2_ardour/SConscript b/gtk2_ardour/SConscript
index cfeff7a1aa..53eb217062 100644
--- a/gtk2_ardour/SConscript
+++ b/gtk2_ardour/SConscript
@@ -409,12 +409,12 @@ if gtkardour['GTKOSX'] and gtkardour['NATIVE_OSX_KEYS']:
keybindings_dict['%WINDOW%'] = 'Mod1'
else:
#
- # Ctrl, Alt, Shift, Mod3(Meta)
+ # Ctrl, Alt, Shift, Mod4(Super/Windows/Hyper)
#
keybindings_dict['%PRIMARY%'] = 'Ctrl'
keybindings_dict['%SECONDARY%'] = 'Alt'
keybindings_dict['%TERTIARY%'] = 'Shift'
- keybindings_dict['%LEVEL4%'] = 'Mod2'
+ keybindings_dict['%LEVEL4%'] = env['WINDOWS_KEY']
keybindings_dict['%WINDOW%'] = 'Alt'
for b in [ 'SAE-de', 'mnemonic-us', 'ergonomic-us' ]: