Switch to a vaguely tango palette based blue=audio green=midi colour scheme.

If you don't like it, make it better :P


git-svn-id: svn://localhost/ardour2/branches/3.0@3855 d708f5d6-7413-0410-9779-e7cbd77b26cf

3 files changed, 17 insertions, 35 deletions

diff --git a/gtk2_ardour/ardour3_ui_dark.rc.in b/gtk2_ardour/ardour3_ui_dark.rc.in
index c819a886c3..74effb52dd 100644
--- a/gtk2_ardour/ardour3_ui_dark.rc.in
+++ b/gtk2_ardour/ardour3_ui_dark.rc.in
@@ -99,9 +99,9 @@ style "default_base" = "medium_text"
   fg[INSENSITIVE] = { 0.80, 0.80, 0.80 }	
   fg[SELECTED] = { 0.80, 0.80, 0.80 }	
   
-  bg[NORMAL] = { 0.31, 0.35, 0.38 }
-  bg[ACTIVE] = { 0.31, 0.35, 0.38 }
-  bg[PRELIGHT] = "#515690"
+  bg[NORMAL] = { 0.31, 0.32, 0.38 }
+  bg[ACTIVE] = { 0.31, 0.32, 0.38 }
+  bg[PRELIGHT] = "#515290"
   bg[INSENSITIVE] = { 0.06, 0.10, 0.10 }
   bg[SELECTED] = { 0, 0.40, 0.60 }
   
@@ -111,8 +111,8 @@ style "default_base" = "medium_text"
   text[INSENSITIVE] = { 0.80, 0.80, 0.80}	
   text[SELECTED] = { 1.0, 1.0, 1.0 }
   
-  base[ACTIVE]     = "#272a32"
-  base[NORMAL]      =  "#1a1e24"
+  base[ACTIVE]       = "#272a32"
+  base[NORMAL]       = "#1a1e24"
   base[PRELIGHT]     = { 0.18, 0.20, 0.22 }
   base[INSENSITIVE]  = "#4c5159"
   base[SELECTED]     = { 0.23, 0.25, 0.27 }
@@ -729,6 +729,7 @@ style "audio_track_base" = "default_base"
 {
   font_name = "%FONT_SMALLER%"
   fg[NORMAL] = { 0.77, 0.77, 0.72 }	
+  bg[NORMAL] = "#43546e"
   bg[NORMAL] = { 0.18, 0.19, 0.22 }
   bg[ACTIVE] = { 0.20, 0.20, 0.20 }	
   bg[PRELIGHT] = { 0.20, 0.20, 0.20 }
@@ -736,20 +737,11 @@ style "audio_track_base" = "default_base"
   bg[SELECTED] = { 0.20, 0.20, 0.20 }
 }
 
