diff options
| author | Carl Hetherington <carl@carlh.net> | 2010-08-15 12:37:44 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2010-08-15 12:37:44 +0000 |
| commit | 66ea8edc6e317eba925558df7d8369ce5d260752 (patch) | |
| tree | c3f3670c523f2a51f1e85b0523fd9719e8602b0f | |
| parent | 9ad776039e187aef613fe4e215444a8d9be94705 (diff) | |
Fix windows key shortcuts on Linux.
git-svn-id: svn://localhost/ardour2/branches/3.0@7632 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | gtk2_ardour/mnemonic-us.bindings.in | 2 | ||||
| -rw-r--r-- | gtk2_ardour/wscript | 2 | ||||
| -rw-r--r-- | wscript | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/gtk2_ardour/mnemonic-us.bindings.in b/gtk2_ardour/mnemonic-us.bindings.in index 5ba5011187..6b6f760e55 100644 --- a/gtk2_ardour/mnemonic-us.bindings.in +++ b/gtk2_ardour/mnemonic-us.bindings.in @@ -103,7 +103,7 @@ This mode provides many different operations on both regions and control points, @trans|Transport/ToggleRoll|space|toggle roll @epp|Editor/play-edit-range|<@SECONDARY@>space|play edit range @epp|Editor/play-from-edit-point-and-return|<@LEVEL4@>space|play from EP \& return -@trans|Transport/ToggleRollMaybe|<@PRIMARY@><@SECONDARY>space|stop but do not leave loop/range play +@trans|Transport/ToggleRollMaybe|<@PRIMARY@><@SECONDARY@>space|stop but do not leave loop/range play @trans|Transport/ToggleRollForgetCapture|<@PRIMARY@>space|stop and destroy @trans|Transport/record-roll|<@TERTIARY@>space|start recording diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript index 858d086c48..5ec8ac5726 100644 --- a/gtk2_ardour/wscript +++ b/gtk2_ardour/wscript @@ -445,7 +445,7 @@ def build(bld): obj = bld.new_task_gen ( target = b + '.bindings', source = b + '.bindings.in', - rule = '../tools/fmt-bindings --winkey=%s --accelmap <${SRC} >${TGT}' % bld.env['windows_key'] + rule = '../tools/fmt-bindings --winkey="%s" --accelmap <${SRC} >${TGT}' % bld.env['WINDOWS_KEY'] ) obj.install_path = os.path.join(bld.env['CONFIGDIR'], 'ardour3') @@ -559,8 +559,7 @@ def configure(conf): autowaf.display_msg(conf, 'Wiimote Support', opts.wiimote) if opts.wiimote: conf.define('WIIMOTE',1) - if opts.windows_key: - conf.define('WINDOWS_KEY', opts.windows_key) + conf.define('WINDOWS_KEY', opts.windows_key) autowaf.display_msg(conf, 'Windows Key', opts.windows_key) conf.env['PROGRAM_NAME'] = opts.program_name autowaf.display_msg(conf, 'Program Name', opts.program_name) |