Update Patch Selector Colors

Custom text color is no longer available, so remove it.
Also prefer a semantic description "unnamed", not a visual cue.

7 files changed, 15 insertions, 20 deletions

diff --git a/gtk2_ardour/patch_change_widget.cc b/gtk2_ardour/patch_change_widget.cc
index 16e9aa8c4a..a528adfb29 100644
--- a/gtk2_ardour/patch_change_widget.cc
+++ b/gtk2_ardour/patch_change_widget.cc
@@ -356,9 +356,10 @@ PatchChangeWidget::refill_banks ()
 		std::string n = string_compose (_("Pgm-%1"), (int)(pgm +1));
 		_program_btn[pgm].set_text (n);
 		if (shade) {
-			_program_btn[pgm].set_name (X_("patch change dim button"));
+			_program_btn[pgm].set_name (X_("patch change button unnamed"));
 		} else {
 			_program_btn[pgm].set_name (X_("patch change button"));
+			continue;
 		}
 		set_tooltip (_program_btn[pgm], n);
 	}
diff --git a/gtk2_ardour/themes/blueberry_milk-ardour.colors b/gtk2_ardour/themes/blueberry_milk-ardour.colors
index c7d5f508b9..2ea215ee3b 100644
--- a/gtk2_ardour/themes/blueberry_milk-ardour.colors
+++ b/gtk2_ardour/themes/blueberry_milk-ardour.colors
@@ -289,9 +289,8 @@
     <ColorAlias name="page switch button: fill active" alias="alert:blue"/>
     <ColorAlias name="patch change button: fill" alias="widget:bg"/>
     <ColorAlias name="patch change button: fill active" alias="widget:blue"/>
-    <ColorAlias name="patch change dim button: fill" alias="neutral:background2"/>
-    <ColorAlias name="patch change dim button: fill active" alias="widget:blue"/>
-    <ColorAlias name="patch change dim button: text" alias="widget:blue"/>
+    <ColorAlias name="patch change button unnamed: fill" alias="neutral:background2"/>
+    <ColorAlias name="patch change button unnamed: fill active" alias="widget:blue"/>
     <ColorAlias name="piano roll black" alias="theme:contrasting selection"/>
     <ColorAlias name="piano roll black outline" alias="neutral:foreground2"/>
     <ColorAlias name="piano roll white" alias="neutral:foreground2"/>
diff --git a/gtk2_ardour/themes/caineville-ardour.colors b/gtk2_ardour/themes/caineville-ardour.colors
index de6540b40e..bcd8341e6b 100644
--- a/gtk2_ardour/themes/caineville-ardour.colors
+++ b/gtk2_ardour/themes/caineville-ardour.colors
@@ -290,9 +290,8 @@
     <ColorAlias name="page switch button: fill active" alias="alert:green"/>
     <ColorAlias name="patch change button: fill" alias="widget:bg"/>
     <ColorAlias name="patch change button: fill active" alias="widget:blue"/>
-    <ColorAlias name="patch change dim button: fill" alias="neutral:background2"/>
-    <ColorAlias name="patch change dim button: fill active" alias="widget:blue"/>
-    <ColorAlias name="patch change dim button: text" alias="widget:blue"/>
+    <ColorAlias name="patch change button unnamed: fill" alias="neutral:background2"/>
+    <ColorAlias name="patch change button unnamed: fill active" alias="widget:blue"/>
     <ColorAlias name="piano roll black" alias="theme:contrasting selection"/>
     <ColorAlias name="piano roll black outline" alias="neutral:foreground2"/>
     <ColorAlias name="piano roll white" alias="neutral:foreground2"/>
diff --git a/gtk2_ardour/themes/clear_gray-ardour.colors b/gtk2_ardour/themes/clear_gray-ardour.colors
index c44f60f632..1758f73dea 100644
--- a/gtk2_ardour/themes/clear_gray-ardour.colors
+++ b/gtk2_ardour/themes/clear_gray-ardour.colors
@@ -290,9 +290,8 @@
     <ColorAlias name="page switch button: fill active" alias="alert:green"/>
     <ColorAlias name="patch change button: fill" alias="widget:bg"/>
     <ColorAlias name="patch change button: fill active" alias="widget:blue"/>
-    <ColorAlias name="patch change dim button: fill" alias="neutral:background2"/>
-    <ColorAlias name="patch change dim button: fill active" alias="widget:blue"/>
-    <ColorAlias name="patch change dim button: text" alias="widget:blue"/>
+    <ColorAlias name="patch change button unnamed: fill" alias="neutral:background2"/>
+    <ColorAlias name="patch change button unnamed: fill active" alias="widget:blue"/>
     <ColorAlias name="piano roll black" alias="theme:contrasting selection"/>
     <ColorAlias name="piano roll black outline" alias="neutral:foreground2"/>
     <ColorAlias name="piano roll white" alias="neutral:foreground2"/>
