projects / ardour.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
replace unicode dash with (monospace) minus.
[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 3b3ff039bf29c3cc073fbb32304464e97ffb1727..0872fc914132d5f6e19e28b1fbd5fa2ec0bbaf0e 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" 
@@ -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
@@ -78,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] = { 0.525, 0.521, 0.568 }
+        fg[NORMAL] = { 0.525, 0.521, 0.568 }
+       fg[ACTIVE] = { 0.525, 0.521, 0.568 }
 }
 
 #MSR and related buttons
@@ -366,9 +361,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"
@@ -436,7 +431,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"
@@ -561,8 +556,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
@@ -572,11 +567,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
@@ -584,40 +585,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"
@@ -629,13 +642,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"
@@ -648,103 +668,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"
@@ -832,18 +760,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"
@@ -861,7 +790,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
 
@@ -940,6 +869,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
@@ -1019,10 +951,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"
 {
Unnamed repository; edit this file 'description' to name the repository.