-style "midi_bus_base"
-{
-  font_name = "%FONT_SMALLER%"
-  fg[NORMAL] = { 0.77, 0.77, 0.72 }	
-  fg[NORMAL] = { 0.7, 0.8, 0.2 }	
-  #bg[NORMAL] = {0, 0.36, 0.40 }
-  bg[NORMAL] = "#444466"	
-}
-
 style "midi_track_base" = "default_base"
 {
   font_name = "%FONT_SMALLER%"
   fg[NORMAL] = { 0.77, 0.77, 0.72 }	
-  bg[NORMAL] = { 0.48, 0.30, 0.32 }
+  bg[NORMAL] = "#546e43"
   bg[ACTIVE] = { 0.20, 0.20, 0.20 }	
   bg[PRELIGHT] = { 0.20, 0.20, 0.20 }
   bg[INSENSITIVE] = { 0.20, 0.20, 0.20 }
diff --git a/gtk2_ardour/ardour3_ui_default.conf b/gtk2_ardour/ardour3_ui_default.conf
index c9ce81cfde..85f10d7ecf 100644
--- a/gtk2_ardour/ardour3_ui_default.conf
+++ b/gtk2_ardour/ardour3_ui_default.conf
@@ -2,8 +2,8 @@
 <Ardour>
   <Canvas>
     <Option name="active crossfade" value="e8ed3d77"/>
-    <Option name="audio bus base" value="dbd1ea68"/>
-    <Option name="audio track base" value="c6d3d868"/>
+    <Option name="audio bus base" value="73829968"/>
+    <Option name="audio track base" value="6882aa68"/>
     <Option name="automation line" value="44bc59ff"/>
     <Option name="automation track fill" value="a0a0ce68"/>
     <Option name="automation track outline" value="282828ff"/>
@@ -54,27 +54,26 @@
     <Option name="meter fill mid" value="eeee33ff"/>
     <Option name="meter fill min" value="33dd33ff"/>
     <Option name="meter marker" value="f2425bff"/>
-    <Option name="midi bus base" value="ffceea40"/>
-    <Option name="midi frame base" value="698f9d6d"/>
+    <Option name="midi frame base" value="35353566"/>
+    <Option name="midi note fill inactive channel" value="bfbfbf88"/>
     <Option name="midi note fill max" value="ee33338a"/>
     <Option name="midi note fill mid" value="eeee338a"/>
     <Option name="midi note fill min" value="33ee338a"/>
-    <Option name="midi note fill inactive channel" value="bfbfbf88"/>
+    <Option name="midi note outline inactive channel" value="bfbfbfff"/>
     <Option name="midi note outline max" value="ff2222b0"/>
     <Option name="midi note outline mid" value="ffff22b0"/>
     <Option name="midi note outline min" value="22ff22b0"/>
-    <Option name="midi note outline inactive channel" value="bfbfbfff"/>
     <Option name="midi note selected outline" value="5566ffee"/>
     <Option name="midi program change fill" value="0000ffa0"/>
-    <Option name="midi program change outline" value="a7a7d4ff"/>    
+    <Option name="midi program change outline" value="a7a7d4ff"/>
     <Option name="midi select rect fill" value="8888ff88"/>
     <Option name="midi select rect outline" value="5555ffff"/>
-    <Option name="midi track base" value="c67e7e5f"/>
+    <Option name="midi track base" value="9bcc7c5f"/>
     <Option name="name highlight fill" value="0000ffff"/>
     <Option name="name highlight outline" value="7c00ff96"/>
-    <Option name="piano roll black outline" value="b5b5b576"/>
-    <Option name="piano roll black" value="88393b6b"/>
-    <Option name="piano roll white" value="aa585865"/>
+    <Option name="piano roll black outline" value="e3f4d976"/>
+    <Option name="piano roll black" value="8baf736b"/>
+    <Option name="piano roll white" value="b4e89465"/>
     <Option name="play head" value="ff0000ff"/>
     <Option name="processor automation line" value="7aa3f9ff"/>
     <Option name="punch line" value="a80000ff"/>
diff --git a/gtk2_ardour/ardour3_ui_light.rc.in b/gtk2_ardour/ardour3_ui_light.rc.in
index ec1cb5275d..0a78afb39d 100644
--- a/gtk2_ardour/ardour3_ui_light.rc.in
+++ b/gtk2_ardour/ardour3_ui_light.rc.in
@@ -734,15 +734,6 @@ style "audio_track_base" = "default_base"
   bg[SELECTED] = { 0.80, 0.80, 0.80 }
 }
 
-style "midi_bus_base"
-{
-  font_name = "%FONT_SMALLER%"
-  fg[NORMAL] = { 0.77, 0.77, 0.72 }	
-  fg[NORMAL] = { 0.7, 0.8, 0.2 }	
-  #bg[NORMAL] = {0, 0.36, 0.40 }
-  bg[NORMAL] = "#444466"	
-}
-
 style "midi_track_base" = "default_base"
 {
   font_name = "%FONT_SMALLER%"