From 2d40773755484ded82736177cf15b6a7900c7dc8 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Thu, 5 Jul 2018 16:59:10 -0400
Subject: [PATCH] apply commit cbe458adddc34 to all other themes

---
 .../themes/blueberry_milk-ardour.colors       | 26 ++++++++++-------
 gtk2_ardour/themes/caineville-ardour.colors   | 26 ++++++++++-------
 gtk2_ardour/themes/clear_gray-ardour.colors   | 26 ++++++++++-------
 gtk2_ardour/themes/cubasish-ardour.colors     | 25 +++++++++++------
 gtk2_ardour/themes/unastudia-ardour.colors    | 28 +++++++++++--------
 5 files changed, 81 insertions(+), 50 deletions(-)

diff --git a/gtk2_ardour/themes/blueberry_milk-ardour.colors b/gtk2_ardour/themes/blueberry_milk-ardour.colors
index 6fb317d033..e8a2ac9c98 100644
--- a/gtk2_ardour/themes/blueberry_milk-ardour.colors
+++ b/gtk2_ardour/themes/blueberry_milk-ardour.colors
@@ -115,6 +115,12 @@
     <Color name="meter color7" value="0xff8700ff"/>
     <Color name="meter color8" value="0xff0000ff"/>
     <Color name="meter color9" value="0xff0000ff"/>
+    <Color name="midi color0" value="0x1e7727ff"/>
+    <Color name="midi color1" value="0x52af25ff"/>
+    <Color name="midi color2" value="0x85e524ff"/>
+    <Color name="midi color3" value="0xcbba0fff"/>
+    <Color name="midi color4" value="0xe2ab09ff"/>
+    <Color name="midi color5" value="0xff9900ff"/>
   </Colors>
   <ColorAliases>
     <ColorAlias name="active crossfade" alias="color 1"/>
@@ -266,16 +272,16 @@
     <ColorAlias name="midi frame base" alias="color 81"/>
     <ColorAlias name="midi input button: fill active" alias="color 63"/>
     <ColorAlias name="midi input button: led active" alias="color 4"/>
-    <ColorAlias name="midi meter color0" alias="color 52"/>
-    <ColorAlias name="midi meter color1" alias="color 53"/>
-    <ColorAlias name="midi meter color2" alias="color 53"/>
-    <ColorAlias name="midi meter color3" alias="color 54"/>
-    <ColorAlias name="midi meter color4" alias="color 54"/>
-    <ColorAlias name="midi meter color5" alias="color 55"/>
-    <ColorAlias name="midi meter color6" alias="color 55"/>
-    <ColorAlias name="midi meter color7" alias="color 56"/>
-    <ColorAlias name="midi meter color8" alias="color 56"/>
-    <ColorAlias name="midi meter color9" alias="color 17"/>
+    <ColorAlias name="midi meter color0" alias="midi color0"/>
+    <ColorAlias name="midi meter color1" alias="midi color1"/>
+    <ColorAlias name="midi meter color2" alias="midi color1"/>
+    <ColorAlias name="midi meter color3" alias="midi color2"/>
+    <ColorAlias name="midi meter color4" alias="midi color2"/>
+    <ColorAlias name="midi meter color5" alias="midi color3"/>
+    <ColorAlias name="midi meter color6" alias="midi color3"/>
+    <ColorAlias name="midi meter color7" alias="midi color4"/>
+    <ColorAlias name="midi meter color8" alias="midi color4"/>
+    <ColorAlias name="midi meter color9" alias="midi color5"/>
     <ColorAlias name="midi note inactive channel" alias="color 4"/>
     <ColorAlias name="midi note selected outline" alias="color 67"/>
     <ColorAlias name="midi note velocity text" alias="color 32"/>
diff --git a/gtk2_ardour/themes/caineville-ardour.colors b/gtk2_ardour/themes/caineville-ardour.colors
index 6998bc9855..e750e10b55 100644
--- a/gtk2_ardour/themes/caineville-ardour.colors
+++ b/gtk2_ardour/themes/caineville-ardour.colors
@@ -114,6 +114,12 @@
     <Color name="meter color7" value="0xff8800ff"/>
     <Color name="meter color8" value="0xff0000ff"/>
     <Color name="meter color9" value="0xff0000ff"/>
