diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2007-12-12 21:42:25 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2007-12-12 21:42:25 +0000 |
| commit | 7d351e7e486717d7d0cc2a4f338676faa8c35f5e (patch) | |
| tree | bf5a19ba6d937aadc4579c6f187fe921a3d83d07 /gtk2_ardour/SConscript | |
| parent | 24593ea7308346f54a8d51a367e20fc880432671 (diff) | |
per-kbd-layout keybindings selection; initial pass at link-region-and-track-selection
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2779 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/SConscript')
| -rw-r--r-- | gtk2_ardour/SConscript | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/gtk2_ardour/SConscript b/gtk2_ardour/SConscript index e0c9785b9f..45745a39b6 100644 --- a/gtk2_ardour/SConscript +++ b/gtk2_ardour/SConscript @@ -188,6 +188,7 @@ new_session_dialog.cc option_editor.cc opts.cc pan_automation_time_axis.cc + panner.cc panner2d.cc panner_ui.cc @@ -399,7 +400,7 @@ if gtkardour['GTKOSX'] and gtkardour['NATIVE_OSX_KEYS']: keybindings_dict['%PRIMARY%'] = 'Mod5' keybindings_dict['%SECONDARY%'] = 'Alt' keybindings_dict['%TERTIARY%'] = 'Shift' - keybindings_dict['%LEVEL4%'] = 'Shift' + keybindings_dict['%LEVEL4%'] = 'Ctrl' keybindings_dict['%WINDOW%'] = 'Mod5' else: # @@ -412,7 +413,8 @@ else: keybindings_dict['%WINDOW%'] = 'Ctrl' 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); +ardoursaeDEbindings = env.SubstInFile ('ardour-sae-de.bindings', 'ardour-sae-de.bindings.in', SUBST_DICT = keybindings_dict); +ardoursaeANSIbindings = env.SubstInFile ('ardour-sae-ansi.bindings', 'ardour-sae-ansi.bindings.in', SUBST_DICT = keybindings_dict); my_subst_dict['%INSTALL_PREFIX%'] = final_prefix my_subst_dict['%LIBDIR%'] = env['LIBDIR'] @@ -425,7 +427,8 @@ ardourdev = env.SubstInFile ('ardev_common.sh','ardev_common.sh.in', SUBST_DICT env.AddPostAction (ardourdev, Chmod ('$TARGET', 0755)) Default(ardourbindings) -Default(ardoursaebindings) +Default(ardoursaeDEbindings) +Default(ardoursaeANSIbindings) Default(ardourdev) Default(ardoursh) Default(ardour_dark_theme) @@ -476,7 +479,9 @@ env.Alias ('tarball', env.Distribute (env['DISTTREE'], 'ardev', 'ardbg', 'ardour2_ui_dark.rc.in', 'ardour2_ui_light.rc.in', 'splash.png', 'ardour.menus', 'ardour-sae.menus', - 'ardour.bindings.in', 'ardour-sae.bindings.in', + 'ardour.bindings.in', + 'ardour-sae-ansi.bindings.in', + 'ardour-sae-de.bindings.in', 'ardour2_ui_default.conf', 'editor_xpms' ] + |