From 8ffb89b5007f4115a8334fcca776c3b73d381f9f Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Wed, 25 Mar 2009 17:50:38 +0000 Subject: [PATCH] reverse all SAE keybindings so that next/prev-region-boundary variants (with and without selected tracks) are swapped) git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@4894 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/SAE-de-keypad.bindings.in | 8 ++++---- gtk2_ardour/SAE-de-nokeypad.bindings.in | 8 ++++---- gtk2_ardour/SAE-us-keypad.bindings.in | 8 ++++---- gtk2_ardour/SAE-us-nokeypad.bindings.in | 8 ++++---- gtk2_ardour/ardour_ui_ed.cc | 2 +- gtk2_ardour/route_ui.cc | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/gtk2_ardour/SAE-de-keypad.bindings.in b/gtk2_ardour/SAE-de-keypad.bindings.in index 5265b87a3d..dad2ead224 100644 --- a/gtk2_ardour/SAE-de-keypad.bindings.in +++ b/gtk2_ardour/SAE-de-keypad.bindings.in @@ -122,8 +122,8 @@ (gtk_accel_path "/Editor/editor-delete" "BackSpace") (gtk_accel_path "/Editor/remove-last-capture" "<%PRIMARY%>Delete") -(gtk_accel_path "/Editor/playhead-to-previous-region-boundary-noselection" "leftarrow") -(gtk_accel_path "/Editor/playhead-to-previous-region-boundary" "<%LEVEL4%>leftarrow") +(gtk_accel_path "/Editor/playhead-to-previous-region-boundary-noselection" "<%LEVEL4%>leftarrow") +(gtk_accel_path "/Editor/playhead-to-previous-region-boundary" "leftarrow") (gtk_accel_path "/Editor/playhead-backward-to-grid" "<%TERTIARY%><%LEVEL4%>leftarrow") (gtk_accel_path "/Editor/edit-cursor-to-previous-region-sync" "<%TERTIARY%><%SECONDARY%>leftarrow") (gtk_accel_path "/Transport/Rewind" "<%PRIMARY%>leftarrow") @@ -133,8 +133,8 @@ (gtk_accel_path "/Editor/selected-marker-to-previous-region-boundary" "<%PRIMARY%><%TERTIARY%>leftarrow") -(gtk_accel_path "/Editor/playhead-to-next-region-boundary-noselection" "rightarrow") -(gtk_accel_path "/Editor/playhead-to-next-region-boundary" "<%LEVEL4%>rightarrow") +(gtk_accel_path "/Editor/playhead-to-next-region-boundary-noselection" "<%LEVEL4%>rightarrow") +(gtk_accel_path "/Editor/playhead-to-next-region-boundary" "rightarrow") (gtk_accel_path "/Editor/playhead-forward-to-grid" "<%TERTIARY%><%LEVEL4%>rightarrow") (gtk_accel_path "/Editor/edit-cursor-to-next-region-sync" "<%TERTIARY%><%SECONDARY%>leftarrow") (gtk_accel_path "/Transport/Forward" "<%PRIMARY%>rightarrow") diff --git a/gtk2_ardour/SAE-de-nokeypad.bindings.in b/gtk2_ardour/SAE-de-nokeypad.bindings.in index 8807256c92..bcd7f6d3de 100644 --- a/gtk2_ardour/SAE-de-nokeypad.bindings.in +++ b/gtk2_ardour/SAE-de-nokeypad.bindings.in @@ -121,8 +121,8 @@ (gtk_accel_path "/Editor/editor-delete" "BackSpace") (gtk_accel_path "/Editor/remove-last-capture" "<%PRIMARY%>BackSpace") -(gtk_accel_path "/Editor/playhead-to-previous-region-boundary-noselection" "leftarrow") -(gtk_accel_path "/Editor/playhead-to-previous-region-boundary" "<%LEVEL4%>leftarrow") +(gtk_accel_path "/Editor/playhead-to-previous-region-boundary-noselection" "<%LEVEL4%>leftarrow") +(gtk_accel_path "/Editor/playhead-to-previous-region-boundary" "leftarrow") (gtk_accel_path "/Editor/playhead-backward-to-grid" "<%TERTIARY%><%LEVEL4%>leftarrow") (gtk_accel_path "/Editor/edit-cursor-to-previous-region-sync" "<%TERTIARY%><%SECONDARY%>leftarrow") (gtk_accel_path "/Transport/Rewind" "<%PRIMARY%>leftarrow") @@ -132,8 +132,8 @@ (gtk_accel_path "/Editor/selected-marker-to-previous-region-boundary" "<%PRIMARY%><%TERTIARY%>leftarrow") -(gtk_accel_path "/Editor/playhead-to-next-region-boundary-noselection" "rightarrow") -(gtk_accel_path "/Editor/playhead-to-next-region-boundary" "<%LEVEL4%>rightarrow") +(gtk_accel_path "/Editor/playhead-to-next-region-boundary-noselection" "<%LEVEL4%>rightarrow") +(gtk_accel_path "/Editor/playhead-to-next-region-boundary" "rightarrow") (gtk_accel_path "/Editor/playhead-forward-to-grid" "<%TERTIARY%><%LEVEL4%>rightarrow") (gtk_accel_path "/Editor/edit-cursor-to-next-region-sync" "<%TERTIARY%><%SECONDARY%>leftarrow") (gtk_accel_path "/Transport/Forward" "<%PRIMARY%>rightarrow") diff --git a/gtk2_ardour/SAE-us-keypad.bindings.in b/gtk2_ardour/SAE-us-keypad.bindings.in index 6dc86f5062..88085b0968 100644 --- a/gtk2_ardour/SAE-us-keypad.bindings.in +++ b/gtk2_ardour/SAE-us-keypad.bindings.in @@ -120,8 +120,8 @@ (gtk_accel_path "/Editor/editor-delete" "BackSpace") (gtk_accel_path "/Editor/remove-last-capture" "<%PRIMARY%>Delete") -(gtk_accel_path "/Editor/playhead-to-previous-region-boundary-noselection" "leftarrow") -(gtk_accel_path "/Editor/playhead-to-previous-region-boundary" "<%LEVEL4%>leftarrow") +(gtk_accel_path "/Editor/playhead-to-previous-region-boundary-noselection" "<%LEVEL4%>leftarrow") +(gtk_accel_path "/Editor/playhead-to-previous-region-boundary" "leftarrow") (gtk_accel_path "/Editor/playhead-backward-to-grid" "<%TERTIARY%><%LEVEL4%>leftarrow") (gtk_accel_path "/Editor/edit-cursor-to-previous-region-sync" "<%TERTIARY%><%SECONDARY%>leftarrow") (gtk_accel_path "/Transport/Rewind" "<%PRIMARY%>leftarrow") @@ -131,8 +131,8 @@ (gtk_accel_path "/Editor/selected-marker-to-previous-region-boundary" "<%PRIMARY%><%TERTIARY%>leftarrow") -(gtk_accel_path "/Editor/playhead-to-next-region-boundary-noselection" "rightarrow") -(gtk_accel_path "/Editor/playhead-to-next-region-boundary" "<%LEVEL4%>rightarrow") +(gtk_accel_path "/Editor/playhead-to-next-region-boundary-noselection" "<%LEVEL4%>rightarrow") +(gtk_accel_path "/Editor/playhead-to-next-region-boundary" "rightarrow") (gtk_accel_path "/Editor/playhead-forward-to-grid" "<%TERTIARY%><%LEVEL4%>rightarrow") (gtk_accel_path "/Editor/edit-cursor-to-next-region-sync" "<%TERTIARY%><%SECONDARY%>leftarrow") (gtk_accel_path "/Transport/Forward" "<%PRIMARY%>rightarrow") diff --git a/gtk2_ardour/SAE-us-nokeypad.bindings.in b/gtk2_ardour/SAE-us-nokeypad.bindings.in index 575cc7d712..33fe2f0e76 100644 --- a/gtk2_ardour/SAE-us-nokeypad.bindings.in +++ b/gtk2_ardour/SAE-us-nokeypad.bindings.in @@ -119,8 +119,8 @@ (gtk_accel_path "/Editor/editor-delete" "BackSpace") (gtk_accel_path "/Editor/remove-last-capture" "<%PRIMARY%>BackSpace") -(gtk_accel_path "/Editor/playhead-to-previous-region-boundary-noselection" "leftarrow") -(gtk_accel_path "/Editor/playhead-to-previous-region-boundary" "<%LEVEL4%>leftarrow") +(gtk_accel_path "/Editor/playhead-to-previous-region-boundary-noselection" "<%LEVEL4%>leftarrow") +(gtk_accel_path "/Editor/playhead-to-previous-region-boundary" "leftarrow") (gtk_accel_path "/Editor/playhead-backward-to-grid" "<%TERTIARY%><%LEVEL4%>leftarrow") (gtk_accel_path "/Editor/edit-cursor-to-previous-region-sync" "<%TERTIARY%><%SECONDARY%>leftarrow") (gtk_accel_path "/Transport/Rewind" "<%PRIMARY%>leftarrow") @@ -130,8 +130,8 @@ (gtk_accel_path "/Editor/selected-marker-to-previous-region-boundary" "<%PRIMARY%><%TERTIARY%>leftarrow") -(gtk_accel_path "/Editor/playhead-to-next-region-boundary-noselection" "rightarrow") -(gtk_accel_path "/Editor/playhead-to-next-region-boundary" "<%LEVEL4%>rightarrow") +(gtk_accel_path "/Editor/playhead-to-next-region-boundary-noselection" "<%LEVEL4%>rightarrow") +(gtk_accel_path "/Editor/playhead-to-next-region-boundary" "rightarrow") (gtk_accel_path "/Editor/playhead-forward-to-grid" "<%TERTIARY%><%LEVEL4%>rightarrow") (gtk_accel_path "/Editor/edit-cursor-to-next-region-sync" "<%TERTIARY%><%SECONDARY%>leftarrow") (gtk_accel_path "/Transport/Forward" "<%PRIMARY%>rightarrow") diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc index 14158ab9af..2916257aa3 100644 --- a/gtk2_ardour/ardour_ui_ed.cc +++ b/gtk2_ardour/ardour_ui_ed.cc @@ -203,7 +203,7 @@ ARDOUR_UI::install_actions () ActionManager::register_action (common_actions, X_("goto-editor"), _("Show Editor"), mem_fun(*this, &ARDOUR_UI::goto_editor_window)); ActionManager::register_action (common_actions, X_("goto-mixer"), _("Show Mixer"), mem_fun(*this, &ARDOUR_UI::goto_mixer_window)); - ActionManager::register_action (common_actions, X_("toggle-editor-mixer-on-top"), _("Toggle Editor Mixer on Top"), mem_fun(*this, &ARDOUR_UI::toggle_editor_mixer_on_top)); + ActionManager::register_action (common_actions, X_("toggle-editor-mixer-on-top"), _("Toggle Editor or Mixer on Top"), mem_fun(*this, &ARDOUR_UI::toggle_editor_mixer_on_top)); ActionManager::register_toggle_action (common_actions, X_("ToggleOptionsEditor"), _("Preferences"), mem_fun(*this, &ARDOUR_UI::toggle_options_window)); act = ActionManager::register_toggle_action (common_actions, X_("ToggleInspector"), _("Track/Bus Inspector"), mem_fun(*this, &ARDOUR_UI::toggle_route_params_window)); ActionManager::session_sensitive_actions.push_back (act); diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc index 6cbb5290d4..74d95a469c 100644 --- a/gtk2_ardour/route_ui.cc +++ b/gtk2_ardour/route_ui.cc @@ -698,7 +698,7 @@ RouteUI::build_solo_menu (void) MenuList& items = solo_menu->items(); CheckMenuItem* check; - check = new CheckMenuItem(_("Solo-safe")); + check = new CheckMenuItem(_("Solo Locke ")); check->set_active (_route->solo_safe()); check->signal_toggled().connect (bind (mem_fun (*this, &RouteUI::toggle_solo_safe), check)); _route->solo_safe_changed.connect(bind (mem_fun (*this, &RouteUI::solo_safe_toggle), check)); -- 2.30.2