Colour touchups.

git-svn-id: svn://localhost/ardour2/trunk@1103 d708f5d6-7413-0410-9779-e7cbd77b26cf

2 files changed, 24 insertions, 32 deletions

diff --git a/gtk2_ardour/ardour.colors b/gtk2_ardour/ardour.colors
index b678b49225..f8aa244234 100644
--- a/gtk2_ardour/ardour.colors
+++ b/gtk2_ardour/ardour.colors
@@ -2,14 +2,14 @@ cWaveForm 0.0 0.0 0.0 0.80
 cMutedWaveForm 0.35 0.35 0.35 1.0
 cSelectedFrameBase 0.71 0.57 0.66 1.0
 cFrameBase 0.75 0.75 0.76 1.0
-cAudioTrackBase 0.79 0.80 0.85 0.41
+cAudioTrackBase 0.78 0.83 0.85 0.41
 cAudioTrackOutline 0.00 0.00 0.00 1.00
-cAudioBusBase 0.90 0.82 0.90 0.41
-cMeterBar 0.40 0.40 0.40 1.0
-cTempoBar 0.45 0.45 0.45 1.0
-cMarkerBar 0.50 0.50 0.50 1.0
-cRangeMarkerBar 0.55 0.55 0.55 1.0
-cTransportMarkerBar 0.60 0.60 0.60 1.0
+cAudioBusBase 0.86 0.82 0.92 0.41
+cMeterBar 0.40 0.40 0.45 1.0
+cTempoBar 0.45 0.45 0.50 1.0
+cMarkerBar 0.50 0.50 0.55 1.0
+cRangeMarkerBar 0.55 0.55 0.59 1.0
+cTransportMarkerBar 0.60 0.60 0.64 1.0
 cTimeStretchFill 0.89 0.71 0.71 0.59
 cTimeStretchOutline 0.39 0.39 0.39 0.59
 cAutomationLine 0.27 0.74 0.35 1.0
diff --git a/gtk2_ardour/ardour2_ui.rc b/gtk2_ardour/ardour2_ui.rc
index 39f1d08c17..8aa6539e6e 100644
--- a/gtk2_ardour/ardour2_ui.rc
+++ b/gtk2_ardour/ardour2_ui.rc
@@ -106,8 +106,8 @@ style "default_base" = "medium_text"
   text[INSENSITIVE] = { 0.80, 0.80, 0.80}	
   text[SELECTED] = { 1.0, 1.0, 1.0 }
   
-  base[ACTIVE]     = "#2f272f"
-  base[NORMAL]      =  "#1c1e21"
+  base[ACTIVE]     = "#272a2f"
+  base[NORMAL]      =  "#1a1e20"
   base[PRELIGHT]     = { 0.20, 0.20, 0.20 }
   base[INSENSITIVE]  = "#4c5159"
   base[SELECTED]     = { 0.25, 0.25, 0.25 }
@@ -138,8 +138,8 @@ style "transport_base" = "medium_bold_text"
 
 style "black_mackie_menu_bar" = "medium_bold_text"
 {
-      fg[NORMAL] = { 1.0, 1.0, 1.0 }
-      bg[NORMAL] = { 0, 0, 0 }
+  fg[NORMAL] = { 1.0, 1.0, 1.0 }
+  bg[NORMAL] = { 0, 0, 0 }
 }
 
 style "default_buttons_menus" 
@@ -340,13 +340,13 @@ style "xrun_warn"
 	bg[ACTIVE] = { 0.09, 1.0, 0.46 }
 }
 
-style "menu_bar_base"
+style "menu_bar_base" = "default_base"
 {
-  bg[NORMAL] = { 0, 0, 0 }	
-  bg[ACTIVE] = { 0, 0, 0 }
-  bg[PRELIGHT] = { 0, 0, 0 }
-  bg[INSENSITIVE] = { 0, 0, 0 }
-  bg[SELECTED] = { 0, 0, 0 }
+	bg[NORMAL] = { 0.2, 0.2, 0.3 }
+	bg[ACTIVE] = { 0, 0, 0 }
+	bg[PRELIGHT] = { 0, 0, 0 }
+	bg[INSENSITIVE] = { 0, 0, 0 }
+	bg[SELECTED] = { 0, 0, 0 }
 }
 
 style "fatal_message" = "medium_text"
@@ -517,7 +517,7 @@ style "audio_track_base" = "default_base"
 {
   font_name = "sans 6"
   fg[NORMAL] = { 0.77, 0.77, 0.72 }	
-  bg[NORMAL] = { 0.18, 0.18, 0.22 }
+  bg[NORMAL] = { 0.18, 0.19, 0.22 }
   bg[ACTIVE] = { 0.20, 0.20, 0.20 }	
   bg[PRELIGHT] = { 0.20, 0.20, 0.20 }
   bg[INSENSITIVE] = { 0.20, 0.20, 0.20 }
@@ -530,7 +530,7 @@ style "audio_bus_base"
   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] = "#464666"	
+  bg[NORMAL] = "#444466"	
 }
 
 style "track_name_display"
@@ -622,11 +622,11 @@ style "region_list_display" = "small_bold_text"
 
 style "main_canvas_area"
 {
-	bg[NORMAL] = { 0.38, 0.38, 0.38 }
-	bg[ACTIVE] = { 0.38, 0.38, 0.38 }
-	bg[INSENSITIVE] = { 0.38, 0.38, 0.38 }
-	bg[SELECTED] = { 0.38, 0.38, 0.38 }
-	bg[PRELIGHT] = { 0.38, 0.38, 0.38 }
+	bg[NORMAL] = { 0.32, 0.32, 0.36 }
+	bg[ACTIVE] = { 0.38, 0.38, 0.42 }
+	bg[INSENSITIVE] = { 0.38, 0.38, 0.42 }
+	bg[SELECTED] = { 0.38, 0.38, 0.42 }
+	bg[PRELIGHT] = { 0.38, 0.38, 0.42 }
 }
 
 style "track_controls_inactive"
@@ -752,12 +752,6 @@ style "pan_zone" = "default_base"
 	fg[ACTIVE] = { 0.95, 0.48, 0.11 }
 }
 
-style "wall_clock" = "medium_bold_text"
-{
-	fg[NORMAL] = { 1.0, 1.0, 1.0 }
-	bg[NORMAL] = { 0, 0, 0 }
-}
-
 style "paler_red_when_active" = "medium_text"
 {
 	fg[NORMAL] = { 0.80, 0.80, 0.80 }
@@ -1094,8 +1088,6 @@ widget "*MixerTrackDisplayList" style "track_list_display"
 widget "*MixerSnapshotDisplayList" style "track_list_display"
 widget "*MixerAuxDisplayList" style "track_list_display"
 widget "*MixerGroupList" style "track_list_display"
-widget "*WallClock" style "wall_clock"
-widget "*CPULoad" style "wall_clock"
 widget "*RegionEditorLabel" style "medium_text"
 widget "*RegionEditorSmallLabel" style "small_text"
 widget "*RegionEditorEntry" style "medium_entry"