give mixer (R|M|S) buttons back their special status

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

5 files changed, 115 insertions, 64 deletions

diff --git a/gtk2_ardour/ardour2_ui.rc b/gtk2_ardour/ardour2_ui.rc
index e53a2f9c0f..8b7c64cdca 100644
--- a/gtk2_ardour/ardour2_ui.rc
+++ b/gtk2_ardour/ardour2_ui.rc
@@ -184,6 +184,12 @@ style "small_red_active_and_selected_button" = "small_button"
 	bg[SELECTED] = { 1.0, 0, 0}
 }
 
+style "gain_fader"
+{
+	bg[NORMAL] =   { 0.269, 0.269, 0.300}
+	bg[ACTIVE] =   { 0.152, 0.152, 0.168 }
+}
+
 style "track_rec_enable_button" = "small_button"
 {
 }
@@ -195,10 +201,10 @@ style "track_rec_enable_button_active" = "small_button"
 	fg[PRELIGHT] = { 0.0, 0.0, 0.0 }
 	fg[NORMAL] = { 0.0, 0.0, 0.0 }
 
-	bg[NORMAL] =   { 1.0, 0.0, 0.0 } # actively recording
-	bg[ACTIVE] =   { 1.0, 0.0, 0.0 } # actively recording
-	bg[SELECTED] =   { 1.0, 0.0, 0.0 } # actively recording
-	bg[PRELIGHT] =   { 1.0, 0.0, 0.0 } # actively recording
+	bg[NORMAL] =   { 1.0, 0.0, 0.0 }
+	bg[ACTIVE] =   { 1.0, 0.0, 0.0 }
+	bg[SELECTED] =   { 1.0, 0.0, 0.0 }
+	bg[PRELIGHT] =   { 1.0, 0.0, 0.0 }
 }
 
 style "track_rec_enable_button_alternate" = "small_button"
@@ -208,19 +214,27 @@ style "track_rec_enable_button_alternate" = "small_button"
 	fg[PRELIGHT] = { 0.0, 0.0, 0.0 }
 	fg[NORMAL] = { 0.0, 0.0, 0.0 }
 
-	bg[NORMAL] =   { 0.91, 0.68, 0.68} # enabled, not active
-	bg[ACTIVE] =   { 0.91, 0.68, 0.68} # enabled, not active
-	bg[SELECTED] =   { 0.91, 0.68, 0.68} # enabled, not active
-	bg[PRELIGHT] =   { 0.91, 0.68, 0.68} # enabled, not active
+	bg[NORMAL] =   { 0.91, 0.68, 0.68}
+	bg[ACTIVE] =   { 0.91, 0.68, 0.68}
+	bg[SELECTED] =   { 0.91, 0.68, 0.68}
+	bg[PRELIGHT] =   { 0.91, 0.68, 0.68}
 }
 
-style "gain_fader"
+style "mixer_track_rec_enable_button" = "track_rec_enable_button"
 {
-	bg[NORMAL] =   { 0.269, 0.269, 0.300}
-	bg[ACTIVE] =   { 0.152, 0.152, 0.168 }
+	font_name = "sans 7"
+	xthickness = 0
+	ythickness = 0
 }
 
