From 510a0314cf12b037f41538c8afab25b99bf55cb2 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Fri, 24 Aug 2018 09:42:43 -0400 Subject: move select-all-tracks,deselect-all,invert-selection to be global actions (and bindings) --- gtk2_ardour/SAE-de-keypad.bindings.in | 2 +- gtk2_ardour/SAE-de-nokeypad.bindings.in | 2 +- gtk2_ardour/SAE-us-keypad.bindings.in | 2 +- gtk2_ardour/ardour.keys.in | 6 ++++-- gtk2_ardour/ardour_ui_ed.cc | 7 +++++++ gtk2_ardour/editor_actions.cc | 3 --- gtk2_ardour/ergonomic-us.bindings.in | 4 ++-- gtk2_ardour/mixer.bindings | 1 - gtk2_ardour/mixer_ui.cc | 7 ------- gtk2_ardour/mixer_ui.h | 1 - gtk2_ardour/public_editor.h | 1 + 11 files changed, 17 insertions(+), 19 deletions(-) (limited to 'gtk2_ardour') diff --git a/gtk2_ardour/SAE-de-keypad.bindings.in b/gtk2_ardour/SAE-de-keypad.bindings.in index b142c58a96..88c1505a9a 100644 --- a/gtk2_ardour/SAE-de-keypad.bindings.in +++ b/gtk2_ardour/SAE-de-keypad.bindings.in @@ -63,7 +63,7 @@ (gtk_accel_path "/Editor/set-region-sync-position" "u") (gtk_accel_path "/Editor/insert-region-from-region-list" "i") (gtk_accel_path "/Editor/addExistingAudioFiles" "<@PRIMARY@>i") -(gtk_accel_path "/Editor/invert-selection" "<@TERTIARY@>i") +(gtk_accel_path "/Common/invert-selection" "<@TERTIARY@>i") (gtk_accel_path "/Main/Open" "<@PRIMARY@>o") (gtk_accel_path "/Main/Recent" "<@PRIMARY@><@TERTIARY@>o") (gtk_accel_path "/Editor/naturalize-region" "<@LEVEL4@>o") diff --git a/gtk2_ardour/SAE-de-nokeypad.bindings.in b/gtk2_ardour/SAE-de-nokeypad.bindings.in index d91eed041e..5ea1d8d7a6 100644 --- a/gtk2_ardour/SAE-de-nokeypad.bindings.in +++ b/gtk2_ardour/SAE-de-nokeypad.bindings.in @@ -63,7 +63,7 @@ (gtk_accel_path "/Editor/set-region-sync-position" "u") (gtk_accel_path "/Editor/insert-region-from-region-list" "i") (gtk_accel_path "/Editor/addExistingAudioFiles" "<@PRIMARY@>i") -(gtk_accel_path "/Editor/invert-selection" "<@TERTIARY@>i") +(gtk_accel_path "/Common/invert-selection" "<@TERTIARY@>i") (gtk_accel_path "/Main/Open" "<@PRIMARY@>o") (gtk_accel_path "/Main/Recent" "<@PRIMARY@><@TERTIARY@>o") (gtk_accel_path "/Editor/naturalize-region" "<@LEVEL4@>o") diff --git a/gtk2_ardour/SAE-us-keypad.bindings.in b/gtk2_ardour/SAE-us-keypad.bindings.in index c10a8cc062..a4ed568a3b 100644 --- a/gtk2_ardour/SAE-us-keypad.bindings.in +++ b/gtk2_ardour/SAE-us-keypad.bindings.in @@ -61,7 +61,7 @@ (gtk_accel_path "/Editor/set-region-sync-position" "u") (gtk_accel_path "/Editor/insert-region-from-region-list" "i") (gtk_accel_path "/Editor/addExistingAudioFiles" "<@PRIMARY@>i") -(gtk_accel_path "/Editor/invert-selection" "<@TERTIARY@>i") +(gtk_accel_path "/Common/invert-selection" "<@TERTIARY@>i") (gtk_accel_path "/Main/Open" "<@PRIMARY@>o") (gtk_accel_path "/Main/Recent" "<@PRIMARY@><@TERTIARY@>o") (gtk_accel_path "/Editor/naturalize-region" "<@LEVEL4@>o") diff --git a/gtk2_ardour/ardour.keys.in b/gtk2_ardour/ardour.keys.in index 96b1785776..b482553a87 100644 --- a/gtk2_ardour/ardour.keys.in +++ b/gtk2_ardour/ardour.keys.in @@ -69,6 +69,8 @@ playhead to the n-th marker. %select Editor Selecting +%gselect Global Selecting + %ranges Editor Defining Loop, Punch Range and Tempo Changes %markers Editor Markers \& Locations @@ -157,13 +159,13 @@ This mode provides many different operations on both regions and control points, @edit|Editor/redo|<@PRIMARY@>r|redo @trans|Transport/Record|<@TERTIARY@>r|engage record @mmode|MouseMode/set-mouse-mode-timefx|t|timefx mode -@select|Editor/select-all-tracks|<@PRIMARY@>t|select all tracks +@gselect|Common/select-all-tracks|<@PRIMARY@>t|select all tracks @edit|Editor/alternate-redo|<@PRIMARY@>y|redo @select|Editor/select-all-between-cursors|<@PRIMARY@>u|all enclosed by edit range @select|Editor/select-all-within-cursors|u|all present in edit range @eep|Region/insert-region-from-region-list|i|insert from region list @sess|Common/addExistingAudioFiles|<@PRIMARY@>i|import audio files -@select|Editor/invert-selection|<@TERTIARY@>i|invert selection +@gselect|Common/invert-selection|<@TERTIARY@>i|invert selection @edtrk|Editor/toggle-midi-input-active|<@SECONDARY@>i|toggle sel. track MIDI input @mmode|MouseMode/set-mouse-mode-object|g|object mode @mmode|MouseMode/set-mouse-mode-content|e|content mode diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc index b5c0a9d563..79d3c6abca 100644 --- a/gtk2_ardour/ardour_ui_ed.cc +++ b/gtk2_ardour/ardour_ui_ed.cc @@ -342,6 +342,13 @@ ARDOUR_UI::install_actions () act = global_actions.register_action (common_actions, "alt-finish-range", _("Finish Range"), sigc::bind (sigc::mem_fun(editor, &PublicEditor::keyboard_selection_finish), false, Editing::EDIT_IGNORE_NONE)); ActionManager::session_sensitive_actions.push_back (act); + act = global_actions.register_action (common_actions, "select-all-tracks", _("Select All Tracks"), sigc::mem_fun(editor, &PublicEditor::select_all_tracks)); + ActionManager::session_sensitive_actions.push_back (act); + act = global_actions.register_action (common_actions, "deselect-all", _("Deselect All"), sigc::mem_fun(editor, &PublicEditor::deselect_all)); + ActionManager::session_sensitive_actions.push_back (act); + act = global_actions.register_action (common_actions, "invert-selection", _("Invert Selection"), sigc::mem_fun(editor, &PublicEditor::invert_selection)); + ActionManager::session_sensitive_actions.push_back (act); + /* These "change" actions are not intended to be used inside menus, but are for the tab/window control buttons, which have somewhat odd semantics. diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc index e5af91d132..334284a301 100644 --- a/gtk2_ardour/editor_actions.cc +++ b/gtk2_ardour/editor_actions.cc @@ -219,9 +219,6 @@ Editor::register_actions () reg_sens (editor_actions, "playhead-to-range-end", _("Playhead to Range End"), sigc::bind (sigc::mem_fun(*this, &Editor::cursor_to_selection_end), playhead_cursor)); reg_sens (editor_actions, "select-all-objects", _("Select All Objects"), sigc::bind (sigc::mem_fun(*this, &Editor::select_all_objects), Selection::Set)); - reg_sens (editor_actions, "select-all-tracks", _("Select All Tracks"), sigc::mem_fun(*this, &Editor::select_all_tracks)); - reg_sens (editor_actions, "deselect-all", _("Deselect All"), sigc::mem_fun(*this, &Editor::deselect_all)); - reg_sens (editor_actions, "invert-selection", _("Invert Selection"), sigc::mem_fun(*this, &Editor::invert_selection)); reg_sens (editor_actions, "select-loop-range", _("Set Range to Loop Range"), sigc::mem_fun(*this, &Editor::set_selection_from_loop)); reg_sens (editor_actions, "select-punch-range", _("Set Range to Punch Range"), sigc::mem_fun(*this, &Editor::set_selection_from_punch)); diff --git a/gtk2_ardour/ergonomic-us.bindings.in b/gtk2_ardour/ergonomic-us.bindings.in index 0a9c3b21d9..a83f4dab61 100644 --- a/gtk2_ardour/ergonomic-us.bindings.in +++ b/gtk2_ardour/ergonomic-us.bindings.in @@ -156,8 +156,8 @@ ; (gtk_accel_path "/options/UseExternalMonitoring" "") ; (gtk_accel_path "/Editor/Smpte23976" "") (gtk_accel_path "/Common/goto-editor" "<@WINDOW@>e") -(gtk_accel_path "/Editor/select-all" "F14") -(gtk_accel_path "/Editor/invert-selection" "F15") +(gtk_accel_path "/Common/select-all" "F14") +(gtk_accel_path "/Common/invert-selection" "F15") (gtk_accel_path "/Editor/nudge-next-forward" "<@PRIMARY@>KP_Add") ; (gtk_accel_path "/options/ShowSoloMutes" "") ; (gtk_accel_path "/Snap/snap-to-eighths" "") diff --git a/gtk2_ardour/mixer.bindings b/gtk2_ardour/mixer.bindings index b650974aed..6056cdcd64 100644 --- a/gtk2_ardour/mixer.bindings +++ b/gtk2_ardour/mixer.bindings @@ -4,7 +4,6 @@ - diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc index 359feb360c..4bd46e5b5b 100644 --- a/gtk2_ardour/mixer_ui.cc +++ b/gtk2_ardour/mixer_ui.cc @@ -639,12 +639,6 @@ Mixer_UI::deselect_all_strip_processors () } } -void -Mixer_UI::select_all_tracks () -{ - PublicEditor::instance().select_all_tracks (); -} - void Mixer_UI::select_none () { @@ -3082,7 +3076,6 @@ Mixer_UI::register_actions () myactions.register_action (group, "toggle-processors", _("Toggle Selected Processors"), sigc::mem_fun (*this, &Mixer_UI::toggle_processors)); myactions.register_action (group, "ab-plugins", _("Toggle Selected Plugins"), sigc::mem_fun (*this, &Mixer_UI::ab_plugins)); myactions.register_action (group, "select-none", _("Deselect all strips and processors"), sigc::mem_fun (*this, &Mixer_UI::select_none)); - myactions.register_action (group, "select-all-tracks", _("Select All Tracks"), sigc::mem_fun (*this, &Mixer_UI::select_all_tracks)); myactions.register_action (group, "scroll-left", _("Scroll Mixer Window to the left"), sigc::mem_fun (*this, &Mixer_UI::scroll_left)); myactions.register_action (group, "scroll-right", _("Scroll Mixer Window to the right"), sigc::mem_fun (*this, &Mixer_UI::scroll_right)); diff --git a/gtk2_ardour/mixer_ui.h b/gtk2_ardour/mixer_ui.h index 0ef17eee38..f617fdbb6a 100644 --- a/gtk2_ardour/mixer_ui.h +++ b/gtk2_ardour/mixer_ui.h @@ -115,7 +115,6 @@ public: void deselect_all_strip_processors(); void delete_processors(); void select_none (); - void select_all_tracks (); void do_vca_assign (boost::shared_ptr); void do_vca_unassign (boost::shared_ptr); diff --git a/gtk2_ardour/public_editor.h b/gtk2_ardour/public_editor.h index 4f655f0fb1..aed2fb94c1 100644 --- a/gtk2_ardour/public_editor.h +++ b/gtk2_ardour/public_editor.h @@ -281,6 +281,7 @@ public: virtual void clear_playlists (TimeAxisView*) = 0; virtual void select_all_tracks () = 0; virtual void deselect_all () = 0; + virtual void invert_selection () = 0; virtual void set_selected_track (TimeAxisView&, Selection::Operation op = Selection::Set, bool no_remove = false) = 0; virtual void set_selected_mixer_strip (TimeAxisView&) = 0; virtual void hide_track_in_display (TimeAxisView* tv, bool apply_to_selection = false) = 0; -- cgit v1.2.3