proper 1px track separator

[ardour.git] / gtk2_ardour / ardour_ui2.cc

diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc
index e9efb1d03aee94d8d0d61a0112045c3eef31e098..bd06f346f81aa40874fe4fc522bb3cbd5b96199e 100644 (file)
--- a/gtk2_ardour/ardour_ui2.cc
+++ b/gtk2_ardour/ardour_ui2.cc
@@ -64,6 +64,7 @@ using namespace PBD;
 using namespace Gtkmm2ext;
 using namespace Gtk;
 using namespace Glib;
+using namespace ARDOUR_UI_UTILS;
 
 int
 ARDOUR_UI::setup_windows ()
@@ -111,9 +112,9 @@ ARDOUR_UI::setup_windows ()
        top_packer.pack_start (menu_bar_base, false, false);
 #endif
 
-       top_packer.pack_start (transport_frame, false, false);
+       editor->add_toplevel_menu (top_packer);
 
-       editor->add_toplevel_controls (top_packer);
+       editor->add_transport_frame (transport_frame);
 
        setup_transport();
 
@@ -144,7 +145,7 @@ ARDOUR_UI::setup_tooltips ()
        set_tip (feedback_alert_button, _("When active, there is a feedback loop."));
        set_tip (primary_clock, _("<b>Primary Clock</b> right-click to set display mode. Click to edit, click+drag a digit or mouse-over+scroll wheel to modify.\nText edits: right-to-left overwrite <tt>Esc</tt>: cancel; <tt>Enter</tt>: confirm; postfix the edit with '+' or '-' to enter delta times.\n"));
        set_tip (secondary_clock, _("<b>Secondary Clock</b> right-click to set display mode. Click to edit, click+drag a digit or mouse-over+scroll wheel to modify.\nText edits: right-to-left overwrite <tt>Esc</tt>: cancel; <tt>Enter</tt>: confirm; postfix the edit with '+' or '-' to enter delta times.\n"));
-       set_tip (editor_meter_peak_display, _("Reset Level Meter"));
+       set_tip (editor_meter_peak_display, _("Reset All Peak Indicators"));
 
        synchronize_sync_source_and_video_pullup ();
 
@@ -222,7 +223,7 @@ ARDOUR_UI::setup_transport ()
        transport_tearoff->set_name ("TransportBase");
        transport_tearoff->tearoff_window().signal_key_press_event().connect (sigc::bind (sigc::ptr_fun (relay_key_press), &transport_tearoff->tearoff_window()), false);
 
-       if (Profile->get_sae()) {
+       if (Profile->get_sae() || Profile->get_mixbus()) {
                transport_tearoff->set_can_be_torn_off (false);
        }
 
@@ -638,6 +639,18 @@ ARDOUR_UI::restore_editing_space ()
        }
 }
 
+void
+ARDOUR_UI::show_ui_prefs ()
+{
+       RefPtr<Action> act = ActionManager::get_action (X_("Window"), X_("toggle-rc-options-editor"));
+       assert (act);
+
+       act->activate();
+
+       rc_option_editor->set_current_page (_("GUI"));
+}
+
+
 bool
 ARDOUR_UI::click_button_clicked (GdkEventButton* ev)
 {
@@ -656,7 +669,7 @@ ARDOUR_UI::click_button_clicked (GdkEventButton* ev)
 }
 
 void
-ARDOUR_UI::toggle_always_play_range ()
+ARDOUR_UI::toggle_follow_edits ()
 {
        RefPtr<Action> act = ActionManager::get_action (X_("Transport"), X_("ToggleFollowEdits"));
        assert (act);
@@ -664,7 +677,7 @@ ARDOUR_UI::toggle_always_play_range ()
        RefPtr<ToggleAction> tact = RefPtr<ToggleAction>::cast_dynamic (act);
        assert (tact);
 
-       Config->set_always_play_range (tact->get_active ());
+       Config->set_follow_edits (tact->get_active ());
 }