X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour3_styles.rc.in;h=a80cea4b051910e1d056313345a7389c787f3838;hb=ef213e49a7e4eb7083696fd7e953c8f11e492849;hp=f29a4ef5f9123840a7869ab605a6c14b1971fdf8;hpb=3764eedca0d8ca8d666401c8bb8364705a64317e;p=ardour.git

diff --git a/gtk2_ardour/ardour3_styles.rc.in b/gtk2_ardour/ardour3_styles.rc.in
index f29a4ef5f9..a80cea4b05 100644
--- a/gtk2_ardour/ardour3_styles.rc.in
+++ b/gtk2_ardour/ardour3_styles.rc.in
@@ -40,7 +40,6 @@ style "default_generic" = "medium_text"
 
 style "text_cell_entry" = "medium_text"
 {
-	GtkWidget::cursor_color =  @@COLPREFIX@_darkest
 }
 
 style "very_small_button" = "default_button" 
@@ -60,15 +59,6 @@ style "very_small_red_active_and_selected_button" = "very_small_button"
 	bg[SELECTED] = @@COLPREFIX@_bright_indicator
 }
 
-style "punch_button" = "very_small_red_active_and_selected_button"
-{
- 	font_name = "@FONT_SMALLER@"
-
-	fg[ACTIVE] = @@COLPREFIX@_darkest
-	bg[ACTIVE] = @@COLPREFIX@_bright_indicator
-	bg[SELECTED] = @@COLPREFIX@_bright_indicator
-}
-
 style "small_red_active_and_selected_button" = "small_button"
 {
 	fg[ACTIVE] = @@COLPREFIX@_darkest
@@ -148,26 +138,16 @@ style "mixer_track_rec_enable_button_active" = "track_rec_enable_button_active"
 	ythickness = 0
 }
 
-style "monitor_input_button" = "small_button"
+style "monitor" = "small_button"
 {
-        fg[NORMAL] = darker(@@COLPREFIX@_fg)
-        fg[PRELIGHT] = darker(@@COLPREFIX@_fg)
-        bg[NORMAL] = mix(0.1,@@COLPREFIX@_bright_indicator,darker(@@COLPREFIX@_bg))
-        bg[PRELIGHT] = mix(0.1,@@COLPREFIX@_bright_indicator,darker(@@COLPREFIX@_bg))
-        
-	fg[ACTIVE] = @@COLPREFIX@_fg
-	bg[ACTIVE] = @@COLPREFIX@_bright_indicator
 }
 
-style "monitor_disk_button" = "small_button"
+style "solo_isolate" = "very_small_text"
+{
+}
+
+style "solo_safe" = "very_small_text"
 {
-        fg[NORMAL] = darker(@@COLPREFIX@_fg)
-        fg[PRELIGHT] = darker(@@COLPREFIX@_fg)
-        bg[NORMAL] = mix(0.1,@@COLPREFIX@_bright_indicator,darker(@@COLPREFIX@_bg))
-        bg[PRELIGHT] = mix(0.1,@@COLPREFIX@_bright_indicator,darker(@@COLPREFIX@_bg))
-        
-	fg[ACTIVE] = @@COLPREFIX@_fg
-	bg[ACTIVE] = @@COLPREFIX@_bright_indicator
 }
 
 style "solo_button" = "small_button"
@@ -177,18 +157,6 @@ style "solo_button" = "small_button"
   fg[ACTIVE] = @@COLPREFIX@_darkest
 }
 
-style "solo_isolate_led"
-{
-  fg[NORMAL] = mix(0.2,@@COLPREFIX@_isolate, @@COLPREFIX@_darkest)
-  fg[ACTIVE] = @@COLPREFIX@_isolate
-}
-
-style "solo_safe_led"
-{
-  fg[NORMAL] = mix(0.2,@@COLPREFIX@_isolate, @@COLPREFIX@_darkest)
-  fg[ACTIVE] = @@COLPREFIX@_isolate
-}
-
 style "solo_button_alternate" = "small_button"
 {
         #
@@ -237,6 +205,10 @@ style "solo_button_active" = "small_button"
 	fg[PRELIGHT] = @@COLPREFIX@_darkest
 }
 
+style "processor" = "small_text"
+{
+}
+
 style "mixer_invert_button" = "small_button"
 {
 	bg[ACTIVE] = @@COLPREFIX@_not_so_bright_indicator
@@ -268,18 +240,6 @@ style "mixer_solo_button_active" = "solo_button_active"
 	ythickness = 0
 }
 
