Merge branch 'windows' of git.ardour.org:ardour/ardour into windows

[ardour.git] / gtk2_ardour / ardour3_styles.rc.in

diff --git a/gtk2_ardour/ardour3_styles.rc.in b/gtk2_ardour/ardour3_styles.rc.in
index da636eefd14e1c01e34d91fad3d37f30d7a53504..e3978d063a1983238d76a6fe099c51fca8836233 100644 (file)
--- a/gtk2_ardour/ardour3_styles.rc.in
+++ b/gtk2_ardour/ardour3_styles.rc.in
@@ -72,9 +72,9 @@ style "gain_fader"
        bg[ACTIVE] = shade (0.705, @@COLPREFIX@_bg)
        bg[INSENSITIVE] = shade (0.705, @@COLPREFIX@_bg)
 
-        fg[INSENSITIVE] = { 0.525, 0.521, 0.568 }
-        fg[NORMAL] = { 0.525, 0.521, 0.568 }
-       fg[ACTIVE] = { 0.525, 0.521, 0.568 }
+        fg[INSENSITIVE] = shade(1.4, @@COLPREFIX@_bg)
+        fg[NORMAL] = shade(1.4, @@COLPREFIX@_bg)
+       fg[ACTIVE] = shade(1.4, @@COLPREFIX@_bg)
 }
 
 #MSR and related buttons
@@ -147,6 +147,10 @@ style "monitor" = "small_button"
 {
 }
 
+style "meterbridge_label" = "small_text"
+{
+}
+
 style "solo_isolate" = "very_small_text"
 {
 }
@@ -679,6 +683,7 @@ style "audio_bus_base" = "very_small_text"
 {
   fg[NORMAL] = @@COLPREFIX@_fg
   bg[NORMAL] = @@COLPREFIX@_audio_bus
+  bg[ACTIVE] = @@COLPREFIX@_bg
 }
 
 style "send_strip_base" = "default"
@@ -787,7 +792,7 @@ style "track_name_display" = "medium_text"
 
 style "track_separator"
 {
-       bg[NORMAL] = @@COLPREFIX@_fg
+       bg[NORMAL] = lighter(@@COLPREFIX@_bg)
 }
 
 # Plugin Editors
@@ -984,3 +989,25 @@ style "default_toggle_button"
        bg[ACTIVE] = @@COLPREFIX@_contrasting_indicator
        fg[ACTIVE] = @@COLPREFIX@_darkest
 }
+
+
+style "meter_strip_dpm" = "default"
+{
+}
+
+style "meter_strip_ppm" = "default"
+{
+  bg[NORMAL] = { 0.1, 0.1, 0.1 }
+  fg[NORMAL] = { 1.0, 1.0, 1.0 }
+}
+
+style "meter_strip_vu" = "default"
+{
+  bg[NORMAL] = { .84, .77, .58 }
+  fg[NORMAL] = { 0.0, 0.0, 0.0 }
+}
+
+style "meter_strip_sep" = "default"
+{
+  bg[NORMAL] = { 0.0, 0.0, 0.0 }
+}