use a more appropriate @color name for the cursor color in a text entry

[ardour.git] / gtk2_ardour / clearlooks.rc.in

diff --git a/gtk2_ardour/clearlooks.rc.in b/gtk2_ardour/clearlooks.rc.in
index 081629face532553894aa7879639ae291dde5b45..af36a3f4f47d51a45f15f2892df1645f2115fd54 100644 (file)
--- a/gtk2_ardour/clearlooks.rc.in
+++ b/gtk2_ardour/clearlooks.rc.in
@@ -4,10 +4,13 @@ style "default" = "medium_text"
 {
   #Original values for reference
 
-  GtkTreeView::vertical-padding = 0
-  GtkTreeView::horizontal-padding = 0
-  GtkTreeView::even-row-color = shade(0.25,@bases)
-  GtkTreeView::odd-row-color = lighter(lighter(@bases))
+  GtkTreeView         :: vertical-padding                 = 0
+  GtkTreeView         :: horizontal-padding               = 0
+  GtkTreeView         :: even-row-color                   = @bases
+  GtkTreeView         :: odd-row-color                    = @bases
+  GtkTreeView         :: focus-line-width                 = 0
+  GtkTreeView         :: tree-line-width                  = 1
+  GtkTreeView         :: row-ending-details               = 0
   
   GtkWidget           :: focus-line-pattern               = "\001\001"        #                              Dash pattern used to draw the focus indicator.
   GtkWidget           :: focus-line-width                 = 1                 # [               1 ] ( >= 0 ) Width, in pixels, of the focus indicator line.
@@ -100,8 +103,7 @@ style "default" = "medium_text"
   GtkTreeView         :: horizontal-separator             = 8                 # [               2 ] ( >= 0 ) Horizontal space between cells. Must be an even number.
   GtkTreeView         :: vertical-separator               = 2                 # [               2 ] ( >= 0 ) Vertical space between cells. Must be an even number.
 
-  GtkEntry            :: honors-transparent-bg-hint       = 1                 # [               0 ] ( bool ) (Clearlooks) Without this, gecko will fill in the background of the entry.
-  GtkEntry            :: cursor-color = @bg_selected
+  GtkEntry::cursor_color = @entry_cursor
 
   #GtkToolbar::shadow_type = GTK_SHADOW_ETCHED_IN
 
@@ -235,7 +237,7 @@ style "small_text"
 
 style "small_clock"
 {
-       font_name = "@CLOCKFONT@ @FONT_SMALLER@"
+       font_name = "@CLOCKFONT@ @FONT_NORMAL@"
 }
 
 style "small_italic_text"
@@ -645,7 +647,7 @@ style "small_entry" = "small_text"
 
        text[NORMAL] = @texts
        text[ACTIVE] = @texts
-       text[SELECTED] = @fg_selected
+       text[SELECTED] = @texts
 
        bg[NORMAL] = @bases
        bg[ACTIVE] = @bases
@@ -795,25 +797,10 @@ style "audio_bus_metrics_inactive" = "track_controls_inactive"
        font_name = ""
 }
 
-style "track_name_display" = "medium_text"
+style "track_name_editor" = "medium_text"
 {
        xthickness = 0
        ythickness = 0
-       fg[NORMAL] = @foreground
-       fg[ACTIVE] = @foreground
-       fg[SELECTED] = @foreground
-
-       text[NORMAL] = @foreground
-       text[ACTIVE] = @foreground
-       text[SELECTED] = @foreground
-
-       base[NORMAL] = @bases
-       base[ACTIVE] = lighter(@bases)
-       base[SELECTED] = @bg_selected
-
-       bg[NORMAL] = lighter(@bases)
-       bg[ACTIVE] = lighter(@bases)
-       bg[SELECTED] = lighter(@bases)
 }
 
 style "track_separator"
@@ -982,11 +969,6 @@ style "ardour_button" ="default_button"
        ythickness = 1
 }
 
