more hot wine.

[ardour.git] / gtk2_ardour / ardour_ui2.cc

diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc
index 775f5ae3d27fb14cf4092b024cc21e9dc3d9b678..3e8fde5dbb3d79c5d2e6731c958f620b93c0287d 100644 (file)
--- a/gtk2_ardour/ardour_ui2.cc
+++ b/gtk2_ardour/ardour_ui2.cc
@@ -134,11 +134,11 @@ ARDOUR_UI::setup_tooltips ()
        set_tip (auto_loop_button, _("Play loop range"));
        set_tip (midi_panic_button, _("MIDI Panic\nSend note off and reset controller messages on all MIDI channels"));
        set_tip (auto_return_button, _("Return to last playback start when stopped"));
-       set_tip (follow_edits_button, _("Playhead follows Range Selections and Edits"));
+       set_tip (follow_edits_button, _("Playhead follows range selections and edits"));
        set_tip (auto_input_button, _("Be sensible about input monitoring"));
        set_tip (click_button, _("Enable/Disable audio click"));
        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 (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.\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"));
@@ -216,7 +216,7 @@ ARDOUR_UI::tearoff_settings (const char* name) const
        return 0;
 }
 
-#define PX_SCALE(px) std::max((float)px, rintf((float)px * ARDOUR_UI::ui_scale))
+#define PX_SCALE(px) std::max((float)px, rintf((float)px * UIConfiguration::instance().get_ui_scale()))
 
 void
 ARDOUR_UI::setup_transport ()
@@ -258,7 +258,7 @@ ARDOUR_UI::setup_transport ()
 
 //     auto_input_button.set_text (_("Auto Input"));
 
-       click_button.set_icon (ArdourButton::TransportMetronom);
+       click_button.set_icon (ArdourIcon::TransportMetronom);
 
        act = ActionManager::get_action ("Transport", "ToggleClick");
        click_button.set_related_action (act);
@@ -275,14 +275,14 @@ ARDOUR_UI::setup_transport ()
 
        stop_button.set_active (true);
 
-       goto_start_button.set_icon (ArdourButton::TransportStart);
-       goto_end_button.set_icon (ArdourButton::TransportEnd);
-       roll_button.set_icon (ArdourButton::TransportPlay);
-       stop_button.set_icon (ArdourButton::TransportStop);
-       play_selection_button.set_icon (ArdourButton::TransportRange);
-       auto_loop_button.set_icon (ArdourButton::TransportLoop);
-       rec_button.set_icon (ArdourButton::RecButton);
-       midi_panic_button.set_icon (ArdourButton::TransportPanic);
+       goto_start_button.set_icon (ArdourIcon::TransportStart);
+       goto_end_button.set_icon (ArdourIcon::TransportEnd);
+       roll_button.set_icon (ArdourIcon::TransportPlay);
+       stop_button.set_icon (ArdourIcon::TransportStop);
+       play_selection_button.set_icon (ArdourIcon::TransportRange);
+       auto_loop_button.set_icon (ArdourIcon::TransportLoop);
+       rec_button.set_icon (ArdourIcon::RecButton);
+       midi_panic_button.set_icon (ArdourIcon::TransportPanic);
 
        act = ActionManager::get_action (X_("Transport"), X_("Stop"));
        stop_button.set_related_action (act);
@@ -324,7 +324,8 @@ ARDOUR_UI::setup_transport ()
        /* CANNOT sigc::bind these to clicked or toggled, must use pressed or released */
 
        solo_alert_button.set_name ("rude solo");
-       solo_alert_button.signal_button_press_event().connect (sigc::mem_fun(*this,&ARDOUR_UI::solo_alert_press), false);
+       act = ActionManager::get_action (X_("Main"), X_("cancel-solo"));
+       solo_alert_button.set_related_action (act);
        auditioning_alert_button.set_name ("rude audition");
        auditioning_alert_button.signal_button_press_event().connect (sigc::mem_fun(*this,&ARDOUR_UI::audition_alert_press), false);
        feedback_alert_button.set_name ("feedback alert");
@@ -342,7 +343,7 @@ ARDOUR_UI::setup_transport ()
        alert_box.pack_start (feedback_alert_button, true, true);
 
        /* all transport buttons should be the same size vertically and
-        * horizontally 
+        * horizontally
         */
 
        Glib::RefPtr<SizeGroup> transport_button_size_group = SizeGroup::create (SIZE_GROUP_BOTH);
@@ -411,7 +412,7 @@ ARDOUR_UI::setup_transport ()
 
        shuttle_box = manage (new ShuttleControl);
        shuttle_box->show ();
-       
+
        VBox* transport_vbox = manage (new VBox);
        transport_vbox->set_name ("TransportBase");
        transport_vbox->set_border_width (0);
@@ -454,10 +455,6 @@ ARDOUR_UI::setup_transport ()
                transport_tearoff_hbox.pack_start (*time_info_box, false, false);
        }
 
-        if (ARDOUR::Profile->get_small_screen()) {
-                transport_tearoff_hbox.pack_start (_editor_transport_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);
@@ -531,19 +528,6 @@ ARDOUR_UI::audition_alert_press (GdkEventButton*)
        return true;
 }
 
-bool
-ARDOUR_UI::solo_alert_press (GdkEventButton*)
-{
-       if (_session) {
-               if (_session->soloing()) {
-                       _session->set_solo (_session->get_routes(), false);
-               } else if (_session->listening()) {
-                       _session->set_listen (_session->get_routes(), false);
-               }
-       }
-       return true;
-}
-
 bool
 ARDOUR_UI::feedback_alert_press (GdkEventButton *)
 {
@@ -682,7 +666,7 @@ ARDOUR_UI::editor_realized ()
        boost::function<void (string)> pc (boost::bind (&ARDOUR_UI::parameter_changed, this, _1));
        Config->map_parameters (pc);
 
-       reset_dpi ();
+       UIConfiguration::instance().reset_dpi ();
 }
 
 void
@@ -747,7 +731,7 @@ ARDOUR_UI::toggle_follow_edits ()
        RefPtr<ToggleAction> tact = RefPtr<ToggleAction>::cast_dynamic (act);
        assert (tact);
 
-       ui_config->set_follow_edits (tact->get_active ());
+       UIConfiguration::instance().set_follow_edits (tact->get_active ());
 }
 
-       
+