fixed merge conflict

1 files changed, 8 insertions, 75 deletions

diff --git a/gtk2_ardour/dark.colors b/gtk2_ardour/dark.colors
index be4a34f3ff..204740c9ec 100644
--- a/gtk2_ardour/dark.colors
+++ b/gtk2_ardour/dark.colors
@@ -172,16 +172,12 @@
     <ColorAlias name="entered marker" alias="color 19"/>
     <ColorAlias name="feedback alert: fill" alias="color 20"/>
     <ColorAlias name="feedback alert: fill active" alias="color 9"/>
-    <ColorAlias name="feedback alert: led" alias="color 4"/>
     <ColorAlias name="feedback alert: led active" alias="color 4"/>
-    <ColorAlias name="feedback alert: text" alias="color 21"/>
-    <ColorAlias name="feedback alert: text active" alias="color 22"/>
     <ColorAlias name="frame handle" alias="color 23"/>
     <ColorAlias name="gain line" alias="color 6"/>
     <ColorAlias name="gain line inactive" alias="color 24"/>
     <ColorAlias name="generic button: fill" alias="color 25"/>
     <ColorAlias name="generic button: fill active" alias="color 9"/>
-    <ColorAlias name="generic button: led" alias="color 15"/>
     <ColorAlias name="generic button: led active" alias="color 18"/>
     <ColorAlias name="ghost track base" alias="color 28"/>
     <ColorAlias name="ghost track midi outline" alias="color 4"/>
@@ -234,7 +230,6 @@
     <ColorAlias name="inactive fade handle" alias="color 33"/>
     <ColorAlias name="inactive group tab" alias="color 34"/>
     <ColorAlias name="invert button: fill active" alias="color 35"/>
-    <ColorAlias name="invert button: led" alias="color 36"/>
     <ColorAlias name="invert button: led active" alias="color 37"/>
     <ColorAlias name="location cd marker" alias="color 38"/>
     <ColorAlias name="location loop" alias="color 39"/>
@@ -242,7 +237,6 @@
     <ColorAlias name="location punch" alias="color 40"/>
     <ColorAlias name="location range" alias="color 41"/>
     <ColorAlias name="lock button: fill active" alias="color 42"/>
-    <ColorAlias name="lock button: led" alias="color 4"/>
     <ColorAlias name="lock button: led active" alias="color 4"/>
     <ColorAlias name="marker bar" alias="color 11"/>
     <ColorAlias name="marker bar separator" alias="color 2"/>
@@ -274,13 +268,9 @@
     <ColorAlias name="midi bus base" alias="color 4"/>
     <ColorAlias name="midi device: fill" alias="color 25"/>
     <ColorAlias name="midi device: fill active" alias="color 42"/>
-    <ColorAlias name="midi device: led" alias="color 49"/>
     <ColorAlias name="midi device: led active" alias="color 17"/>
-    <ColorAlias name="midi device: text" alias="color 26"/>
-    <ColorAlias name="midi device: text active" alias="color 50"/>
     <ColorAlias name="midi frame base" alias="color 51"/>
     <ColorAlias name="midi input button: fill active" alias="color 48"/>
-    <ColorAlias name="midi input button: led" alias="color 4"/>
     <ColorAlias name="midi input button: led active" alias="color 4"/>
     <ColorAlias name="midi meter fill: 0" alias="color 52"/>
     <ColorAlias name="midi meter fill: 1" alias="color 53"/>
@@ -308,65 +298,38 @@
     <ColorAlias name="midi sysex outline" alias="color 64"/>
     <ColorAlias name="midi track base" alias="color 65"/>
     <ColorAlias name="mixer strip button: fill active" alias="color 8"/>
-    <ColorAlias name="mixer strip button: led" alias="color 66"/>
     <ColorAlias name="mixer strip button: led active" alias="color 8"/>
     <ColorAlias name="mixer strip name button: fill active" alias="color 67"/>
-    <ColorAlias name="mixer strip name button: led" alias="color 66"/>
     <ColorAlias name="mixer strip name button: led active" alias="color 8"/>
     <ColorAlias name="monitor button: fill active" alias="color 68"/>
-    <ColorAlias name="monitor button: led" alias="color 69"/>
     <ColorAlias name="monitor button: led active" alias="color 9"/>
     <ColorAlias name="monitor knob" alias="color 60"/>
     <ColorAlias name="monitor knob: arc end" alias="color 70"/>
     <ColorAlias name="monitor knob: arc start" alias="color 16"/>
     <ColorAlias name="monitor section cut: fill" alias="color 71"/>
     <ColorAlias name="monitor section cut: fill active" alias="color 8"/>
-    <ColorAlias name="monitor section cut: led" alias="color 36"/>
     <ColorAlias name="monitor section cut: led active" alias="color 37"/>
