smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-06 23:05:04 +01:00
Code Issues Projects Releases Wiki Activity

move select-all-tracks,deselect-all,invert-selection to be global actions (and bindings)

Browse source
This commit is contained in:
Paul Davis 2018-08-24 09:42:43 -04:00
parent 6bd81ee3c7
commit 510a0314cf
13 changed files with 19 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gtk2_ardour/SAE-de-keypad.bindings.in
View file

@ -63,7 +63,7 @@
(gtk_accel_path "<Actions>/Editor/set-region-sync-position" "u") (gtk_accel_path "<Actions>/Editor/set-region-sync-position" "u")
(gtk_accel_path "<Actions>/Editor/insert-region-from-region-list" "i") (gtk_accel_path "<Actions>/Editor/insert-region-from-region-list" "i")
(gtk_accel_path "<Actions>/Editor/addExistingAudioFiles" "<@PRIMARY@>i") (gtk_accel_path "<Actions>/Editor/addExistingAudioFiles" "<@PRIMARY@>i")
(gtk_accel_path "<Actions>/Editor/invert-selection" "<@TERTIARY@>i") (gtk_accel_path "<Actions>/Common/invert-selection" "<@TERTIARY@>i")
(gtk_accel_path "<Actions>/Main/Open" "<@PRIMARY@>o") (gtk_accel_path "<Actions>/Main/Open" "<@PRIMARY@>o")
(gtk_accel_path "<Actions>/Main/Recent" "<@PRIMARY@><@TERTIARY@>o") (gtk_accel_path "<Actions>/Main/Recent" "<@PRIMARY@><@TERTIARY@>o")
(gtk_accel_path "<Actions>/Editor/naturalize-region" "<@LEVEL4@>o") (gtk_accel_path "<Actions>/Editor/naturalize-region" "<@LEVEL4@>o")

2
gtk2_ardour/SAE-de-nokeypad.bindings.in
View file

@ -63,7 +63,7 @@
(gtk_accel_path "<Actions>/Editor/set-region-sync-position" "u") (gtk_accel_path "<Actions>/Editor/set-region-sync-position" "u")
(gtk_accel_path "<Actions>/Editor/insert-region-from-region-list" "i") (gtk_accel_path "<Actions>/Editor/insert-region-from-region-list" "i")
(gtk_accel_path "<Actions>/Editor/addExistingAudioFiles" "<@PRIMARY@>i") (gtk_accel_path "<Actions>/Editor/addExistingAudioFiles" "<@PRIMARY@>i")
(gtk_accel_path "<Actions>/Editor/invert-selection" "<@TERTIARY@>i") (gtk_accel_path "<Actions>/Common/invert-selection" "<@TERTIARY@>i")
(gtk_accel_path "<Actions>/Main/Open" "<@PRIMARY@>o") (gtk_accel_path "<Actions>/Main/Open" "<@PRIMARY@>o")
(gtk_accel_path "<Actions>/Main/Recent" "<@PRIMARY@><@TERTIARY@>o") (gtk_accel_path "<Actions>/Main/Recent" "<@PRIMARY@><@TERTIARY@>o")
(gtk_accel_path "<Actions>/Editor/naturalize-region" "<@LEVEL4@>o") (gtk_accel_path "<Actions>/Editor/naturalize-region" "<@LEVEL4@>o")

2
gtk2_ardour/SAE-us-keypad.bindings.in
View file

@ -61,7 +61,7 @@
(gtk_accel_path "<Actions>/Editor/set-region-sync-position" "u") (gtk_accel_path "<Actions>/Editor/set-region-sync-position" "u")
(gtk_accel_path "<Actions>/Editor/insert-region-from-region-list" "i") (gtk_accel_path "<Actions>/Editor/insert-region-from-region-list" "i")
(gtk_accel_path "<Actions>/Editor/addExistingAudioFiles" "<@PRIMARY@>i") (gtk_accel_path "<Actions>/Editor/addExistingAudioFiles" "<@PRIMARY@>i")
(gtk_accel_path "<Actions>/Editor/invert-selection" "<@TERTIARY@>i") (gtk_accel_path "<Actions>/Common/invert-selection" "<@TERTIARY@>i")
(gtk_accel_path "<Actions>/Main/Open" "<@PRIMARY@>o") (gtk_accel_path "<Actions>/Main/Open" "<@PRIMARY@>o")
(gtk_accel_path "<Actions>/Main/Recent" "<@PRIMARY@><@TERTIARY@>o") (gtk_accel_path "<Actions>/Main/Recent" "<@PRIMARY@><@TERTIARY@>o")
(gtk_accel_path "<Actions>/Editor/naturalize-region" "<@LEVEL4@>o") (gtk_accel_path "<Actions>/Editor/naturalize-region" "<@LEVEL4@>o")

