convert transport buttons to ArdourButton

git-svn-id: svn://localhost/ardour2/branches/3.0@10473 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 20 insertions, 56 deletions

diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc
index 00d0341603..2b3ee34ffb 100644
--- a/gtk2_ardour/ardour_ui2.cc
+++ b/gtk2_ardour/ardour_ui2.cc
@@ -236,15 +236,6 @@ ARDOUR_UI::setup_transport ()
 	transport_tearoff->Visible.connect (sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::reattach_tearoff), static_cast<Box*> (&top_packer),
 						  static_cast<Widget*> (&transport_frame), 1));
 
-	goto_start_button.set_name ("TransportButton");
-	goto_end_button.set_name ("TransportButton");
-	roll_button.set_name ("TransportButton");
-	stop_button.set_name ("TransportButton");
-	play_selection_button.set_name ("TransportButton");
-	rec_button.set_name ("TransportRecButton");
-	auto_loop_button.set_name ("TransportButton");
-	join_play_range_button.set_name ("TransportButton");
-
 	auto_return_button.set_name ("TransportButton");
 	auto_play_button.set_name ("TransportButton");
 	auto_input_button.set_name ("TransportButton");
@@ -262,49 +253,36 @@ ARDOUR_UI::setup_transport ()
 
 	Widget* w;
 
-	stop_button.set_visual_state (1);
-
-	w = manage (new Image (get_icon (X_("transport_start"))));
-	w->show();
-	goto_start_button.add (*w);
-	w = manage (new Image (get_icon (X_("transport_end"))));
-	w->show();
-	goto_end_button.add (*w);
-	w = manage (new Image (get_icon (X_("transport_play"))));
-	w->show();
-	roll_button.add (*w);
-	w = manage (new Image (get_icon (X_("transport_stop"))));
-	w->show();
-	stop_button.add (*w);
-	w = manage (new Image (get_icon (X_("transport_range"))));
-	w->show();
-	play_selection_button.add (*w);
-	w = manage (new Image (get_icon (X_("transport_record"))));
-	w->show();
-	rec_button.add (*w);
-	w = manage (new Image (get_icon (X_("transport_loop"))));
-	w->show();
-	auto_loop_button.add (*w);
-	w = manage (new Image (get_icon (X_("tool_object_range"))));
-	w->show ();
-	join_play_range_button.add (*w);
+	stop_button.set_active_state (Active);
+
+
+	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")));
+	rec_button.set_image (get_icon (X_("transport_record")));
+	auto_loop_button.set_image (get_icon (X_("transport_loop")));
+	join_play_range_button.set_image (get_icon (X_("tool_object_range")));
 
 	RefPtr<Action> act;
 
 	act = ActionManager::get_action (X_("Transport"), X_("Stop"));
-	act->connect_proxy (stop_button);
+	stop_button.set_related_action (act);
 	act = ActionManager::get_action (X_("Transport"), X_("Roll"));
-	act->connect_proxy (roll_button);
+	roll_button.set_related_action (act);
 	act = ActionManager::get_action (X_("Transport"), X_("Record"));
-	act->connect_proxy (rec_button);
+	rec_button.set_related_action (act);
 	act = ActionManager::get_action (X_("Transport"), X_("GotoStart"));
-	act->connect_proxy (goto_start_button);
+	goto_start_button.set_related_action (act);
 	act = ActionManager::get_action (X_("Transport"), X_("GotoEnd"));
-	act->connect_proxy (goto_end_button);
+	goto_end_button.set_related_action (act);
 	act = ActionManager::get_action (X_("Transport"), X_("Loop"));
-	act->connect_proxy (auto_loop_button);
+	auto_loop_button.set_related_action (act);
 	act = ActionManager::get_action (X_("Transport"), X_("PlaySelection"));
-	act->connect_proxy (play_selection_button);
+	play_selection_button.set_related_action (act);
+
+
 	act = ActionManager::get_action (X_("Transport"), X_("ToggleTimeMaster"));
 	act->connect_proxy (time_master_button);
 	act = ActionManager::get_action (X_("Transport"), X_("ToggleExternalSync"));
@@ -324,14 +302,6 @@ ARDOUR_UI::setup_transport ()
 	ActionManager::get_action ("Transport", "ToggleAutoPlay")->connect_proxy (auto_play_button);
 	ActionManager::get_action ("Transport", "ToggleAutoInput")->connect_proxy (auto_input_button);
 
-	preroll_button.set_name ("TransportButton");
-	postroll_button.set_name ("TransportButton");
-
-	preroll_clock->set_mode (AudioClock::MinSec);
-	preroll_clock->set_name ("TransportClockDisplay");
-	postroll_clock->set_mode (AudioClock::MinSec);
-	postroll_clock->set_name ("TransportClockDisplay");
-
 	/* alerts */
 
 	/* CANNOT sigc::bind these to clicked or toggled, must use pressed or released */
@@ -440,12 +410,6 @@ ARDOUR_UI::setup_transport ()
 
 	set_transport_sensitivity (false);
 
-//	toggle_box->pack_start (preroll_button, false, false);
-//	toggle_box->pack_start (preroll_clock, false, false);
-
-//	toggle_box->pack_start (postroll_button, false, false);
-//	toggle_box->pack_start (postroll_clock, false, false);
-
 	transport_tearoff_hbox.pack_start (*toggle_box, false, false, 4);
         if (Profile->get_small_screen()) {
                 transport_tearoff_hbox.pack_start (_editor_transport_box, false, false, 4);