X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fthemes%2Fdark-ardour.colors;h=d8fd0bee4420efbaa8794f549c7a42d4b1ad5e39;hb=7496a856c7785888327146c9934e5db23ba5f155;hp=e281f8c433f6afadaa9de149ef811ae040a169ff;hpb=a6317060599e7a17eddc6172eab28bfed4cb1b97;p=ardour.git

diff --git a/gtk2_ardour/themes/dark-ardour.colors b/gtk2_ardour/themes/dark-ardour.colors
index e281f8c433..d8fd0bee44 100644
--- a/gtk2_ardour/themes/dark-ardour.colors
+++ b/gtk2_ardour/themes/dark-ardour.colors
@@ -30,7 +30,7 @@
     <Color name="color 3" value="0x738299ff"/>
     <Color name="color 30" value="0xe500cfff"/>
     <Color name="color 31" value="0xddddd8ff"/>
-    <Color name="color 32" value="0xeddc3d77"/>
+    <Color name="color 32" value="0xeddc3dff"/>
     <Color name="color 33" value="0xbbbbbbff"/>
     <Color name="color 34" value="0x3d3d3dff"/>
     <Color name="color 35" value="0x4250d0ff"/>
@@ -46,9 +46,9 @@
     <Color name="color 44" value="0x004f08ff"/>
     <Color name="color 45" value="0xa29e9eff"/>
     <Color name="color 46" value="0x333333ff"/>
-    <Color name="color 47" value="0x00880eff"/>
+    <Color name="color 47" value="0x101010ff"/> <!--dark bg for clocks-->
     <Color name="color 48" value="0x00aa11ff"/>
-    <Color name="color 49" value="0x00660aff"/>
+    <Color name="color 49" value="0x44cc44ff"/> <!--clock text-->
     <Color name="color 5" value="0x9dadc4ff"/>
     <Color name="color 50" value="0xeeeeecff"/>
     <Color name="color 51" value="0x383d37ff"/>
@@ -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"/>
@@ -128,17 +134,17 @@
     <ColorAlias name="big clock active: cursor" alias="color 8"/>
     <ColorAlias name="big clock active: edited text" alias="color 8"/>
     <ColorAlias name="big clock active: text" alias="color 9"/>
-    <ColorAlias name="big clock: background" alias="color 67"/>
+    <ColorAlias name="big clock: background" alias="color 47"/>
     <ColorAlias name="big clock: cursor" alias="color 8"/>
     <ColorAlias name="big clock: edited text" alias="color 8"/>
-    <ColorAlias name="big clock: text" alias="color 10"/>
+    <ColorAlias name="big clock: text" alias="color 49"/>
     <ColorAlias name="border color" alias="color 4"/>
     <ColorAlias name="cd marker bar" alias="color 87"/>
     <ColorAlias name="clipped waveform" alias="color 9"/>
-    <ColorAlias name="clock: background" alias="color 67"/>
+    <ColorAlias name="clock: background" alias="color 47"/>
     <ColorAlias name="clock: cursor" alias="color 8"/>
     <ColorAlias name="clock: edited text" alias="color 8"/>
-    <ColorAlias name="clock: text" alias="color 12"/>
+    <ColorAlias name="clock: text" alias="color 49"/>
     <ColorAlias name="comment button: fill" alias="color 20"/>
     <ColorAlias name="control point fill" alias="color 17"/>
     <ColorAlias name="control point outline" alias="meter color3"/>
@@ -156,7 +162,7 @@
     <ColorAlias name="entered automation line" alias="color 19"/>
     <ColorAlias name="entered gain line" alias="color 19"/>
     <ColorAlias name="entered marker" alias="color 19"/>
-    <ColorAlias name="feedback alert: fill" alias="color 20"/>
+    <ColorAlias name="feedback alert: fill" alias="color 25"/>
     <ColorAlias name="feedback alert: fill active" alias="color 9"/>
     <ColorAlias name="feedback alert: led active" alias="color 4"/>
     <ColorAlias name="frame handle" alias="color 23"/>
@@ -219,6 +225,8 @@
     <ColorAlias name="inactive group tab" alias="color 34"/>
     <ColorAlias name="invert button: fill active" alias="color 35"/>
     <ColorAlias name="invert button: led active" alias="color 37"/>
+    <ColorAlias name="layered button: fill" alias="color 25"/>
+    <ColorAlias name="layered button: fill active" alias="color 48"/>
     <ColorAlias name="location cd marker" alias="color 38"/>
     <ColorAlias name="location loop" alias="color 39"/>
     <ColorAlias name="location marker" alias="color 32"/>
@@ -234,8 +242,9 @@
     <ColorAlias name="master monitor section button normal: fill active" alias="color 42"/>
     <ColorAlias name="master monitor section button active: fill"        alias="color 40"/>
     <ColorAlias name="master monitor section button active: fill active" alias="color 54"/>
