X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour3_styles.rc.in;h=e3978d063a1983238d76a6fe099c51fca8836233;hb=8cd71108c1d153f84f25c3b9e5153a110826c130;hp=d1a4500525d507f77ff0a9ccca970fe1f7054c57;hpb=5425b7773d3aff2c4aab93d3c08c9836f2d27753;p=ardour.git

diff --git a/gtk2_ardour/ardour3_styles.rc.in b/gtk2_ardour/ardour3_styles.rc.in
index d1a4500525..e3978d063a 100644
--- 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"
@@ -562,11 +571,17 @@ style "warning_message" = "medium_text"
 style "medium_entry" = "medium_text"
 {
 	fg[NORMAL] = @@COLPREFIX@_text
-	fg[ACTIVE] = @@COLPREFIX@_text
+	fg[ACTIVE] = @@COLPREFIX@_contrasting_indicator
 	fg[SELECTED] = @@COLPREFIX@_fg_selected
-	
+
+	text[NORMAL] = @@COLPREFIX@_text
+	text[ACTIVE] = @@COLPREFIX@_text
+	text[SELECTED] = @@COLPREFIX@_fg_selected
+
 	bg[NORMAL] = @@COLPREFIX@_base
-	
+	bg[SELECTED] = @@COLPREFIX@_base
+	bg[SELECTED] = @@COLPREFIX@_bg_selected
+
 	base[NORMAL] = @@COLPREFIX@_base
 	base[ACTIVE] = @@COLPREFIX@_base
 	base[SELECTED] = @@COLPREFIX@_bg_selected
@@ -574,40 +589,52 @@ style "medium_entry" = "medium_text"
 
 style "medium_entry_noselection_fg" = "medium_entry"
 {
+        # this seems wrong to me, but the light theme uses it
 	fg[SELECTED] = @@COLPREFIX@_contrasting_indicator
 }
 
 style "medium_entry_noselection_bg" = "medium_entry"
 {
+        # this seems wrong to me, but the light theme uses it
 	bg[SELECTED] = @@COLPREFIX@_text
 }
 
 style "medium_bold_entry"  = "medium_bold_text"
 {
 	fg[NORMAL] = @@COLPREFIX@_text
-	fg[ACTIVE] = @@COLPREFIX@_text
+	fg[ACTIVE] = @@COLPREFIX@_contrasting_indicator
+	fg[SELECTED] = @@COLPREFIX@_fg_selected
 	
+	text[NORMAL] = @@COLPREFIX@_text
+	text[ACTIVE] = @@COLPREFIX@_text
+	text[SELECTED] = @@COLPREFIX@_fg_selected
+
 	bg[NORMAL] = @@COLPREFIX@_base
+	bg[SELECTED] = @@COLPREFIX@_base
+	bg[SELECTED] = @@COLPREFIX@_base
 	
 	base[NORMAL] = @@COLPREFIX@_base
 	base[ACTIVE] = @@COLPREFIX@_base
-	base[SELECTED] = @@COLPREFIX@_base
+	base[SELECTED] = @@COLPREFIX@_bg_selected
 }
 
 style "small_entry" = "small_text"
 {
 	fg[NORMAL] = @@COLPREFIX@_text
 	fg[ACTIVE] = @@COLPREFIX@_contrasting_indicator
-	fg[SELECTED] = @@COLPREFIX@_contrasting_indicator
+	fg[SELECTED] = @@COLPREFIX@_fg_selected
+
 	text[NORMAL] = @@COLPREFIX@_text
-	text[ACTIVE] = @@COLPREFIX@_contrasting_indicator
+	text[ACTIVE] = @@COLPREFIX@_text
 	text[SELECTED] = @@COLPREFIX@_fg_selected
+
 	bg[NORMAL] = @@COLPREFIX@_base
 	bg[SELECTED] = @@COLPREFIX@_base
-	bg[SELECTED] = @@COLPREFIX@_base
+	bg[SELECTED] = @@COLPREFIX@_bg_selected
+
 	base[NORMAL] = @@COLPREFIX@_base
 	base[ACTIVE] = @@COLPREFIX@_base
-	base[SELECTED] = @@COLPREFIX@_base
+	base[SELECTED] = @@COLPREFIX@_bg_selected
 }
 
 style "red_active_small_entry" = "small_entry"
@@ -619,13 +646,20 @@ style "red_active_small_entry" = "small_entry"
 style "small_bold_entry" = "small_bold_text"
 {
 	fg[NORMAL] = @@COLPREFIX@_text
-	fg[ACTIVE] = @@COLPREFIX@_text
-	
+	fg[ACTIVE] = @@COLPREFIX@_contrasting_indicator
+	fg[SELECTED] = @@COLPREFIX@_fg_selected
+
+	text[NORMAL] = @@COLPREFIX@_text
+	text[ACTIVE] = @@COLPREFIX@_text
+	text[SELECTED] = @@COLPREFIX@_fg_selected
+
 	bg[NORMAL] = @@COLPREFIX@_base
-	
+	bg[SELECTED] = @@COLPREFIX@_base
+	bg[SELECTED] = @@COLPREFIX@_bg_selected
+
 	base[NORMAL] = @@COLPREFIX@_base
 	base[ACTIVE] = @@COLPREFIX@_base
-	base[SELECTED] = @@COLPREFIX@_base
+	base[SELECTED] = @@COLPREFIX@_bg_selected
 }
 
 style "small_red_on_black_entry"  = "small_bold_text"
@@ -642,12 +676,14 @@ style "editor_time_ruler" = "small_text"
 {
 	fg[NORMAL] = @@COLPREFIX@_fg
 	bg[NORMAL] = @@COLPREFIX@_base
+        ythickness = 0
 }
 
 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"
@@ -705,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@"
@@ -720,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@"
@@ -746,7 +792,7 @@ style "track_name_display" = "medium_text"
 
 style "track_separator"
 {
-	bg[NORMAL] = @@COLPREFIX@_fg
+	bg[NORMAL] = lighter(@@COLPREFIX@_bg)
 }
 
 # Plugin Editors
@@ -759,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
 
@@ -838,6 +884,9 @@ style "peak_display_peaked_entry" = "small_text"
 	fg[NORMAL] = @@COLPREFIX@_text
 	fg[ACTIVE] = @@COLPREFIX@_text
 	fg[SELECTED] = @@COLPREFIX@_text
+	text[NORMAL] = @@COLPREFIX@_text
+	text[ACTIVE] = @@COLPREFIX@_text
+	text[SELECTED] = @@COLPREFIX@_text
 
         bg[NORMAL] = @@COLPREFIX@_bright_indicator
         bg[ACTIVE] = @@COLPREFIX@_bright_indicator
@@ -940,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 }
+}