-style "mixer_monitor_input_button" = "monitor_input_button"
-{
-	xthickness = 0
-	ythickness = 0
-}
-
-style "mixer_monitor_disk_button" = "monitor_disk_button"
-{
-	xthickness = 0
-	ythickness = 0
-}
-
 style "monitor_opt_button" = "small_button"
 {
         bg[NORMAL] = mix(0.1,@@COLPREFIX@_not_so_bright_indicator,@@COLPREFIX@_bg)
@@ -466,7 +426,7 @@ style "midi_channel_selector_button"
 	bg[NORMAL] = @@COLPREFIX@_bg
 	bg[ACTIVE] = @@COLPREFIX@_midi_channel_selector
 	fg[NORMAL] = @@COLPREFIX@_fg
-	fg[ACTIVE] = @@COLPREFIX@_darkest
+	fg[ACTIVE] = @@COLPREFIX@_light_text_on_dark
 }
 
 style "shuttle_control" = "very_small_text"
@@ -591,8 +551,8 @@ style "info_message" = "medium_text"
 
 style "warning_message" = "medium_text"
 {
-   fg[ACTIVE] = @@COLPREFIX@_somewhat_bright_indicator
-   fg[NORMAL] = @@COLPREFIX@_somewhat_bright_indicator
+   fg[ACTIVE] = @@COLPREFIX@_bright_color
+   fg[NORMAL] = @@COLPREFIX@_bright_color
    bg[ACTIVE]   = @@COLPREFIX@_base
    bg[NORMAL]   = @@COLPREFIX@_base
    base[NORMAL] = @@COLPREFIX@_base
@@ -678,103 +638,11 @@ style "small_red_on_black_entry"  = "small_bold_text"
        bg[ACTIVE] = @@COLPREFIX@_base
 }
 
-#
-# Clocks: "text" is the clock digits; "base" is the bg
-#
-
-style "non_recording_big_clock_display" = "medium_entry"
-{
-	font_name = "@FONT_MASSIVE@"
-
-	text[NORMAL] = @@COLPREFIX@_control_text
-	text[ACTIVE] = @@COLPREFIX@_bright_indicator
-	text[SELECTED] = @@COLPREFIX@_bright_indicator
-	text[PRELIGHT] = @@COLPREFIX@_bright_indicator
-	text[INSENSITIVE] = @@COLPREFIX@_bright_indicator
-	
-	base[NORMAL] = @@COLPREFIX@_control_base
-	base[ACTIVE] = shade(0.5,@@COLPREFIX@_bright_indicator)
-}
-
-style "recording_big_clock_display" = "non_recording_big_clock_display"
-{
-	text[NORMAL] = darker(@@COLPREFIX@_arm)
-}
-
-style "transport_clock_display"
-{
-	font_name = "@FONT_BOLD_BIG@"
-
-        text[NORMAL] = darker (@@COLPREFIX@_contrasting_indicator)
-        text[ACTIVE] = darker (@@COLPREFIX@_bright_indicator)
-	text[SELECTED] = darker(@@COLPREFIX@_bright_indicator)
-	text[PRELIGHT] = darker(@@COLPREFIX@_bright_indicator)
-        text[INSENSITIVE] = darker(@@COLPREFIX@_bright_indicator)
-
-	base[NORMAL] = @@COLPREFIX@_darkest
-	base[ACTIVE] = @@COLPREFIX@_darkest
-	bg[NORMAL] = @@COLPREFIX@_darkest
-	bg[ACTIVE] = @@COLPREFIX@_darkest
-}
-
-style "transport_clock_display_delta" = "transport_clock_display"
-{
-        text[NORMAL] = @@COLPREFIX@_bright_color
-}
-
-style "tempo_meter_clock_display" = "very_small_text"
-{
-	text[NORMAL] = @@COLPREFIX@_fg
-        text[ACTIVE] = @@COLPREFIX@_somewhat_bright_indicator
-	text[SELECTED] = @@COLPREFIX@_bright_indicator
-	base[NORMAL] = @@COLPREFIX@_base
-	base[ACTIVE] = @@COLPREFIX@_contrasting_indicator
-}
-
-style "default_clock_display" = "medium_text"
-{
-        text[NORMAL] = @@COLPREFIX@_contrasting_indicator
-	text[ACTIVE] = @@COLPREFIX@_bright_indicator
-	text[SELECTED] = @@COLPREFIX@_bright_indicator
-	base[NORMAL] = @@COLPREFIX@_darkest
-	base[ACTIVE] = @@COLPREFIX@_darkest
-}
-
-style "selection_clock_display" 
-{
-        font_name = "@FONT_SMALLER@"
-
-        text[NORMAL] = @@COLPREFIX@_contrasting_indicator
-	text[ACTIVE] = @@COLPREFIX@_bright_indicator
-	text[SELECTED] = @@COLPREFIX@_bright_indicator
-	base[NORMAL] = @@COLPREFIX@_darkest
-	base[ACTIVE] = @@COLPREFIX@_darkest
-}
-
-style "punch_clock_display" = "very_small_text"
-{
-        font_name = "@FONT_SMALLER@"
-
-        text[NORMAL] = @@COLPREFIX@_contrasting_indicator
-	text[ACTIVE] = @@COLPREFIX@_bright_indicator
-	text[SELECTED] = @@COLPREFIX@_bright_indicator
-	base[NORMAL] = @@COLPREFIX@_darkest
-	base[ACTIVE] = @@COLPREFIX@_darkest
-}
-
-style "white_on_black_clock_display" = "medium_text"
-{
-	text[NORMAL] = @@COLPREFIX@_fg
-	text[ACTIVE] = @@COLPREFIX@_bright_indicator
-        base[SELECTED] = @@COLPREFIX@_bright_indicator
-	base[NORMAL] = @@COLPREFIX@_darkest
-	base[ACTIVE] = @@COLPREFIX@_darkest
-}
-
 style "editor_time_ruler" = "small_text"
 {
 	fg[NORMAL] = @@COLPREFIX@_fg
 	bg[NORMAL] = @@COLPREFIX@_base
+        ythickness = 0
 }
 
 style "audio_bus_base" = "very_small_text"