diff --git a/gtk2_ardour/themes/cubasish-ardour.colors b/gtk2_ardour/themes/cubasish-ardour.colors
index 88679c8f08..463781931b 100644
--- a/gtk2_ardour/themes/cubasish-ardour.colors
+++ b/gtk2_ardour/themes/cubasish-ardour.colors
@@ -290,9 +290,8 @@
     <ColorAlias name="page switch button: fill active" alias="alert:blue"/>
     <ColorAlias name="patch change button: fill" alias="widget:bg"/>
     <ColorAlias name="patch change button: fill active" alias="widget:blue"/>
-    <ColorAlias name="patch change dim button: fill" alias="neutral:background2"/>
-    <ColorAlias name="patch change dim button: fill active" alias="widget:blue"/>
-    <ColorAlias name="patch change dim button: text" alias="widget:blue"/>
+    <ColorAlias name="patch change button unnamed: fill" alias="neutral:background2"/>
+    <ColorAlias name="patch change button unnamed: fill active" alias="widget:blue"/>
     <ColorAlias name="piano roll black" alias="theme:contrasting selection"/>
     <ColorAlias name="piano roll black outline" alias="neutral:foreground2"/>
     <ColorAlias name="piano roll white" alias="neutral:foreground2"/>
diff --git a/gtk2_ardour/themes/dark-ardour.colors b/gtk2_ardour/themes/dark-ardour.colors
index 11d2bd1286..7afe575ffa 100644
--- a/gtk2_ardour/themes/dark-ardour.colors
+++ b/gtk2_ardour/themes/dark-ardour.colors
@@ -19,7 +19,7 @@
     <Color name="theme:contrasting alt" value="CCA336ff"/>  <!--secondary delta clock: text-->
     <Color name="neutral:backgroundest" value="000000ff"/>  <!--border color-->
     <Color name="neutral:background" value="202020ff"/>  <!--audio track base-->
-    <Color name="neutral:background2" value="505050ff"/>  <!--range marker bar-->
+    <Color name="neutral:background2" value="555555ff"/>  <!--range marker bar-->
     <Color name="neutral:midground" value="7f7f7fff"/>  <!--grid line minor-->
     <Color name="neutral:foreground2" value="ccccccff"/>  <!--marker track-->
     <Color name="neutral:foreground" value="e5e5e5ff"/>  <!--gtk_foreground-->
@@ -290,9 +290,8 @@
     <ColorAlias name="page switch button: fill active" alias="alert:green"/>
     <ColorAlias name="patch change button: fill" alias="widget:bg"/>
     <ColorAlias name="patch change button: fill active" alias="widget:blue"/>
-    <ColorAlias name="patch change dim button: fill" alias="neutral:background2"/>
-    <ColorAlias name="patch change dim button: fill active" alias="widget:blue"/>
-    <ColorAlias name="patch change dim button: text" alias="widget:blue"/>
+    <ColorAlias name="patch change button unnamed: fill" alias="neutral:background2"/>
+    <ColorAlias name="patch change button unnamed: fill active" alias="widget:blue"/>
     <ColorAlias name="piano roll black" alias="theme:contrasting selection"/>
     <ColorAlias name="piano roll black outline" alias="neutral:foreground2"/>
     <ColorAlias name="piano roll white" alias="neutral:foreground2"/>
diff --git a/gtk2_ardour/themes/unastudia-ardour.colors b/gtk2_ardour/themes/unastudia-ardour.colors
index 06daf6c53b..25be061395 100644
--- a/gtk2_ardour/themes/unastudia-ardour.colors
+++ b/gtk2_ardour/themes/unastudia-ardour.colors
@@ -289,9 +289,8 @@
     <ColorAlias name="page switch button: fill active" alias="alert:blue"/>
     <ColorAlias name="patch change button: fill" alias="widget:bg"/>
     <ColorAlias name="patch change button: fill active" alias="widget:blue"/>
-    <ColorAlias name="patch change dim button: fill" alias="neutral:background2"/>
-    <ColorAlias name="patch change dim button: fill active" alias="widget:blue"/>
-    <ColorAlias name="patch change dim button: text" alias="widget:blue"/>
+    <ColorAlias name="patch change button unnamed: fill" alias="neutral:background2"/>
+    <ColorAlias name="patch change button unnamed: fill active" alias="widget:blue"/>
     <ColorAlias name="piano roll black" alias="theme:contrasting selection"/>
     <ColorAlias name="piano roll black outline" alias="neutral:foreground2"/>
     <ColorAlias name="piano roll white" alias="neutral:foreground2"/>