Added support for exporting mp4 chapter marks

[ardour.git] / gtk2_ardour / ardour_ui2.cc

diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc
index 357067dc6ea3491b1ecb363a51ce4268d96c7a69..497a379448f46dc13fe5d66486f3f69ee9af27de 100644 (file)
--- a/gtk2_ardour/ardour_ui2.cc
+++ b/gtk2_ardour/ardour_ui2.cc
@@ -216,13 +216,17 @@ ARDOUR_UI::tearoff_settings (const char* name) const
        return 0;
 }
 
+#define PX_SCALE(pxmin, dflt) rint(std::max((double)pxmin, (double)dflt * btn_scale))
+
 void
 ARDOUR_UI::setup_transport ()
 {
        RefPtr<Action> act;
 
-       transport_tearoff_hbox.set_border_width (3);
-       transport_tearoff_hbox.set_spacing (3);
+       const double btn_scale = config()->get_font_scale () / 102400.;
+
+       transport_tearoff_hbox.set_border_width (PX_SCALE(3,3));
+       transport_tearoff_hbox.set_spacing (PX_SCALE(3,3));
 
        transport_tearoff = manage (new TearOff (transport_tearoff_hbox));
        transport_tearoff->set_name ("TransportBase");
@@ -256,7 +260,9 @@ ARDOUR_UI::setup_transport ()
 
 //     auto_input_button.set_text (_("Auto Input"));
 
-       click_button.set_image (get_icon (X_("metronome")));
+       click_button.set_elements ((ArdourButton::Element) (ArdourButton::Edge|ArdourButton::Body|ArdourButton::VectorIcon));
+       click_button.set_icon (ArdourButton::TransportMetronom);
+
        act = ActionManager::get_action ("Transport", "ToggleClick");
        click_button.set_related_action (act);
        click_button.signal_button_press_event().connect (sigc::mem_fun (*this, &ARDOUR_UI::click_button_clicked), false);
@@ -272,19 +278,25 @@ ARDOUR_UI::setup_transport ()
 
        stop_button.set_active (true);
 
-       goto_start_button.set_image (get_icon (X_("transport_start")));
-       goto_end_button.set_image (get_icon (X_("transport_end")));
-       roll_button.set_image (get_icon (X_("transport_play")));
-       stop_button.set_image (get_icon (X_("transport_stop")));
-       play_selection_button.set_image (get_icon (X_("transport_range")));
-       auto_loop_button.set_image (get_icon (X_("transport_loop")));
-
-       rec_button.set_elements ((ArdourButton::Element) (ArdourButton::Edge|ArdourButton::Body|ArdourButton::RecButton));
+       goto_start_button.set_elements ((ArdourButton::Element) (ArdourButton::Edge|ArdourButton::Body|ArdourButton::VectorIcon));
+       goto_start_button.set_icon (ArdourButton::TransportStart);
+       goto_end_button.set_elements ((ArdourButton::Element) (ArdourButton::Edge|ArdourButton::Body|ArdourButton::VectorIcon));
+       goto_end_button.set_icon (ArdourButton::TransportEnd);
+       roll_button.set_elements ((ArdourButton::Element) (ArdourButton::Edge|ArdourButton::Body|ArdourButton::VectorIcon));
+       roll_button.set_icon (ArdourButton::TransportPlay);
+       stop_button.set_elements ((ArdourButton::Element) (ArdourButton::Edge|ArdourButton::Body|ArdourButton::VectorIcon));
+       stop_button.set_icon (ArdourButton::TransportStop);
+       play_selection_button.set_elements ((ArdourButton::Element) (ArdourButton::Edge|ArdourButton::Body|ArdourButton::VectorIcon));
+       play_selection_button.set_icon (ArdourButton::TransportRange);
+       auto_loop_button.set_elements ((ArdourButton::Element) (ArdourButton::Edge|ArdourButton::Body|ArdourButton::VectorIcon));
+       auto_loop_button.set_icon (ArdourButton::TransportLoop);
+
+       rec_button.set_elements ((ArdourButton::Element) (ArdourButton::Edge|ArdourButton::Body|ArdourButton::VectorIcon));
+       rec_button.set_icon (ArdourButton::RecButton);
+
+       midi_panic_button.set_elements ((ArdourButton::Element) (ArdourButton::Edge|ArdourButton::Body|ArdourButton::VectorIcon));
+       midi_panic_button.set_icon (ArdourButton::TransportPanic);
 
-       midi_panic_button.set_image (get_icon (X_("midi_panic")));
-       /* the icon for this has an odd aspect ratio, so fatten up the button */
-       midi_panic_button.set_size_request (25, -1);
-       
        act = ActionManager::get_action (X_("Transport"), X_("Stop"));
        stop_button.set_related_action (act);
        act = ActionManager::get_action (X_("Transport"), X_("Roll"));
@@ -337,7 +349,7 @@ ARDOUR_UI::setup_transport ()
        error_alert_button.set_fallthrough_to_parent(true);
 
        alert_box.set_homogeneous (true);
-       alert_box.set_spacing (2);
+       alert_box.set_spacing (PX_SCALE(2, 2));
        alert_box.pack_start (solo_alert_button, true, true);
        alert_box.pack_start (auditioning_alert_button, true, true);
        alert_box.pack_start (feedback_alert_button, true, true);
@@ -355,7 +367,11 @@ 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);
+       /* the icon for this has an odd aspect ratio, so fatten up the button */
+       midi_panic_button.set_size_request (PX_SCALE(25, 25), -1);
+       goto_start_button.set_size_request (PX_SCALE(28, 28), PX_SCALE(44, 44));
+       click_button.set_size_request (PX_SCALE(32, 32), PX_SCALE(44, 44));
+
 
        HBox* tbox1 = manage (new HBox);
        HBox* tbox2 = manage (new HBox);
