Do not try to restore Route solo state after clearing all solo state

[ardour.git] / gtk2_ardour / ardour_ui2.cc

diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc
index f251ccdfa3cf3bd48daa5e9b835808920dfb3737..c4404b824358f7030b86d6d7d93dfd3c09ae838b 100644 (file)
--- a/gtk2_ardour/ardour_ui2.cc
+++ b/gtk2_ardour/ardour_ui2.cc
@@ -29,6 +29,8 @@
 #include <cmath>
 
 #include <sigc++/bind.h>
+#include "canvas/canvas.h"
+
 #include "pbd/error.h"
 #include "pbd/basename.h"
 #include "pbd/fastlog.h"
@@ -58,7 +60,7 @@
 #include "rc_option_editor.h"
 #include "time_info_box.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -72,6 +74,8 @@ using namespace ARDOUR_UI_UTILS;
 void
 ARDOUR_UI::setup_tooltips ()
 {
+       ArdourCanvas::Canvas::set_tooltip_timeout (Gtk::Settings::get_default()->property_gtk_tooltip_timeout ());
+
        set_tip (roll_button, _("Play from playhead"));
        set_tip (stop_button, _("Stop playback"));
        set_tip (rec_button, _("Toggle record"));
@@ -644,7 +648,7 @@ ARDOUR_UI::click_button_clicked (GdkEventButton* ev)
        }
 
        show_tabbable (rc_option_editor);
-       rc_option_editor->set_current_page (_("Misc"));
+       rc_option_editor->set_current_page (_("Misc/Click"));
        return true;
 }