X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_actions.cc;h=8a447beecf1f98898d3b7344fb4e26e8a5602b73;hb=631629b8e7d3ca826fc55901653c1c795a8a5083;hp=9fc9361bd2cf1cc568d6b97bda98149a6d58285c;hpb=f9e5e4360e54f5ff5327b4384ee451d86f8dec91;p=ardour.git

diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc
index 9fc9361bd2..8a447beecf 100644
--- a/gtk2_ardour/editor_actions.cc
+++ b/gtk2_ardour/editor_actions.cc
@@ -160,7 +160,10 @@ Editor::register_actions ()
 	myactions.register_action (editor_menu_actions, X_("SyncMenu"), _("Sync"));
 	myactions.register_action (editor_menu_actions, X_("TempoMenu"), _("Tempo"));
 	myactions.register_action (editor_menu_actions, X_("Timecode"), _("Timecode fps"));
-	myactions.register_action (editor_menu_actions, X_("TrackHeightMenu"), _("Height"));
+
+	act = myactions.register_action (editor_menu_actions, X_("TrackHeightMenu"), _("Height"));
+	ActionManager::stripable_selection_sensitive_actions.push_back (act);
+
 	myactions.register_action (editor_menu_actions, X_("TrackMenu"), _("Track"));
 	myactions.register_action (editor_menu_actions, X_("Tools"), _("Tools"));
 	myactions.register_action (editor_menu_actions, X_("View"), _("View"));
@@ -237,17 +240,20 @@ Editor::register_actions ()
 	reg_sens (editor_actions, "select-all-in-punch-range", _("Select All in Punch Range"), sigc::mem_fun(*this, &Editor::select_all_selectables_using_punch));
 	reg_sens (editor_actions, "select-all-in-loop-range", _("Select All in Loop Range"), sigc::mem_fun(*this, &Editor::select_all_selectables_using_loop));
 
-	reg_sens (editor_actions, "select-next-route", _("Select Next Track or Bus"), sigc::mem_fun(*this, &Editor::select_next_route));
-	reg_sens (editor_actions, "select-prev-route", _("Select Previous Track or Bus"), sigc::mem_fun(*this, &Editor::select_prev_route));
+	reg_sens (editor_actions, "select-next-route", _("Select Next Track or Bus"), sigc::bind (sigc::mem_fun(*this, &Editor::select_next_stripable), true));
+	reg_sens (editor_actions, "select-prev-route", _("Select Previous Track or Bus"), sigc::bind (sigc::mem_fun(*this, &Editor::select_prev_stripable), true));
+
+	reg_sens (editor_actions, "select-next-stripable", _("Select Next Strip"), sigc::bind (sigc::mem_fun(*this, &Editor::select_next_stripable), false));
+	reg_sens (editor_actions, "select-prev-stripable", _("Select Previous Strip"), sigc::bind (sigc::mem_fun(*this, &Editor::select_prev_stripable), false));
 
 	act = reg_sens (editor_actions, "track-record-enable-toggle", _("Toggle Record Enable"), sigc::mem_fun(*this, &Editor::toggle_record_enable));
 	ActionManager::track_selection_sensitive_actions.push_back (act);
 	act = reg_sens (editor_actions, "track-solo-toggle", _("Toggle Solo"), sigc::mem_fun(*this, &Editor::toggle_solo));
-	ActionManager::track_selection_sensitive_actions.push_back (act);
+	ActionManager::stripable_selection_sensitive_actions.push_back (act);
 	act = reg_sens (editor_actions, "track-mute-toggle", _("Toggle Mute"), sigc::mem_fun(*this, &Editor::toggle_mute));
-	ActionManager::track_selection_sensitive_actions.push_back (act);
+	ActionManager::stripable_selection_sensitive_actions.push_back (act);
 	act = reg_sens (editor_actions, "track-solo-isolate-toggle", _("Toggle Solo Isolate"), sigc::mem_fun(*this, &Editor::toggle_solo_isolate));
