change US bindings for Z/Y key swap

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@4172 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/SAE-us-keypad.bindings.in b/gtk2_ardour/SAE-us-keypad.bindings.in
index a50af3bd4c84053978417bb921784c15dad5321e..f89d7aace82b861966056b6a02a4b52acd8545b2 100644 (file)
--- a/gtk2_ardour/SAE-us-keypad.bindings.in
+++ b/gtk2_ardour/SAE-us-keypad.bindings.in
@@ -56,7 +56,7 @@
 (gtk_accel_path "<Actions>/Editor/temporal-zoom-in" "t")
 (gtk_accel_path "<Actions>/Common/ToggleThemeManager" "<%WINDOW%>t")
 (gtk_accel_path "<Actions>/Editor/pitch-shift-region" "<%LEVEL4%>t")
-(gtk_accel_path "<Actions>/Editor/split-region" "y")
+(gtk_accel_path "<Actions>/Editor/split-region" "z")
 (gtk_accel_path "<Actions>/Editor/set-region-sync-position" "u")
 (gtk_accel_path "<Actions>/Editor/insert-region" "i")
 (gtk_accel_path "<Actions>/Editor/addExistingAudioFiles" "<%PRIMARY%>i")
@@ -94,10 +94,10 @@
 
 ;; UNTERE ZEILE
 
-(gtk_accel_path "<Actions>/Editor/zoom-to-region" "z")
+(gtk_accel_path "<Actions>/Editor/zoom-to-region" "y")
 (gtk_accel_path "<Actions>/Editor/undo" "<%PRIMARY%>z")
-(gtk_accel_path "<Actions>/Editor/zoom-to-session" "<%SECONDARY%>z")
-(gtk_accel_path "<Actions>/Editor/toggle-zoom" "<%TERTIARY%>z")
+(gtk_accel_path "<Actions>/Editor/zoom-to-session" "<%SECONDARY%>y")
+(gtk_accel_path "<Actions>/Editor/toggle-zoom" "<%TERTIARY%>y")
 (gtk_accel_path "<Actions>/Editor/editor-separate" "x")
 (gtk_accel_path "<Actions>/Editor/editor-cut" "<%PRIMARY%>x")
 (gtk_accel_path "<Actions>/Editor/crop" "c")

diff --git a/gtk2_ardour/SAE-us-nokeypad.bindings.in b/gtk2_ardour/SAE-us-nokeypad.bindings.in
index 044df5cd7d3f38d10dc7f734ce429585ba60f3f4..1ff0d0982c172edd29f4d38f0bc5c1a94d5329a0 100644 (file)
--- a/gtk2_ardour/SAE-us-nokeypad.bindings.in
+++ b/gtk2_ardour/SAE-us-nokeypad.bindings.in
@@ -56,7 +56,7 @@
 (gtk_accel_path "<Actions>/Editor/temporal-zoom-in" "t")
 (gtk_accel_path "<Actions>/Common/ToggleThemeManager" "<%SECONDARY%>t")
 (gtk_accel_path "<Actions>/Editor/pitch-shift-region" "<%LEVEL4%>t")
-(gtk_accel_path "<Actions>/Editor/split-region" "y")
+(gtk_accel_path "<Actions>/Editor/split-region" "z")
 (gtk_accel_path "<Actions>/Editor/set-region-sync-position" "u")
 (gtk_accel_path "<Actions>/Editor/insert-region" "i")
 (gtk_accel_path "<Actions>/Editor/addExistingAudioFiles" "<%PRIMARY%>i")
@@ -94,10 +94,10 @@
 
 ;; UNTERE ZEILE
 
-(gtk_accel_path "<Actions>/Editor/zoom-to-region" "z")
+(gtk_accel_path "<Actions>/Editor/zoom-to-region" "y")
 (gtk_accel_path "<Actions>/Editor/undo" "<%PRIMARY%>z")
-(gtk_accel_path "<Actions>/Editor/zoom-to-session" "<%SECONDARY%>z")
-(gtk_accel_path "<Actions>/Editor/toggle-zoom" "<%TERTIARY%>z")
+(gtk_accel_path "<Actions>/Editor/zoom-to-session" "<%SECONDARY%>y")
+(gtk_accel_path "<Actions>/Editor/toggle-zoom" "<%TERTIARY%>y")
 (gtk_accel_path "<Actions>/Editor/editor-separate" "x")
 (gtk_accel_path "<Actions>/Editor/editor-cut" "<%PRIMARY%>x")
 (gtk_accel_path "<Actions>/Editor/crop" "c")

diff --git a/gtk2_ardour/SConscript b/gtk2_ardour/SConscript
index d7b307f8f8a1db11c94d24d69fa923547698c5a0..4dafedd598273ccf2a9c3b710a66c1ef1ad106a8 100644 (file)
--- a/gtk2_ardour/SConscript
+++ b/gtk2_ardour/SConscript
@@ -435,7 +435,7 @@ else:
        keybindings_dict['%LEVEL4%'] = env['WINDOWS_KEY']
        keybindings_dict['%WINDOW%'] = 'Alt'
 
-for b in [ 'SAE-de-keypad',  'SAE-de-nokeypad', 'SAE-us-keypad', 'SAE-de-nokeypad', 'mnemonic-us', 'ergonomic-us' ]:
+for b in [ 'SAE-de-keypad',  'SAE-de-nokeypad', 'SAE-us-keypad', 'SAE-us-nokeypad', 'mnemonic-us', 'ergonomic-us' ]:
        target_file = b + '.bindings'
        src_file = target_file + '.in'
        Default (env.SubstInFile (target_file, src_file, SUBST_DICT = keybindings_dict))