Enforce mixer strip widths, more case fixes, and minor theme changes

3 files changed, 21 insertions, 20 deletions

diff --git a/gtk2_ardour/ardour3_ui_default.conf.in b/gtk2_ardour/ardour3_ui_default.conf.in
index 5a83e101f2..f3a8de0706 100644
--- a/gtk2_ardour/ardour3_ui_default.conf.in
+++ b/gtk2_ardour/ardour3_ui_default.conf.in
@@ -353,7 +353,7 @@
     <Option name="feedback alert: text" value="969696ff"/>
     <Option name="feedback alert: text active" value="e5e5e5ff"/>
     <Option name="mute button: fill start" value="565659ff"/>
-    <Option name="mute button: fill end" value="484853ff"/>
+    <Option name="mute button: fill end" value="404149ff"/>
     <Option name="mute button: fill start active" value="5f4943ff"/>
     <Option name="mute button: fill end active" value="ffff00ff"/>
     <Option name="mute button: led" value="00000000"/>
@@ -361,7 +361,7 @@
     <Option name="mute button: text" value="bfbfafff"/>
     <Option name="mute button: text active" value="191919ff"/>
     <Option name="solo button: fill start" value="565659ff"/>
-    <Option name="solo button: fill end" value="484853ff"/>
+    <Option name="solo button: fill end" value="404149ff"/>
     <Option name="solo button: fill start active" value="1d7a05ff"/>
     <Option name="solo button: fill end active" value="4dbb00ff"/>
     <Option name="solo button: led" value="00000000"/>
@@ -369,7 +369,7 @@
     <Option name="solo button: text" value="afbfafff"/>
     <Option name="solo button: text active" value="191919ff"/>
     <Option name="invert button: fill start" value="565659ff"/>
-    <Option name="invert button: fill end" value="484853ff"/>
+    <Option name="invert button: fill end" value="404149ff"/>
     <Option name="invert button: fill start active" value="222260ff"/>
     <Option name="invert button: fill end active" value="4242d0ff"/>
     <Option name="invert button: led" value="473812ff"/>
@@ -401,7 +401,7 @@
     <Option name="send alert button: text" value="ccccccff"/>
     <Option name="send alert button: text active" value="000000ff"/>
     <Option name="transport button: fill start" value="616268ff"/>
-    <Option name="transport button: fill end" value="505159ff"/>
+    <Option name="transport button: fill end" value="4a4b51ff"/>
     <Option name="transport button: fill start active" value="1d7a05ff"/>
     <Option name="transport button: fill end active" value="00a300ff"/>
     <Option name="transport button: led" value="00000000"/>
@@ -417,17 +417,17 @@
     <Option name="transport recenable button: text" value="00000000"/>
     <Option name="transport recenable button: text active" value="00000000"/>
     <Option name="transport option button: fill start" value="636470ff"/>
-    <Option name="transport option button: fill end" value="54555dff"/>
+    <Option name="transport option button: fill end" value="4a4b51ff"/>
     <Option name="transport option button: fill start active" value="636470ff"/>
     <Option name="transport option button: fill end active" value="4a4b51ff"/>
     <Option name="transport option button: led" value="4f3300ff"/>
     <Option name="transport option button: led active" value="ffa500ff"/>
     <Option name="transport option button: text" value="c7c7d8ff"/>
     <Option name="transport option button: text active" value="c8c8d9ff"/>
-    <Option name="transport active option button: fill start" value="616268ff"/>
-    <Option name="transport active option button: fill end" value="505159ff"/>
-    <Option name="transport active option button: fill start active" value="257f25ff"/>
-    <Option name="transport active option button: fill end active" value="23b223ff"/>
+    <Option name="transport active option button: fill start" value="636470ff"/>
+    <Option name="transport active option button: fill end" value="4a4b51ff"/>
+    <Option name="transport active option button: fill start active" value="1d7a05ff"/>
+    <Option name="transport active option button: fill end active" value="00a300ff"/>
     <Option name="transport active option button: led" value="4f3300ff"/>
     <Option name="transport active option button: led active" value="ffa500ff"/>
     <Option name="transport active option button: text" value="c7c7d8ff"/>
@@ -449,7 +449,7 @@
     <Option name="punch button: text" value="a5a5a5ff"/>
     <Option name="punch button: text active" value="d8d8d8ff"/>
     <Option name="mouse mode button: fill start" value="616268ff"/>