6
gtk2_ardour/ardour.keys.in
View file

@ -69,6 +69,8 @@ playhead to the n-th marker.
%select Editor Selecting %select Editor Selecting
%gselect Global Selecting
%ranges Editor Defining Loop, Punch Range and Tempo Changes %ranges Editor Defining Loop, Punch Range and Tempo Changes
%markers Editor Markers \& Locations %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 @edit|Editor/redo|<@PRIMARY@>r|redo
@trans|Transport/Record|<@TERTIARY@>r|engage record @trans|Transport/Record|<@TERTIARY@>r|engage record
@mmode|MouseMode/set-mouse-mode-timefx|t|timefx mode @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 @edit|Editor/alternate-redo|<@PRIMARY@>y|redo
@select|Editor/select-all-between-cursors|<@PRIMARY@>u|all enclosed by edit range @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 @select|Editor/select-all-within-cursors|u|all present in edit range
@eep|Region/insert-region-from-region-list|i|insert from region list @eep|Region/insert-region-from-region-list|i|insert from region list
@sess|Common/addExistingAudioFiles|<@PRIMARY@>i|import audio files @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 @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-object|g|object mode
@mmode|MouseMode/set-mouse-mode-content|e|content mode @mmode|MouseMode/set-mouse-mode-content|e|content mode

7
gtk2_ardour/ardour_ui_ed.cc
View file

