crossfade hack and slash. removed overlap checks, overlap mode, default length,...

[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 7ea58511d766c0c338172b97488735dd3e153cff..4e18ce068ae4a6c15b230f15e2f4e3927dea2c38 100644 (file)
--- 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" 
@@ -427,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"
@@ -563,11 +562,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
@@ -575,40 +580,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"
@@ -620,13 +637,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"
@@ -643,6 +667,7 @@ style "editor_time_ruler" = "small_text"
 {
        fg[NORMAL] = @@COLPREFIX@_fg
        bg[NORMAL] = @@COLPREFIX@_base
+        ythickness = 0
 }
 
 style "audio_bus_base" = "very_small_text"
@@ -730,18 +755,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"
@@ -838,6 +864,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