-    <ColorAlias name="measure line bar" alias="color 13"/>
-    <ColorAlias name="measure line beat" alias="color 33"/>
+    <ColorAlias name="grid line major" alias="color 13"/>
+    <ColorAlias name="grid line minor" alias="color 62"/>
+    <ColorAlias name="grid line micro" alias="color 62"/>
     <ColorAlias name="meter background bottom" alias="color 46"/>
     <ColorAlias name="meter background top" alias="color 34"/>
     <ColorAlias name="meter bar" alias="color 7"/>
@@ -265,21 +274,17 @@
     <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="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 max" alias="color 8"/>
-    <ColorAlias name="midi note mid" alias="color 96"/>
-    <ColorAlias name="midi note min" alias="color 103"/>
-    <ColorAlias name="midi note selected" alias="color 40"/>
     <ColorAlias name="midi note selected outline" alias="color 9"/>
     <ColorAlias name="midi note velocity text" alias="color 32"/>
     <ColorAlias name="midi patch change fill" alias="color 60"/>
@@ -327,19 +332,23 @@
     <ColorAlias name="nudge button: fill" alias="color 20"/>
     <ColorAlias name="nudge button: fill active" alias="color 42"/>
     <ColorAlias name="nudge button: led active" alias="color 8"/>
-    <ColorAlias name="nudge clock: background" alias="color 67"/>
+    <ColorAlias name="nudge clock: background" alias="color 47"/>
     <ColorAlias name="nudge clock: cursor" alias="color 8"/>
     <ColorAlias name="nudge clock: edited text" alias="color 8"/>
-    <ColorAlias name="nudge clock: text" alias="color 12"/>
+    <ColorAlias name="nudge clock: text" alias="color 49"/>
     <ColorAlias name="page switch button: fill active" alias="color 92"/>
     <ColorAlias name="page switch button: fill" alias="color 94"/>
+    <ColorAlias name="patch change button: fill active" alias="color 74"/>
+    <ColorAlias name="patch change button: fill" alias="color 25"/>
+    <ColorAlias name="patch change dim button: fill active" alias="color 74"/>
+    <ColorAlias name="patch change dim button: fill" alias="color 46"/>
+    <ColorAlias name="patch change dim button: text" alias="color 92"/>
     <ColorAlias name="piano roll black" alias="color 76"/>
     <ColorAlias name="piano roll black outline" alias="color 33"/>
     <ColorAlias name="piano roll white" alias="color 45"/>
     <ColorAlias name="play head" alias="color 9"/>
     <ColorAlias name="plugin bypass button: led active" alias="color 8"/>
-    <ColorAlias name="pluginlist hide button: led active" alias="color 14"/>
-    <ColorAlias name="pluginlist filter button: fill active" alias="color 14"/>
+    <ColorAlias name="pluginlist filter button: led active" alias="color 8"/>
     <ColorAlias name="pluginui toggle: fill" alias="color 71"/>
     <ColorAlias name="pluginui toggle: fill active" alias="color 9"/>
     <ColorAlias name="processor automation line" alias="color 77"/>
@@ -369,10 +378,10 @@
     <ColorAlias name="punch button: fill" alias="color 20"/>
     <ColorAlias name="punch button: fill active" alias="color 9"/>
     <ColorAlias name="punch button: led active" alias="color 4"/>
-    <ColorAlias name="punch clock: background" alias="color 4"/>
+    <ColorAlias name="punch clock: background" alias="color 47"/>
     <ColorAlias name="punch clock: cursor" alias="color 9"/>
     <ColorAlias name="punch clock: edited text" alias="color 9"/>
-    <ColorAlias name="punch clock: text" alias="color 12"/>
+    <ColorAlias name="punch clock: text" alias="color 49"/>
     <ColorAlias name="punch line" alias="color 83"/>
     <ColorAlias name="range drag bar rect" alias="color 21"/>
     <ColorAlias name="range drag rect" alias="color 56"/>
@@ -388,22 +397,22 @@
     <ColorAlias name="route button: fill active" alias="color 67"/>
     <ColorAlias name="route button: led active" alias="color 8"/>
     <ColorAlias name="rubber band rect" alias="color 88"/>
-    <ColorAlias name="rude audition: fill" alias="color 20"/>
+    <ColorAlias name="rude audition: fill" alias="color 25"/>
     <ColorAlias name="rude audition: fill active" alias="color 86"/>
     <ColorAlias name="rude audition: led active" alias="color 4"/>
     <ColorAlias name="rude isolate: fill" alias="color 42"/>
     <ColorAlias name="rude isolate: fill active" alias="color 89"/>
     <ColorAlias name="rude isolate: led active" alias="color 4"/>
-    <ColorAlias name="rude solo: fill" alias="color 20"/>
+    <ColorAlias name="rude solo: fill" alias="color 25"/>
     <ColorAlias name="rude solo: fill active" alias="color 86"/>
     <ColorAlias name="rude solo: led active" alias="color 4"/>
     <ColorAlias name="ruler base" alias="color 67"/>
     <ColorAlias name="ruler text" alias="color 22"/>