@ -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)); 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); 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 /* These "change" actions are not intended to be used inside menus, but
are for the tab/window control buttons, which have somewhat odd are for the tab/window control buttons, which have somewhat odd
semantics. semantics.

3
gtk2_ardour/editor_actions.cc
View file

@ -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, "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-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-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)); reg_sens (editor_actions, "select-punch-range", _("Set Range to Punch Range"), sigc::mem_fun(*this, &Editor::set_selection_from_punch));

4
gtk2_ardour/ergonomic-us.bindings.in
View file

@ -156,8 +156,8 @@
; (gtk_accel_path "<Actions>/options/UseExternalMonitoring" "") ; (gtk_accel_path "<Actions>/options/UseExternalMonitoring" "")
; (gtk_accel_path "<Actions>/Editor/Smpte23976" "") ; (gtk_accel_path "<Actions>/Editor/Smpte23976" "")
(gtk_accel_path "<Actions>/Common/goto-editor" "<@WINDOW@>e") (gtk_accel_path "<Actions>/Common/goto-editor" "<@WINDOW@>e")
(gtk_accel_path "<Actions>/Editor/select-all" "F14") (gtk_accel_path "<Actions>/Common/select-all" "F14")
(gtk_accel_path "<Actions>/Editor/invert-selection" "F15") (gtk_accel_path "<Actions>/Common/invert-selection" "F15")
(gtk_accel_path "<Actions>/Editor/nudge-next-forward" "<@PRIMARY@>KP_Add") (gtk_accel_path "<Actions>/Editor/nudge-next-forward" "<@PRIMARY@>KP_Add")
; (gtk_accel_path "<Actions>/options/ShowSoloMutes" "") ; (gtk_accel_path "<Actions>/options/ShowSoloMutes" "")
; (gtk_accel_path "<Actions>/Snap/snap-to-eighths" "") ; (gtk_accel_path "<Actions>/Snap/snap-to-eighths" "")

1
gtk2_ardour/mixer.bindings
View file

@ -4,7 +4,6 @@
<Binding key="m" action="Mixer/mute" group="Operations on the selected strip(s)"/> <Binding key="m" action="Mixer/mute" group="Operations on the selected strip(s)"/>
<Binding key="Secondary-i" action="Mixer/toggle-midi-input-active" group="Operations on the selected strip(s)"/> <Binding key="Secondary-i" action="Mixer/toggle-midi-input-active" group="Operations on the selected strip(s)"/>
<Binding key="r" action="Mixer/recenable" group="Operations on the selected strip(s)"/> <Binding key="r" action="Mixer/recenable" group="Operations on the selected strip(s)"/>
<Binding key="Primary-t" action="Mixer/select-all-tracks" group="Operations on the selected strip(s)"/>
<Binding key="0" action="Mixer/unity-gain" group="Operations on the selected strip(s)"/> <Binding key="0" action="Mixer/unity-gain" group="Operations on the selected strip(s)"/>
<Binding key="Up" action="Mixer/increment-gain" group="Operations on the selected strip(s)"/> <Binding key="Up" action="Mixer/increment-gain" group="Operations on the selected strip(s)"/>
<Binding key="Down" action="Mixer/decrement-gain" group="Operations on the selected strip(s)"/> <Binding key="Down" action="Mixer/decrement-gain" group="Operations on the selected strip(s)"/>

7
gtk2_ardour/mixer_ui.cc
View file

@ -639,12 +639,6 @@ Mixer_UI::deselect_all_strip_processors ()
} }
} }
void
Mixer_UI::select_all_tracks ()
{
PublicEditor::instance().select_all_tracks ();
}
void void
Mixer_UI::select_none () 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, "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, "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-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-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)); myactions.register_action (group, "scroll-right", _("Scroll Mixer Window to the right"), sigc::mem_fun (*this, &Mixer_UI::scroll_right));

1
gtk2_ardour/mixer_ui.h
View file

@ -115,7 +115,6 @@ public:
void deselect_all_strip_processors(); void deselect_all_strip_processors();
void delete_processors(); void delete_processors();
void select_none (); void select_none ();
void select_all_tracks ();
void do_vca_assign (boost::shared_ptr<ARDOUR::VCA>); void do_vca_assign (boost::shared_ptr<ARDOUR::VCA>);
void do_vca_unassign (boost::shared_ptr<ARDOUR::VCA>); void do_vca_unassign (boost::shared_ptr<ARDOUR::VCA>);

1
gtk2_ardour/public_editor.h
View file

@ -281,6 +281,7 @@ public:
virtual void clear_playlists (TimeAxisView*) = 0; virtual void clear_playlists (TimeAxisView*) = 0;
virtual void select_all_tracks () = 0; virtual void select_all_tracks () = 0;
virtual void deselect_all () = 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_track (TimeAxisView&, Selection::Operation op = Selection::Set, bool no_remove = false) = 0;
virtual void set_selected_mixer_strip (TimeAxisView&) = 0; virtual void set_selected_mixer_strip (TimeAxisView&) = 0;
virtual void hide_track_in_display (TimeAxisView* tv, bool apply_to_selection = false) = 0; virtual void hide_track_in_display (TimeAxisView* tv, bool apply_to_selection = false) = 0;

2
libs/surfaces/mackie/mcp_buttons.cc
View file

@ -588,7 +588,7 @@ MackieControlProtocol::enter_press (Button &)
if (main_modifier_state() & MODIFIER_SHIFT) { if (main_modifier_state() & MODIFIER_SHIFT) {
access_action ("Transport/ToggleFollowEdits"); access_action ("Transport/ToggleFollowEdits");
} else { } else {
access_action ("Editor/select-all-tracks"); access_action ("Common/select-all-tracks");
} }
return none; return none;
} }

2
libs/surfaces/us2400/mcp_buttons.cc
View file

@ -589,7 +589,7 @@ US2400Protocol::enter_press (Button &)
if (main_modifier_state() & MODIFIER_SHIFT) { if (main_modifier_state() & MODIFIER_SHIFT) {
access_action ("Transport/ToggleFollowEdits"); access_action ("Transport/ToggleFollowEdits");
} else { } else {
access_action ("Editor/select-all-tracks"); access_action ("Common/select-all-tracks");
} }
return none; return none;
} }