diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2007-11-27 04:32:25 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2007-11-27 04:32:25 +0000 |
| commit | 263520b70bcbd378da86c89c12edf7e1390d5ded (patch) | |
| tree | 22470fdcc2373ab0899cf859eb3effb432013a8b /gtk2_ardour/SConscript | |
| parent | 1268bf8b45d2f7c4dad55f055b4f76d4b66c5dd3 (diff) | |
MESCLUN: new SAE-specific bindings file; parametized binding files; fix handling of master source info loading from XML; change rubberband stretch progress reporting; better handling of top level menubar accelerators on Quartz; fixup handling of user-specified bindings file; no more audition on double-click in region list (does rename instead); various OS X specific fixups; partial fix for memory leakage in import code (fixed by timbyr in trunk but not back-portable to 2.X)
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2716 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/SConscript')
| -rw-r--r-- | gtk2_ardour/SConscript | 29 |
1 files changed, 27 insertions, 2 deletions
diff --git a/gtk2_ardour/SConscript b/gtk2_ardour/SConscript index 0983fc81f8..a0a197d4c0 100644 --- a/gtk2_ardour/SConscript +++ b/gtk2_ardour/SConscript @@ -382,7 +382,27 @@ my_subst_dict = { } # null substitution just to avoid ardour.bindings being in svn # -ardourbindings = env.SubstInFile ('ardour.bindings', 'ardour.bindings.in', SUBST_DICT = my_subst_dict); +keybindings_dict = { } + +if gtkardour['GTKOSX'] and gtkardour['NATIVE_OSX_KEYS']: + # + # Command(Mod1), Alt(Mod5), Ctrl, Shift + # + keybindings_dict['%PRIMARY%'] = 'Mod1' + keybindings_dict['%SECONDARY%'] = 'Alt' + keybindings_dict['%TERTIARY%'] = 'Ctrl' + keybindings_dict['%LEVEL4%'] = 'Shift' +else: + # + # Ctrl, Alt, Shift, Mod3(Meta) + # + keybindings_dict['%PRIMARY%'] = 'Ctrl' + keybindings_dict['%SECONDARY%'] = 'Alt' + keybindings_dict['%TERTIARY%'] = 'Shift' + keybindings_dict['%LEVEL4%'] = 'Mod3' + +ardourbindings = env.SubstInFile ('ardour.bindings', 'ardour.bindings.in', SUBST_DICT = keybindings_dict); +ardoursaebindings = env.SubstInFile ('ardour-sae.bindings', 'ardour-sae.bindings.in', SUBST_DICT = keybindings_dict); my_subst_dict['%INSTALL_PREFIX%'] = final_prefix my_subst_dict['%LIBDIR%'] = env['LIBDIR'] @@ -395,6 +415,7 @@ ardourdev = env.SubstInFile ('ardev_common.sh','ardev_common.sh.in', SUBST_DICT env.AddPostAction (ardourdev, Chmod ('$TARGET', 0755)) Default(ardourbindings) +Default(ardoursaebindings) Default(ardourdev) Default(ardoursh) Default(ardour_dark_theme) @@ -426,7 +447,9 @@ env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), ardour_ env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), ardour_light_theme)) env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour2_ui_default.conf')) env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour.menus')) +env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour-sae.menus')) env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour.bindings')) +env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour-sae.bindings')) # data files env.Alias('install', env.Install(os.path.join(install_prefix, 'share', 'ardour2'), 'splash.png')) env.Alias('install', env.Install(os.path.join(install_prefix, 'share', 'ardour2', 'pixmaps'), pixmap_files)) @@ -442,7 +465,9 @@ env.Alias ('tarball', env.Distribute (env['DISTTREE'], 'ardev_common.sh.in', 'ardev', 'ardbg', 'ardour2_ui_dark.rc.in', 'ardour2_ui_light.rc.in', 'splash.png', - 'ardour.menus', 'ardour.bindings.in', 'ardour2_ui_default.conf', + 'ardour.menus', 'ardour-sae.menus', + 'ardour.bindings.in', 'ardour-sae.bindings.in', + 'ardour2_ui_default.conf', 'editor_xpms' ] + gtkardour_files + |