-	ActionManager::track_selection_sensitive_actions.push_back (act);
+	ActionManager::stripable_selection_sensitive_actions.push_back (act);
 
 	for (int i = 1; i <= 12; ++i) {
 		string const a = string_compose (X_("save-visual-state-%1"), i);
@@ -270,6 +276,7 @@ Editor::register_actions ()
 	reg_sens (editor_actions, "temporal-zoom-out", _("Zoom Out"), sigc::bind (sigc::mem_fun(*this, &Editor::temporal_zoom_step), true));
 	reg_sens (editor_actions, "temporal-zoom-in", _("Zoom In"), sigc::bind (sigc::mem_fun(*this, &Editor::temporal_zoom_step), false));
 	reg_sens (editor_actions, "zoom-to-session", _("Zoom to Session"), sigc::mem_fun(*this, &Editor::temporal_zoom_session));
+	reg_sens (editor_actions, "zoom-to-extents", _("Zoom to Extents"), sigc::mem_fun(*this, &Editor::temporal_zoom_extents));
 	reg_sens (editor_actions, "zoom-to-selection", _("Zoom to Selection"), sigc::bind (sigc::mem_fun(*this, &Editor::temporal_zoom_selection), Both));
 	reg_sens (editor_actions, "zoom-to-selection-horiz", _("Zoom to Selection (Horizontal)"), sigc::bind (sigc::mem_fun(*this, &Editor::temporal_zoom_selection), Horizontal));
 	reg_sens (editor_actions, "toggle-zoom", _("Toggle Zoom State"), sigc::mem_fun(*this, &Editor::swap_visual_state));
@@ -294,9 +301,9 @@ Editor::register_actions ()
 	reg_sens (editor_actions, "zoom_10_min", _("Zoom to 10 min"), sigc::bind (sigc::mem_fun(*this, &Editor::set_zoom_preset), 10 * 60 * 1000));
 
 	act = reg_sens (editor_actions, "move-selected-tracks-up", _("Move Selected Tracks Up"), sigc::bind (sigc::mem_fun(*_routes, &EditorRoutes::move_selected_tracks), true));
-	ActionManager::track_selection_sensitive_actions.push_back (act);
+	ActionManager::stripable_selection_sensitive_actions.push_back (act);
 	act = reg_sens (editor_actions, "move-selected-tracks-down", _("Move Selected Tracks Down"), sigc::bind (sigc::mem_fun(*_routes, &EditorRoutes::move_selected_tracks), false));
-	ActionManager::track_selection_sensitive_actions.push_back (act);
+	ActionManager::stripable_selection_sensitive_actions.push_back (act);
 
 	act = reg_sens (editor_actions, "scroll-tracks-up", _("Scroll Tracks Up"), sigc::mem_fun(*this, &Editor::scroll_tracks_up));
 	act = reg_sens (editor_actions, "scroll-tracks-down", _("Scroll Tracks Down"), sigc::mem_fun(*this, &Editor::scroll_tracks_down));
@@ -426,29 +433,28 @@ Editor::register_actions ()
 
 
 	act = reg_sens (editor_actions, "toggle-track-active", _("Toggle Active"), (sigc::mem_fun(*this, &Editor::toggle_tracks_active)));
-	ActionManager::track_selection_sensitive_actions.push_back (act);
+	ActionManager::route_selection_sensitive_actions.push_back (act);
 	act = reg_sens (editor_actions, "remove-track", _("Remove"), (sigc::mem_fun(*this, &Editor::remove_tracks)));
-	/* not selection sensitive? */
-
-	ActionManager::track_selection_sensitive_actions.push_back (act);
+	ActionManager::stripable_selection_sensitive_actions.push_back (act);
 
 	act = reg_sens (editor_actions, "fit-selection", _("Fit Selection (Vertical)"), sigc::mem_fun(*this, &Editor::fit_selection));
+	ActionManager::stripable_selection_sensitive_actions.push_back (act);
 
 	act = reg_sens (editor_actions, "track-height-largest", _("Largest"), sigc::bind (
 				sigc::mem_fun(*this, &Editor::set_track_height), HeightLargest));
-	ActionManager::track_selection_sensitive_actions.push_back (act);
+	ActionManager::stripable_selection_sensitive_actions.push_back (act);
 	act = reg_sens (editor_actions, "track-height-larger", _("Larger"), sigc::bind (
 				sigc::mem_fun(*this, &Editor::set_track_height), HeightLarger));
-	ActionManager::track_selection_sensitive_actions.push_back (act);
+	ActionManager::stripable_selection_sensitive_actions.push_back (act);
 	act = reg_sens (editor_actions, "track-height-large", _("Large"), sigc::bind (
 				sigc::mem_fun(*this, &Editor::set_track_height), HeightLarge));
-	ActionManager::track_selection_sensitive_actions.push_back (act);
+	ActionManager::stripable_selection_sensitive_actions.push_back (act);
 	act = reg_sens (editor_actions, "track-height-normal", _("Normal"), sigc::bind (
 				sigc::mem_fun(*this, &Editor::set_track_height), HeightNormal));
-	ActionManager::track_selection_sensitive_actions.push_back (act);
+	ActionManager::stripable_selection_sensitive_actions.push_back (act);
 	act = reg_sens (editor_actions, "track-height-small", _("Small"), sigc::bind (
 				sigc::mem_fun(*this, &Editor::set_track_height), HeightSmall));
-	ActionManager::track_selection_sensitive_actions.push_back (act);
+	ActionManager::stripable_selection_sensitive_actions.push_back (act);
 
 	toggle_reg_sens (editor_actions, "sound-midi-notes", _("Sound Selected MIDI Notes"), sigc::mem_fun (*this, &Editor::toggle_sound_midi_notes));