@@ -862,18 +730,19 @@ style "track_name_display" = "medium_text"
 {
 	fg[NORMAL] = @@COLPREFIX@_fg
 	fg[ACTIVE] = @@COLPREFIX@_fg
+	fg[SELECTED] = @@COLPREFIX@_fg
+
+	text[NORMAL] = @@COLPREFIX@_fg
+	text[ACTIVE] = @@COLPREFIX@_fg
+	text[SELECTED] = @@COLPREFIX@_fg
 
 	base[NORMAL] = @@COLPREFIX@_base
 	base[ACTIVE] = lighter(@@COLPREFIX@_base)
+        base[SELECTED] = @@COLPREFIX@_bg_selected
+
 	bg[NORMAL] = lighter(@@COLPREFIX@_base)
 	bg[ACTIVE] = lighter(@@COLPREFIX@_base)
-}
-
-style "active_track_name_display" = "medium_text"
-{
-	GtkWidget::cursor_color =  @@COLPREFIX@_base
-	text[NORMAL] = @@COLPREFIX@_base
-	base[NORMAL] = @@COLPREFIX@_text
+	bg[SELECTED] = lighter(@@COLPREFIX@_base)
 }
 
 style "track_separator"
@@ -935,14 +804,6 @@ style "processor_list" = "very_small_text"
 	bg[NORMAL] = @@COLPREFIX@_darkest
         bg[ACTIVE] = shade (1.8, @@COLPREFIX@_fg_selected)
         fg[ACTIVE] = @@COLPREFIX@_darkest
-	GtkCheckButton::indicator-size = 10
-	GtkCheckButton::indicator-spacing = 0
-}
-
-# Colour of a processor frame when it is selected
-style "processor_frame_selected"
-{
-	bg[NORMAL] = @@COLPREFIX@_fg_selected
 }
 
 # Colour of a processor frame when it is a send whose level is being controller by the fader
@@ -951,42 +812,6 @@ style "processor_frame_active_send"
 	bg[NORMAL] = @@COLPREFIX@_send_fg
 }
 
-# Fader processor's background
-style "processor_fader"
-{
-	bg[NORMAL] = @@COLPREFIX@_processor_fader_bg
-}
-
-# Fader processor's frame
-style "processor_fader_frame" 
-{
-bg[NORMAL] = @@COLPREFIX@_processor_fader_frame
-}
-
-# Pre-fader processor's background
-style "processor_prefader"
-{
-	bg[NORMAL] = @@COLPREFIX@_processor_prefader
-}
-
-# Pre-fader processor's frame
-style "processor_prefader_frame"
-{
-	bg[NORMAL] = @@COLPREFIX@_processor_prefader_frame
-}
-
-# Post-fader processor's background
-style "processor_postfader"
-{
-	bg[NORMAL] = @@COLPREFIX@_processor_postfader
-}
-
-# Post-fader processor's frame
-style "processor_postfader_frame"
-{
-	bg[NORMAL] = @@COLPREFIX@_processor_postfader_frame
-}
-
 # MixerPanZone:
 #
 # the NORMAL fg color is used for the pan puck
@@ -1093,10 +918,6 @@ style "location_row_button" = "default_button"
 	font_name = "@FONT_NORMAL@"
 }
 
-style "location_rows_clock" = "default_clock_display"
-{
-	font_name = "@FONT_NORMAL@"
-}
 
 style "ardour_button" ="default_button"
 {