fix computation of Text bounding box to respect _clamped_width

[ardour.git] / gtk2_ardour / ardour_ui2.cc

diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc
index 3b060a73eaa71d2e9086770413717d3e629bf84e..e9ad63103291a739741104857cff76103009de22 100644 (file)
--- a/gtk2_ardour/ardour_ui2.cc
+++ b/gtk2_ardour/ardour_ui2.cc
@@ -46,7 +46,6 @@
 #include "public_editor.h"
 #include "audio_clock.h"
 #include "actions.h"
-#include "button_joiner.h"
 #include "main_clock.h"
 #include "utils.h"
 #include "theme_manager.h"
@@ -79,12 +78,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);
@@ -140,8 +142,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 ();
 
@@ -242,8 +245,10 @@ ARDOUR_UI::setup_transport ()
                                                  static_cast<Widget*> (&transport_frame), 1));
 
        auto_return_button.set_text(_("Auto Return"));
+
        follow_edits_button.set_text(_("Follow Edits"));
-       auto_input_button.set_text (_("Auto Input"));
+
+//     auto_input_button.set_text (_("Auto Input"));
 
        click_button.set_image (get_icon (X_("metronome")));
        act = ActionManager::get_action ("Transport", "ToggleClick");
@@ -336,6 +341,8 @@ ARDOUR_UI::setup_transport ()
        transport_button_size_group->add_widget (roll_button);
        transport_button_size_group->add_widget (stop_button);
 
+       goto_start_button.set_size_request (-1, 40);
+
        HBox* tbox1 = manage (new HBox);
        HBox* tbox2 = manage (new HBox);
        HBox* tbox = manage (new HBox);
@@ -350,15 +357,12 @@ 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);
-       tbox1->pack_start (midi_panic_button, false, false);
        tbox1->pack_start (goto_start_button, false, false);
        tbox1->pack_start (goto_end_button, false, false);
        tbox1->pack_start (auto_loop_button, false, false);
 
-       play_selection_button.set_rounded_corner_mask (0x1); /* upper left only */
-       roll_button.set_rounded_corner_mask (0x2); /* upper right only */
-
        tbox2->pack_start (play_selection_button, false, false);
        tbox2->pack_start (roll_button, false, false);
        tbox2->pack_start (stop_button, false, false);
@@ -388,7 +392,7 @@ ARDOUR_UI::setup_transport ()
 
        VBox* transport_vbox = manage (new VBox);
        transport_vbox->set_name ("TransportBase");
-       transport_vbox->set_border_width (3);
+       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);
@@ -414,6 +418,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")))));
@@ -430,14 +436,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 +620,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;