-    <ColorAlias name="secondary clock: background" alias="color 67"/>
+    <ColorAlias name="secondary clock: background" alias="color 47"/>
     <ColorAlias name="secondary clock: cursor" alias="color 8"/>
     <ColorAlias name="secondary clock: edited text" alias="color 8"/>
-    <ColorAlias name="secondary clock: text" alias="color 91"/>
-    <ColorAlias name="secondary delta clock: background" alias="color 67"/>
+    <ColorAlias name="secondary clock: text" alias="color 49"/>
+    <ColorAlias name="secondary delta clock: background" alias="color 47"/>
     <ColorAlias name="secondary delta clock: cursor" alias="color 9"/>
     <ColorAlias name="secondary delta clock: edited text" alias="color 9"/>
     <ColorAlias name="secondary delta clock: text" alias="color 92"/>
@@ -413,10 +422,10 @@
     <ColorAlias name="selected waveform fill" alias="color 8"/>
     <ColorAlias name="selected waveform outline" alias="color 67"/>
     <ColorAlias name="selection" alias="color 94"/>
-    <ColorAlias name="selection clock: background" alias="color 4"/>
+    <ColorAlias name="selection clock: background" alias="color 47"/>
     <ColorAlias name="selection clock: cursor" alias="color 9"/>
     <ColorAlias name="selection clock: edited text" alias="color 9"/>
-    <ColorAlias name="selection clock: text" alias="color 12"/>
+    <ColorAlias name="selection clock: text" alias="color 49"/>
     <ColorAlias name="selection rect" alias="color 95"/>
     <ColorAlias name="send alert button: fill" alias="color 71"/>
     <ColorAlias name="send alert button: fill active" alias="color 38"/>
@@ -448,10 +457,10 @@
     <ColorAlias name="stereo panner outline" alias="color 70"/>
     <ColorAlias name="stereo panner rule" alias="color 70"/>
     <ColorAlias name="stereo panner text" alias="color 4"/>
-    <ColorAlias name="stretch clock: background" alias="color 67"/>
+    <ColorAlias name="stretch clock: background" alias="color 47"/>
     <ColorAlias name="stretch clock: cursor" alias="color 8"/>
     <ColorAlias name="stretch clock: edited text" alias="color 8"/>
-    <ColorAlias name="stretch clock: text" alias="color 91"/>
+    <ColorAlias name="stretch clock: text" alias="color 49"/>
     <ColorAlias name="sync mark" alias="color 75"/>
     <ColorAlias name="tempo bar" alias="color 46"/>
     <ColorAlias name="tempo curve" alias="color 62"/>
@@ -468,11 +477,11 @@
     <ColorAlias name="transport active option button: led active" alias="color 8"/>
     <ColorAlias name="transport button: fill active" alias="color 48"/>
     <ColorAlias name="transport button: led active" alias="color 4"/>
-    <ColorAlias name="transport clock: background" alias="color 67"/>
+    <ColorAlias name="transport clock: background" alias="color 47"/>
     <ColorAlias name="transport clock: cursor" alias="color 8"/>
     <ColorAlias name="transport clock: edited text" alias="color 8"/>
-    <ColorAlias name="transport clock: text" alias="color 91"/>
-    <ColorAlias name="transport delta clock: background" alias="color 67"/>
+    <ColorAlias name="transport clock: text" alias="color 49"/>
+    <ColorAlias name="transport delta clock: background" alias="color 47"/>
     <ColorAlias name="transport delta clock: cursor" alias="color 9"/>
     <ColorAlias name="transport delta clock: edited text" alias="color 9"/>
     <ColorAlias name="transport delta clock: text" alias="color 92"/>
@@ -501,6 +510,7 @@
   <Modifiers>
     <Modifier name="audio bus base" modifier="= alpha:0.3"/>
     <Modifier name="audio track base" modifier="= alpha:0.3"/>
+    <Modifier name="automation line fill" modifier="= alpha:0.3"/>
     <Modifier name="automation track fill" modifier="= alpha:0.3"/>
     <Modifier name="covered region base" modifier="= alpha:0.7"/>
     <Modifier name="crossfade alpha" modifier="= alpha:0.1803"/>
@@ -512,7 +522,7 @@
     <Modifier name="inactive crossfade" modifier="= alpha:0.4666"/>
     <Modifier name="loop rectangle" modifier="= alpha:0.5"/>
     <Modifier name="marker bar" modifier="= alpha:0.5"/>
-    <Modifier name="measure line beat" modifier="= alpha:1.0"/>
+    <Modifier name="grid line" modifier="= alpha:1.0"/>
     <Modifier name="midi frame base" modifier="= alpha:0.4"/>
     <Modifier name="midi note" modifier="= alpha:0.8"/>
     <Modifier name="midi note velocity text" modifier="= alpha:0.4666"/>