-    <ColorAlias name="monitor section cut: text" alias="color 26"/>
-    <ColorAlias name="monitor section cut: text active" alias="color 4"/>
     <ColorAlias name="monitor section dim: fill" alias="color 71"/>
     <ColorAlias name="monitor section dim: fill active" alias="color 72"/>
-    <ColorAlias name="monitor section dim: led" alias="color 4"/>
     <ColorAlias name="monitor section dim: led active" alias="color 37"/>
-    <ColorAlias name="monitor section dim: text" alias="color 26"/>
-    <ColorAlias name="monitor section dim: text active" alias="color 26"/>
     <ColorAlias name="monitor section invert: fill" alias="color 71"/>
     <ColorAlias name="monitor section invert: fill active" alias="color 35"/>
-    <ColorAlias name="monitor section invert: led" alias="color 36"/>
     <ColorAlias name="monitor section invert: led active" alias="color 37"/>
-    <ColorAlias name="monitor section invert: text" alias="color 4"/>
-    <ColorAlias name="monitor section invert: text active" alias="color 4"/>
     <ColorAlias name="monitor section mono: fill" alias="color 71"/>
     <ColorAlias name="monitor section mono: fill active" alias="color 73"/>
-    <ColorAlias name="monitor section mono: led" alias="color 36"/>
     <ColorAlias name="monitor section mono: led active" alias="color 37"/>
-    <ColorAlias name="monitor section mono: text" alias="color 26"/>
-    <ColorAlias name="monitor section mono: text active" alias="color 26"/>
     <ColorAlias name="monitor section solo model: fill" alias="color 71"/>
     <ColorAlias name="monitor section solo model: fill active" alias="color 42"/>
-    <ColorAlias name="monitor section solo model: led" alias="color 66"/>
     <ColorAlias name="monitor section solo model: led active" alias="color 8"/>
-    <ColorAlias name="monitor section solo model: text" alias="color 26"/>
-    <ColorAlias name="monitor section solo model: text active" alias="color 26"/>
     <ColorAlias name="monitor section solo: fill" alias="color 71"/>
     <ColorAlias name="monitor section solo: fill active" alias="color 12"/>
-    <ColorAlias name="monitor section solo: led" alias="color 36"/>
     <ColorAlias name="monitor section solo: led active" alias="color 8"/>
-    <ColorAlias name="monitor section solo: text" alias="color 4"/>
-    <ColorAlias name="monitor section solo: text active" alias="color 4"/>
     <ColorAlias name="monitor solo exclusive: fill" alias="color 71"/>
     <ColorAlias name="monitor solo exclusive: fill active" alias="color 20"/>
-    <ColorAlias name="monitor solo exclusive: led" alias="color 66"/>
     <ColorAlias name="monitor solo exclusive: led active" alias="color 8"/>
-    <ColorAlias name="monitor solo exclusive: text" alias="color 26"/>
-    <ColorAlias name="monitor solo exclusive: text active" alias="color 26"/>
     <ColorAlias name="monitor solo override: fill" alias="color 71"/>
     <ColorAlias name="monitor solo override: fill active" alias="color 42"/>
-    <ColorAlias name="monitor solo override: led" alias="color 66"/>
     <ColorAlias name="monitor solo override: led active" alias="color 8"/>
-    <ColorAlias name="monitor solo override: text" alias="color 26"/>
-    <ColorAlias name="monitor solo override: text active" alias="color 26"/>
     <ColorAlias name="mono panner bg" alias="color 67"/>
     <ColorAlias name="mono panner fill" alias="color 74"/>
     <ColorAlias name="mono panner outline" alias="color 70"/>
@@ -374,16 +337,13 @@
     <ColorAlias name="mono panner position outline" alias="color 70"/>
     <ColorAlias name="mono panner text" alias="color 4"/>
     <ColorAlias name="mouse mode button: fill active" alias="color 12"/>
-    <ColorAlias name="mouse mode button: led" alias="color 66"/>
     <ColorAlias name="mouse mode button: led active" alias="color 8"/>
     <ColorAlias name="mute button: fill active" alias="color 75"/>
-    <ColorAlias name="mute button: led" alias="color 4"/>
     <ColorAlias name="mute button: led active" alias="color 4"/>
     <ColorAlias name="name highlight fill" alias="color 18"/>
     <ColorAlias name="name highlight outline" alias="color 23"/>
     <ColorAlias name="nudge button: fill" alias="color 20"/>
     <ColorAlias name="nudge button: fill active" alias="color 42"/>
