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 194a63a163620d5e0dc93ae9932f727d9cd2794b..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"
@@ -282,6 +283,7 @@ Editor::Editor ()
        , _last_cut_copy_source_track (0)
 
        , _region_selection_change_updates_region_list (true)
+       , _following_mixer_selection (false)
 {
        constructed = false;
 
@@ -2810,8 +2812,8 @@ 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);
 
        RefPtr<Action> act;
 
@@ -2892,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);
@@ -4697,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 ();
        }
@@ -4716,7 +4718,6 @@ Editor::first_idle ()
        _routes->redisplay ();
 
        delete dialog;
-
        _have_idled = true;
 }
 
@@ -5006,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;
 
@@ -5500,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);
 }
+