Fix windows key shortcuts on Linux.
authorCarl Hetherington <carl@carlh.net>
Sun, 15 Aug 2010 12:37:44 +0000 (12:37 +0000)
committerCarl Hetherington <carl@carlh.net>
Sun, 15 Aug 2010 12:37:44 +0000 (12:37 +0000)
git-svn-id: svn://localhost/ardour2/branches/3.0@7632 d708f5d6-7413-0410-9779-e7cbd77b26cf

gtk2_ardour/mnemonic-us.bindings.in
gtk2_ardour/wscript
wscript

index 5ba5011187b117896b4268c51377e125e6787af6..6b6f760e55dc6c16733b6a936010ade15a5c7db3 100644 (file)
@@ -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
 
index 858d086c4898ed8d2eef9f8c39a5cf7fbca5f87b..5ec8ac572692b1ab933239af917ee6691f5e5312 100644 (file)
@@ -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')
 
diff --git a/wscript b/wscript
index ca584987c1d71c3639e9fc2f35009a5c91875666..cd417b7ad4b96a68deddbc21b2b78c7b0bbc9627 100644 (file)
--- a/wscript
+++ b/wscript
@@ -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)