From bc89fe0147c04b67141936d109c00dfd4d69cc4b Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Fri, 12 Dec 2008 14:43:24 +0000 Subject: most of the 2.X->3.0 commit (up to rev 4299) except for gtk2_ardour/editor_canvas.cc; builds and runs and does a few specific things but expect it to be buggy for a while yet git-svn-id: svn://localhost/ardour2/branches/3.0@4313 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/mnemonic-us.bindings.in | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'gtk2_ardour/mnemonic-us.bindings.in') diff --git a/gtk2_ardour/mnemonic-us.bindings.in b/gtk2_ardour/mnemonic-us.bindings.in index 8a2a1923ba..27e6e9f259 100644 --- a/gtk2_ardour/mnemonic-us.bindings.in +++ b/gtk2_ardour/mnemonic-us.bindings.in @@ -108,28 +108,30 @@ (gtk_accel_path "/Common/ToggleBigClock" "<%WINDOW%>b") (gtk_accel_path "/Editor/normalize-region" "<%SECONDARY%>n") (gtk_accel_path "/Editor/mute-unmute-region" "<%SECONDARY%>m") -(gtk_accel_path "/Common/goto-mixer" "<%WINDOW%>m") +(gtk_accel_path "/Common/toggle-editor-mixer-on-top" "<%WINDOW%>m") ;; arrow keys, navigation etc. (gtk_accel_path "/Editor/step-tracks-up" "uparrow") -(gtk_accel_path "/Transport/TransitionToRoll" "<%PRIMARY%>uparrow") +(gtk_accel_path "/Transport/TransitionToRoll" "<%TERTIARY%>uparrow") (gtk_accel_path "/Editor/select-prev-route" "<%SECONDARY%>uparrow") -(gtk_accel_path "/Editor/move-selected-tracks-up" "<%TERTIARY%>uparrow") +(gtk_accel_path "/Editor/move-selected-tracks-up" "<%PRIMARY%>uparrow") (gtk_accel_path "/Editor/step-tracks-down" "downarrow") -(gtk_accel_path "/Transport/TransitionToReverse" "<%PRIMARY%>downarrow") +(gtk_accel_path "/Transport/TransitionToReverse" "<%TERTIARY%>downarrow") (gtk_accel_path "/Editor/select-next-route" "<%SECONDARY%>downarrow") -(gtk_accel_path "/Editor/move-selected-tracks-down" "<%TERTIARY%>downarrow") +(gtk_accel_path "/Editor/move-selected-tracks-down" "<%PRIMARY%>downarrow") (gtk_accel_path "/Editor/playhead-to-previous-region-boundary" "leftarrow") (gtk_accel_path "/Editor/tab-to-transient-backwards" "<%PRIMARY%>leftarrow") (gtk_accel_path "/Editor/nudge-playhead-backward" "<%SECONDARY%>leftarrow") +(gtk_accel_path "/Transport/Rewind" "<%TERTIARY%>leftarrow") (gtk_accel_path "/Editor/selected-marker-to-previous-region-boundary" "<%PRIMARY%><%TERTIARY%>leftarrow") (gtk_accel_path "/Editor/playhead-to-next-region-boundary" "rightarrow") (gtk_accel_path "/Editor/tab-to-transient-forwards" "<%PRIMARY%>rightarrow") (gtk_accel_path "/Editor/nudge-playhead-forward" "<%SECONDARY%>rightarrow") +(gtk_accel_path "/Transport/Forward" "<%TERTIARY%>rightarrow") (gtk_accel_path "/Editor/selected-marker-to-next-region-boundary" "<%PRIMARY%><%TERTIARY%>rightarrow") (gtk_accel_path "/Editor/scroll-tracks-down" "Page_Down") @@ -214,8 +216,9 @@ (gtk_accel_path "/Editor/toggle-edit-mode" "1") (gtk_accel_path "/Editor/cycle-snap-mode" "2") (gtk_accel_path "/Editor/cycle-snap-choice" "3") -(gtk_accel_path "/Transport/ToggleAutoReturn" "4") -(gtk_accel_path "/Transport/ToggleClick" "5") +(gtk_accel_path "/Editor/step-mouse-mode" "4") +(gtk_accel_path "/Transport/ToggleAutoReturn" "5") +(gtk_accel_path "/Transport/ToggleClick" "6") (gtk_accel_path "/Editor/set-tempo-from-region" "9") (gtk_accel_path "/Editor/set-tempo-from-edit-range" "0") -- cgit v1.2.3