smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-06 05:35:47 +01:00
Code Issues Projects Releases Wiki Activity

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)

Browse source 
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2716 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2007-11-27 04:32:25 +00:00
parent 1268bf8b45
commit 263520b70b
22 changed files with 521 additions and 106 deletions
Download patch file Download diff file Expand all files Collapse all files

29
gtk2_ardour/SConscript
View file

@ -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 +