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 4e18ce068ae4a6c15b230f15e2f4e3927dea2c38..e3978d063a1983238d76a6fe099c51fca8836233 100644 (file)
--- a/gtk2_ardour/ardour3_styles.rc.in
+++ b/gtk2_ardour/ardour3_styles.rc.in
@@ -68,8 +68,13 @@ style "small_red_active_and_selected_button" = "small_button"
 
 style "gain_fader"
 {
-        bg[NORMAL] = shade (0.7, @@COLPREFIX@_lightest)
-       bg[ACTIVE] = shade (0.705, @@COLPREFIX@_lightest)
+        bg[NORMAL] = shade (0.7, @@COLPREFIX@_bg)
+       bg[ACTIVE] = shade (0.705, @@COLPREFIX@_bg)
+       bg[INSENSITIVE] = shade (0.705, @@COLPREFIX@_bg)
+
+        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
@@ -142,6 +147,10 @@ style "monitor" = "small_button"
 {
 }
 
+style "meterbridge_label" = "small_text"
+{
+}
+
 style "solo_isolate" = "very_small_text"
 {
 }
@@ -356,9 +365,9 @@ style "mixer_red_active_button" = "very_small_button"
        bg[INSENSITIVE] = { 0.16, 0.16, 0.21 }
 }
 
-style "time_button" = "default_button"
+style "ruler_label" = "small_bold_text"
 {
-       font_name = "@FONT_SMALL@"
+        fg[NORMAL] = @@COLPREFIX@_light_text_on_dark
 }
 
 style "transport_button"
@@ -674,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"
@@ -731,6 +741,11 @@ style "midi_track_metrics" = "midi_track_base"
        font_name = "@FONT_TINY@"
 }
 
+style "audiomidi_track_metrics" = "midi_track_base"
+{
+       font_name = "@FONT_TINY@"
+}
+
 style "audio_bus_metrics" = "audio_bus_base"
 {
        font_name = "@FONT_TINY@"
@@ -746,6 +761,11 @@ style "midi_track_metrics_inactive" = "track_controls_inactive"
        font_name = "@FONT_TINY@"
 }
 
+style "audiomidi_track_metrics_inactive" = "track_controls_inactive"
+{
+       font_name = "@FONT_TINY@"
+}
+
 style "audio_bus_metrics_inactive" = "track_controls_inactive"
 {
        font_name = "@FONT_TINY@"
@@ -772,7 +792,7 @@ style "track_name_display" = "medium_text"
 
 style "track_separator"
 {
-       bg[NORMAL] = @@COLPREFIX@_fg
+       bg[NORMAL] = lighter(@@COLPREFIX@_bg)
 }
 
 # Plugin Editors
@@ -785,7 +805,7 @@ style "plugin_slider"
 
        fg[NORMAL] = @@COLPREFIX@_bright_color
        fg[ACTIVE] = @@COLPREFIX@_bright_color
-       fg[INSENSITIVE] = @@COLPREFIX@_base # matches default
+       fg[INSENSITIVE] = @@COLPREFIX@_lightest # matches default
        fg[SELECTED] = @@COLPREFIX@_bright_color
        fg[PRELIGHT] = @@COLPREFIX@_bright_color
 
@@ -969,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 }
+}