+    <Color name="midi color0" value="0x1e7727ff"/>
+    <Color name="midi color1" value="0x52af25ff"/>
+    <Color name="midi color2" value="0x85e524ff"/>
+    <Color name="midi color3" value="0xcbba0fff"/>
+    <Color name="midi color4" value="0xe2ab09ff"/>
+    <Color name="midi color5" value="0xff9900ff"/>
   </Colors>
   <ColorAliases>
     <ColorAlias name="active crossfade" alias="color 1"/>
@@ -266,16 +272,16 @@
     <ColorAlias name="midi frame base" alias="color 87"/>
     <ColorAlias name="midi input button: fill active" alias="color 48"/>
     <ColorAlias name="midi input button: led active" alias="color 4"/>
-    <ColorAlias name="midi meter color0" alias="color 52"/>
-    <ColorAlias name="midi meter color1" alias="color 53"/>
-    <ColorAlias name="midi meter color2" alias="color 53"/>
-    <ColorAlias name="midi meter color3" alias="color 54"/>
-    <ColorAlias name="midi meter color4" alias="color 54"/>
-    <ColorAlias name="midi meter color5" alias="color 55"/>
-    <ColorAlias name="midi meter color6" alias="color 55"/>
-    <ColorAlias name="midi meter color7" alias="color 56"/>
-    <ColorAlias name="midi meter color8" alias="color 56"/>
-    <ColorAlias name="midi meter color9" alias="meter color3"/>
+    <ColorAlias name="midi meter color0" alias="midi color0"/>
+    <ColorAlias name="midi meter color1" alias="midi color1"/>
+    <ColorAlias name="midi meter color2" alias="midi color1"/>
+    <ColorAlias name="midi meter color3" alias="midi color2"/>
+    <ColorAlias name="midi meter color4" alias="midi color2"/>
+    <ColorAlias name="midi meter color5" alias="midi color3"/>
+    <ColorAlias name="midi meter color6" alias="midi color3"/>
+    <ColorAlias name="midi meter color7" alias="midi color4"/>
+    <ColorAlias name="midi meter color8" alias="midi color4"/>
+    <ColorAlias name="midi meter color9" alias="midi color5"/>
     <ColorAlias name="midi note inactive channel" alias="color 4"/>
     <ColorAlias name="midi note selected outline" alias="color 67"/>
     <ColorAlias name="midi note velocity text" alias="color 32"/>
diff --git a/gtk2_ardour/themes/clear_gray-ardour.colors b/gtk2_ardour/themes/clear_gray-ardour.colors
index 49e61e3e92..e52892f890 100644
--- a/gtk2_ardour/themes/clear_gray-ardour.colors
+++ b/gtk2_ardour/themes/clear_gray-ardour.colors
@@ -114,6 +114,12 @@
     <Color name="meter color7" value="0xff8800ff"/>
     <Color name="meter color8" value="0xff0000ff"/>
     <Color name="meter color9" value="0xff0000ff"/>
+    <Color name="midi color0" value="0x1e7727ff"/>
+    <Color name="midi color1" value="0x52af25ff"/>
+    <Color name="midi color2" value="0x85e524ff"/>
+    <Color name="midi color3" value="0xcbba0fff"/>
+    <Color name="midi color4" value="0xe2ab09ff"/>
+    <Color name="midi color5" value="0xff9900ff"/>
   </Colors>
   <ColorAliases>
     <ColorAlias name="active crossfade" alias="color 1"/>
@@ -266,16 +272,16 @@
     <ColorAlias name="midi frame base" alias="color 87"/>
     <ColorAlias name="midi input button: fill active" alias="color 48"/>
     <ColorAlias name="midi input button: led active" alias="color 4"/>