-    <ColorAlias name="nudge button: led" alias="color 66"/>
     <ColorAlias name="nudge button: led active" alias="color 8"/>
     <ColorAlias name="nudge clock: background" alias="color 67"/>
     <ColorAlias name="nudge clock: cursor" alias="color 8"/>
@@ -395,34 +355,22 @@
     <ColorAlias name="play head" alias="color 9"/>
     <ColorAlias name="plugin bypass button: fill" alias="color 71"/>
     <ColorAlias name="plugin bypass button: fill active" alias="color 42"/>
-    <ColorAlias name="plugin bypass button: led" alias="color 69"/>
     <ColorAlias name="plugin bypass button: led active" alias="color 9"/>
     <ColorAlias name="processor automation line" alias="color 77"/>
     <ColorAlias name="processor control button: fill" alias="color 29"/>
     <ColorAlias name="processor control button: fill active" alias="color 46"/>
-    <ColorAlias name="processor control button: led" alias="color 67"/>
     <ColorAlias name="processor control button: led active" alias="color 16"/>
     <ColorAlias name="processor fader: fill" alias="color 16"/>
     <ColorAlias name="processor fader: fill active" alias="color 78"/>
-    <ColorAlias name="processor fader: led" alias="color 44"/>
     <ColorAlias name="processor fader: led active" alias="color 37"/>
-    <ColorAlias name="processor fader: text" alias="color 45"/>
-    <ColorAlias name="processor fader: text active" alias="color 50"/>
     <ColorAlias name="processor postfader: fill" alias="color 58"/>
     <ColorAlias name="processor postfader: fill active" alias="color 79"/>
-    <ColorAlias name="processor postfader: led" alias="color 44"/>
     <ColorAlias name="processor postfader: led active" alias="color 37"/>
-    <ColorAlias name="processor postfader: text" alias="color 45"/>
-    <ColorAlias name="processor postfader: text active" alias="color 50"/>
     <ColorAlias name="processor prefader: fill" alias="color 40"/>
     <ColorAlias name="processor prefader: fill active" alias="color 80"/>
-    <ColorAlias name="processor prefader: led" alias="color 44"/>
     <ColorAlias name="processor prefader: led active" alias="color 37"/>
-    <ColorAlias name="processor prefader: text" alias="color 45"/>
-    <ColorAlias name="processor prefader: text active" alias="color 50"/>
     <ColorAlias name="punch button: fill" alias="color 20"/>
     <ColorAlias name="punch button: fill active" alias="color 9"/>
-    <ColorAlias name="punch button: led" alias="color 4"/>
     <ColorAlias name="punch button: led active" alias="color 4"/>
     <ColorAlias name="punch clock: background" alias="color 67"/>
     <ColorAlias name="punch clock: cursor" alias="color 9"/>
@@ -433,7 +381,6 @@
     <ColorAlias name="range drag rect" alias="color 56"/>
     <ColorAlias name="range marker bar" alias="color 3"/>
     <ColorAlias name="record enable button: fill active" alias="color 83"/>
-    <ColorAlias name="record enable button: led" alias="color 84"/>
     <ColorAlias name="record enable button: led active" alias="color 85"/>
     <ColorAlias name="recorded waveform fill" alias="color 13"/>
     <ColorAlias name="recorded waveform outline" alias="color 43"/>
@@ -444,28 +391,24 @@
     <ColorAlias name="region area covered by another region" alias="color 87"/>
     <ColorAlias name="region base" alias="color 11"/>
     <ColorAlias name="route button: fill active" alias="color 67"/>
-    <ColorAlias name="route button: led" alias="color 66"/>
     <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 active" alias="color 86"/>
-    <ColorAlias name="rude audition: led" alias="color 4"/>
     <ColorAlias name="rude audition: led active" alias="color 4"/>
-    <ColorAlias name="rude audition: text" alias="color 21"/>
-    <ColorAlias name="rude audition: text active" alias="color 13"/>
     <ColorAlias name="rude isolate: fill" alias="color 42"/>
     <ColorAlias name="rude isolate: fill active" alias="color 89"/>
-    <ColorAlias name="rude isolate: led" alias="color 4"/>
     <ColorAlias name="rude isolate: led active" alias="color 4"/>
-    <ColorAlias name="rude isolate: text" alias="color 21"/>
-    <ColorAlias name="rude isolate: text active" alias="color 4"/>
     <ColorAlias name="rude solo: fill" alias="color 20"/>
     <ColorAlias name="rude solo: fill active" alias="color 86"/>
-    <ColorAlias name="rude solo: led" alias="color 4"/>
     <ColorAlias name="rude solo: led active" alias="color 4"/>
+<<<<<<< Updated upstream
     <ColorAlias name="rude solo: text" alias="color 21"/>
     <ColorAlias name="rude solo: text active" alias="color 22"/>
     <ColorAlias name="ruler base" alias="color 67"/>
