use TRX Profile to alter transport button layout

[ardour.git] / gtk2_ardour / ardour_ui2.cc

diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc
index 5a64e5314091bc9494b7fbc13a73fc11c52ebfcb..2a794827e07ea56a29a0ff8351d9c72e388be134 100644 (file)
--- a/gtk2_ardour/ardour_ui2.cc
+++ b/gtk2_ardour/ardour_ui2.cc
@@ -144,6 +144,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"));
 
        synchronize_sync_source_and_video_pullup ();
 
@@ -356,13 +357,18 @@ ARDOUR_UI::setup_transport ()
        tbox2->set_spacing (2);
        tbox->set_spacing (2);
 
-       tbox1->pack_start (midi_panic_button, false, false, 5);
-       tbox1->pack_start (click_button, false, false, 5);
+       if (!Profile->get_trx()) {
+               tbox1->pack_start (midi_panic_button, false, false, 5);
+               tbox1->pack_start (click_button, false, false, 5);
+       }
+
        tbox1->pack_start (goto_start_button, false, false);
        tbox1->pack_start (goto_end_button, false, false);
        tbox1->pack_start (auto_loop_button, false, false);
 
-       tbox2->pack_start (play_selection_button, false, false);
+       if (!Profile->get_trx()) {
+               tbox2->pack_start (play_selection_button, false, false);
+       }
        tbox2->pack_start (roll_button, false, false);
        tbox2->pack_start (stop_button, false, false);
        tbox2->pack_start (rec_button, false, false, 5);
@@ -417,6 +423,8 @@ ARDOUR_UI::setup_transport ()
                 transport_tearoff_hbox.pack_start (_editor_transport_box, false, false);
         }
        transport_tearoff_hbox.pack_start (alert_box, false, false);
+       transport_tearoff_hbox.pack_start (meter_box, false, false);
+       transport_tearoff_hbox.pack_start (editor_meter_peak_display, false, false);
 
        if (Profile->get_sae()) {
                Image* img = manage (new Image ((::get_icon (X_("sae")))));
@@ -617,11 +625,10 @@ ARDOUR_UI::click_button_clicked (GdkEventButton* ev)
                return false;
        }
 
-       RefPtr<Action> act = ActionManager::get_action (X_("Common"), X_("ToggleRCOptionsEditor"));
+       RefPtr<Action> act = ActionManager::get_action (X_("Window"), X_("toggle-rc-options-editor"));
        assert (act);
 
-       RefPtr<ToggleAction> tact = RefPtr<ToggleAction>::cast_dynamic (act);
-       tact->set_active ();
+       act->activate();
 
        rc_option_editor->set_current_page (_("Misc"));
        return true;