-    <ColorAlias name="midi meter color0" alias="color 52"/>
-    <ColorAlias name="midi meter color1" alias="color 53"/>
-    <ColorAlias name="midi meter color2" alias="color 53"/>
-    <ColorAlias name="midi meter color3" alias="color 54"/>
-    <ColorAlias name="midi meter color4" alias="color 54"/>
-    <ColorAlias name="midi meter color5" alias="color 55"/>
-    <ColorAlias name="midi meter color6" alias="color 55"/>
-    <ColorAlias name="midi meter color7" alias="color 56"/>
-    <ColorAlias name="midi meter color8" alias="color 56"/>
-    <ColorAlias name="midi meter color9" alias="meter color3"/>
+    <ColorAlias name="midi meter color0" alias="midi color0"/>
+    <ColorAlias name="midi meter color1" alias="midi color1"/>
+    <ColorAlias name="midi meter color2" alias="midi color1"/>
+    <ColorAlias name="midi meter color3" alias="midi color2"/>
+    <ColorAlias name="midi meter color4" alias="midi color2"/>
+    <ColorAlias name="midi meter color5" alias="midi color3"/>
+    <ColorAlias name="midi meter color6" alias="midi color3"/>
+    <ColorAlias name="midi meter color7" alias="midi color4"/>
+    <ColorAlias name="midi meter color8" alias="midi color4"/>
+    <ColorAlias name="midi meter color9" alias="midi color5"/>
     <ColorAlias name="midi note inactive channel" alias="color 4"/>
     <ColorAlias name="midi note selected outline" alias="color 67"/>
     <ColorAlias name="midi note velocity text" alias="color 13"/>
diff --git a/gtk2_ardour/themes/cubasish-ardour.colors b/gtk2_ardour/themes/cubasish-ardour.colors
index e7b8a9b2b3..58541740db 100644
--- a/gtk2_ardour/themes/cubasish-ardour.colors
+++ b/gtk2_ardour/themes/cubasish-ardour.colors
@@ -114,6 +114,12 @@
     <Color name="meter color7" value="0xff8800ff"/>
     <Color name="meter color8" value="0xff0000ff"/>
     <Color name="meter color9" value="0xff0000ff"/>
+    <Color name="midi color0" value="0x1e7727ff"/>
+    <Color name="midi color1" value="0x52af25ff"/>
+    <Color name="midi color2" value="0x85e524ff"/>
+    <Color name="midi color3" value="0xcbba0fff"/>
+    <Color name="midi color4" value="0xe2ab09ff"/>
+    <Color name="midi color5" value="0xff9900ff"/>
   </Colors>
   <ColorAliases>
     <ColorAlias name="active crossfade" alias="color 1"/>
@@ -266,15 +272,16 @@
     <ColorAlias name="midi frame base" alias="color 87"/>
     <ColorAlias name="midi input button: fill active" alias="color 48"/>
     <ColorAlias name="midi input button: led active" alias="color 4"/>
-    <ColorAlias name="midi meter color0" alias="color 52"/>
-    <ColorAlias name="midi meter color1" alias="color 53"/>
-    <ColorAlias name="midi meter color2" alias="color 53"/>
-    <ColorAlias name="midi meter color3" alias="color 54"/>
-    <ColorAlias name="midi meter color4" alias="color 54"/>
-    <ColorAlias name="midi meter color5" alias="color 55"/>
-    <ColorAlias name="midi meter color6" alias="color 55"/>
-    <ColorAlias name="midi meter color7" alias="color 56"/>
-    <ColorAlias name="midi meter color8" alias="color 56"/>
+    <ColorAlias name="midi meter color0" alias="midi color0"/>
+    <ColorAlias name="midi meter color1" alias="midi color1"/>
+    <ColorAlias name="midi meter color2" alias="midi color1"/>
+    <ColorAlias name="midi meter color3" alias="midi color2"/>
+    <ColorAlias name="midi meter color4" alias="midi color2"/>
+    <ColorAlias name="midi meter color5" alias="midi color3"/>
+    <ColorAlias name="midi meter color6" alias="midi color3"/>
+    <ColorAlias name="midi meter color7" alias="midi color4"/>
+    <ColorAlias name="midi meter color8" alias="midi color4"/>
+    <ColorAlias name="midi meter color9" alias="midi color5"/>
     <ColorAlias name="midi meter color9" alias="meter color3"/>
     <ColorAlias name="midi note inactive channel" alias="color 4"/>
     <ColorAlias name="midi note selected outline" alias="color 67"/>