-    <Option name="mouse mode button: fill end" value="505159ff"/>
+    <Option name="mouse mode button: fill end" value="45464dff"/>
     <Option name="mouse mode button: fill start active" value="1e7f05ff"/>
     <Option name="mouse mode button: fill end active" value="00b200ff"/>
     <Option name="mouse mode button: led" value="4f3300ff"/>
@@ -473,7 +473,7 @@
     <Option name="zoom menu: text" value="c7c7d8ff"/>
     <Option name="zoom menu: text active" value="c8c8d9ff"/>
     <Option name="zoom button: fill start" value="616268ff"/>
-    <Option name="zoom button: fill end" value="505159ff"/>
+    <Option name="zoom button: fill end" value="45464dff"/>
     <Option name="zoom button: fill start active" value="1d7a05ff"/>
     <Option name="zoom button: fill end active" value="00a300ff"/>
     <Option name="zoom button: led" value="4f3300ff"/>
@@ -481,7 +481,7 @@
     <Option name="zoom button: text" value="c7c7d8ff"/>
     <Option name="zoom button: text active" value="000000ff"/>
     <Option name="route button: fill start" value="565659ff"/>
-    <Option name="route button: fill end" value="484853ff"/>
+    <Option name="route button: fill end" value="404149ff"/>
     <Option name="route button: fill start active" value="4d4d4dff"/>
     <Option name="route button: fill end active" value="121212ff"/>
     <Option name="route button: led" value="4f3300ff"/>
@@ -489,7 +489,7 @@
     <Option name="route button: text" value="bfbfbfff"/>
     <Option name="route button: text active" value="191919ff"/>
     <Option name="mixer strip button: fill start" value="565659ff"/>
-    <Option name="mixer strip button: fill end" value="484853ff"/>
+    <Option name="mixer strip button: fill end" value="454652ff"/>
     <Option name="mixer strip button: fill start active" value="5f4943ff"/>
     <Option name="mixer strip button: fill end active" value="ffa500ff"/>
     <Option name="mixer strip button: led" value="4f3300ff"/>
@@ -497,7 +497,7 @@
     <Option name="mixer strip button: text" value="c7c7d8ff"/>
     <Option name="mixer strip button: text active" value="000000ff"/>
     <Option name="mixer strip name button: fill start" value="565659ff"/>
-    <Option name="mixer strip name button: fill end" value="484853ff"/>
+    <Option name="mixer strip name button: fill end" value="404149ff"/>
     <Option name="mixer strip name button: fill start active" value="4d4d4dff"/>
     <Option name="mixer strip name button: fill end active" value="121212ff"/>
     <Option name="mixer strip name button: led" value="4f3300ff"/>
diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index f30e53fab4..41d04e417e 100644
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -718,7 +718,8 @@ MixerStrip::set_width_enum (Width w, void* owner)
 
 
 		Gtkmm2ext::set_size_request_to_display_given_text_width (name_button, longest_label.c_str(), 2, _button_vpad);
-		set_size_request (-1, -1);
+		set_size_request (max (110, gpm.get_gm_width()+5), -1);
+//		set_size_request (-1, -1);
 		break;
 
 	case Narrow:
diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc
index a1acb0749b..d54d1949eb 100644
--- a/gtk2_ardour/route_time_axis.cc
+++ b/gtk2_ardour/route_time_axis.cc
@@ -96,9 +96,9 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session* sess, ArdourCan
 	, parent_canvas (canvas)
 	, no_redraw (false)
 	, button_table (3, 3)
-	, route_group_button (_("g"))
-	, playlist_button (_("p"))
-	, automation_button (_("a"))
+	, route_group_button (_("G"))
+	, playlist_button (_("P"))
+	, automation_button (_("A"))
 	, automation_action_menu (0)
 	, plugins_submenu_item (0)
 	, route_group_menu (0)
@@ -2524,10 +2524,10 @@ RouteTimeAxisView::set_button_names ()
 			break;
 		}
 	} else {
-		solo_button->set_text (_("s"));
+		solo_button->set_text (_("S"));
 		ARDOUR_UI::instance()->set_tip (*solo_button, _("Solo"));
 	}
-	mute_button->set_text (_("m"));
+	mute_button->set_text (_("M"));
 }
 
 Gtk::CheckMenuItem*