diff --git a/gtk2_ardour/ardour3_ui_default.conf b/gtk2_ardour/ardour3_ui_default.conf
index 08507da2a4..ac6f7c0c45 100644
--- a/gtk2_ardour/ardour3_ui_default.conf
+++ b/gtk2_ardour/ardour3_ui_default.conf
@@ -207,38 +207,38 @@
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
+
+
+
@@ -479,15 +479,15 @@
-
-
+
+
-
-
-
-
-
+
+
+
+
+
@@ -495,21 +495,37 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index bbc5211c3e..750480b5d7 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -153,10 +153,10 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
, play_selection_controllable (new TransportControllable ("transport play selection", *this, TransportControllable::PlaySelection))
, rec_controllable (new TransportControllable ("transport rec-enable", *this, TransportControllable::RecordEnable))
- , auto_return_button (_("Auto Return"))
- , auto_play_button (_("Auto Play"))
- , auto_input_button (_("Auto Input"))
- // , click_button (_("Click"))
+ , auto_return_button (ArdourButton::led_default_elements)
+ , auto_play_button (ArdourButton::led_default_elements)
+ , auto_input_button (ArdourButton::led_default_elements)
+
, time_master_button (_("time\nmaster"))
, auditioning_alert_button (_("AUDITION"))
diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h
index f29f06ce94..e8340f366d 100644
--- a/gtk2_ardour/ardour_ui.h
+++ b/gtk2_ardour/ardour_ui.h
@@ -435,10 +435,10 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
ShuttleControl* shuttle_box;
- Gtkmm2ext::StatefulToggleButton auto_return_button;
- Gtkmm2ext::StatefulToggleButton auto_play_button;
- Gtkmm2ext::StatefulToggleButton auto_input_button;
- Gtkmm2ext::StatefulToggleButton click_button;
+ ArdourButton auto_return_button;
+ ArdourButton auto_play_button;
+ ArdourButton auto_input_button;
+ ArdourButton click_button;
Gtkmm2ext::StatefulToggleButton time_master_button;
Gtkmm2ext::StatefulToggleButton sync_button;
diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc
index dd100b820f..076f9f2f52 100644
--- a/gtk2_ardour/ardour_ui2.cc
+++ b/gtk2_ardour/ardour_ui2.cc
@@ -210,6 +210,8 @@ ARDOUR_UI::tearoff_settings (const char* name) const
void
ARDOUR_UI::setup_transport ()
{
+ RefPtr act;
+
transport_tearoff = manage (new TearOff (transport_tearoff_hbox));
transport_tearoff->set_name ("TransportBase");
transport_tearoff->tearoff_window().signal_key_press_event().connect (sigc::bind (sigc::ptr_fun (relay_key_press), &transport_tearoff->tearoff_window()), false);
@@ -236,15 +238,23 @@ ARDOUR_UI::setup_transport ()
transport_tearoff->Visible.connect (sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::reattach_tearoff), static_cast (&top_packer),
static_cast (&transport_frame), 1));
- auto_return_button.set_name ("TransportButton");
- auto_play_button.set_name ("TransportButton");
- auto_input_button.set_name ("TransportButton");
- click_button.set_name ("TransportButton");
+ auto_return_button.set_text(_("Auto Return"));
+ auto_play_button.set_text(_("Auto Play"));
+ auto_input_button.set_text (_("Auto Input"));
+
+ click_button.set_image (get_icon (X_("metronome")));
+ 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);
+
+ auto_return_button.set_name ("transport option button");
+ auto_play_button.set_name ("transport option button");
+ auto_input_button.set_name ("transport option button");
+ click_button.set_name ("transport option button");
+
time_master_button.set_name ("TransportButton");
sync_button.set_name ("TransportSyncButton");
- Widget* w;
-
stop_button.set_active_state (Active);
goto_start_button.set_image (get_icon (X_("transport_start")));
@@ -256,8 +266,6 @@ ARDOUR_UI::setup_transport ()
auto_loop_button.set_image (get_icon (X_("transport_loop")));
join_play_range_button.set_image (get_icon (X_("tool_object_range")));
- RefPtr act;
-
act = ActionManager::get_action (X_("Transport"), X_("Stop"));
stop_button.set_related_action (act);
act = ActionManager::get_action (X_("Transport"), X_("Roll"));
@@ -289,9 +297,12 @@ ARDOUR_UI::setup_transport ()
secondary_clock->ValueChanged.connect (sigc::mem_fun(*this, &ARDOUR_UI::secondary_clock_value_changed));
big_clock->ValueChanged.connect (sigc::mem_fun(*this, &ARDOUR_UI::big_clock_value_changed));
- ActionManager::get_action ("Transport", "ToggleAutoReturn")->connect_proxy (auto_return_button);
- ActionManager::get_action ("Transport", "ToggleAutoPlay")->connect_proxy (auto_play_button);
- ActionManager::get_action ("Transport", "ToggleAutoInput")->connect_proxy (auto_input_button);
+ act = ActionManager::get_action ("Transport", "ToggleAutoReturn");
+ auto_return_button.set_related_action (act);
+ act = ActionManager::get_action ("Transport", "ToggleAutoPlay");
+ auto_play_button.set_related_action (act);
+ act = ActionManager::get_action ("Transport", "ToggleAutoInput");
+ auto_input_button.set_related_action (act);
/* alerts */
@@ -382,14 +393,6 @@ ARDOUR_UI::setup_transport ()
time_controls_table->attach (sync_button, 0, 1, 0, 1, Gtk::AttachOptions(FILL|EXPAND), Gtk::AttachOptions(0));
time_controls_table->attach (time_master_button, 0, 1, 1, 2, Gtk::AttachOptions(FILL|EXPAND), Gtk::AttachOptions(0));
- w = manage (new Image (get_icon (X_("metronome"))));
- w->show ();
- click_button.add (*w);
-
- ActionManager::get_action ("Transport", "ToggleClick")->connect_proxy (click_button);
-
- click_button.signal_button_press_event().connect (sigc::mem_fun (*this, &ARDOUR_UI::click_button_clicked), false);
-
time_controls_table->attach (click_button, 1, 2, 0, 2, Gtk::AttachOptions(FILL|EXPAND), FILL);
transport_tearoff_hbox.pack_start (*clock_box, false, false);
diff --git a/gtk2_ardour/canvas_vars.h b/gtk2_ardour/canvas_vars.h
index c4a64eb6e8..d9ff718639 100644
--- a/gtk2_ardour/canvas_vars.h
+++ b/gtk2_ardour/canvas_vars.h
@@ -179,4 +179,5 @@ BUTTON_VARS(RecEnableButton, "record enable button")
BUTTON_VARS(SendButton, "send alert button")
BUTTON_VARS(TransportButton, "transport button")
BUTTON_VARS(TransportRecenableButton, "transport recenable button")
+BUTTON_VARS(TransportOptionButton, "transport option button")