fix buttons, finally?

git-svn-id: svn://localhost/ardour2/trunk@1454 d708f5d6-7413-0410-9779-e7cbd77b26cf

4 files changed, 26 insertions, 7 deletions

diff --git a/gtk2_ardour/ardour.bindings b/gtk2_ardour/ardour.bindings
index 0a32f5410d..d8316a0147 100644
--- a/gtk2_ardour/ardour.bindings
+++ b/gtk2_ardour/ardour.bindings
@@ -1,4 +1,4 @@
-; ardour_vst.exe.so GtkAccelMap rc-file         -*- scheme -*-
+; ardour-2.0beta11.1 GtkAccelMap rc-file         -*- scheme -*-
 ; this file is an automated accelerator map dump
 ;
 ; (gtk_accel_path "<Actions>/RegionList/RegionListSort" "")
diff --git a/gtk2_ardour/ardour2_ui.rc b/gtk2_ardour/ardour2_ui.rc
index ea54d74615..3cee04ced9 100644
--- a/gtk2_ardour/ardour2_ui.rc
+++ b/gtk2_ardour/ardour2_ui.rc
@@ -190,9 +190,9 @@ style "gain_fader"
 	bg[ACTIVE] =   { 0.152, 0.152, 0.168 }
 }
 
+
 style "track_rec_enable_button" = "small_button"
 {
-	bg[ACTIVE] = { 0.30, 0.30, 0.35 }
 }
 
 style "track_rec_enable_button_active" = "small_button"
@@ -399,8 +399,22 @@ style "transport_button_active"
 
 style "transport_rec_button"
 {
+}
+
+style "transport_rec_button_active"
+{
 	bg[ACTIVE] = { 1.0, 0, 0 }
-	bg[PRELIGHT] = { 0.91, 0.68, 0.68 }		#blinking rec button color
+	bg[NORMAL] = { 1.0, 0, 0 }
+	bg[SELECTED] = { 1.0, 0, 0 }
+	bg[PRELIGHT] = { 1.0, 0, 0 }
+}
+
+style "transport_rec_button_alternate"
+{
+	bg[PRELIGHT] = { 0.91, 0.68, 0.68 }
+	bg[NORMAL] = { 0.91, 0.68, 0.68 }
+	bg[SELECTED] = { 0.91, 0.68, 0.68 }
+	bg[ACTIVE] = { 0.91, 0.68, 0.68 }
 }
 
 style "shuttle_control" = "very_small_text"
@@ -1214,7 +1228,7 @@ widget "*MixerCommentButton" style "very_small_button"
 widget "*MixerCommentButton*" style "very_small_button"
 widget "*EditGroupButton" style "very_small_button"
 widget "*EditGroupButtonLabel" style "very_small_button"
-widget "*TransportButton" style "transport_button"
+widget "*TransportButton" style "transport_rec_button"
 widget "*TransportButton-active" style "transport_button_active"
 widget "*ShuttleButton" style "transport_button"
 widget "*ShuttleButton*" style "transport_button"
@@ -1223,6 +1237,11 @@ widget "*ShuttleDisplay*" style "transport_button"
 widget "*ShuttleControl" style "shuttle_control"
 widget "*TransportRecButton" style "transport_rec_button"
 widget "*TransportRecButton*" style "transport_rec_button"
+widget "*TransportRecButton-active" style "transport_rec_button_active"
+widget "*TransportRecButton-active*" style "transport_rec_button_active"
+widget "*TransportRecButton-alternate" style "transport_rec_button_alternate"
+widget "*TransportRecButton-alternate*" style "transport_rec_button_alternate"
+widget "*TransportRecButton*" style "transport_rec_button"
 widget "*RecordingXrunWarningWindow" style "xrun_warn"
 widget "*RecordingXrunWarningWindow*" style "xrun_warn"
 widget "*MainMenuBar" style "menu_bar_base"
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index f233c972f2..8f07d091a7 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -1682,14 +1682,14 @@ ARDOUR_UI::transport_rec_enable_blink (bool onoff)
 	switch (session->record_status()) {
 	case Session::Enabled:
 		if (onoff) {
-			rec_button.set_visual_state (1);
+			rec_button.set_visual_state (2);
 		} else {
 			rec_button.set_visual_state (0);
 		}
 		break;
 
 	case Session::Recording:
-		rec_button.set_visual_state (2);
+		rec_button.set_visual_state (1);
 		break;
 
 	default:
diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc
index 519a97587d..9769037461 100644
--- a/gtk2_ardour/route_time_axis.cc
+++ b/gtk2_ardour/route_time_axis.cc
@@ -142,7 +142,7 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session& sess, boost::sh
 		}
 		rec_enable_button->show_all ();
 
-		rec_enable_button->signal_button_press_event().connect (mem_fun(*this, &RouteUI::rec_enable_press));
+		rec_enable_button->signal_button_press_event().connect (mem_fun(*this, &RouteUI::rec_enable_press), false);
 		rec_enable_button->signal_button_release_event().connect (mem_fun(*this, &RouteUI::rec_enable_release));
 		controls_table.attach (*rec_enable_button, 5, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
 		ARDOUR_UI::instance()->tooltips().set_tip(*rec_enable_button, _("Record"));