-style "mixer_rec_enable_button" = "track_rec_enable_button"
+style "mixer_track_rec_enable_button_alternate" = "track_rec_enable_button_alternate"
+{
+	font_name = "sans 7"
+	xthickness = 0
+	ythickness = 0
+}
+
+style "mixer_track_rec_enable_button_active" = "track_rec_enable_button_active"
 {
 	font_name = "sans 7"
 	xthickness = 0
@@ -229,17 +243,10 @@ style "mixer_rec_enable_button" = "track_rec_enable_button"
 
 style "solo_button" = "small_button"
 {
-	#	font_name = "sans 7"
-	#	xthickness = 0
-	#	ythickness = 0
 }
 
 style "solo_button_alternate" = "small_button"
 {
-	#	font_name = "sans 7"
-	#	xthickness = 0
-	#	ythickness = 0
-
 	bg[NORMAL] = { 0.19, 0.97, 0.69 } # solo-safe
 	bg[ACTIVE] = { 0.19, 0.97, 0.69 } # solo-safe
 	bg[SELECTED] = { 0.19, 0.97, 0.69 } # solo-safe
@@ -254,10 +261,6 @@ style "solo_button_alternate" = "small_button"
 
 style "solo_button_active" = "small_button"
 {
-	#	font_name = "sans 7"
-	#	xthickness = 0
-	#	ythickness = 0
-
 	bg[NORMAL] = { 0.66, 0.97, 0.19 }   # solo
 	bg[ACTIVE] = { 0.66, 0.97, 0.19 }   # solo
 	bg[SELECTED] = { 0.66, 0.97, 0.19 }   # solo
@@ -269,6 +272,27 @@ style "solo_button_active" = "small_button"
 	fg[PRELIGHT] = { 0, 0, 0 }
 }
 
+style "mixer_solo_button" = "solo_button"
+{
+	font_name = "sans 7"
+	xthickness = 0
+	ythickness = 0
+}
+
+style "mixer_solo_button_alternate" = "solo_button_alternate"
+{
+	font_name = "sans 7"
+	xthickness = 0
+	ythickness = 0
+}
+style "mixer_solo_button_active" = "solo_button_active"
+{
+	font_name = "sans 7"
+	xthickness = 0
+	ythickness = 0
+}
+
+
 style "mute_button" = "small_button"
 {
 }
@@ -299,6 +323,27 @@ style "mute_button_active" = "small_button"
 	fg[PRELIGHT] = { 0, 0, 0 }
 }
 
+style "mixer_mute_button" = "mute_button"
+{
+	font_name = "sans 7"
+	xthickness = 0
+	ythickness = 0
+}
+
+style "mixer_mute_button_alternate" = "mute_button_alternate"
+{
+	font_name = "sans 7"
+	xthickness = 0
+	ythickness = 0
+}
+
+style "mixer_mute_button_active" = "mute_button_active"
+{
+	font_name = "sans 7"
+	xthickness = 0
+	ythickness = 0
+}
+
 style "multiline_combo" = "small_button"
 {
 	font_name = "sans 8"
@@ -1134,16 +1179,24 @@ widget "*NewSessionDialogButton" style "small_red_active_and_selected_button"
 widget "*RecordEnableButton" style "track_rec_enable_button"
 widget "*RecordEnableButton-active" style "track_rec_enable_button_active"
 widget "*RecordEnableButton-alternate" style "track_rec_enable_button_alternate"
-widget "*MuteButton*" style "mute_button"
-widget "*MuteButton-alternate*" style "mute_button_alternate"
-widget "*MuteButton-active*" style "mute_button_active"
+widget "*MixerRecordEnableButton" style "mixer_track_rec_enable_button"
+widget "*MixerRecordEnableButton-active" style "mixer_track_rec_enable_button_active"
+widget "*MixerRecordEnableButton-alternate" style "mixer_track_rec_enable_button_alternate"
+widget "*MuteButton" style "mute_button"
+widget "*MuteButton-alternate" style "mute_button_alternate"
+widget "*MuteButton-active" style "mute_button_active"
+widget "*MixerMuteButton" style "mixer_mute_button"
+widget "*MixerMuteButton-alternate" style "mixer_mute_button_alternate"
+widget "*MixerMuteButton-active" style "mixer_mute_button_active"
+widget "*SoloButton" style "solo_button"
+widget "*SoloButton-alternate" style "solo_button_alternate"
+widget "*SoloButton-active" style "solo_button_active"
+widget "*MixerSoloButton" style "mixer_solo_button"
+widget "*MixerSoloButton-alternate" style "mixer_solo_button_alternate"
+widget "*MixerSoloButton-active" style "mixer_solo_button_active"
 widget "*TrackLoopButton*" style "track_loop_button"
 widget "*PanAutomationLineSelector*" style "multiline_combo"
 widget "*EditorTimeButton*" style "time_button"
-widget "*EditorMixerButton*" style "default_buttons_menus"
-widget "*SoloButton*" style "solo_button"
-widget "*SoloButton-alternate*" style "solo_button_alternate"
-widget "*SoloButton-active*" style "solo_button_active"
 widget "*MixerPhaseInvertButton*" style "very_small_button"
 widget "*MixerPhaseInvertButton.*" style "very_small_button"
 widget "*MixerAutomationRecordingButton*" style "very_small_button"
diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index 21eb495066..41e5734628 100644
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -157,12 +157,8 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, boost::shared_ptr<Route> rt
 
 	hide_button.set_events (hide_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK));
 
-	width_button.unset_flags (Gtk::CAN_FOCUS);
-	hide_button.unset_flags (Gtk::CAN_FOCUS);
-	input_button.unset_flags (Gtk::CAN_FOCUS);
-	output_button.unset_flags (Gtk::CAN_FOCUS);
-	solo_button->unset_flags (Gtk::CAN_FOCUS);
-	mute_button->unset_flags (Gtk::CAN_FOCUS);
+	mute_button->set_name ("MixerMuteButton");
+	solo_button->set_name ("MixerSoloButton");
 
 	button_table.set_homogeneous (true);
 	button_table.set_spacings (0);
@@ -184,6 +180,8 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, boost::shared_ptr<Route> rt
 		rec_enable_button->signal_button_press_event().connect (mem_fun(*this, &RouteUI::rec_enable_press));
 		rec_enable_button->signal_button_release_event().connect (mem_fun(*this, &RouteUI::rec_enable_release));
 
+		rec_enable_button->set_name ("MixerRecordEnableButton");
+
 		AudioTrack* at = audio_track();
 
 		at->FreezeChange.connect (mem_fun(*this, &MixerStrip::map_frozen));
@@ -415,30 +413,30 @@ MixerStrip::set_width (Width w)
 	ensure_xml_node ();
 	
 	_width = w;
-
+	
 	switch (w) {
 	case Wide:
 		set_size_request (-1, -1);
 		xml_node->add_property ("strip_width", "wide");
-
-		if (rec_enable_button) {
-			rec_enable_button->set_label (_("record"));
+		
+		if (rec_enable_button)  {
+			((Gtk::Label*)rec_enable_button->get_child())->set_text (_("record"));
 		}
-		mute_button->set_label  (_("Mute"));
-		solo_button->set_label (_("Solo"));
+		((Gtk::Label*)mute_button->get_child())->set_text  (_("Mute"));
+		((Gtk::Label*)solo_button->get_child())->set_text (_("Solo"));
 
 		if (_route->comment() == "") {
 		       comment_button.unset_bg (STATE_NORMAL);
-		       comment_button.set_label (_("comments"));
+		       ((Gtk::Label*)comment_button.get_child())->set_text (_("comments"));
 		} else {
 		       comment_button.modify_bg (STATE_NORMAL, color());
-		       comment_button.set_label (_("*comments*"));
+		       ((Gtk::Label*)comment_button.get_child())->set_text (_("*comments*"));
 		}
 
-		gpm.gain_automation_style_button.set_label (gpm.astyle_string(_route->gain_automation_curve().automation_style()));
-		gpm.gain_automation_state_button.set_label (gpm.astate_string(_route->gain_automation_curve().automation_state()));
-		panners.pan_automation_style_button.set_label (panners.astyle_string(_route->panner().automation_style()));
-		panners.pan_automation_state_button.set_label (panners.astate_string(_route->panner().automation_state()));
+		((Gtk::Label*)gpm.gain_automation_style_button.get_child())->set_text (gpm.astyle_string(_route->gain_automation_curve().automation_style()));
+		((Gtk::Label*)gpm.gain_automation_state_button.get_child())->set_text (gpm.astate_string(_route->gain_automation_curve().automation_state()));
+		((Gtk::Label*)panners.pan_automation_style_button.get_child())->set_text (panners.astyle_string(_route->panner().automation_style()));
+		((Gtk::Label*)panners.pan_automation_state_button.get_child())->set_text (panners.astate_string(_route->panner().automation_state()));
 		Gtkmm2ext::set_size_request_to_display_given_text (name_button, "long", 2, 2);
 		break;
 
@@ -447,23 +445,23 @@ MixerStrip::set_width (Width w)
 		xml_node->add_property ("strip_width", "narrow");
 
 		if (rec_enable_button) {
-			rec_enable_button->set_label (_("Rec"));
+			((Gtk::Label*)rec_enable_button->get_child())->set_text (_("Rec"));
 		}
-		mute_button->set_label (_("M"));
-		solo_button->set_label (_("S"));
+		((Gtk::Label*)mute_button->get_child())->set_text (_("M"));
+		((Gtk::Label*)solo_button->get_child())->set_text (_("S"));
 
 		if (_route->comment() == "") {
 		       comment_button.unset_bg (STATE_NORMAL);
-		       comment_button.set_label (_("Cmt"));
+		       ((Gtk::Label*)comment_button.get_child())->set_text (_("Cmt"));
 		} else {
 		       comment_button.modify_bg (STATE_NORMAL, color());
-		       comment_button.set_label (_("*Cmt*"));
+		       ((Gtk::Label*)comment_button.get_child())->set_text (_("*Cmt*"));
 		}
 
-		gpm.gain_automation_style_button.set_label (gpm.short_astyle_string(_route->gain_automation_curve().automation_style()));
-		gpm.gain_automation_state_button.set_label (gpm.short_astate_string(_route->gain_automation_curve().automation_state()));
-		panners.pan_automation_style_button.set_label (panners.short_astyle_string(_route->panner().automation_style()));
-		panners.pan_automation_state_button.set_label (panners.short_astate_string(_route->panner().automation_state()));
+		((Gtk::Label*)gpm.gain_automation_style_button.get_child())->set_text (gpm.short_astyle_string(_route->gain_automation_curve().automation_style()));
+		((Gtk::Label*)gpm.gain_automation_state_button.get_child())->set_text (gpm.short_astate_string(_route->gain_automation_curve().automation_state()));
+		((Gtk::Label*)panners.pan_automation_style_button.get_child())->set_text (panners.short_astyle_string(_route->panner().automation_style()));
+		((Gtk::Label*)panners.pan_automation_state_button.get_child())->set_text (panners.short_astate_string(_route->panner().automation_state()));
 		Gtkmm2ext::set_size_request_to_display_given_text (name_button, "longest label", 2, 2);
 		break;
 	}
@@ -785,20 +783,20 @@ MixerStrip::comment_editor_done_editing() {
 		case Wide:
 			if (! str.empty()) {
 			        comment_button.modify_bg (STATE_NORMAL, color());
-				comment_button.set_label (_("*Comments*"));
+				((Gtk::Label*)comment_button.get_child())->set_text (_("*Comments*"));
 			} else {
 			        comment_button.unset_bg (STATE_NORMAL);
-				comment_button.set_label (_("Comments"));
+				((Gtk::Label*)comment_button.get_child())->set_text (_("Comments"));
 			}
 			break;
 		   
 		case Narrow:
 			if (! str.empty()) {
 			        comment_button.modify_bg (STATE_NORMAL, color());
-				comment_button.set_label (_("*Cmt*"));
+				((Gtk::Label*)comment_button.get_child())->set_text (_("*Cmt*"));
 			} else {
 			        comment_button.unset_bg (STATE_NORMAL);
-				comment_button.set_label (_("Cmt"));
+				((Gtk::Label*)comment_button.get_child())->set_text (_("Cmt"));
 			} 
 			break;
 		}
diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc
index a86fe45887..519a97587d 100644
--- a/gtk2_ardour/route_time_axis.cc
+++ b/gtk2_ardour/route_time_axis.cc
@@ -142,7 +142,6 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session& sess, boost::sh
 		}
 		rec_enable_button->show_all ();
 
-		rec_enable_button->set_name ("RecordEnableButton");
 		rec_enable_button->signal_button_press_event().connect (mem_fun(*this, &RouteUI::rec_enable_press));
 		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);
diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc
index e2783a11b9..cc8545ad61 100644
--- a/gtk2_ardour/route_ui.cc
+++ b/gtk2_ardour/route_ui.cc
@@ -101,6 +101,7 @@ RouteUI::RouteUI (boost::shared_ptr<ARDOUR::Route> rt, ARDOUR::Session& sess, co
 		_session.RecordStateChanged.connect (mem_fun (*this, &RouteUI::session_rec_enable_changed));
 
 		rec_enable_button = manage (new BindableToggleButton (t->rec_enable_control(), r_name ));
+		rec_enable_button->set_name ("RecordEnableButton");
 		rec_enable_button->set_self_managed (true);
 
 		update_rec_display ();
diff --git a/libs/gtkmm2ext/stateful_button.cc b/libs/gtkmm2ext/stateful_button.cc
index b40105c0d2..cee350a0d0 100644
--- a/libs/gtkmm2ext/stateful_button.cc
+++ b/libs/gtkmm2ext/stateful_button.cc
@@ -34,7 +34,7 @@ StateButton::set_visual_state (int n)
 	
 	switch (n) {
 	case 0:
-		name += "-normal";
+		/* relax */
 		break;
 	case 1:
 		name += "-active";
@@ -43,7 +43,7 @@ StateButton::set_visual_state (int n)
 		name += "-alternate";
 		break;
 	}
-	
+
 	set_widget_name (name);
 	visual_state = n;
 }