X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour_ui2.cc;h=27b852982ac249cf19706b8441688bb47e5e776e;hb=afa29d319007ce20bd1546c343e9277c58c80c1a;hp=337362d9da07eae2ff41db3777372cdcd098fcd8;hpb=ac1272c0d4d4632106f7ed636ff1a9182b671a05;p=ardour.git

diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc
index 337362d9da..27b852982a 100644
--- a/gtk2_ardour/ardour_ui2.cc
+++ b/gtk2_ardour/ardour_ui2.cc
@@ -139,7 +139,7 @@ ARDOUR_UI::transport_rolling ()
 		roll_button.set_active (false);
 		auto_loop_button.set_active (false);
 
-	} else if (Config->get_auto_loop ()) {
+	} else if (session->get_play_loop ()) {
 		auto_loop_button.set_active (true);
 		play_selection_button.set_active (false);
 		roll_button.set_active (false);
@@ -239,29 +239,37 @@ ARDOUR_UI::setup_transport ()
 	goto_start_button.set_colors (colors);
 	goto_end_button.set_colors (colors);
 	
+	stop_button.set_size_request(29, -1);
+	roll_button.set_size_request(29, -1);
+	auto_loop_button.set_size_request(29, -1);
+	play_selection_button.set_size_request(29, -1);
+	goto_start_button.set_size_request(29, -1);
+	goto_end_button.set_size_request(29, -1);
+	rec_button.set_size_request(29, -1);
+	
 	Widget* w;
 
 	stop_button.set_active (true);
-
-	w = manage (new Image (Stock::MEDIA_PREVIOUS, ICON_SIZE_BUTTON));
+	
+	w = manage (new Image (get_icon (X_("transport_start"))));
 	w->show();
 	goto_start_button.add (*w);
-	w = manage (new Image (Stock::MEDIA_NEXT, ICON_SIZE_BUTTON));
+	w = manage (new Image (get_icon (X_("transport_end"))));
 	w->show();
 	goto_end_button.add (*w);
-	w = manage (new Image (Stock::MEDIA_PLAY, ICON_SIZE_BUTTON));
+	w = manage (new Image (get_icon (X_("transport_play"))));
 	w->show();
 	roll_button.add (*w);
-	w = manage (new Image (Stock::MEDIA_STOP, ICON_SIZE_BUTTON));
+	w = manage (new Image (get_icon (X_("transport_stop"))));
 	w->show();
 	stop_button.add (*w);
-	w = manage (new Image (Stock::MEDIA_PLAY, ICON_SIZE_BUTTON));
+	w = manage (new Image (get_icon (X_("transport_range"))));
 	w->show();
 	play_selection_button.add (*w);
-	w = manage (new Image (Stock::MEDIA_RECORD, ICON_SIZE_BUTTON));
+	w = manage (new Image (get_icon (X_("transport_record"))));
 	w->show();
 	rec_button.add (*w);
-	w = manage (new Image (get_xpm("loop.xpm")));
+	w = manage (new Image (get_icon (X_("transport_loop"))));
 	w->show();
 	auto_loop_button.add (*w);
 
@@ -355,6 +363,9 @@ ARDOUR_UI::setup_transport ()
 	auditioning_alert_button.set_name ("TransportAuditioningAlert");
 	auditioning_alert_button.signal_pressed().connect (mem_fun(*this,&ARDOUR_UI::audition_alert_toggle));
 
+	tooltips().set_tip (solo_alert_button, _("When active, something is soloed.\nClick to de-solo everything"));
+	tooltips().set_tip (auditioning_alert_button, _("When active, auditioning is taking place\nClick to stop the audition"));
+
 	alert_box.pack_start (solo_alert_button, false, false);
 	alert_box.pack_start (auditioning_alert_button, false, false);
 
@@ -451,23 +462,6 @@ ARDOUR_UI::setup_transport ()
 	transport_tearoff_hbox.pack_start (alert_box, false, false);
 }
 
-void
-ARDOUR_UI::setup_clock ()
-{
-	ARDOUR_UI::Clock.connect (bind (mem_fun (big_clock, &AudioClock::set), false));
-	
-	big_clock_window = new Window (WINDOW_TOPLEVEL);
-	
-	big_clock_window->set_border_width (0);
-	big_clock_window->add  (big_clock);
-	big_clock_window->set_title (_("ardour: clock"));
-	big_clock_window->set_type_hint (Gdk::WINDOW_TYPE_HINT_MENU);
-	big_clock_window->signal_realize().connect (bind (sigc::ptr_fun (set_decoration), big_clock_window,  (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH)));
-	big_clock_window->signal_unmap().connect (bind (sigc::ptr_fun(&ActionManager::uncheck_toggleaction), X_("<Actions>/Common/ToggleBigClock")));
-
-	manage_window (*big_clock_window);
-}
-
 void
 ARDOUR_UI::manage_window (Window& win)
 {
@@ -615,7 +609,7 @@ ARDOUR_UI::show_shuttle_context_menu ()
 		build_shuttle_context_menu ();
 	}
 
-	shuttle_context_menu->popup (1, 0);
+	shuttle_context_menu->popup (1, gtk_get_current_event_time());
 }
 
 void
@@ -821,7 +815,7 @@ ARDOUR_UI::shuttle_unit_clicked ()
 	if (shuttle_unit_menu == 0) {
 		shuttle_unit_menu = dynamic_cast<Menu*> (ActionManager::get_widget ("/ShuttleUnitPopup"));
 	}
-	shuttle_unit_menu->popup (1, 0);
+	shuttle_unit_menu->popup (1, gtk_get_current_event_time());
 }
 
 void