-style "padded_button" = "default_button"
-{
-       xthickness = 8
-}
-
 style "tooltip" = "medium_text"
 {
        fg[NORMAL] = @fg_tooltip
@@ -1021,6 +1003,20 @@ style "settings_notebook" = "big_text"
 {
 
 }
+
+style "pane"
+{
+      fg[NORMAL] = lighter(@background)
+      fg[SELECTED] = @foreground
+      fg[ACTIVE] = @somewhat_bright_indicator
+}
+
+style "vca_label_bar" = "medium_bold_text"
+{
+       bg[NORMAL] = @darkest
+       fg[NORMAL] = @lightest
+}
+
 class "GtkWidget" style:highest "default"
 class "GtkScrollbar" style:highest "ardour_adjusters"
 class "GtkLabel" style:highest "default_generic"
@@ -1029,8 +1025,6 @@ class "GtkCheckButton" style:highest "ardour_button"
 class "GtkArrow" style:highest "tearoff_arrow"
 class "GtkProgressBar" style:highest "ardour_progressbars"
 
-
-widget "*PaddedButton" style:highest "padded_button"
 widget "*VerboseCanvasCursor" style:highest "verbose_canvas_cursor"
 widget "*MarkerText" style:highest "marker_text"
 widget "*ArdourContextMenu*" style:highest "default_menu"
@@ -1062,6 +1056,7 @@ widget "*transport clock" style:highest "bigger_clock"
 widget "*secondary clock" style:highest "bigger_clock"
 widget "*transport delta clock" style:highest "bigger_clock"
 widget "*secondary delta clock" style:highest "bigger_clock"
+widget "*stretch clock" style:highest "bigger_clock"
 widget "*silence duration clock" style:highest "medium_text"
 widget "*edit point clock" style:highest "medium_text"
 widget "*nudge clock" style:highest "small_clock"
@@ -1108,8 +1103,8 @@ widget "*AudioBusFader" style:highest "audio_bus_fader"
 
 widget "*BusControlsBaseUnselected" style:highest "audio_bus_base"
 widget "*TrackSeparator" style:highest "track_separator"
-widget "*EditorTrackNameDisplay" style:highest "track_name_display"
-widget "*EditorTrackNameDisplay*" style:highest "track_name_display"
+widget "*TrackNameEditor" style:highest "track_name_editor"
+widget "*TrackNameEditor*" style:highest "track_name_editor"
 widget "*CrossfadeEditAuditionButton" style:highest "bright_when_active"
 widget "*CrossfadeEditAuditionButton*" style:highest "bright_when_active"
 widget "*CrossfadeEditCurveButton" style:highest "bright_when_active"
@@ -1164,7 +1159,6 @@ widget "*BlackSeparator" style:highest "black_separator"
 
 widget "*MetricLabel" style:highest "medium_text"
 widget "*ChoiceWindow" style:highest "default_generic"
-widget "*TrackLabel" style:highest "medium_text"
 widget "*TrackParameterName" style:highest "small_italic_text"
 widget "*AddRouteDialog*" style:highest "medium_text"
 widget "*AddRouteDialogSpinner" style:highest "medium_bold_entry"
@@ -1173,6 +1167,7 @@ widget "*AddRouteDialogNameTemplateEntry" style:highest "medium_bold_entry"
 widget "*NewSessionSR1Label" style:highest "red_medium_text"
 widget "*NewSessionSR2Label" style:highest "medium_text"
 widget "*location edit row clock" style:highest "medium_text"
+widget "*ArdourLuaEntry" style:highest "medium_monospace_text"
 widget "*LocationEditNameLabel" style:highest "medium_text"
 widget "*LocationEditCdButton" style:highest "small_red_active_and_selected_button"
 widget "*LocationEditCdButton*" style:highest "small_red_active_and_selected_button"
@@ -1211,3 +1206,8 @@ widget "*processor fader" style:highest "processor"
 widget "*processor postfader" style:highest "processor"
 widget "*MonitorSectionLabel" style:highest "small_text"
 widget "*ooltip*" style:highest "tooltip"
+widget "*Pane" style:highest "pane"
+widget "*Pane.Divider" style:highest "pane"
+widget "*VCALabelBar" style:highest "vca_label_bar"
+widget "*VCALabelBar*" style:highest "vca_label_bar"
+