+=======
+    <ColorAlias name="ruler base" alias="color 90"/>
+>>>>>>> Stashed changes
     <ColorAlias name="ruler text" alias="color 22"/>
     <ColorAlias name="secondary clock: background" alias="color 67"/>
     <ColorAlias name="secondary clock: cursor" alias="color 8"/>
@@ -494,27 +437,25 @@
     <ColorAlias name="send bg" alias="color 38"/>
     <ColorAlias name="send alert button: fill" alias="color 71"/>
     <ColorAlias name="send alert button: fill active" alias="color 38"/>
-    <ColorAlias name="send alert button: led" alias="color 4"/>
     <ColorAlias name="send alert button: led active" alias="color 4"/>
     <ColorAlias name="shuttle" alias="color 12"/>
     <ColorAlias name="silence" alias="color 98"/>
     <ColorAlias name="silence text" alias="color 99"/>
     <ColorAlias name="solo button: fill active" alias="color 12"/>
-    <ColorAlias name="solo button: led" alias="color 4"/>
     <ColorAlias name="solo button: led active" alias="color 4"/>
     <ColorAlias name="solo isolate: fill" alias="color 25"/>
     <ColorAlias name="solo isolate: fill active" alias="color 42"/>
-    <ColorAlias name="solo isolate: led" alias="color 69"/>
     <ColorAlias name="solo isolate: led active" alias="color 9"/>
-    <ColorAlias name="solo isolate: text" alias="color 26"/>
-    <ColorAlias name="solo isolate: text active" alias="color 26"/>
     <ColorAlias name="solo safe: fill" alias="color 25"/>
     <ColorAlias name="solo safe: fill active" alias="color 42"/>
-    <ColorAlias name="solo safe: led" alias="color 69"/>
     <ColorAlias name="solo safe: led active" alias="color 9"/>
+<<<<<<< Updated upstream
     <ColorAlias name="solo safe: text" alias="color 26"/>
     <ColorAlias name="solo safe: text active" alias="color 26"/>
     <ColorAlias name="stereo panner bg" alias="color 67"/>
+=======
+    <ColorAlias name="stereo panner bg" alias="color 61"/>
+>>>>>>> Stashed changes
     <ColorAlias name="stereo panner fill" alias="color 74"/>
     <ColorAlias name="stereo panner inverted bg" alias="color 61"/>
     <ColorAlias name="stereo panner inverted fill" alias="color 100"/>
@@ -534,15 +475,10 @@
     <ColorAlias name="time stretch outline" alias="color 94"/>
     <ColorAlias name="tracknumber label: fill" alias="color 34"/>
     <ColorAlias name="tracknumber label: fill active" alias="color 46"/>
-    <ColorAlias name="tracknumber label: led" alias="color 9"/>
     <ColorAlias name="tracknumber label: led active" alias="color 9"/>
-    <ColorAlias name="tracknumber label: text" alias="color 26"/>
-    <ColorAlias name="tracknumber label: text active" alias="color 9"/>
     <ColorAlias name="transport active option button: fill active" alias="color 48"/>
-    <ColorAlias name="transport active option button: led" alias="color 66"/>
     <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" alias="color 4"/>
     <ColorAlias name="transport button: led active" alias="color 4"/>
     <ColorAlias name="transport clock: background" alias="color 67"/>
     <ColorAlias name="transport clock: cursor" alias="color 8"/>
@@ -556,12 +492,10 @@
     <ColorAlias name="transport loop rect" alias="color 103"/>
     <ColorAlias name="transport marker bar" alias="color 11"/>
     <ColorAlias name="transport option button: fill active" alias="color 42"/>
-    <ColorAlias name="transport option button: led" alias="color 66"/>
     <ColorAlias name="transport option button: led active" alias="color 8"/>
     <ColorAlias name="transport punch rect" alias="color 80"/>
     <ColorAlias name="transport recenable button: fill" alias="color 20"/>
     <ColorAlias name="transport recenable button: fill active" alias="color 83"/>
-    <ColorAlias name="transport recenable button: led" alias="color 4"/>
     <ColorAlias name="transport recenable button: led active" alias="color 4"/>
     <ColorAlias name="trim handle" alias="color 18"/>
     <ColorAlias name="trim handle locked" alias="color 86"/>
@@ -572,7 +506,6 @@
     <ColorAlias name="waveform outline" alias="color 4"/>
     <ColorAlias name="zero line" alias="color 104"/>
     <ColorAlias name="zoom button: fill active" alias="color 48"/>
-    <ColorAlias name="zoom button: led" alias="color 66"/>
     <ColorAlias name="zoom button: led active" alias="color 8"/>
   </ColorAliases>    
 </Ardour>