@@ -367,9 +383,9 @@ ARDOUR_UI::setup_transport ()
        Alignment* a1 = manage (new Alignment);
        Alignment* a2 = manage (new Alignment);
 
-       tbox1->set_spacing (2);
-       tbox2->set_spacing (2);
-       tbox->set_spacing (2);
+       tbox1->set_spacing (PX_SCALE(2, 2));
+       tbox2->set_spacing (PX_SCALE(2, 2));
+       tbox->set_spacing (PX_SCALE(2, 2));
 
        if (!Profile->get_trx()) {
                tbox1->pack_start (midi_panic_button, true, true, 5);
@@ -404,7 +420,7 @@ ARDOUR_UI::setup_transport ()
        if (!ARDOUR::Profile->get_small_screen() && !ARDOUR::Profile->get_trx()) {
                clock_box->pack_start (*secondary_clock, false, false);
        }
-       clock_box->set_spacing (3);
+       clock_box->set_spacing (PX_SCALE(3, 3));
 
        shuttle_box = manage (new ShuttleControl);
        shuttle_box->show ();
@@ -412,7 +428,7 @@ ARDOUR_UI::setup_transport ()
        VBox* transport_vbox = manage (new VBox);
        transport_vbox->set_name ("TransportBase");
        transport_vbox->set_border_width (0);
-       transport_vbox->set_spacing (3);
+       transport_vbox->set_spacing (PX_SCALE(3, 3));
        transport_vbox->pack_start (*tbox, true, true, 0);
 
        if (!Profile->get_trx()) {
@@ -431,7 +447,7 @@ ARDOUR_UI::setup_transport ()
 
        VBox* auto_box = manage (new VBox);
        auto_box->set_homogeneous (true);
-       auto_box->set_spacing (2);
+       auto_box->set_spacing (PX_SCALE(2, 2));
        auto_box->pack_start (sync_button, true, true);
        if (!ARDOUR::Profile->get_trx()) {
                auto_box->pack_start (follow_edits_button, true, true);
@@ -475,6 +491,7 @@ ARDOUR_UI::setup_transport ()
                transport_tearoff->set_state (*tnode);
        }
 }
+#undef PX_SCALE
 
 void
 ARDOUR_UI::detach_tearoff (Box* b, Widget* w)