diff --git a/gtk2_ardour/themes/unastudia-ardour.colors b/gtk2_ardour/themes/unastudia-ardour.colors
index a39661e780..a03de05261 100644
--- a/gtk2_ardour/themes/unastudia-ardour.colors
+++ b/gtk2_ardour/themes/unastudia-ardour.colors
@@ -119,6 +119,12 @@
 		<Color name="meter color7" value="0x418cb1ff"/>
 		<Color name="meter color8" value="0x418cb1ff"/>
 		<Color name="meter color9" value="0x418cb1ff"/>
+		<Color name="midi color0" value="0x1e7727ff"/>
+		<Color name="midi color1" value="0x52af25ff"/>
+		<Color name="midi color2" value="0x85e524ff"/>
+		<Color name="midi color3" value="0xcbba0fff"/>
+		<Color name="midi color4" value="0xe2ab09ff"/>
+		<Color name="midi color5" value="0xff9900ff"/>
 	</Colors>
 	<ColorAliases>
 		<ColorAlias name="active crossfade" alias="color 105"/>
@@ -271,16 +277,16 @@
 		<ColorAlias name="midi frame base" alias="color 27"/>
 		<ColorAlias name="midi input button: fill active" alias="color 1"/>
 		<ColorAlias name="midi input button: led active" alias="color 1"/>
-		<ColorAlias name="midi meter color0" alias="meter color0"/>
-		<ColorAlias name="midi meter color1" alias="meter color1"/>
-		<ColorAlias name="midi meter color2" alias="meter color2"/>
-		<ColorAlias name="midi meter color3" alias="meter color3"/>
-		<ColorAlias name="midi meter color4" alias="meter color4"/>
-		<ColorAlias name="midi meter color5" alias="meter color5"/>
-		<ColorAlias name="midi meter color6" alias="meter color6"/>
-		<ColorAlias name="midi meter color7" alias="meter color7"/>
-		<ColorAlias name="midi meter color8" alias="meter color8"/>
-		<ColorAlias name="midi meter color9" alias="meter color9"/>
+		<ColorAlias name="midi meter color0" alias="midi color0"/>
+		<ColorAlias name="midi meter color1" alias="midi color1"/>
+		<ColorAlias name="midi meter color2" alias="midi color1"/>
+		<ColorAlias name="midi meter color3" alias="midi color2"/>
+		<ColorAlias name="midi meter color4" alias="midi color2"/>
+		<ColorAlias name="midi meter color5" alias="midi color3"/>
+		<ColorAlias name="midi meter color6" alias="midi color3"/>
+		<ColorAlias name="midi meter color7" alias="midi color4"/>
+		<ColorAlias name="midi meter color8" alias="midi color4"/>
+		<ColorAlias name="midi meter color9" alias="midi color5"/>
 		<ColorAlias name="midi note inactive channel" alias="color 4"/>
 		<ColorAlias name="midi note selected outline" alias="color 105"/>
 		<ColorAlias name="midi note velocity text" alias="color 2"/>
@@ -495,7 +501,7 @@
 		<Modifier name="gain line inactive" modifier="= alpha:0.782113"/>
 		<Modifier name="ghost track base" modifier="= alpha:0.640782"/>
 		<Modifier name="ghost track midi fill" modifier="= alpha:0.3"/>
-	    <Modifier name="grid line" modifier="= alpha:1.0"/>
+		<Modifier name="grid line" modifier="= alpha:1.0"/>
 		<Modifier name="inactive crossfade" modifier="= alpha:0.4666"/>
 		<Modifier name="loop rectangle" modifier="= alpha:0.3"/>
 		<Modifier name="marker bar" modifier="= alpha:0.5"/>