Make activate/deactivate all only operate on visible

[ardour.git] / gtk2_ardour / editor.cc

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 05108eaf0882a2ec472a34bd9f0282339ee18227..80f7feed72d34509cb9cb5b15e58d14d8eb37efa 100644 (file)
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -108,6 +108,7 @@
 #include "marker.h"
 #include "midi_time_axis.h"
 #include "mixer_strip.h"
+#include "mixer_ui.h"
 #include "mouse_cursors.h"
 #include "playlist_selector.h"
 #include "public_editor.h"
@@ -268,7 +269,6 @@ Editor::Editor ()
        , automation_mode_button (_("mode"))
 
        , _toolbar_viewport (*manage (new Gtk::Adjustment (0, 0, 1e10)), *manage (new Gtk::Adjustment (0, 0, 1e10)))
-       , midi_panic_button (_("Panic"))
 
 #ifdef WITH_CMT
        , image_socket_listener(0)
@@ -283,6 +283,7 @@ Editor::Editor ()
        , _last_cut_copy_source_track (0)
 
        , _region_selection_change_updates_region_list (true)
+       , _following_mixer_selection (false)
 {
        constructed = false;
 
@@ -2811,20 +2812,28 @@ Editor::setup_toolbar ()
 
        /* Zoom */
 
-       _zoom_box.set_spacing (1);
-       _zoom_box.set_border_width (0);
+       _zoom_box.set_spacing (2);
+       _zoom_box.set_border_width (2);
 
-       zoom_in_button.set_name ("EditorTimeButton");
-       zoom_in_button.set_image (*(manage (new Image (::get_icon ("zoom_in")))));
-       zoom_in_button.signal_clicked().connect (sigc::bind (sigc::mem_fun(*this, &Editor::temporal_zoom_step), false));
+       RefPtr<Action> act;
+
+       zoom_in_button.set_name ("zoom button");
+       zoom_in_button.set_image (::get_icon ("zoom_in"));
+       zoom_in_button.set_tweaks (ArdourButton::ShowClick);
+       act = ActionManager::get_action (X_("Editor"), X_("temporal-zoom-in"));
+       zoom_in_button.set_related_action (act);
 
-       zoom_out_button.set_name ("EditorTimeButton");
-       zoom_out_button.set_image (*(manage (new Image (::get_icon ("zoom_out")))));
-       zoom_out_button.signal_clicked().connect (sigc::bind (sigc::mem_fun(*this, &Editor::temporal_zoom_step), true));
+       zoom_out_button.set_name ("zoom button");
+       zoom_out_button.set_image (::get_icon ("zoom_out"));
+       zoom_out_button.set_tweaks (ArdourButton::ShowClick);
+       act = ActionManager::get_action (X_("Editor"), X_("temporal-zoom-out"));
+       zoom_out_button.set_related_action (act);
 
-       zoom_out_full_button.set_name ("EditorTimeButton");
-       zoom_out_full_button.set_image (*(manage (new Image (::get_icon ("zoom_full")))));
-       zoom_out_full_button.signal_clicked().connect (sigc::mem_fun(*this, &Editor::temporal_zoom_session));
+       zoom_out_full_button.set_name ("zoom button");
+       zoom_out_full_button.set_image (::get_icon ("zoom_full"));
+       zoom_out_full_button.set_tweaks (ArdourButton::ShowClick);
+       act = ActionManager::get_action (X_("Editor"), X_("zoom-to-session"));
+       zoom_out_full_button.set_related_action (act);
 
        zoom_focus_selector.set_name ("ZoomFocusSelector");
        set_popdown_strings (zoom_focus_selector, zoom_focus_strings, true);
@@ -2840,7 +2849,7 @@ Editor::setup_toolbar ()
        tav_expand_button.set_name ("TrackHeightButton");
        tav_expand_button.set_size_request (-1, 20);
        tav_expand_button.add (*(manage (new Image (::get_icon ("tav_exp")))));
-       RefPtr<Action> act = ActionManager::get_action (X_("Editor"), X_("expand-tracks"));
+       act = ActionManager::get_action (X_("Editor"), X_("expand-tracks"));
        act->connect_proxy (tav_expand_button);
 
        tav_shrink_button.set_name ("TrackHeightButton");
@@ -2885,7 +2894,7 @@ Editor::setup_toolbar ()
        /* Nudge */
 
        HBox *nudge_box = manage (new HBox);
-       nudge_box->set_spacing(1);
+       nudge_box->set_spacing (2);
        nudge_box->set_border_width (2);
 
        nudge_forward_button.signal_button_release_event().connect (sigc::mem_fun(*this, &Editor::nudge_forward_release), false);
@@ -2972,19 +2981,9 @@ Editor::setup_tooltips ()
        ARDOUR_UI::instance()->set_tip (snap_mode_selector, _("Snap/Grid Mode"));
        ARDOUR_UI::instance()->set_tip (edit_point_selector, _("Edit point"));
        ARDOUR_UI::instance()->set_tip (midi_sound_notes, _("Sound Notes"));
-       ARDOUR_UI::instance()->set_tip (midi_panic_button, _("Send note off and reset controller messages on all MIDI channels"));
        ARDOUR_UI::instance()->set_tip (edit_mode_selector, _("Edit Mode"));
 }
 
-void
-Editor::midi_panic ()
-{
-       cerr << "MIDI panic\n";
-
-       if (_session) {
-               _session->midi_panic();
-       }
-}
 
 void
 Editor::setup_midi_toolbar ()
@@ -2998,12 +2997,8 @@ Editor::setup_midi_toolbar ()
 
        /* Panic */
 
-       act = ActionManager::get_action (X_("MIDI"), X_("panic"));
-       midi_panic_button.set_name("MidiPanicButton");
-       act->connect_proxy (midi_panic_button);
-
        panic_box.pack_start (midi_sound_notes , true, true);
-       panic_box.pack_start (midi_panic_button, true, true);
+       // panic_box.pack_start (midi_panic_button, true, true);
 }
 
 int
@@ -4704,13 +4699,13 @@ void
 Editor::first_idle ()
 {
        MessageDialog* dialog = 0;
-
+       
        if (track_views.size() > 1) {
-               dialog = new MessageDialog (*this,
-                                           string_compose (_("Please wait while %1 loads visual data"), PROGRAM_NAME),
-                                           true,
-                                           Gtk::MESSAGE_INFO,
-                                           Gtk::BUTTONS_NONE);
+               dialog = new MessageDialog (
+                       *this,
+                       string_compose (_("Please wait while %1 loads visual data."), PROGRAM_NAME),
+                       true
+                       );
                dialog->present ();
                ARDOUR_UI::instance()->flush_pending ();
        }
@@ -4723,7 +4718,6 @@ Editor::first_idle ()
        _routes->redisplay ();
 
        delete dialog;
-
        _have_idled = true;
 }
 
@@ -5013,7 +5007,7 @@ Editor::foreach_time_axis_view (sigc::slot<void,TimeAxisView&> theslot)
 
 /** Find a RouteTimeAxisView by the ID of its route */
 RouteTimeAxisView*
-Editor::get_route_view_by_route_id (PBD::ID& id) const
+Editor::get_route_view_by_route_id (const PBD::ID& id) const
 {
        RouteTimeAxisView* v;
 
@@ -5507,3 +5501,4 @@ Editor::popup_control_point_context_menu (ArdourCanvas::Item* item, GdkEvent* ev
 
        _control_point_context_menu.popup (event->button.button, event->button.time);
 }
+