removed no-longer-used Editor::track_canvas_motion()

[ardour.git] / gtk2_ardour / ardour_ui2.cc

diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc
index 3e69c48e27609b62777c3b9feca57d7136d950d1..f78d096000a13f5181ef94483bdd9ef91002c587 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 ()
@@ -78,12 +79,15 @@ ARDOUR_UI::setup_windows ()
                return -1;
        }
 
+       if (create_meterbridge ()) {
+               error << _("UI: cannot setup meterbridge") << endmsg;
+               return -1;
+       }
+
        /* all other dialogs are created conditionally */
 
        we_have_dependents ();
 
-       theme_manager->signal_unmap().connect (sigc::bind (sigc::ptr_fun(&ActionManager::uncheck_toggleaction), X_("<Actions>/Common/ToggleThemeManager")));
-
 #ifdef TOP_MENUBAR
        HBox* status_bar_packer = manage (new HBox);
        EventBox* status_bar_event_box = manage (new EventBox);
@@ -139,8 +143,9 @@ ARDOUR_UI::setup_tooltips ()
        set_tip (solo_alert_button, _("When active, something is soloed.\nClick to de-solo everything"));
        set_tip (auditioning_alert_button, _("When active, auditioning is taking place\nClick to stop the audition"));
        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.\nSee <span color=\"blue\">http://ardour.org/a3_features_clocks</span> for details."));
-       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.\nSee <span color=\"blue\">http://ardour.org/a3_features_clocks</span> for details."));
+       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 ();
 
@@ -353,13 +358,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);
@@ -378,20 +388,29 @@ ARDOUR_UI::setup_transport ()
        HBox* clock_box = manage (new HBox);
 
        clock_box->pack_start (*primary_clock, false, false);
-       if (!ARDOUR::Profile->get_small_screen()) {
+       if (!ARDOUR::Profile->get_small_screen() && !ARDOUR::Profile->get_trx()) {
                clock_box->pack_start (*secondary_clock, false, false);
        }
        clock_box->set_spacing (3);
 
        shuttle_box = new ShuttleControl;
        shuttle_box->show ();
-
+       
        VBox* transport_vbox = manage (new VBox);
        transport_vbox->set_name ("TransportBase");
        transport_vbox->set_border_width (0);
        transport_vbox->set_spacing (3);
        transport_vbox->pack_start (*tbox, true, true, 0);
-       transport_vbox->pack_start (*shuttle_box, false, false, 0);
+
+       if (!Profile->get_trx()) {
+               transport_vbox->pack_start (*shuttle_box, false, false, 0);
+       }
+
+       time_info_box = manage (new TimeInfoBox);
+
+       if (ARDOUR::Profile->get_trx()) {
+               transport_tearoff_hbox.pack_start (*time_info_box, false, false);
+       }
 
        transport_tearoff_hbox.pack_start (*transport_vbox, false, false);
 
@@ -401,19 +420,33 @@ ARDOUR_UI::setup_transport ()
        auto_box->set_homogeneous (true);
        auto_box->set_spacing (2);
        auto_box->pack_start (sync_button, false, false);
-       auto_box->pack_start (follow_edits_button, false, false);
-       auto_box->pack_start (auto_return_button, false, false);
+       if (!ARDOUR::Profile->get_trx()) {
+               auto_box->pack_start (follow_edits_button, false, false);
+               auto_box->pack_start (auto_return_button, false, false);
+       }
 
-       transport_tearoff_hbox.pack_start (*auto_box, false, false);
+       if (!ARDOUR::Profile->get_trx()) {
+               transport_tearoff_hbox.pack_start (*auto_box, false, false);
+       }
        transport_tearoff_hbox.pack_start (*clock_box, true, true);
 
-       time_info_box = manage (new TimeInfoBox);
-       transport_tearoff_hbox.pack_start (*time_info_box, false, false);
+       if (ARDOUR::Profile->get_trx()) {
+               transport_tearoff_hbox.pack_start (*auto_box, false, false);
+       }
+
+       if (!ARDOUR::Profile->get_trx()) {
+               transport_tearoff_hbox.pack_start (*time_info_box, false, false);
+       }
 
-        if (Profile->get_small_screen()) {
+        if (ARDOUR::Profile->get_small_screen()) {
                 transport_tearoff_hbox.pack_start (_editor_transport_box, false, false);
         }
-       transport_tearoff_hbox.pack_start (alert_box, false, false);
+
+       if (!ARDOUR::Profile->get_trx()) {
+               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")))));
@@ -430,14 +463,6 @@ ARDOUR_UI::setup_transport ()
        }
 }
 
-void
-ARDOUR_UI::manage_window (Window& win)
-{
-       win.signal_delete_event().connect (sigc::bind (sigc::ptr_fun (just_hide_it), &win));
-       win.signal_enter_notify_event().connect (sigc::bind (sigc::mem_fun (Keyboard::the_keyboard(), &Keyboard::enter_window), &win));
-       win.signal_leave_notify_event().connect (sigc::bind (sigc::mem_fun (Keyboard::the_keyboard(), &Keyboard::leave_window), &win));
-}
-
 void
 ARDOUR_UI::detach_tearoff (Box* b, Widget* w)
 {
@@ -622,11 +647,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;