diff --git a/rtdata/themes/09-Gray-Orange.gtkrc b/rtdata/themes/09-Gray-Orange.gtkrc index 58cf72cbf..48e8d2ff0 100644 --- a/rtdata/themes/09-Gray-Orange.gtkrc +++ b/rtdata/themes/09-Gray-Orange.gtkrc @@ -99,6 +99,7 @@ style "clearlooks-default" { toolbarstyle = 1 animation = FALSE radius = 3.0 + # style between CLASSIC, GLOSSY, INVERTED and GUMMY style = GUMMY # Set a hint to disable backward compatibility fallbacks. @@ -116,7 +117,7 @@ style "wider" { ythickness = 3 } -style "entry" { +style "clearlooks-entry" { xthickness = 3 ythickness = 3 @@ -128,7 +129,7 @@ style "entry" { } } -style "paned" { +style "clearlooks-paned" { bg[PRELIGHT] = shade (0.8, @bg_color) @@ -137,7 +138,7 @@ style "paned" { } } -style "HSV" { +style "clearlooks-HSV" { engine "clearlooks" { hint = "HSV" @@ -145,19 +146,19 @@ style "HSV" { } } -style "spinbutton" { +style "clearlooks-spinbutton" { engine "clearlooks" { hint = "spinbutton" } } -style "scale" { +style "clearlooks-scale" { xthickness = 2 ythickness = 2 - bg[NORMAL] = shade (1.35, @bg_color) - bg[PRELIGHT] = shade (1.70, @bg_color) + bg[NORMAL] = shade (1.80, @bg_color) + bg[PRELIGHT] = shade (2.00, @bg_color) # when GtkScale::trough-side-details = 1, bg[SELECTED] set the color of the slider background on the left of the knob #bg[SELECTED] = @bg_color @@ -167,21 +168,21 @@ style "scale" { } } -style "vscale" { +style "clearlooks-vscale" { engine "clearlooks" { hint = "vscale" } } -style "hscale" { +style "clearlooks-hscale" { engine "clearlooks" { hint = "hscale" } } -style "scrollbar" { +style "clearlooks-scrollbar" { xthickness = 2 ythickness = 2 @@ -192,31 +193,40 @@ style "scrollbar" { } } -style "hscrollbar" { +style "clearlooks-hscrollbar" { engine "clearlooks" { hint = "hscrollbar" } } -style "vscrollbar" { +style "clearlooks-vscrollbar" { engine "clearlooks" { hint = "vscrollbar" } } -style "notebook_bg" { +style "clearlooks-notebook_bg" { bg[NORMAL] = shade (1.02, @bg_color) bg[ACTIVE] = @base_color } -style "button" { +style "clearlooks-combobox" { - bg[NORMAL] = shade (1.35, @bg_color) - bg[PRELIGHT] = shade (1.55, @bg_color) - bg[ACTIVE] = shade (1.80, @bg_color) + text[NORMAL] = @fg_color + text[PRELIGHT] = @fg_color + text[SELECTED] = @selected_fg_color + text[INSENSITIVE] = mix (0.2, @fg_color, @bg_color) + text[ACTIVE] = @fg_color +} + +style "clearlooks-button" { + + bg[NORMAL] = shade (1.45, @bg_color) + bg[PRELIGHT] = shade (1.65, @bg_color) + bg[ACTIVE] = shade (2.00, @bg_color) engine "clearlooks" { @@ -226,21 +236,21 @@ style "button" { # The color is changed by the notebook_bg style, this style # changes the x/ythickness -style "notebook" { +style "clearlooks-notebook" { xthickness = 3 ythickness = 3 bg[SELECTED] = @salt_pinch } -style "statusbar" { +style "clearlooks-statusbar" { engine "clearlooks" { hint = "statusbar" } } -style "comboboxentry" { +style "clearlooks-comboboxentry" { engine "clearlooks" { # Note: @@ -250,7 +260,7 @@ style "comboboxentry" { } } -style "expander" { +style "clearlooks-expander" { fg[NORMAL] = @salt_pinch fg[PRELIGHT] = @salt_pinch @@ -267,20 +277,20 @@ style "expander" { } } -style "expanderLabel" { +style "clearlooks-expanderLabel" { fg[NORMAL] = shade (1.50, @text_color) fg[PRELIGHT] = @selected_fg_color } -style "menubar" { +style "clearlooks-menubar" { engine "clearlooks" { hint = "menubar" } } -style "menu" { +style "clearlooks-menu" { xthickness = 0 ythickness = 0 @@ -291,17 +301,19 @@ style "menu" { } } -style "menu_item" { +style "clearlooks-menu_item" { xthickness = 2 ythickness = 3 fg[PRELIGHT] = @selected_fg_color + text[NORMAL] = @fg_color + text[PRELIGHT] = @selected_fg_color } # This style is there to modify the separator menu items. The goals are: # 1. Get a specific height. # 2. The line should go to the edges (ie. no border at the left/right) -style "separator_menu_item" { +style "clearlooks-separator_menu_item" { xthickness = 1 ythickness = 0 @@ -311,12 +323,12 @@ style "separator_menu_item" { GtkWidget::separator-height = 7 } -style "frame_title" { +style "clearlooks-frame_title" { fg[NORMAL] = shade (1.50, @text_color) } -style "treeview" { +style "clearlooks-treeview" { base[ACTIVE] = mix(0.50, @selected_bg_color, @base_color) @@ -326,7 +338,7 @@ style "treeview" { } # The almost useless progress bar style -style "progressbar" { +style "clearlooks-progressbar" { xthickness = 1 ythickness = 1 @@ -342,16 +354,19 @@ style "progressbar" { # This style is based on the clearlooks-default style, so that the colors from the button # style are overriden again. -style "treeview_header" = "clearlooks-default" { +style "clearlooks-treeview_header" = "clearlooks-default" { xthickness = 2 ythickness = 1 + bg[NORMAL] = shade (1.35, @bg_color) + engine "clearlooks" { + radius = 0.0 hint = "treeview-header" } } -style "tooltips" { +style "clearlooks-tooltips" { xthickness = 4 ythickness = 4 @@ -359,53 +374,6 @@ style "tooltips" { fg[NORMAL] = @tooltip_fg_color } -style "nautilus_location" { - - bg[NORMAL] = mix (0.60, shade (1.05, @bg_color), @selected_bg_color) -} - -# Wrokaroudn style for places where the text color is used instead of the fg color. -style "text_is_fg_color_workaround" { - - text[NORMAL] = @fg_color - text[PRELIGHT] = @fg_color - text[SELECTED] = @selected_fg_color - text[ACTIVE] = @fg_color - text[INSENSITIVE] = darker (@bg_color) -} - -# Workaround style for menus where the text color is used instead of the fg color. -style "menuitem_text_is_fg_color_workaround" { - - text[NORMAL] = @fg_color - text[PRELIGHT] = @selected_fg_color - text[SELECTED] = @selected_fg_color - text[ACTIVE] = @fg_color - text[INSENSITIVE] = darker (@bg_color) -} - -# Workaround style for places where the fg color is used instead of the text color. -style "fg_is_text_color_workaround" { - - fg[NORMAL] = @text_color - fg[PRELIGHT] = @text_color - fg[SELECTED] = @selected_fg_color - fg[ACTIVE] = @selected_fg_color - fg[INSENSITIVE] = darker (@bg_color) -} - -# Style to set the toolbar to use a flat style. This is because the "New" button in -# Evolution is not drawn transparent. So if there is a gradient in the background it will -# look really wrong. -# See http://bugzilla.gnome.org/show_bug.cgi?id=446953. -style "evo_new_button_workaround" { - - engine "clearlooks" { - toolbarstyle = 0 - } -} - - ############################################################################### # The following part of the gtkrc applies the different styles to the widgets. ############################################################################### @@ -418,56 +386,56 @@ class "GtkFrame" style "wide" class "GtkCalendar" style "wide" class "GtkCheckButton" style "wider" class "GtkRadioButton" style "wider" -class "GtkEntry" style "entry" +class "GtkEntry" style "clearlooks-entry" -class "GtkPaned" style "paned" -class "GtkSpinButton" style "spinbutton" -class "GtkScale" style "scale" -class "GtkVScale" style "vscale" -class "GtkHScale" style "hscale" -class "GtkScrollbar" style "scrollbar" -class "GtkHScrollbar" style "hscrollbar" -class "GtkVScrollbar" style "vscrollbar" +class "GtkPaned" style "clearlooks-paned" +class "GtkSpinButton" style "clearlooks-spinbutton" +class "GtkScale" style "clearlooks-scale" +class "GtkVScale" style "clearlooks-vscale" +class "GtkHScale" style "clearlooks-hscale" +class "GtkScrollbar" style "clearlooks-scrollbar" +class "GtkHScrollbar" style "clearlooks-hscrollbar" +class "GtkVScrollbar" style "clearlooks-vscrollbar" -class "GtkExpander" style "expander" -class "GtkHSV" style "HSV" +class "GtkExpander" style "clearlooks-expander" +class "GtkHSV" style "clearlooks-HSV" # General matching follows. The order is choosen so that the right styles override # each other. EG. progressbar needs to be more important than the menu match. -widget_class "*" style "notebook_bg" +widget_class "*" style "clearlooks-notebook_bg" # This is not perfect, it could be done better. # (That is modify *every* widget in the notebook, and change those back that # we really don't want changed) -widget_class "**" style "notebook_bg" -widget_class "**" style "notebook_bg" -widget_class "**" style "notebook_bg" -widget_class "**" style "notebook_bg" -widget_class "**" style "notebook_bg" +widget_class "**" style "clearlooks-notebook_bg" +widget_class "**" style "clearlooks-notebook_bg" +widget_class "**" style "clearlooks-notebook_bg" +widget_class "**" style "clearlooks-notebook_bg" +widget_class "**" style "clearlooks-notebook_bg" -widget_class "*" style "button" -widget_class "*" style "notebook" -widget_class "**" style "statusbar" +widget_class "*" style "clearlooks-button" +widget_class "*" style "clearlooks-notebook" +widget_class "**" style "clearlooks-statusbar" -widget_class "**" style "comboboxentry" -widget_class "**" style "comboboxentry" +#widget_class "**" style "clearlooks-comboboxentry" +widget_class "**" style "clearlooks-combobox" -widget_class "*." style "expanderLabel" +widget_class "*." style "clearlooks-expanderLabel" -widget_class "**" style "menubar" -widget_class "**" style "menu" -widget_class "**" style "menu_item" -widget_class "**" style "separator_menu_item" +widget_class "**" style "clearlooks-menubar" +widget_class "**" style "clearlooks-menu" +widget_class "**" style "clearlooks-menu_item" +widget_class "**" style "clearlooks-separator_menu_item" -widget_class "*.." style "frame_title" -widget_class "*.*" style "treeview" +widget_class "*.." style "clearlooks-frame_title" +widget_class "*.*" style "clearlooks-treeview" -widget_class "*" style "progressbar" +widget_class "*" style "clearlooks-progressbar" # Treeview headers (and similar stock GTK+ widgets) -widget_class "*.." style "treeview_header" -widget_class "*.." style "treeview_header" -widget_class "*.." style "treeview_header" -widget_class "*.." style "treeview_header" +widget_class "*.." style "clearlooks-treeview_header" +widget_class "*.." style "clearlooks-treeview_header" +widget_class "*.." style "clearlooks-treeview_header" +widget_class "*.." style "clearlooks-treeview_header" # The window of the tooltip is called "gtk-tooltip" ################################################################## @@ -477,34 +445,5 @@ widget_class "*.." style "treeview_header" # quite a bit to get this working correctly. # (It will involve setting different priorities, etc.) ################################################################## -widget "gtk-tooltip*" style "tooltips" +widget "gtk-tooltip*" style "clearlooks-tooltips" -########################################################################## -# Following are special cases and workarounds for issues in applications. -########################################################################## - -# Workaround for the evolution ETable (bug #527532) -widget_class "*.." style "treeview_header" -# Workaround for the evolution ETree -widget_class "*.." style "treeview_header" - -# Special case the nautilus-extra-view-widget -# ToDo: A more generic approach for all applications that have a widget like this. -widget "*.nautilus-extra-view-widget" style : highest "nautilus_location" - -# Work around for http://bugzilla.gnome.org/show_bug.cgi?id=382646 -# Note that this work around assumes that the combobox is _not_ in appears-as-list mode. -widget_class "*.." style "text_is_fg_color_workaround" -# This is the part of the workaround that fixes the menus -widget "*.gtk-combobox-popup-menu.*" style "menuitem_text_is_fg_color_workaround" - -# Work around the usage of GtkLabel inside GtkListItems to display text. -# This breaks because the label is shown on a background that is based on the base color. -widget_class "**" style "fg_is_text_color_workaround" -# GtkCList also uses the fg color to draw text on top of the base colors. -widget_class "*" style "fg_is_text_color_workaround" -# Nautilus when renaming files, and maybe other places. -widget_class "*" style "fg_is_text_color_workaround" - -# See the documentation of the style. -widget_class "EShellWindow.GtkVBox.BonoboDock.BonoboDockBand.BonoboDockItem*" style "evo_new_button_workaround" diff --git a/rtdata/themes/17-Gray-Red.gtkrc b/rtdata/themes/17-Gray-Red.gtkrc index 23dd94096..f579a2bd1 100644 --- a/rtdata/themes/17-Gray-Red.gtkrc +++ b/rtdata/themes/17-Gray-Red.gtkrc @@ -99,6 +99,7 @@ style "clearlooks-default" { toolbarstyle = 1 animation = FALSE radius = 3.0 + # style between CLASSIC, GLOSSY, INVERTED and GUMMY style = GUMMY # Set a hint to disable backward compatibility fallbacks. @@ -116,7 +117,7 @@ style "wider" { ythickness = 3 } -style "entry" { +style "clearlooks-entry" { xthickness = 3 ythickness = 3 @@ -128,7 +129,7 @@ style "entry" { } } -style "paned" { +style "clearlooks-paned" { bg[PRELIGHT] = shade (0.9, @bg_color) @@ -137,7 +138,7 @@ style "paned" { } } -style "HSV" { +style "clearlooks-HSV" { engine "clearlooks" { hint = "HSV" @@ -145,14 +146,14 @@ style "HSV" { } } -style "spinbutton" { +style "clearlooks-spinbutton" { engine "clearlooks" { hint = "spinbutton" } } -style "scale" { +style "clearlooks-scale" { xthickness = 2 ythickness = 2 @@ -167,21 +168,21 @@ style "scale" { } } -style "vscale" { +style "clearlooks-vscale" { engine "clearlooks" { hint = "vscale" } } -style "hscale" { +style "clearlooks-hscale" { engine "clearlooks" { hint = "hscale" } } -style "scrollbar" { +style "clearlooks-scrollbar" { xthickness = 2 ythickness = 2 @@ -192,27 +193,36 @@ style "scrollbar" { } } -style "hscrollbar" { +style "clearlooks-hscrollbar" { engine "clearlooks" { hint = "hscrollbar" } } -style "vscrollbar" { +style "clearlooks-vscrollbar" { engine "clearlooks" { hint = "vscrollbar" } } -style "notebook_bg" { +style "clearlooks-notebook_bg" { bg[NORMAL] = shade (1.02, @bg_color) bg[ACTIVE] = shade (0.80, @bg_color) } -style "button" { +style "clearlooks-combobox" { + + text[NORMAL] = @fg_color + text[PRELIGHT] = @fg_color + text[SELECTED] = @selected_fg_color + text[INSENSITIVE] = mix (0.2, @fg_color, @bg_color) + text[ACTIVE] = @fg_color +} + +style "clearlooks-button" { bg[NORMAL] = shade (1.25, @bg_color) bg[PRELIGHT] = shade (1.50, @bg_color) @@ -226,21 +236,21 @@ style "button" { # The color is changed by the notebook_bg style, this style # changes the x/ythickness -style "notebook" { +style "clearlooks-notebook" { xthickness = 3 ythickness = 3 bg[SELECTED] = @salt_pinch } -style "statusbar" { +style "clearlooks-statusbar" { engine "clearlooks" { hint = "statusbar" } } -style "comboboxentry" { +style "clearlooks-comboboxentry" { engine "clearlooks" { # Note: @@ -250,7 +260,7 @@ style "comboboxentry" { } } -style "expander" { +style "clearlooks-expander" { fg[NORMAL] = @salt_pinch fg[PRELIGHT] = @salt_pinch @@ -267,20 +277,20 @@ style "expander" { } } -style "expanderLabel" { +style "clearlooks-expanderLabel" { fg[NORMAL] = "#a0a0a0" fg[PRELIGHT] = "#d0d0d0" } -style "menubar" { +style "clearlooks-menubar" { engine "clearlooks" { hint = "menubar" } } -style "menu" { +style "clearlooks-menu" { xthickness = 0 ythickness = 0 @@ -291,17 +301,19 @@ style "menu" { } } -style "menu_item" { +style "clearlooks-menu_item" { xthickness = 2 ythickness = 3 fg[PRELIGHT] = @selected_fg_color + text[NORMAL] = @fg_color + text[PRELIGHT] = @selected_fg_color } # This style is there to modify the separator menu items. The goals are: # 1. Get a specific height. # 2. The line should go to the edges (ie. no border at the left/right) -style "separator_menu_item" { +style "clearlooks-separator_menu_item" { xthickness = 1 ythickness = 0 @@ -311,12 +323,12 @@ style "separator_menu_item" { GtkWidget::separator-height = 7 } -style "frame_title" { +style "clearlooks-frame_title" { fg[NORMAL] = lighter (@fg_color) } -style "treeview" { +style "clearlooks-treeview" { base[ACTIVE] = mix(0.50, @selected_bg_color, @base_color) @@ -326,7 +338,7 @@ style "treeview" { } # The almost useless progress bar style -style "progressbar" { +style "clearlooks-progressbar" { xthickness = 1 ythickness = 1 @@ -342,18 +354,19 @@ style "progressbar" { # This style is based on the clearlooks-default style, so that the colors from the button # style are overriden again. -style "treeview_header" = "clearlooks-default" { +style "clearlooks-treeview_header" = "clearlooks-default" { xthickness = 2 ythickness = 1 bg[NORMAL] = shade (0.80, @bg_color) engine "clearlooks" { + radius = 0.0 hint = "treeview-header" } } -style "tooltips" { +style "clearlooks-tooltips" { xthickness = 4 ythickness = 4 @@ -361,53 +374,6 @@ style "tooltips" { fg[NORMAL] = @tooltip_fg_color } -style "nautilus_location" { - - bg[NORMAL] = mix (0.60, shade (1.05, @bg_color), @selected_bg_color) -} - -# Wrokaroudn style for places where the text color is used instead of the fg color. -style "text_is_fg_color_workaround" { - - text[NORMAL] = @fg_color - text[PRELIGHT] = @fg_color - text[SELECTED] = @selected_fg_color - text[ACTIVE] = @fg_color - text[INSENSITIVE] = darker (@bg_color) -} - -# Workaround style for menus where the text color is used instead of the fg color. -style "menuitem_text_is_fg_color_workaround" { - - text[NORMAL] = @fg_color - text[PRELIGHT] = @selected_fg_color - text[SELECTED] = @selected_fg_color - text[ACTIVE] = @fg_color - text[INSENSITIVE] = darker (@bg_color) -} - -# Workaround style for places where the fg color is used instead of the text color. -style "fg_is_text_color_workaround" { - - fg[NORMAL] = @text_color - fg[PRELIGHT] = @text_color - fg[SELECTED] = @selected_fg_color - fg[ACTIVE] = @selected_fg_color - fg[INSENSITIVE] = darker (@bg_color) -} - -# Style to set the toolbar to use a flat style. This is because the "New" button in -# Evolution is not drawn transparent. So if there is a gradient in the background it will -# look really wrong. -# See http://bugzilla.gnome.org/show_bug.cgi?id=446953. -style "evo_new_button_workaround" { - - engine "clearlooks" { - toolbarstyle = 0 - } -} - - ############################################################################### # The following part of the gtkrc applies the different styles to the widgets. ############################################################################### @@ -420,56 +386,56 @@ class "GtkFrame" style "wide" class "GtkCalendar" style "wide" class "GtkCheckButton" style "wider" class "GtkRadioButton" style "wider" -class "GtkEntry" style "entry" +class "GtkEntry" style "clearlooks-entry" -class "GtkPaned" style "paned" -class "GtkSpinButton" style "spinbutton" -class "GtkScale" style "scale" -class "GtkVScale" style "vscale" -class "GtkHScale" style "hscale" -class "GtkScrollbar" style "scrollbar" -class "GtkHScrollbar" style "hscrollbar" -class "GtkVScrollbar" style "vscrollbar" +class "GtkPaned" style "clearlooks-paned" +class "GtkSpinButton" style "clearlooks-spinbutton" +class "GtkScale" style "clearlooks-scale" +class "GtkVScale" style "clearlooks-vscale" +class "GtkHScale" style "clearlooks-hscale" +class "GtkScrollbar" style "clearlooks-scrollbar" +class "GtkHScrollbar" style "clearlooks-hscrollbar" +class "GtkVScrollbar" style "clearlooks-vscrollbar" -class "GtkExpander" style "expander" -class "GtkHSV" style "HSV" +class "GtkExpander" style "clearlooks-expander" +class "GtkHSV" style "clearlooks-HSV" # General matching follows. The order is choosen so that the right styles override # each other. EG. progressbar needs to be more important than the menu match. -widget_class "*" style "notebook_bg" +widget_class "*" style "clearlooks-notebook_bg" # This is not perfect, it could be done better. # (That is modify *every* widget in the notebook, and change those back that # we really don't want changed) -widget_class "**" style "notebook_bg" -widget_class "**" style "notebook_bg" -widget_class "**" style "notebook_bg" -widget_class "**" style "notebook_bg" -widget_class "**" style "notebook_bg" +widget_class "**" style "clearlooks-notebook_bg" +widget_class "**" style "clearlooks-notebook_bg" +widget_class "**" style "clearlooks-notebook_bg" +widget_class "**" style "clearlooks-notebook_bg" +widget_class "**" style "clearlooks-notebook_bg" -widget_class "*" style "button" -widget_class "*" style "notebook" -widget_class "**" style "statusbar" +widget_class "*" style "clearlooks-button" +widget_class "*" style "clearlooks-notebook" +widget_class "**" style "clearlooks-statusbar" -widget_class "**" style "comboboxentry" -widget_class "**" style "comboboxentry" +#widget_class "**" style "clearlooks-comboboxentry" +widget_class "**" style "clearlooks-combobox" -widget_class "*." style "expanderLabel" +widget_class "*." style "clearlooks-expanderLabel" -widget_class "**" style "menubar" -widget_class "**" style "menu" -widget_class "**" style "menu_item" -widget_class "**" style "separator_menu_item" +widget_class "**" style "clearlooks-menubar" +widget_class "**" style "clearlooks-menu" +widget_class "**" style "clearlooks-menu_item" +widget_class "**" style "clearlooks-separator_menu_item" -widget_class "*.." style "frame_title" -widget_class "*.*" style "treeview" +widget_class "*.." style "clearlooks-frame_title" +widget_class "*.*" style "clearlooks-treeview" -widget_class "*" style "progressbar" +widget_class "*" style "clearlooks-progressbar" # Treeview headers (and similar stock GTK+ widgets) -widget_class "*.." style "treeview_header" -widget_class "*.." style "treeview_header" -widget_class "*.." style "treeview_header" -widget_class "*.." style "treeview_header" +widget_class "*.." style "clearlooks-treeview_header" +widget_class "*.." style "clearlooks-treeview_header" +widget_class "*.." style "clearlooks-treeview_header" +widget_class "*.." style "clearlooks-treeview_header" # The window of the tooltip is called "gtk-tooltip" ################################################################## @@ -479,34 +445,5 @@ widget_class "*.." style "treeview_header" # quite a bit to get this working correctly. # (It will involve setting different priorities, etc.) ################################################################## -widget "gtk-tooltip*" style "tooltips" +widget "gtk-tooltip*" style "clearlooks-tooltips" -########################################################################## -# Following are special cases and workarounds for issues in applications. -########################################################################## - -# Workaround for the evolution ETable (bug #527532) -widget_class "*.." style "treeview_header" -# Workaround for the evolution ETree -widget_class "*.." style "treeview_header" - -# Special case the nautilus-extra-view-widget -# ToDo: A more generic approach for all applications that have a widget like this. -widget "*.nautilus-extra-view-widget" style : highest "nautilus_location" - -# Work around for http://bugzilla.gnome.org/show_bug.cgi?id=382646 -# Note that this work around assumes that the combobox is _not_ in appears-as-list mode. -widget_class "*.." style "text_is_fg_color_workaround" -# This is the part of the workaround that fixes the menus -widget "*.gtk-combobox-popup-menu.*" style "menuitem_text_is_fg_color_workaround" - -# Work around the usage of GtkLabel inside GtkListItems to display text. -# This breaks because the label is shown on a background that is based on the base color. -widget_class "**" style "fg_is_text_color_workaround" -# GtkCList also uses the fg color to draw text on top of the base colors. -widget_class "*" style "fg_is_text_color_workaround" -# Nautilus when renaming files, and maybe other places. -widget_class "*" style "fg_is_text_color_workaround" - -# See the documentation of the style. -widget_class "EShellWindow.GtkVBox.BonoboDock.BonoboDockBand.BonoboDockItem*" style "evo_new_button_workaround" diff --git a/rtdata/themes/01-Cookie-Dough.gtkrc b/rtdata/themes/21-Gray-Gray.gtkrc similarity index 57% rename from rtdata/themes/01-Cookie-Dough.gtkrc rename to rtdata/themes/21-Gray-Gray.gtkrc index df9db4bf0..b5f4d00c5 100644 --- a/rtdata/themes/01-Cookie-Dough.gtkrc +++ b/rtdata/themes/21-Gray-Gray.gtkrc @@ -1,7 +1,25 @@ +# +# This file is part of RawTherapee. +# +# Copyright (c) 2004-2011 Gabor Horvath +# +# RawTherapee is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# RawTherapee is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with RawTherapee. If not, see . +# # Please keep this gtkrc in sync with the other ones from Clearlooks based themes. -gtk-color-scheme = "salt_pinch:#B0B0B0\nselected_bg_color:#4A4A4A\nbase_color:#1A1A1A\nfg_color:#B0B0B0\nselected_fg_color:#B0B0B0\ntext_color:#909090\nbg_color:#363636\ntooltip_fg_color:#1A1A1A\ntooltip_bg_color:#909090" +gtk-color-scheme = "salt_pinch:#B0B0B0\nbase_color:#1A1A1A\nfg_color:#B0B0B0\ntooltip_fg_color:#1A1A1A\nselected_bg_color:#4A4A4A\nselected_fg_color:#B0B0B0\ntext_color:#909090\nbg_color:#363636\ntooltip_bg_color:#909090" style "clearlooks-default" { xthickness = 1 @@ -26,7 +44,7 @@ style "clearlooks-default" { #GtkScale::slider-width = 12 GtkScale::slider-length = 30 - GtkScale::trough-side-details = 10 + GtkScale::trough-side-details = 0 GtkScrollbar::min-slider-length = 30 GtkMenuBar::internal-padding = 0 @@ -81,6 +99,7 @@ style "clearlooks-default" { toolbarstyle = 1 animation = FALSE radius = 3.0 + # style between CLASSIC, GLOSSY, INVERTED and GUMMY style = GUMMY # Set a hint to disable backward compatibility fallbacks. @@ -98,7 +117,7 @@ style "wider" { ythickness = 3 } -style "entry" { +style "clearlooks-entry" { xthickness = 3 ythickness = 3 @@ -110,7 +129,7 @@ style "entry" { } } -style "paned" { +style "clearlooks-paned" { bg[PRELIGHT] = shade (0.8, @bg_color) @@ -119,14 +138,22 @@ style "paned" { } } -style "spinbutton" { +style "clearlooks-HSV" { + + engine "clearlooks" { + hint = "HSV" + disable_focus = TRUE + } +} + +style "clearlooks-spinbutton" { engine "clearlooks" { hint = "spinbutton" } } -style "scale" { +style "clearlooks-scale" { xthickness = 2 ythickness = 2 @@ -141,21 +168,21 @@ style "scale" { } } -style "vscale" { +style "clearlooks-vscale" { engine "clearlooks" { hint = "vscale" } } -style "hscale" { +style "clearlooks-hscale" { engine "clearlooks" { hint = "hscale" } } -style "scrollbar" { +style "clearlooks-scrollbar" { xthickness = 2 ythickness = 2 @@ -166,27 +193,36 @@ style "scrollbar" { } } -style "hscrollbar" { +style "clearlooks-hscrollbar" { engine "clearlooks" { hint = "hscrollbar" } } -style "vscrollbar" { +style "clearlooks-vscrollbar" { engine "clearlooks" { hint = "vscrollbar" } } -style "notebook_bg" { +style "clearlooks-notebook_bg" { bg[NORMAL] = shade (1.02, @bg_color) bg[ACTIVE] = @base_color } -style "button" { +style "clearlooks-combobox" { + + text[NORMAL] = @fg_color + text[PRELIGHT] = @fg_color + text[SELECTED] = @selected_fg_color + text[INSENSITIVE] = mix (0.2, @fg_color, @bg_color) + text[ACTIVE] = @fg_color +} + +style "clearlooks-button" { bg[NORMAL] = shade (1.35, @bg_color) bg[PRELIGHT] = shade (1.55, @bg_color) @@ -200,21 +236,21 @@ style "button" { # The color is changed by the notebook_bg style, this style # changes the x/ythickness -style "notebook" { +style "clearlooks-notebook" { xthickness = 3 ythickness = 3 bg[SELECTED] = @salt_pinch } -style "statusbar" { +style "clearlooks-statusbar" { engine "clearlooks" { hint = "statusbar" } } -style "comboboxentry" { +style "clearlooks-comboboxentry" { engine "clearlooks" { # Note: @@ -224,13 +260,13 @@ style "comboboxentry" { } } -style "expander" { +style "clearlooks-expander" { fg[NORMAL] = @salt_pinch fg[PRELIGHT] = @salt_pinch fg[INSENSITIVE] = @salt_pinch - bg[PRELIGHT] = mix(0.5, @selected_bg_color, @bg_color) + bg[PRELIGHT] = mix(0.8, @selected_bg_color, @bg_color) base[NORMAL] = @salt_pinch base[PRELIGHT] = @salt_pinch @@ -241,20 +277,20 @@ style "expander" { } } -style "expanderLabel" { +style "clearlooks-expanderLabel" { fg[NORMAL] = shade (1.50, @text_color) - fg[PRELIGHT] = @selected_fg_color + fg[PRELIGHT] = shade (1.50, @text_color) } -style "menubar" { +style "clearlooks-menubar" { engine "clearlooks" { hint = "menubar" } } -style "menu" { +style "clearlooks-menu" { xthickness = 0 ythickness = 0 @@ -265,17 +301,19 @@ style "menu" { } } -style "menu_item" { +style "clearlooks-menu_item" { xthickness = 2 ythickness = 3 fg[PRELIGHT] = @selected_fg_color + text[NORMAL] = @fg_color + text[PRELIGHT] = @selected_fg_color } # This style is there to modify the separator menu items. The goals are: # 1. Get a specific height. # 2. The line should go to the edges (ie. no border at the left/right) -style "separator_menu_item" { +style "clearlooks-separator_menu_item" { xthickness = 1 ythickness = 0 @@ -285,12 +323,12 @@ style "separator_menu_item" { GtkWidget::separator-height = 7 } -style "frame_title" { +style "clearlooks-frame_title" { fg[NORMAL] = shade (1.50, @text_color) } -style "treeview" { +style "clearlooks-treeview" { base[ACTIVE] = mix(0.50, @selected_bg_color, @base_color) @@ -300,7 +338,7 @@ style "treeview" { } # The almost useless progress bar style -style "progressbar" { +style "clearlooks-progressbar" { xthickness = 1 ythickness = 1 @@ -316,16 +354,19 @@ style "progressbar" { # This style is based on the clearlooks-default style, so that the colors from the button # style are overriden again. -style "treeview_header" = "clearlooks-default" { +style "clearlooks-treeview_header" = "clearlooks-default" { xthickness = 2 ythickness = 1 + bg[NORMAL] = shade (0.80, @bg_color) + engine "clearlooks" { + radius = 0.0 hint = "treeview-header" } } -style "tooltips" { +style "clearlooks-tooltips" { xthickness = 4 ythickness = 4 @@ -333,53 +374,6 @@ style "tooltips" { fg[NORMAL] = @tooltip_fg_color } -style "nautilus_location" { - - bg[NORMAL] = mix (0.60, shade (1.05, @bg_color), @selected_bg_color) -} - -# Wrokaroudn style for places where the text color is used instead of the fg color. -style "text_is_fg_color_workaround" { - - text[NORMAL] = @fg_color - text[PRELIGHT] = @fg_color - text[SELECTED] = @selected_fg_color - text[ACTIVE] = @fg_color - text[INSENSITIVE] = darker (@bg_color) -} - -# Workaround style for menus where the text color is used instead of the fg color. -style "menuitem_text_is_fg_color_workaround" { - - text[NORMAL] = @fg_color - text[PRELIGHT] = @selected_fg_color - text[SELECTED] = @selected_fg_color - text[ACTIVE] = @fg_color - text[INSENSITIVE] = darker (@bg_color) -} - -# Workaround style for places where the fg color is used instead of the text color. -style "fg_is_text_color_workaround" { - - fg[NORMAL] = @text_color - fg[PRELIGHT] = @text_color - fg[SELECTED] = @selected_fg_color - fg[ACTIVE] = @selected_fg_color - fg[INSENSITIVE] = darker (@bg_color) -} - -# Style to set the toolbar to use a flat style. This is because the "New" button in -# Evolution is not drawn transparent. So if there is a gradient in the background it will -# look really wrong. -# See http://bugzilla.gnome.org/show_bug.cgi?id=446953. -style "evo_new_button_workaround" { - - engine "clearlooks" { - toolbarstyle = 0 - } -} - - ############################################################################### # The following part of the gtkrc applies the different styles to the widgets. ############################################################################### @@ -392,55 +386,56 @@ class "GtkFrame" style "wide" class "GtkCalendar" style "wide" class "GtkCheckButton" style "wider" class "GtkRadioButton" style "wider" -class "GtkEntry" style "entry" +class "GtkEntry" style "clearlooks-entry" -class "GtkPaned" style "paned" -class "GtkSpinButton" style "spinbutton" -class "GtkScale" style "scale" -class "GtkVScale" style "vscale" -class "GtkHScale" style "hscale" -class "GtkScrollbar" style "scrollbar" -class "GtkHScrollbar" style "hscrollbar" -class "GtkVScrollbar" style "vscrollbar" +class "GtkPaned" style "clearlooks-paned" +class "GtkSpinButton" style "clearlooks-spinbutton" +class "GtkScale" style "clearlooks-scale" +class "GtkVScale" style "clearlooks-vscale" +class "GtkHScale" style "clearlooks-hscale" +class "GtkScrollbar" style "clearlooks-scrollbar" +class "GtkHScrollbar" style "clearlooks-hscrollbar" +class "GtkVScrollbar" style "clearlooks-vscrollbar" -class "GtkExpander" style "expander" +class "GtkExpander" style "clearlooks-expander" +class "GtkHSV" style "clearlooks-HSV" # General matching follows. The order is choosen so that the right styles override # each other. EG. progressbar needs to be more important than the menu match. -widget_class "*" style "notebook_bg" +widget_class "*" style "clearlooks-notebook_bg" # This is not perfect, it could be done better. # (That is modify *every* widget in the notebook, and change those back that # we really don't want changed) -widget_class "**" style "notebook_bg" -widget_class "**" style "notebook_bg" -widget_class "**" style "notebook_bg" -widget_class "**" style "notebook_bg" -widget_class "**" style "notebook_bg" +widget_class "**" style "clearlooks-notebook_bg" +widget_class "**" style "clearlooks-notebook_bg" +widget_class "**" style "clearlooks-notebook_bg" +widget_class "**" style "clearlooks-notebook_bg" +widget_class "**" style "clearlooks-notebook_bg" -widget_class "*" style "button" -widget_class "*" style "notebook" -widget_class "**" style "statusbar" +widget_class "*" style "clearlooks-button" +widget_class "*" style "clearlooks-notebook" +widget_class "**" style "clearlooks-statusbar" -widget_class "**" style "comboboxentry" -widget_class "**" style "comboboxentry" +#widget_class "**" style "clearlooks-comboboxentry" +widget_class "**" style "clearlooks-combobox" -widget_class "*." style "expanderLabel" +widget_class "*." style "clearlooks-expanderLabel" -widget_class "**" style "menubar" -widget_class "**" style "menu" -widget_class "**" style "menu_item" -widget_class "**" style "separator_menu_item" +widget_class "**" style "clearlooks-menubar" +widget_class "**" style "clearlooks-menu" +widget_class "**" style "clearlooks-menu_item" +widget_class "**" style "clearlooks-separator_menu_item" -widget_class "*.." style "frame_title" -widget_class "*.*" style "treeview" +widget_class "*.." style "clearlooks-frame_title" +widget_class "*.*" style "clearlooks-treeview" -widget_class "*" style "progressbar" +widget_class "*" style "clearlooks-progressbar" # Treeview headers (and similar stock GTK+ widgets) -widget_class "*.." style "treeview_header" -widget_class "*.." style "treeview_header" -widget_class "*.." style "treeview_header" -widget_class "*.." style "treeview_header" +widget_class "*.." style "clearlooks-treeview_header" +widget_class "*.." style "clearlooks-treeview_header" +widget_class "*.." style "clearlooks-treeview_header" +widget_class "*.." style "clearlooks-treeview_header" # The window of the tooltip is called "gtk-tooltip" ################################################################## @@ -450,34 +445,5 @@ widget_class "*.." style "treeview_header" # quite a bit to get this working correctly. # (It will involve setting different priorities, etc.) ################################################################## -widget "gtk-tooltip*" style "tooltips" +widget "gtk-tooltip*" style "clearlooks-tooltips" -########################################################################## -# Following are special cases and workarounds for issues in applications. -########################################################################## - -# Workaround for the evolution ETable (bug #527532) -widget_class "*.." style "treeview_header" -# Workaround for the evolution ETree -widget_class "*.." style "treeview_header" - -# Special case the nautilus-extra-view-widget -# ToDo: A more generic approach for all applications that have a widget like this. -widget "*.nautilus-extra-view-widget" style : highest "nautilus_location" - -# Work around for http://bugzilla.gnome.org/show_bug.cgi?id=382646 -# Note that this work around assumes that the combobox is _not_ in appears-as-list mode. -widget_class "*.." style "text_is_fg_color_workaround" -# This is the part of the workaround that fixes the menus -widget "*.gtk-combobox-popup-menu.*" style "menuitem_text_is_fg_color_workaround" - -# Work around the usage of GtkLabel inside GtkListItems to display text. -# This breaks because the label is shown on a background that is based on the base color. -widget_class "**" style "fg_is_text_color_workaround" -# GtkCList also uses the fg color to draw text on top of the base colors. -widget_class "*" style "fg_is_text_color_workaround" -# Nautilus when renaming files, and maybe other places. -widget_class "*" style "fg_is_text_color_workaround" - -# See the documentation of the style. -widget_class "EShellWindow.GtkVBox.BonoboDock.BonoboDockBand.BonoboDockItem*" style "evo_new_button_workaround" diff --git a/rtdata/themes/25-Gray-Gray.gtkrc b/rtdata/themes/25-Gray-Gray.gtkrc new file mode 100644 index 000000000..5aa5efb04 --- /dev/null +++ b/rtdata/themes/25-Gray-Gray.gtkrc @@ -0,0 +1,449 @@ +# +# This file is part of RawTherapee. +# +# Copyright (c) 2004-2011 Gabor Horvath +# +# RawTherapee is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# RawTherapee is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with RawTherapee. If not, see . +# + +# Please keep this gtkrc in sync with the other ones from Clearlooks based themes. + +gtk-color-scheme = "salt_pinch:#606060\nbase_color:#484848\nfg_color:#8c8c8c\ntooltip_fg_color:#D2D2D2\nselected_bg_color:#606060\nselected_fg_color:#C0C0C0\ntext_color:#8c8c8c\nbg_color:#404040\ntooltip_bg_color:#5A5A5A" + +style "clearlooks-default" { + xthickness = 1 + ythickness = 1 + + ####################### + # Style Properties + ####################### + GtkButton::child-displacement-x = 1 + GtkButton::child-displacement-y = 1 + GtkButton::default-border = { 0, 0, 0, 0 } + GtkButton::image-spacing = 4 + GtkToolButton::icon-spacing = 4 + + GtkCheckButton::indicator-size = 14 + + GtkPaned::handle-size = 6 + + GtkRange::trough-border = 0 + GtkRange::slider-width = 15 + GtkRange::stepper-size = 15 + + GtkScale::slider-width = 14 + GtkScale::slider-length = 30 + GtkScale::trough-side-details = 0 + + GtkScrollbar::min-slider-length = 30 + GtkMenuBar::internal-padding = 0 + GtkExpander::expander-size = 18 + GtkExpander::expander-spacing = 0 + GtkToolbar::internal-padding = 1 + GtkTreeView::expander-size = 12 + GtkTreeView::vertical-separator = 0 + + GtkMenu::horizontal-padding = 0 + GtkMenu::vertical-padding = 0 + + WnckTasklist::fade-overlay-rect = 0 + # The following line hints to gecko (and possibly other appliations) + # that the entry should be drawn transparently on the canvas. + # Without this, gecko will fill in the background of the entry. + GtkEntry::honors-transparent-bg-hint = 1 + + GtkEntry::progress-border = { 2, 2, 2, 2 } + + #################### + # Color Definitions + #################### + bg[NORMAL] = @bg_color + bg[PRELIGHT] = shade (1.02, @bg_color) + bg[SELECTED] = @selected_bg_color + bg[INSENSITIVE] = @bg_color + bg[ACTIVE] = shade (0.9, @bg_color) + + fg[NORMAL] = @fg_color + fg[PRELIGHT] = @selected_fg_color + fg[SELECTED] = @selected_fg_color + fg[INSENSITIVE] = mix (0.2, @fg_color, @bg_color) + fg[ACTIVE] = @fg_color + + text[NORMAL] = @text_color + text[PRELIGHT] = @selected_fg_color + text[SELECTED] = @selected_fg_color + text[INSENSITIVE] = darker (@bg_color) + text[ACTIVE] = @selected_fg_color + + base[NORMAL] = @base_color + base[PRELIGHT] = shade (0.95, @bg_color) + base[SELECTED] = @selected_bg_color + base[INSENSITIVE] = @bg_color + base[ACTIVE] = shade (0.9, @selected_bg_color) + + engine "clearlooks" { + colorize_scrollbar = TRUE + reliefstyle = 1 + menubarstyle = 2 + toolbarstyle = 1 + animation = FALSE + radius = 3.0 + # style between CLASSIC, GLOSSY, INVERTED and GUMMY + style = GUMMY + + # Set a hint to disable backward compatibility fallbacks. + hint = "use-hints" + } +} + +style "wide" { + xthickness = 2 + ythickness = 2 +} + +style "wider" { + xthickness = 3 + ythickness = 3 +} + +style "clearlooks-entry" { + xthickness = 3 + ythickness = 3 + + bg[SELECTED] = mix (1.4, @selected_bg_color, @base_color) + fg[SELECTED] = @selected_fg_color + + engine "clearlooks" { + focus_color = shade (0.65, @selected_bg_color) + } +} + +style "clearlooks-paned" { + + bg[PRELIGHT] = shade (0.9, @bg_color) + + engine "clearlooks" { + hint = "paned" + } +} + +style "clearlooks-HSV" { + + engine "clearlooks" { + hint = "HSV" + disable_focus = TRUE + } +} + +style "clearlooks-spinbutton" { + + engine "clearlooks" { + hint = "spinbutton" + } +} + +style "clearlooks-scale" { + xthickness = 2 + ythickness = 2 + + bg[NORMAL] = shade (1.35, @bg_color) + bg[PRELIGHT] = shade (1.70, @bg_color) + # when GtkScale::trough-side-details = 1, bg[SELECTED] set the color of the slider background on the left of the knob + #bg[SELECTED] = @bg_color + + engine "clearlooks" { + focus_color = @selected_bg_color + hint = "scale" + } +} + +style "clearlooks-vscale" { + + engine "clearlooks" { + hint = "vscale" + } +} + +style "clearlooks-hscale" { + + engine "clearlooks" { + hint = "hscale" + } +} + +style "clearlooks-scrollbar" { + xthickness = 2 + ythickness = 2 + + bg[SELECTED] = shade (1.25, @bg_color) + + engine "clearlooks" { + hint = "scrollbar" + } +} + +style "clearlooks-hscrollbar" { + + engine "clearlooks" { + hint = "hscrollbar" + } +} + +style "clearlooks-vscrollbar" { + + engine "clearlooks" { + hint = "vscrollbar" + } +} + +style "clearlooks-notebook_bg" { + + bg[NORMAL] = shade (1.02, @bg_color) + bg[ACTIVE] = shade (0.80, @bg_color) +} + +style "clearlooks-combobox" { + + text[NORMAL] = @fg_color + text[PRELIGHT] = @selected_fg_color + text[SELECTED] = @selected_fg_color + text[INSENSITIVE] = mix (0.2, @fg_color, @bg_color) + text[ACTIVE] = @fg_color +} + +style "clearlooks-button" { + + bg[NORMAL] = shade (1.25, @bg_color) + bg[PRELIGHT] = shade (1.50, @bg_color) + bg[ACTIVE] = shade (1.70, @bg_color) + + engine "clearlooks" + { + hint = "button" + } +} + +# The color is changed by the notebook_bg style, this style +# changes the x/ythickness +style "clearlooks-notebook" { + xthickness = 3 + ythickness = 3 + + bg[SELECTED] = @salt_pinch +} + +style "clearlooks-statusbar" { + + engine "clearlooks" { + hint = "statusbar" + } +} + +style "clearlooks-comboboxentry" { + + engine "clearlooks" { + # Note: + # If you set the appears-as-list option on comboboxes in the theme, + # then you should set this hint on the combobox instead. + hint = "comboboxentry" + } +} + +style "clearlooks-expander" { + + fg[NORMAL] = @salt_pinch + fg[PRELIGHT] = @salt_pinch + fg[INSENSITIVE] = @salt_pinch + + bg[PRELIGHT] = mix(0.75, @selected_bg_color, @bg_color) + + base[NORMAL] = @salt_pinch + base[PRELIGHT] = @salt_pinch + base[INSENSITIVE] = @salt_pinch + + engine "clearlooks" { + hint = "expander" + } +} + +style "clearlooks-expanderLabel" { + + fg[NORMAL] = "#a0a0a0" + fg[PRELIGHT] = "#d0d0d0" +} + +style "clearlooks-menubar" { + + engine "clearlooks" { + hint = "menubar" + } +} + +style "clearlooks-menu" { + xthickness = 0 + ythickness = 0 + + bg[NORMAL] = shade (0.70, @bg_color) + + engine "clearlooks" { + radius = 0.0 + } +} + +style "clearlooks-menu_item" { + xthickness = 2 + ythickness = 3 + + fg[PRELIGHT] = @selected_fg_color + text[NORMAL] = @fg_color + text[PRELIGHT] = @selected_fg_color +} + +# This style is there to modify the separator menu items. The goals are: +# 1. Get a specific height. +# 2. The line should go to the edges (ie. no border at the left/right) +style "clearlooks-separator_menu_item" { + xthickness = 1 + ythickness = 0 + + GtkSeparatorMenuItem::horizontal-padding = 0 + GtkWidget::wide-separators = 1 + GtkWidget::separator-width = 1 + GtkWidget::separator-height = 7 +} + +style "clearlooks-frame_title" { + + fg[NORMAL] = lighter (@fg_color) +} + +style "clearlooks-treeview" { + + base[ACTIVE] = mix(0.50, @selected_bg_color, @base_color) + + engine "clearlooks" { + hint = "treeview" + } +} + +# The almost useless progress bar style +style "clearlooks-progressbar" { + xthickness = 1 + ythickness = 1 + + fg[PRELIGHT] = @selected_fg_color + + engine "clearlooks" { + # Explicitly set the radius for the progress bars inside menu items. + radius = 3.0 + + hint = "progressbar" + } +} + +# This style is based on the clearlooks-default style, so that the colors from the button +# style are overriden again. +style "clearlooks-treeview_header" = "clearlooks-default" { + xthickness = 2 + ythickness = 1 + + bg[NORMAL] = shade (0.80, @bg_color) + + engine "clearlooks" { + radius = 0.0 + hint = "treeview-header" + } +} + +style "clearlooks-tooltips" { + xthickness = 4 + ythickness = 4 + + bg[NORMAL] = @tooltip_bg_color + fg[NORMAL] = @tooltip_fg_color +} + +############################################################################### +# The following part of the gtkrc applies the different styles to the widgets. +############################################################################### + +# The clearlooks-default style is applied to every widget +class "GtkWidget" style "clearlooks-default" + +class "GtkSeparator" style "wide" +class "GtkFrame" style "wide" +class "GtkCalendar" style "wide" +class "GtkCheckButton" style "wider" +class "GtkRadioButton" style "wider" +class "GtkEntry" style "clearlooks-entry" + +class "GtkPaned" style "clearlooks-paned" +class "GtkSpinButton" style "clearlooks-spinbutton" +class "GtkScale" style "clearlooks-scale" +class "GtkVScale" style "clearlooks-vscale" +class "GtkHScale" style "clearlooks-hscale" +class "GtkScrollbar" style "clearlooks-scrollbar" +class "GtkHScrollbar" style "clearlooks-hscrollbar" +class "GtkVScrollbar" style "clearlooks-vscrollbar" + +class "GtkExpander" style "clearlooks-expander" +class "GtkHSV" style "clearlooks-HSV" + +# General matching follows. The order is choosen so that the right styles override +# each other. EG. progressbar needs to be more important than the menu match. +widget_class "*" style "clearlooks-notebook_bg" +# This is not perfect, it could be done better. +# (That is modify *every* widget in the notebook, and change those back that +# we really don't want changed) +widget_class "**" style "clearlooks-notebook_bg" +widget_class "**" style "clearlooks-notebook_bg" +widget_class "**" style "clearlooks-notebook_bg" +widget_class "**" style "clearlooks-notebook_bg" +widget_class "**" style "clearlooks-notebook_bg" + +widget_class "*" style "clearlooks-button" +widget_class "*" style "clearlooks-notebook" +widget_class "**" style "clearlooks-statusbar" + +#widget_class "**" style "clearlooks-comboboxentry" +widget_class "**" style "clearlooks-combobox" + +widget_class "*." style "clearlooks-expanderLabel" + +widget_class "**" style "clearlooks-menubar" +widget_class "**" style "clearlooks-menu" +widget_class "**" style "clearlooks-menu_item" +widget_class "**" style "clearlooks-separator_menu_item" + +widget_class "*.." style "clearlooks-frame_title" +widget_class "*.*" style "clearlooks-treeview" + +widget_class "*" style "clearlooks-progressbar" + +# Treeview headers (and similar stock GTK+ widgets) +widget_class "*.." style "clearlooks-treeview_header" +widget_class "*.." style "clearlooks-treeview_header" +widget_class "*.." style "clearlooks-treeview_header" +widget_class "*.." style "clearlooks-treeview_header" + +# The window of the tooltip is called "gtk-tooltip" +################################################################## +# FIXME: +# This will not work if one embeds eg. a button into the tooltip. +# As far as I can tell right now we will need to rework the theme +# quite a bit to get this working correctly. +# (It will involve setting different priorities, etc.) +################################################################## +widget "gtk-tooltip*" style "clearlooks-tooltips" + diff --git a/rtdata/themes/25-Gray-Purple.gtkrc b/rtdata/themes/25-Gray-Purple.gtkrc index 8f8d0dd67..68d31b5ab 100644 --- a/rtdata/themes/25-Gray-Purple.gtkrc +++ b/rtdata/themes/25-Gray-Purple.gtkrc @@ -99,6 +99,7 @@ style "clearlooks-default" { toolbarstyle = 1 animation = FALSE radius = 3.0 + # style between CLASSIC, GLOSSY, INVERTED and GUMMY style = GUMMY # Set a hint to disable backward compatibility fallbacks. @@ -116,7 +117,7 @@ style "wider" { ythickness = 3 } -style "entry" { +style "clearlooks-entry" { xthickness = 3 ythickness = 3 @@ -128,7 +129,7 @@ style "entry" { } } -style "paned" { +style "clearlooks-paned" { bg[PRELIGHT] = shade (0.9, @bg_color) @@ -137,7 +138,7 @@ style "paned" { } } -style "HSV" { +style "clearlooks-HSV" { engine "clearlooks" { hint = "HSV" @@ -145,14 +146,14 @@ style "HSV" { } } -style "spinbutton" { +style "clearlooks-spinbutton" { engine "clearlooks" { hint = "spinbutton" } } -style "scale" { +style "clearlooks-scale" { xthickness = 2 ythickness = 2 @@ -167,21 +168,21 @@ style "scale" { } } -style "vscale" { +style "clearlooks-vscale" { engine "clearlooks" { hint = "vscale" } } -style "hscale" { +style "clearlooks-hscale" { engine "clearlooks" { hint = "hscale" } } -style "scrollbar" { +style "clearlooks-scrollbar" { xthickness = 2 ythickness = 2 @@ -192,27 +193,36 @@ style "scrollbar" { } } -style "hscrollbar" { +style "clearlooks-hscrollbar" { engine "clearlooks" { hint = "hscrollbar" } } -style "vscrollbar" { +style "clearlooks-vscrollbar" { engine "clearlooks" { hint = "vscrollbar" } } -style "notebook_bg" { +style "clearlooks-notebook_bg" { bg[NORMAL] = shade (1.02, @bg_color) bg[ACTIVE] = shade (0.80, @bg_color) } -style "button" { +style "clearlooks-combobox" { + + text[NORMAL] = @fg_color + text[PRELIGHT] = @fg_color + text[SELECTED] = @selected_fg_color + text[INSENSITIVE] = mix (0.2, @fg_color, @bg_color) + text[ACTIVE] = @fg_color +} + +style "clearlooks-button" { bg[NORMAL] = shade (0.93, @bg_color) bg[PRELIGHT] = shade (0.85, @bg_color) @@ -226,21 +236,21 @@ style "button" { # The color is changed by the notebook_bg style, this style # changes the x/ythickness -style "notebook" { +style "clearlooks-notebook" { xthickness = 3 ythickness = 3 bg[SELECTED] = @salt_pinch } -style "statusbar" { +style "clearlooks-statusbar" { engine "clearlooks" { hint = "statusbar" } } -style "comboboxentry" { +style "clearlooks-comboboxentry" { engine "clearlooks" { # Note: @@ -250,7 +260,7 @@ style "comboboxentry" { } } -style "expander" { +style "clearlooks-expander" { fg[NORMAL] = @salt_pinch fg[PRELIGHT] = @salt_pinch @@ -267,20 +277,20 @@ style "expander" { } } -style "expanderLabel" { +style "clearlooks-expanderLabel" { fg[NORMAL] = "#a0a0a0" fg[PRELIGHT] = "#d0d0d0" } -style "menubar" { +style "clearlooks-menubar" { engine "clearlooks" { hint = "menubar" } } -style "menu" { +style "clearlooks-menu" { xthickness = 0 ythickness = 0 @@ -291,17 +301,19 @@ style "menu" { } } -style "menu_item" { +style "clearlooks-menu_item" { xthickness = 2 ythickness = 3 fg[PRELIGHT] = @selected_fg_color + text[NORMAL] = @fg_color + text[PRELIGHT] = @selected_fg_color } # This style is there to modify the separator menu items. The goals are: # 1. Get a specific height. # 2. The line should go to the edges (ie. no border at the left/right) -style "separator_menu_item" { +style "clearlooks-separator_menu_item" { xthickness = 1 ythickness = 0 @@ -311,12 +323,12 @@ style "separator_menu_item" { GtkWidget::separator-height = 7 } -style "frame_title" { +style "clearlooks-frame_title" { fg[NORMAL] = lighter (@fg_color) } -style "treeview" { +style "clearlooks-treeview" { base[ACTIVE] = mix(0.50, @selected_bg_color, @base_color) @@ -326,7 +338,7 @@ style "treeview" { } # The almost useless progress bar style -style "progressbar" { +style "clearlooks-progressbar" { xthickness = 1 ythickness = 1 @@ -342,18 +354,19 @@ style "progressbar" { # This style is based on the clearlooks-default style, so that the colors from the button # style are overriden again. -style "treeview_header" = "clearlooks-default" { +style "clearlooks-treeview_header" = "clearlooks-default" { xthickness = 2 ythickness = 1 bg[NORMAL] = shade (0.80, @bg_color) engine "clearlooks" { + radius = 0.0 hint = "treeview-header" } } -style "tooltips" { +style "clearlooks-tooltips" { xthickness = 4 ythickness = 4 @@ -361,53 +374,6 @@ style "tooltips" { fg[NORMAL] = @tooltip_fg_color } -style "nautilus_location" { - - bg[NORMAL] = mix (0.60, shade (1.05, @bg_color), @selected_bg_color) -} - -# Wrokaroudn style for places where the text color is used instead of the fg color. -style "text_is_fg_color_workaround" { - - text[NORMAL] = @fg_color - text[PRELIGHT] = @fg_color - text[SELECTED] = @selected_fg_color - text[ACTIVE] = @fg_color - text[INSENSITIVE] = darker (@bg_color) -} - -# Workaround style for menus where the text color is used instead of the fg color. -style "menuitem_text_is_fg_color_workaround" { - - text[NORMAL] = @fg_color - text[PRELIGHT] = @selected_fg_color - text[SELECTED] = @selected_fg_color - text[ACTIVE] = @fg_color - text[INSENSITIVE] = darker (@bg_color) -} - -# Workaround style for places where the fg color is used instead of the text color. -style "fg_is_text_color_workaround" { - - fg[NORMAL] = @text_color - fg[PRELIGHT] = @text_color - fg[SELECTED] = @selected_fg_color - fg[ACTIVE] = @selected_fg_color - fg[INSENSITIVE] = darker (@bg_color) -} - -# Style to set the toolbar to use a flat style. This is because the "New" button in -# Evolution is not drawn transparent. So if there is a gradient in the background it will -# look really wrong. -# See http://bugzilla.gnome.org/show_bug.cgi?id=446953. -style "evo_new_button_workaround" { - - engine "clearlooks" { - toolbarstyle = 0 - } -} - - ############################################################################### # The following part of the gtkrc applies the different styles to the widgets. ############################################################################### @@ -420,56 +386,56 @@ class "GtkFrame" style "wide" class "GtkCalendar" style "wide" class "GtkCheckButton" style "wider" class "GtkRadioButton" style "wider" -class "GtkEntry" style "entry" +class "GtkEntry" style "clearlooks-entry" -class "GtkPaned" style "paned" -class "GtkSpinButton" style "spinbutton" -class "GtkScale" style "scale" -class "GtkVScale" style "vscale" -class "GtkHScale" style "hscale" -class "GtkScrollbar" style "scrollbar" -class "GtkHScrollbar" style "hscrollbar" -class "GtkVScrollbar" style "vscrollbar" +class "GtkPaned" style "clearlooks-paned" +class "GtkSpinButton" style "clearlooks-spinbutton" +class "GtkScale" style "clearlooks-scale" +class "GtkVScale" style "clearlooks-vscale" +class "GtkHScale" style "clearlooks-hscale" +class "GtkScrollbar" style "clearlooks-scrollbar" +class "GtkHScrollbar" style "clearlooks-hscrollbar" +class "GtkVScrollbar" style "clearlooks-vscrollbar" -class "GtkExpander" style "expander" -class "GtkHSV" style "HSV" +class "GtkExpander" style "clearlooks-expander" +class "GtkHSV" style "clearlooks-HSV" # General matching follows. The order is choosen so that the right styles override # each other. EG. progressbar needs to be more important than the menu match. -widget_class "*" style "notebook_bg" +widget_class "*" style "clearlooks-notebook_bg" # This is not perfect, it could be done better. # (That is modify *every* widget in the notebook, and change those back that # we really don't want changed) -widget_class "**" style "notebook_bg" -widget_class "**" style "notebook_bg" -widget_class "**" style "notebook_bg" -widget_class "**" style "notebook_bg" -widget_class "**" style "notebook_bg" +widget_class "**" style "clearlooks-notebook_bg" +widget_class "**" style "clearlooks-notebook_bg" +widget_class "**" style "clearlooks-notebook_bg" +widget_class "**" style "clearlooks-notebook_bg" +widget_class "**" style "clearlooks-notebook_bg" -widget_class "*" style "button" -widget_class "*" style "notebook" -widget_class "**" style "statusbar" +widget_class "*" style "clearlooks-button" +widget_class "*" style "clearlooks-notebook" +widget_class "**" style "clearlooks-statusbar" -widget_class "**" style "comboboxentry" -widget_class "**" style "comboboxentry" +#widget_class "**" style "clearlooks-comboboxentry" +widget_class "**" style "clearlooks-combobox" -widget_class "*." style "expanderLabel" +widget_class "*." style "clearlooks-expanderLabel" -widget_class "**" style "menubar" -widget_class "**" style "menu" -widget_class "**" style "menu_item" -widget_class "**" style "separator_menu_item" +widget_class "**" style "clearlooks-menubar" +widget_class "**" style "clearlooks-menu" +widget_class "**" style "clearlooks-menu_item" +widget_class "**" style "clearlooks-separator_menu_item" -widget_class "*.." style "frame_title" -widget_class "*.*" style "treeview" +widget_class "*.." style "clearlooks-frame_title" +widget_class "*.*" style "clearlooks-treeview" -widget_class "*" style "progressbar" +widget_class "*" style "clearlooks-progressbar" # Treeview headers (and similar stock GTK+ widgets) -widget_class "*.." style "treeview_header" -widget_class "*.." style "treeview_header" -widget_class "*.." style "treeview_header" -widget_class "*.." style "treeview_header" +widget_class "*.." style "clearlooks-treeview_header" +widget_class "*.." style "clearlooks-treeview_header" +widget_class "*.." style "clearlooks-treeview_header" +widget_class "*.." style "clearlooks-treeview_header" # The window of the tooltip is called "gtk-tooltip" ################################################################## @@ -479,34 +445,5 @@ widget_class "*.." style "treeview_header" # quite a bit to get this working correctly. # (It will involve setting different priorities, etc.) ################################################################## -widget "gtk-tooltip*" style "tooltips" +widget "gtk-tooltip*" style "clearlooks-tooltips" -########################################################################## -# Following are special cases and workarounds for issues in applications. -########################################################################## - -# Workaround for the evolution ETable (bug #527532) -widget_class "*.." style "treeview_header" -# Workaround for the evolution ETree -widget_class "*.." style "treeview_header" - -# Special case the nautilus-extra-view-widget -# ToDo: A more generic approach for all applications that have a widget like this. -widget "*.nautilus-extra-view-widget" style : highest "nautilus_location" - -# Work around for http://bugzilla.gnome.org/show_bug.cgi?id=382646 -# Note that this work around assumes that the combobox is _not_ in appears-as-list mode. -widget_class "*.." style "text_is_fg_color_workaround" -# This is the part of the workaround that fixes the menus -widget "*.gtk-combobox-popup-menu.*" style "menuitem_text_is_fg_color_workaround" - -# Work around the usage of GtkLabel inside GtkListItems to display text. -# This breaks because the label is shown on a background that is based on the base color. -widget_class "**" style "fg_is_text_color_workaround" -# GtkCList also uses the fg color to draw text on top of the base colors. -widget_class "*" style "fg_is_text_color_workaround" -# Nautilus when renaming files, and maybe other places. -widget_class "*" style "fg_is_text_color_workaround" - -# See the documentation of the style. -widget_class "EShellWindow.GtkVBox.BonoboDock.BonoboDockBand.BonoboDockItem*" style "evo_new_button_workaround" diff --git a/rtdata/themes/25-Gray-Red.gtkrc b/rtdata/themes/25-Gray-Red.gtkrc index 92e74813c..17e73a66c 100644 --- a/rtdata/themes/25-Gray-Red.gtkrc +++ b/rtdata/themes/25-Gray-Red.gtkrc @@ -99,6 +99,7 @@ style "clearlooks-default" { toolbarstyle = 1 animation = FALSE radius = 3.0 + # style between CLASSIC, GLOSSY, INVERTED and GUMMY style = GUMMY # Set a hint to disable backward compatibility fallbacks. @@ -116,7 +117,7 @@ style "wider" { ythickness = 3 } -style "entry" { +style "clearlooks-entry" { xthickness = 3 ythickness = 3 @@ -128,7 +129,7 @@ style "entry" { } } -style "paned" { +style "clearlooks-paned" { bg[PRELIGHT] = shade (0.9, @bg_color) @@ -137,7 +138,7 @@ style "paned" { } } -style "HSV" { +style "clearlooks-HSV" { engine "clearlooks" { hint = "HSV" @@ -145,14 +146,14 @@ style "HSV" { } } -style "spinbutton" { +style "clearlooks-spinbutton" { engine "clearlooks" { hint = "spinbutton" } } -style "scale" { +style "clearlooks-scale" { xthickness = 2 ythickness = 2 @@ -167,21 +168,21 @@ style "scale" { } } -style "vscale" { +style "clearlooks-vscale" { engine "clearlooks" { hint = "vscale" } } -style "hscale" { +style "clearlooks-hscale" { engine "clearlooks" { hint = "hscale" } } -style "scrollbar" { +style "clearlooks-scrollbar" { xthickness = 2 ythickness = 2 @@ -192,27 +193,36 @@ style "scrollbar" { } } -style "hscrollbar" { +style "clearlooks-hscrollbar" { engine "clearlooks" { hint = "hscrollbar" } } -style "vscrollbar" { +style "clearlooks-vscrollbar" { engine "clearlooks" { hint = "vscrollbar" } } -style "notebook_bg" { +style "clearlooks-notebook_bg" { bg[NORMAL] = shade (1.02, @bg_color) bg[ACTIVE] = shade (0.80, @bg_color) } -style "button" { +style "clearlooks-combobox" { + + text[NORMAL] = @fg_color + text[PRELIGHT] = @fg_color + text[SELECTED] = @selected_fg_color + text[INSENSITIVE] = mix (0.2, @fg_color, @bg_color) + text[ACTIVE] = @fg_color +} + +style "clearlooks-button" { bg[NORMAL] = shade (0.93, @bg_color) bg[PRELIGHT] = shade (0.85, @bg_color) @@ -226,21 +236,21 @@ style "button" { # The color is changed by the notebook_bg style, this style # changes the x/ythickness -style "notebook" { +style "clearlooks-notebook" { xthickness = 3 ythickness = 3 bg[SELECTED] = @salt_pinch } -style "statusbar" { +style "clearlooks-statusbar" { engine "clearlooks" { hint = "statusbar" } } -style "comboboxentry" { +style "clearlooks-comboboxentry" { engine "clearlooks" { # Note: @@ -250,7 +260,7 @@ style "comboboxentry" { } } -style "expander" { +style "clearlooks-expander" { fg[NORMAL] = @salt_pinch fg[PRELIGHT] = @salt_pinch @@ -267,20 +277,20 @@ style "expander" { } } -style "expanderLabel" { +style "clearlooks-expanderLabel" { fg[NORMAL] = "#a0a0a0" fg[PRELIGHT] = "#d0d0d0" } -style "menubar" { +style "clearlooks-menubar" { engine "clearlooks" { hint = "menubar" } } -style "menu" { +style "clearlooks-menu" { xthickness = 0 ythickness = 0 @@ -291,17 +301,19 @@ style "menu" { } } -style "menu_item" { +style "clearlooks-menu_item" { xthickness = 2 ythickness = 3 fg[PRELIGHT] = @selected_fg_color + text[NORMAL] = @fg_color + text[PRELIGHT] = @selected_fg_color } # This style is there to modify the separator menu items. The goals are: # 1. Get a specific height. # 2. The line should go to the edges (ie. no border at the left/right) -style "separator_menu_item" { +style "clearlooks-separator_menu_item" { xthickness = 1 ythickness = 0 @@ -311,12 +323,12 @@ style "separator_menu_item" { GtkWidget::separator-height = 7 } -style "frame_title" { +style "clearlooks-frame_title" { fg[NORMAL] = lighter (@fg_color) } -style "treeview" { +style "clearlooks-treeview" { base[ACTIVE] = mix(0.50, @selected_bg_color, @base_color) @@ -326,7 +338,7 @@ style "treeview" { } # The almost useless progress bar style -style "progressbar" { +style "clearlooks-progressbar" { xthickness = 1 ythickness = 1 @@ -342,18 +354,19 @@ style "progressbar" { # This style is based on the clearlooks-default style, so that the colors from the button # style are overriden again. -style "treeview_header" = "clearlooks-default" { +style "clearlooks-treeview_header" = "clearlooks-default" { xthickness = 2 ythickness = 1 bg[NORMAL] = shade (0.80, @bg_color) engine "clearlooks" { + radius = 0.0 hint = "treeview-header" } } -style "tooltips" { +style "clearlooks-tooltips" { xthickness = 4 ythickness = 4 @@ -361,53 +374,6 @@ style "tooltips" { fg[NORMAL] = @tooltip_fg_color } -style "nautilus_location" { - - bg[NORMAL] = mix (0.60, shade (1.05, @bg_color), @selected_bg_color) -} - -# Wrokaroudn style for places where the text color is used instead of the fg color. -style "text_is_fg_color_workaround" { - - text[NORMAL] = @fg_color - text[PRELIGHT] = @fg_color - text[SELECTED] = @selected_fg_color - text[ACTIVE] = @fg_color - text[INSENSITIVE] = darker (@bg_color) -} - -# Workaround style for menus where the text color is used instead of the fg color. -style "menuitem_text_is_fg_color_workaround" { - - text[NORMAL] = @fg_color - text[PRELIGHT] = @selected_fg_color - text[SELECTED] = @selected_fg_color - text[ACTIVE] = @fg_color - text[INSENSITIVE] = darker (@bg_color) -} - -# Workaround style for places where the fg color is used instead of the text color. -style "fg_is_text_color_workaround" { - - fg[NORMAL] = @text_color - fg[PRELIGHT] = @text_color - fg[SELECTED] = @selected_fg_color - fg[ACTIVE] = @selected_fg_color - fg[INSENSITIVE] = darker (@bg_color) -} - -# Style to set the toolbar to use a flat style. This is because the "New" button in -# Evolution is not drawn transparent. So if there is a gradient in the background it will -# look really wrong. -# See http://bugzilla.gnome.org/show_bug.cgi?id=446953. -style "evo_new_button_workaround" { - - engine "clearlooks" { - toolbarstyle = 0 - } -} - - ############################################################################### # The following part of the gtkrc applies the different styles to the widgets. ############################################################################### @@ -420,56 +386,56 @@ class "GtkFrame" style "wide" class "GtkCalendar" style "wide" class "GtkCheckButton" style "wider" class "GtkRadioButton" style "wider" -class "GtkEntry" style "entry" +class "GtkEntry" style "clearlooks-entry" -class "GtkPaned" style "paned" -class "GtkSpinButton" style "spinbutton" -class "GtkScale" style "scale" -class "GtkVScale" style "vscale" -class "GtkHScale" style "hscale" -class "GtkScrollbar" style "scrollbar" -class "GtkHScrollbar" style "hscrollbar" -class "GtkVScrollbar" style "vscrollbar" +class "GtkPaned" style "clearlooks-paned" +class "GtkSpinButton" style "clearlooks-spinbutton" +class "GtkScale" style "clearlooks-scale" +class "GtkVScale" style "clearlooks-vscale" +class "GtkHScale" style "clearlooks-hscale" +class "GtkScrollbar" style "clearlooks-scrollbar" +class "GtkHScrollbar" style "clearlooks-hscrollbar" +class "GtkVScrollbar" style "clearlooks-vscrollbar" -class "GtkExpander" style "expander" -class "GtkHSV" style "HSV" +class "GtkExpander" style "clearlooks-expander" +class "GtkHSV" style "clearlooks-HSV" # General matching follows. The order is choosen so that the right styles override # each other. EG. progressbar needs to be more important than the menu match. -widget_class "*" style "notebook_bg" +widget_class "*" style "clearlooks-notebook_bg" # This is not perfect, it could be done better. # (That is modify *every* widget in the notebook, and change those back that # we really don't want changed) -widget_class "**" style "notebook_bg" -widget_class "**" style "notebook_bg" -widget_class "**" style "notebook_bg" -widget_class "**" style "notebook_bg" -widget_class "**" style "notebook_bg" +widget_class "**" style "clearlooks-notebook_bg" +widget_class "**" style "clearlooks-notebook_bg" +widget_class "**" style "clearlooks-notebook_bg" +widget_class "**" style "clearlooks-notebook_bg" +widget_class "**" style "clearlooks-notebook_bg" -widget_class "*" style "button" -widget_class "*" style "notebook" -widget_class "**" style "statusbar" +widget_class "*" style "clearlooks-button" +widget_class "*" style "clearlooks-notebook" +widget_class "**" style "clearlooks-statusbar" -widget_class "**" style "comboboxentry" -widget_class "**" style "comboboxentry" +#widget_class "**" style "clearlooks-comboboxentry" +widget_class "**" style "clearlooks-combobox" -widget_class "*." style "expanderLabel" +widget_class "*." style "clearlooks-expanderLabel" -widget_class "**" style "menubar" -widget_class "**" style "menu" -widget_class "**" style "menu_item" -widget_class "**" style "separator_menu_item" +widget_class "**" style "clearlooks-menubar" +widget_class "**" style "clearlooks-menu" +widget_class "**" style "clearlooks-menu_item" +widget_class "**" style "clearlooks-separator_menu_item" -widget_class "*.." style "frame_title" -widget_class "*.*" style "treeview" +widget_class "*.." style "clearlooks-frame_title" +widget_class "*.*" style "clearlooks-treeview" -widget_class "*" style "progressbar" +widget_class "*" style "clearlooks-progressbar" # Treeview headers (and similar stock GTK+ widgets) -widget_class "*.." style "treeview_header" -widget_class "*.." style "treeview_header" -widget_class "*.." style "treeview_header" -widget_class "*.." style "treeview_header" +widget_class "*.." style "clearlooks-treeview_header" +widget_class "*.." style "clearlooks-treeview_header" +widget_class "*.." style "clearlooks-treeview_header" +widget_class "*.." style "clearlooks-treeview_header" # The window of the tooltip is called "gtk-tooltip" ################################################################## @@ -479,34 +445,5 @@ widget_class "*.." style "treeview_header" # quite a bit to get this working correctly. # (It will involve setting different priorities, etc.) ################################################################## -widget "gtk-tooltip*" style "tooltips" +widget "gtk-tooltip*" style "clearlooks-tooltips" -########################################################################## -# Following are special cases and workarounds for issues in applications. -########################################################################## - -# Workaround for the evolution ETable (bug #527532) -widget_class "*.." style "treeview_header" -# Workaround for the evolution ETree -widget_class "*.." style "treeview_header" - -# Special case the nautilus-extra-view-widget -# ToDo: A more generic approach for all applications that have a widget like this. -widget "*.nautilus-extra-view-widget" style : highest "nautilus_location" - -# Work around for http://bugzilla.gnome.org/show_bug.cgi?id=382646 -# Note that this work around assumes that the combobox is _not_ in appears-as-list mode. -widget_class "*.." style "text_is_fg_color_workaround" -# This is the part of the workaround that fixes the menus -widget "*.gtk-combobox-popup-menu.*" style "menuitem_text_is_fg_color_workaround" - -# Work around the usage of GtkLabel inside GtkListItems to display text. -# This breaks because the label is shown on a background that is based on the base color. -widget_class "**" style "fg_is_text_color_workaround" -# GtkCList also uses the fg color to draw text on top of the base colors. -widget_class "*" style "fg_is_text_color_workaround" -# Nautilus when renaming files, and maybe other places. -widget_class "*" style "fg_is_text_color_workaround" - -# See the documentation of the style. -widget_class "EShellWindow.GtkVBox.BonoboDock.BonoboDockBand.BonoboDockItem*" style "evo_new_button_workaround" diff --git a/rtdata/themes/37-Gray-Red-Textured.gtkrc b/rtdata/themes/37-Gray-Red-Textured.gtkrc index a958edaf2..132a2cb70 100644 --- a/rtdata/themes/37-Gray-Red-Textured.gtkrc +++ b/rtdata/themes/37-Gray-Red-Textured.gtkrc @@ -99,6 +99,7 @@ style "clearlooks-default" { toolbarstyle = 1 animation = FALSE radius = 3.0 + # style between CLASSIC, GLOSSY, INVERTED and GUMMY style = GUMMY # Set a hint to disable backward compatibility fallbacks. @@ -118,7 +119,7 @@ style "wider" { ythickness = 3 } -style "entry" { +style "clearlooks-entry" { xthickness = 3 ythickness = 3 @@ -130,7 +131,7 @@ style "entry" { } } -style "paned" { +style "clearlooks-paned" { bg[PRELIGHT] = shade (0.9, @bg_color) @@ -139,7 +140,7 @@ style "paned" { } } -style "HSV" { +style "clearlooks-HSV" { engine "clearlooks" { hint = "HSV" @@ -147,14 +148,14 @@ style "HSV" { } } -style "spinbutton" { +style "clearlooks-spinbutton" { engine "clearlooks" { hint = "spinbutton" } } -style "scale" { +style "clearlooks-scale" { xthickness = 2 ythickness = 2 @@ -169,21 +170,21 @@ style "scale" { } } -style "vscale" { +style "clearlooks-vscale" { engine "clearlooks" { hint = "vscale" } } -style "hscale" { +style "clearlooks-hscale" { engine "clearlooks" { hint = "hscale" } } -style "scrollbar" { +style "clearlooks-scrollbar" { #bg[SELECTED] = shade (1.09, @bg_color) @@ -439,21 +440,21 @@ style "scrollbar" { } } -style "hscrollbar" { +style "clearlooks-hscrollbar" { engine "clearlooks" { hint = "hscrollbar" } } -style "vscrollbar" { +style "clearlooks-vscrollbar" { engine "clearlooks" { hint = "vscrollbar" } } -style "range" { +style "clearlooks-range" { engine "pixmap" { # image @@ -555,13 +556,22 @@ style "range" { } } -style "notebook_bg" { +style "clearlooks-notebook_bg" { bg[NORMAL] = @bg_color bg[ACTIVE] = shade (0.85, @bg_color) } -style "button" { +style "clearlooks-combobox" { + + text[NORMAL] = @fg_color + text[PRELIGHT] = @selected_fg_color + text[SELECTED] = @selected_fg_color + text[INSENSITIVE] = mix (0.2, @fg_color, @bg_color) + text[ACTIVE] = @fg_color +} + +style "clearlooks-button" { bg[NORMAL] = shade (0.93, @bg_color) bg[PRELIGHT] = shade (0.85, @bg_color) @@ -575,21 +585,21 @@ style "button" { # The color is changed by the notebook_bg style, this style # changes the x/ythickness -style "notebook" { +style "clearlooks-notebook" { xthickness = 3 ythickness = 3 bg[SELECTED] = @salt_pinch } -style "statusbar" { +style "clearlooks-statusbar" { engine "clearlooks" { hint = "statusbar" } } -style "comboboxentry" { +style "clearlooks-comboboxentry" { engine "clearlooks" { # Note: @@ -599,7 +609,7 @@ style "comboboxentry" { } } -style "expander" { +style "clearlooks-expander" { fg[NORMAL] = @salt_pinch fg[PRELIGHT] = @salt_pinch @@ -616,20 +626,20 @@ style "expander" { } } -style "expanderLabel" { +style "clearlooks-expanderLabel" { fg[NORMAL] = @text_color fg[PRELIGHT] = lighter (@fg_color) } -style "menubar" { +style "clearlooks-menubar" { engine "clearlooks" { hint = "menubar" } } -style "menu" { +style "clearlooks-menu" { xthickness = 0 ythickness = 0 @@ -640,17 +650,19 @@ style "menu" { } } -style "menu_item" { +style "clearlooks-menu_item" { xthickness = 2 ythickness = 3 fg[PRELIGHT] = @selected_fg_color + text[NORMAL] = @fg_color + text[PRELIGHT] = @selected_fg_color } # This style is there to modify the separator menu items. The goals are: # 1. Get a specific height. # 2. The line should go to the edges (ie. no border at the left/right) -style "separator_menu_item" { +style "clearlooks-separator_menu_item" { xthickness = 1 ythickness = 0 @@ -660,12 +672,12 @@ style "separator_menu_item" { GtkWidget::separator-height = 7 } -style "frame_title" { +style "clearlooks-frame_title" { fg[NORMAL] = lighter (@fg_color) } -style "treeview" { +style "clearlooks-treeview" { # For an unkown reason, shading 7C99AD produce a redish color, so we have to set the value manually text[ACTIVE] = @selected_fg_color @@ -677,7 +689,7 @@ style "treeview" { } # The almost useless progress bar style -style "progressbar" { +style "clearlooks-progressbar" { xthickness = 1 ythickness = 1 @@ -693,18 +705,19 @@ style "progressbar" { # This style is based on the clearlooks-default style, so that the colors from the button # style are overriden again. -style "treeview_header" = "clearlooks-default" { +style "clearlooks-treeview_header" = "clearlooks-default" { xthickness = 2 ythickness = 1 bg[NORMAL] = shade (0.80, @bg_color) engine "clearlooks" { + radius = 0.0 hint = "treeview-header" } } -style "tooltips" { +style "clearlooks-tooltips" { xthickness = 4 ythickness = 4 @@ -712,53 +725,6 @@ style "tooltips" { fg[NORMAL] = @tooltip_fg_color } -style "nautilus_location" { - - bg[NORMAL] = mix (0.60, shade (1.05, @bg_color), @selected_bg_color) -} - -# Wrokaroudn style for places where the text color is used instead of the fg color. -style "text_is_fg_color_workaround" { - - text[NORMAL] = @fg_color - text[PRELIGHT] = @fg_color - text[SELECTED] = @selected_fg_color - text[ACTIVE] = @fg_color - text[INSENSITIVE] = darker (@bg_color) -} - -# Workaround style for menus where the text color is used instead of the fg color. -style "menuitem_text_is_fg_color_workaround" { - - text[NORMAL] = @fg_color - text[PRELIGHT] = @selected_fg_color - text[SELECTED] = @selected_fg_color - text[ACTIVE] = @fg_color - text[INSENSITIVE] = darker (@bg_color) -} - -# Workaround style for places where the fg color is used instead of the text color. -style "fg_is_text_color_workaround" { - - fg[NORMAL] = @text_color - fg[PRELIGHT] = @text_color - fg[SELECTED] = @selected_fg_color - fg[ACTIVE] = @selected_fg_color - fg[INSENSITIVE] = darker (@bg_color) -} - -# Style to set the toolbar to use a flat style. This is because the "New" button in -# Evolution is not drawn transparent. So if there is a gradient in the background it will -# look really wrong. -# See http://bugzilla.gnome.org/show_bug.cgi?id=446953. -style "evo_new_button_workaround" { - - engine "clearlooks" { - toolbarstyle = 0 - } -} - - ############################################################################### # The following part of the gtkrc applies the different styles to the widgets. ############################################################################### @@ -771,57 +737,57 @@ class "GtkFrame" style "wide" class "GtkCalendar" style "wide" class "GtkCheckButton" style "wider" class "GtkRadioButton" style "wider" -class "GtkEntry" style "entry" +class "GtkEntry" style "clearlooks-entry" -class "GtkPaned" style "paned" -class "GtkSpinButton" style "spinbutton" -class "GtkRange" style "range" -#class "GtkScale" style "scale" -#class "GtkVScale" style "vscale" -#class "GtkHScale" style "hscale" -class "GtkScrollbar" style "scrollbar" -#class "GtkHScrollbar" style "hscrollbar" -#class "GtkVScrollbar" style "vscrollbar" +class "GtkPaned" style "clearlooks-paned" +class "GtkSpinButton" style "clearlooks-spinbutton" +class "GtkRange" style "clearlooks-range" +#class "GtkScale" style "clearlooks-scale" +#class "GtkVScale" style "clearlooks-vscale" +#class "GtkHScale" style "clearlooks-hscale" +class "GtkScrollbar" style "clearlooks-scrollbar" +#class "GtkHScrollbar" style "clearlooks-hscrollbar" +#class "GtkVScrollbar" style "clearlooks-vscrollbar" -class "GtkExpander" style "expander" -class "GtkHSV" style "HSV" +class "GtkExpander" style "clearlooks-expander" +class "GtkHSV" style "clearlooks-HSV" # General matching follows. The order is choosen so that the right styles override # each other. EG. progressbar needs to be more important than the menu match. -widget_class "*" style "notebook_bg" +widget_class "*" style "clearlooks-notebook_bg" # This is not perfect, it could be done better. # (That is modify *every* widget in the notebook, and change those back that # we really don't want changed) -widget_class "**" style "notebook_bg" -widget_class "**" style "notebook_bg" -widget_class "**" style "notebook_bg" -widget_class "**" style "notebook_bg" -widget_class "**" style "notebook_bg" +widget_class "**" style "clearlooks-notebook_bg" +widget_class "**" style "clearlooks-notebook_bg" +widget_class "**" style "clearlooks-notebook_bg" +widget_class "**" style "clearlooks-notebook_bg" +widget_class "**" style "clearlooks-notebook_bg" -widget_class "*" style "button" -widget_class "*" style "notebook" -widget_class "**" style "statusbar" +widget_class "*" style "clearlooks-button" +widget_class "*" style "clearlooks-notebook" +widget_class "**" style "clearlooks-statusbar" -widget_class "**" style "comboboxentry" -widget_class "**" style "comboboxentry" +#widget_class "**" style "clearlooks-comboboxentry" +widget_class "**" style "clearlooks-combobox" -widget_class "*." style "expanderLabel" +widget_class "*." style "clearlooks-expanderLabel" -widget_class "**" style "menubar" -widget_class "**" style "menu" -widget_class "**" style "menu_item" -widget_class "**" style "separator_menu_item" +widget_class "**" style "clearlooks-menubar" +widget_class "**" style "clearlooks-menu" +widget_class "**" style "clearlooks-menu_item" +widget_class "**" style "clearlooks-separator_menu_item" -widget_class "*.." style "frame_title" -widget_class "*.*" style "treeview" +widget_class "*.." style "clearlooks-frame_title" +widget_class "*.*" style "clearlooks-treeview" -widget_class "*" style "progressbar" +widget_class "*" style "clearlooks-progressbar" # Treeview headers (and similar stock GTK+ widgets) -widget_class "*.." style "treeview_header" -widget_class "*.." style "treeview_header" -widget_class "*.." style "treeview_header" -widget_class "*.." style "treeview_header" +widget_class "*.." style "clearlooks-treeview_header" +widget_class "*.." style "clearlooks-treeview_header" +widget_class "*.." style "clearlooks-treeview_header" +widget_class "*.." style "clearlooks-treeview_header" # The window of the tooltip is called "gtk-tooltip" ################################################################## @@ -831,34 +797,5 @@ widget_class "*.." style "treeview_header" # quite a bit to get this working correctly. # (It will involve setting different priorities, etc.) ################################################################## -widget "gtk-tooltip*" style "tooltips" +widget "gtk-tooltip*" style "clearlooks-tooltips" -########################################################################## -# Following are special cases and workarounds for issues in applications. -########################################################################## - -# Workaround for the evolution ETable (bug #527532) -widget_class "*.." style "treeview_header" -# Workaround for the evolution ETree -widget_class "*.." style "treeview_header" - -# Special case the nautilus-extra-view-widget -# ToDo: A more generic approach for all applications that have a widget like this. -widget "*.nautilus-extra-view-widget" style : highest "nautilus_location" - -# Work around for http://bugzilla.gnome.org/show_bug.cgi?id=382646 -# Note that this work around assumes that the combobox is _not_ in appears-as-list mode. -widget_class "*.." style "text_is_fg_color_workaround" -# This is the part of the workaround that fixes the menus -widget "*.gtk-combobox-popup-menu.*" style "menuitem_text_is_fg_color_workaround" - -# Work around the usage of GtkLabel inside GtkListItems to display text. -# This breaks because the label is shown on a background that is based on the base color. -widget_class "**" style "fg_is_text_color_workaround" -# GtkCList also uses the fg color to draw text on top of the base colors. -widget_class "*" style "fg_is_text_color_workaround" -# Nautilus when renaming files, and maybe other places. -widget_class "*" style "fg_is_text_color_workaround" - -# See the documentation of the style. -widget_class "EShellWindow.GtkVBox.BonoboDock.BonoboDockBand.BonoboDockItem*" style "evo_new_button_workaround" diff --git a/rtdata/themes/37-Gray-Red.gtkrc b/rtdata/themes/37-Gray-Red.gtkrc index 7559e7d1e..8868f2d2b 100644 --- a/rtdata/themes/37-Gray-Red.gtkrc +++ b/rtdata/themes/37-Gray-Red.gtkrc @@ -117,7 +117,7 @@ style "wider" { ythickness = 3 } -style "entry" { +style "clearlooks-entry" { xthickness = 3 ythickness = 3 @@ -129,7 +129,7 @@ style "entry" { } } -style "paned" { +style "clearlooks-paned" { bg[PRELIGHT] = shade (0.9, @bg_color) @@ -138,7 +138,7 @@ style "paned" { } } -style "HSV" { +style "clearlooks-HSV" { engine "clearlooks" { hint = "HSV" @@ -146,14 +146,14 @@ style "HSV" { } } -style "spinbutton" { +style "clearlooks-spinbutton" { engine "clearlooks" { hint = "spinbutton" } } -style "scale" { +style "clearlooks-scale" { xthickness = 2 ythickness = 2 @@ -168,21 +168,21 @@ style "scale" { } } -style "vscale" { +style "clearlooks-vscale" { engine "clearlooks" { hint = "vscale" } } -style "hscale" { +style "clearlooks-hscale" { engine "clearlooks" { hint = "hscale" } } -style "scrollbar" { +style "clearlooks-scrollbar" { xthickness = 2 ythickness = 2 @@ -193,27 +193,36 @@ style "scrollbar" { } } -style "hscrollbar" { +style "clearlooks-hscrollbar" { engine "clearlooks" { hint = "hscrollbar" } } -style "vscrollbar" { +style "clearlooks-vscrollbar" { engine "clearlooks" { hint = "vscrollbar" } } -style "notebook_bg" { +style "clearlooks-notebook_bg" { bg[NORMAL] = @bg_color bg[ACTIVE] = shade (0.85, @bg_color) } -style "button" { +style "clearlooks-combobox" { + + text[NORMAL] = @fg_color + text[PRELIGHT] = @selected_fg_color + text[SELECTED] = @selected_fg_color + text[INSENSITIVE] = mix (0.2, @fg_color, @bg_color) + text[ACTIVE] = @fg_color +} + +style "clearlooks-button" { bg[NORMAL] = shade (0.93, @bg_color) bg[PRELIGHT] = shade (0.85, @bg_color) @@ -227,21 +236,21 @@ style "button" { # The color is changed by the notebook_bg style, this style # changes the x/ythickness -style "notebook" { +style "clearlooks-notebook" { xthickness = 3 ythickness = 3 bg[SELECTED] = @salt_pinch } -style "statusbar" { +style "clearlooks-statusbar" { engine "clearlooks" { hint = "statusbar" } } -style "comboboxentry" { +style "clearlooks-comboboxentry" { engine "clearlooks" { # Note: @@ -251,7 +260,7 @@ style "comboboxentry" { } } -style "expander" { +style "clearlooks-expander" { fg[NORMAL] = @salt_pinch fg[PRELIGHT] = @salt_pinch @@ -268,20 +277,20 @@ style "expander" { } } -style "expanderLabel" { +style "clearlooks-expanderLabel" { fg[NORMAL] = @text_color fg[PRELIGHT] = lighter (@fg_color) } -style "menubar" { +style "clearlooks-menubar" { engine "clearlooks" { hint = "menubar" } } -style "menu" { +style "clearlooks-menu" { xthickness = 0 ythickness = 0 @@ -292,17 +301,19 @@ style "menu" { } } -style "menu_item" { +style "clearlooks-menu_item" { xthickness = 2 ythickness = 3 fg[PRELIGHT] = @selected_fg_color + text[NORMAL] = @fg_color + text[PRELIGHT] = @selected_fg_color } # This style is there to modify the separator menu items. The goals are: # 1. Get a specific height. # 2. The line should go to the edges (ie. no border at the left/right) -style "separator_menu_item" { +style "clearlooks-separator_menu_item" { xthickness = 1 ythickness = 0 @@ -312,12 +323,12 @@ style "separator_menu_item" { GtkWidget::separator-height = 7 } -style "frame_title" { +style "clearlooks-frame_title" { fg[NORMAL] = lighter (@fg_color) } -style "treeview" { +style "clearlooks-treeview" { # For an unkown reason, shading 7C99AD produce a redish color, so we have to set the value manually text[ACTIVE] = @selected_fg_color @@ -329,7 +340,7 @@ style "treeview" { } # The almost useless progress bar style -style "progressbar" { +style "clearlooks-progressbar" { xthickness = 1 ythickness = 1 @@ -345,18 +356,19 @@ style "progressbar" { # This style is based on the clearlooks-default style, so that the colors from the button # style are overriden again. -style "treeview_header" = "clearlooks-default" { +style "clearlooks-treeview_header" = "clearlooks-default" { xthickness = 2 ythickness = 1 bg[NORMAL] = shade (0.80, @bg_color) engine "clearlooks" { + radius = 0.0 hint = "treeview-header" } } -style "tooltips" { +style "clearlooks-tooltips" { xthickness = 4 ythickness = 4 @@ -364,53 +376,6 @@ style "tooltips" { fg[NORMAL] = @tooltip_fg_color } -style "nautilus_location" { - - bg[NORMAL] = mix (0.60, shade (1.05, @bg_color), @selected_bg_color) -} - -# Wrokaroudn style for places where the text color is used instead of the fg color. -style "text_is_fg_color_workaround" { - - text[NORMAL] = @fg_color - text[PRELIGHT] = @fg_color - text[SELECTED] = @selected_fg_color - text[ACTIVE] = @fg_color - text[INSENSITIVE] = darker (@bg_color) -} - -# Workaround style for menus where the text color is used instead of the fg color. -style "menuitem_text_is_fg_color_workaround" { - - text[NORMAL] = @fg_color - text[PRELIGHT] = @selected_fg_color - text[SELECTED] = @selected_fg_color - text[ACTIVE] = @fg_color - text[INSENSITIVE] = darker (@bg_color) -} - -# Workaround style for places where the fg color is used instead of the text color. -style "fg_is_text_color_workaround" { - - fg[NORMAL] = @text_color - fg[PRELIGHT] = @text_color - fg[SELECTED] = @selected_fg_color - fg[ACTIVE] = @selected_fg_color - fg[INSENSITIVE] = darker (@bg_color) -} - -# Style to set the toolbar to use a flat style. This is because the "New" button in -# Evolution is not drawn transparent. So if there is a gradient in the background it will -# look really wrong. -# See http://bugzilla.gnome.org/show_bug.cgi?id=446953. -style "evo_new_button_workaround" { - - engine "clearlooks" { - toolbarstyle = 0 - } -} - - ############################################################################### # The following part of the gtkrc applies the different styles to the widgets. ############################################################################### @@ -423,56 +388,56 @@ class "GtkFrame" style "wide" class "GtkCalendar" style "wide" class "GtkCheckButton" style "wider" class "GtkRadioButton" style "wider" -class "GtkEntry" style "entry" +class "GtkEntry" style "clearlooks-entry" -class "GtkPaned" style "paned" -class "GtkSpinButton" style "spinbutton" -class "GtkScale" style "scale" -class "GtkVScale" style "vscale" -class "GtkHScale" style "hscale" -class "GtkScrollbar" style "scrollbar" -class "GtkHScrollbar" style "hscrollbar" -class "GtkVScrollbar" style "vscrollbar" +class "GtkPaned" style "clearlooks-paned" +class "GtkSpinButton" style "clearlooks-spinbutton" +class "GtkScale" style "clearlooks-scale" +class "GtkVScale" style "clearlooks-vscale" +class "GtkHScale" style "clearlooks-hscale" +class "GtkScrollbar" style "clearlooks-scrollbar" +class "GtkHScrollbar" style "clearlooks-hscrollbar" +class "GtkVScrollbar" style "clearlooks-vscrollbar" -class "GtkExpander" style "expander" -class "GtkHSV" style "HSV" +class "GtkExpander" style "clearlooks-expander" +class "GtkHSV" style "clearlooks-HSV" # General matching follows. The order is choosen so that the right styles override # each other. EG. progressbar needs to be more important than the menu match. -widget_class "*" style "notebook_bg" +widget_class "*" style "clearlooks-notebook_bg" # This is not perfect, it could be done better. # (That is modify *every* widget in the notebook, and change those back that # we really don't want changed) -widget_class "**" style "notebook_bg" -widget_class "**" style "notebook_bg" -widget_class "**" style "notebook_bg" -widget_class "**" style "notebook_bg" -widget_class "**" style "notebook_bg" +widget_class "**" style "clearlooks-notebook_bg" +widget_class "**" style "clearlooks-notebook_bg" +widget_class "**" style "clearlooks-notebook_bg" +widget_class "**" style "clearlooks-notebook_bg" +widget_class "**" style "clearlooks-notebook_bg" -widget_class "*" style "button" -widget_class "*" style "notebook" -widget_class "**" style "statusbar" +widget_class "*" style "clearlooks-button" +widget_class "*" style "clearlooks-notebook" +widget_class "**" style "clearlooks-statusbar" -widget_class "**" style "comboboxentry" -widget_class "**" style "comboboxentry" +#widget_class "**" style "clearlooks-comboboxentry" +widget_class "**" style "clearlooks-combobox" -widget_class "*." style "expanderLabel" +widget_class "*." style "clearlooks-expanderLabel" -widget_class "**" style "menubar" -widget_class "**" style "menu" -widget_class "**" style "menu_item" -widget_class "**" style "separator_menu_item" +widget_class "**" style "clearlooks-menubar" +widget_class "**" style "clearlooks-menu" +widget_class "**" style "clearlooks-menu_item" +widget_class "**" style "clearlooks-separator_menu_item" -widget_class "*.." style "frame_title" -widget_class "*.*" style "treeview" +widget_class "*.." style "clearlooks-frame_title" +widget_class "*.*" style "clearlooks-treeview" -widget_class "*" style "progressbar" +widget_class "*" style "clearlooks-progressbar" # Treeview headers (and similar stock GTK+ widgets) -widget_class "*.." style "treeview_header" -widget_class "*.." style "treeview_header" -widget_class "*.." style "treeview_header" -widget_class "*.." style "treeview_header" +widget_class "*.." style "clearlooks-treeview_header" +widget_class "*.." style "clearlooks-treeview_header" +widget_class "*.." style "clearlooks-treeview_header" +widget_class "*.." style "clearlooks-treeview_header" # The window of the tooltip is called "gtk-tooltip" ################################################################## @@ -482,34 +447,5 @@ widget_class "*.." style "treeview_header" # quite a bit to get this working correctly. # (It will involve setting different priorities, etc.) ################################################################## -widget "gtk-tooltip*" style "tooltips" +widget "gtk-tooltip*" style "clearlooks-tooltips" -########################################################################## -# Following are special cases and workarounds for issues in applications. -########################################################################## - -# Workaround for the evolution ETable (bug #527532) -widget_class "*.." style "treeview_header" -# Workaround for the evolution ETree -widget_class "*.." style "treeview_header" - -# Special case the nautilus-extra-view-widget -# ToDo: A more generic approach for all applications that have a widget like this. -widget "*.nautilus-extra-view-widget" style : highest "nautilus_location" - -# Work around for http://bugzilla.gnome.org/show_bug.cgi?id=382646 -# Note that this work around assumes that the combobox is _not_ in appears-as-list mode. -widget_class "*.." style "text_is_fg_color_workaround" -# This is the part of the workaround that fixes the menus -widget "*.gtk-combobox-popup-menu.*" style "menuitem_text_is_fg_color_workaround" - -# Work around the usage of GtkLabel inside GtkListItems to display text. -# This breaks because the label is shown on a background that is based on the base color. -widget_class "**" style "fg_is_text_color_workaround" -# GtkCList also uses the fg color to draw text on top of the base colors. -widget_class "*" style "fg_is_text_color_workaround" -# Nautilus when renaming files, and maybe other places. -widget_class "*" style "fg_is_text_color_workaround" - -# See the documentation of the style. -widget_class "EShellWindow.GtkVBox.BonoboDock.BonoboDockBand.BonoboDockItem*" style "evo_new_button_workaround" diff --git a/rtdata/themes/63-Gray-Cyan.gtkrc b/rtdata/themes/63-Gray-Cyan.gtkrc index c23fa8fa8..17045cb67 100644 --- a/rtdata/themes/63-Gray-Cyan.gtkrc +++ b/rtdata/themes/63-Gray-Cyan.gtkrc @@ -97,8 +97,9 @@ style "clearlooks-default" { reliefstyle = 1 menubarstyle = 2 toolbarstyle = 1 - animation = FALSE + animation = FALSE radius = 3.0 + # style between CLASSIC, GLOSSY, INVERTED and GUMMY style = GUMMY # Set a hint to disable backward compatibility fallbacks. @@ -116,7 +117,7 @@ style "wider" { ythickness = 3 } -style "entry" { +style "clearlooks-entry" { xthickness = 3 ythickness = 3 @@ -128,7 +129,7 @@ style "entry" { } } -style "paned" { +style "clearlooks-paned" { bg[PRELIGHT] = shade (0.9, @bg_color) @@ -137,7 +138,7 @@ style "paned" { } } -style "HSV" { +style "clearlooks-HSV" { engine "clearlooks" { hint = "HSV" @@ -145,14 +146,14 @@ style "HSV" { } } -style "spinbutton" { +style "clearlooks-spinbutton" { engine "clearlooks" { hint = "spinbutton" } } -style "scale" { +style "clearlooks-scale" { xthickness = 2 ythickness = 2 @@ -167,21 +168,21 @@ style "scale" { } } -style "vscale" { +style "clearlooks-vscale" { engine "clearlooks" { hint = "vscale" } } -style "hscale" { +style "clearlooks-hscale" { engine "clearlooks" { hint = "hscale" } } -style "scrollbar" { +style "clearlooks-scrollbar" { xthickness = 2 ythickness = 2 @@ -192,27 +193,36 @@ style "scrollbar" { } } -style "hscrollbar" { +style "clearlooks-hscrollbar" { engine "clearlooks" { hint = "hscrollbar" } } -style "vscrollbar" { +style "clearlooks-vscrollbar" { engine "clearlooks" { hint = "vscrollbar" } } -style "notebook_bg" { +style "clearlooks-notebook_bg" { bg[NORMAL] = shade (1.05, @bg_color) bg[ACTIVE] = shade (0.92, @bg_color) } -style "button" { +style "clearlooks-combobox" { + + text[NORMAL] = @fg_color + text[PRELIGHT] = @fg_color + text[SELECTED] = @selected_fg_color + text[INSENSITIVE] = mix (0.2, @fg_color, @bg_color) + text[ACTIVE] = @fg_color +} + +style "clearlooks-button" { bg[NORMAL] = shade (0.95, @bg_color) bg[PRELIGHT] = shade (1.08, @bg_color) @@ -227,21 +237,21 @@ style "button" { # The color is changed by the notebook_bg style, this style # changes the x/ythickness -style "notebook" { +style "clearlooks-notebook" { xthickness = 3 ythickness = 3 bg[SELECTED] = @salt_pinch } -style "statusbar" { +style "clearlooks-statusbar" { engine "clearlooks" { hint = "statusbar" } } -style "comboboxentry" { +style "clearlooks-comboboxentry" { engine "clearlooks" { # Note: @@ -251,7 +261,7 @@ style "comboboxentry" { } } -style "expander" { +style "clearlooks-expander" { fg[NORMAL] = mix (0.6, @selected_bg_color, @text_color) fg[PRELIGHT] = mix (0.6, @selected_bg_color, @text_color) @@ -268,20 +278,20 @@ style "expander" { } } -style "expanderLabel" { +style "clearlooks-expanderLabel" { fg[NORMAL] = @text_color fg[PRELIGHT] = @text_color } -style "menubar" { +style "clearlooks-menubar" { engine "clearlooks" { hint = "menubar" } } -style "menu" { +style "clearlooks-menu" { xthickness = 0 ythickness = 0 @@ -292,17 +302,19 @@ style "menu" { } } -style "menu_item" { +style "clearlooks-menu_item" { xthickness = 2 ythickness = 3 - fg[PRELIGHT] = @selected_fg_color + fg[PRELIGHT] = @selected_fg_color + text[NORMAL] = @fg_color + text[PRELIGHT] = @selected_fg_color } # This style is there to modify the separator menu items. The goals are: # 1. Get a specific height. # 2. The line should go to the edges (ie. no border at the left/right) -style "separator_menu_item" { +style "clearlooks-separator_menu_item" { xthickness = 1 ythickness = 0 @@ -312,12 +324,12 @@ style "separator_menu_item" { GtkWidget::separator-height = 7 } -style "frame_title" { +style "clearlooks-frame_title" { fg[NORMAL] = shade (1.40, @bg_color) } -style "treeview" { +style "clearlooks-treeview" { text[ACTIVE] = @text_color base[ACTIVE] = mix(0.50, @selected_bg_color, @base_color) @@ -328,7 +340,7 @@ style "treeview" { } # The almost useless progress bar style -style "progressbar" { +style "clearlooks-progressbar" { xthickness = 1 ythickness = 1 @@ -344,18 +356,19 @@ style "progressbar" { # This style is based on the clearlooks-default style, so that the colors from the button # style are overriden again. -style "treeview_header" = "clearlooks-default" { +style "clearlooks-treeview_header" = "clearlooks-default" { xthickness = 2 ythickness = 1 bg[NORMAL] = shade (1.2, @bg_color) engine "clearlooks" { + radius = 0.0 hint = "treeview-header" } } -style "tooltips" { +style "clearlooks-tooltips" { xthickness = 4 ythickness = 4 @@ -363,53 +376,6 @@ style "tooltips" { fg[NORMAL] = @tooltip_fg_color } -style "nautilus_location" { - - bg[NORMAL] = mix (0.60, shade (1.05, @bg_color), @selected_bg_color) -} - -# Wrokaroudn style for places where the text color is used instead of the fg color. -style "text_is_fg_color_workaround" { - - text[NORMAL] = @fg_color - text[PRELIGHT] = @fg_color - text[SELECTED] = @selected_fg_color - text[ACTIVE] = @fg_color - text[INSENSITIVE] = darker (@bg_color) -} - -# Workaround style for menus where the text color is used instead of the fg color. -style "menuitem_text_is_fg_color_workaround" { - - text[NORMAL] = @fg_color - text[PRELIGHT] = @selected_fg_color - text[SELECTED] = @selected_fg_color - text[ACTIVE] = @fg_color - text[INSENSITIVE] = darker (@bg_color) -} - -# Workaround style for places where the fg color is used instead of the text color. -style "fg_is_text_color_workaround" { - - fg[NORMAL] = @text_color - fg[PRELIGHT] = @text_color - fg[SELECTED] = @selected_fg_color - fg[ACTIVE] = @selected_fg_color - fg[INSENSITIVE] = darker (@bg_color) -} - -# Style to set the toolbar to use a flat style. This is because the "New" button in -# Evolution is not drawn transparent. So if there is a gradient in the background it will -# look really wrong. -# See http://bugzilla.gnome.org/show_bug.cgi?id=446953. -style "evo_new_button_workaround" { - - engine "clearlooks" { - toolbarstyle = 0 - } -} - - ############################################################################### # The following part of the gtkrc applies the different styles to the widgets. ############################################################################### @@ -422,56 +388,56 @@ class "GtkFrame" style "wide" class "GtkCalendar" style "wide" class "GtkCheckButton" style "wider" class "GtkRadioButton" style "wider" -class "GtkEntry" style "entry" +class "GtkEntry" style "clearlooks-entry" -class "GtkPaned" style "paned" -class "GtkSpinButton" style "spinbutton" -class "GtkScale" style "scale" -class "GtkVScale" style "vscale" -class "GtkHScale" style "hscale" -class "GtkScrollbar" style "scrollbar" -class "GtkHScrollbar" style "hscrollbar" -class "GtkVScrollbar" style "vscrollbar" +class "GtkPaned" style "clearlooks-paned" +class "GtkSpinButton" style "clearlooks-spinbutton" +class "GtkScale" style "clearlooks-scale" +class "GtkVScale" style "clearlooks-vscale" +class "GtkHScale" style "clearlooks-hscale" +class "GtkScrollbar" style "clearlooks-scrollbar" +class "GtkHScrollbar" style "clearlooks-hscrollbar" +class "GtkVScrollbar" style "clearlooks-vscrollbar" -class "GtkExpander" style "expander" -class "GtkHSV" style "HSV" +class "GtkExpander" style "clearlooks-expander" +class "GtkHSV" style "clearlooks-HSV" # General matching follows. The order is choosen so that the right styles override # each other. EG. progressbar needs to be more important than the menu match. -widget_class "*" style "notebook_bg" +widget_class "*" style "clearlooks-notebook_bg" # This is not perfect, it could be done better. # (That is modify *every* widget in the notebook, and change those back that # we really don't want changed) -widget_class "**" style "notebook_bg" -widget_class "**" style "notebook_bg" -widget_class "**" style "notebook_bg" -widget_class "**" style "notebook_bg" -widget_class "**" style "notebook_bg" +widget_class "**" style "clearlooks-notebook_bg" +widget_class "**" style "clearlooks-notebook_bg" +widget_class "**" style "clearlooks-notebook_bg" +widget_class "**" style "clearlooks-notebook_bg" +widget_class "**" style "clearlooks-notebook_bg" -widget_class "*" style "button" -widget_class "*" style "notebook" -widget_class "**" style "statusbar" +widget_class "*" style "clearlooks-button" +widget_class "*" style "clearlooks-notebook" +widget_class "**" style "clearlooks-statusbar" -widget_class "**" style "comboboxentry" -widget_class "**" style "comboboxentry" +#widget_class "**" style "clearlooks-comboboxentry" +widget_class "**" style "clearlooks-combobox" -widget_class "*." style "expanderLabel" +widget_class "*." style "clearlooks-expanderLabel" -widget_class "**" style "menubar" -widget_class "**" style "menu" -widget_class "**" style "menu_item" -widget_class "**" style "separator_menu_item" +widget_class "**" style "clearlooks-menubar" +widget_class "**" style "clearlooks-menu" +widget_class "**" style "clearlooks-menu_item" +widget_class "**" style "clearlooks-separator_menu_item" -widget_class "*.." style "frame_title" -widget_class "*.*" style "treeview" +widget_class "*.." style "clearlooks-frame_title" +widget_class "*.*" style "clearlooks-treeview" -widget_class "*" style "progressbar" +widget_class "*" style "clearlooks-progressbar" # Treeview headers (and similar stock GTK+ widgets) -widget_class "*.." style "treeview_header" -widget_class "*.." style "treeview_header" -widget_class "*.." style "treeview_header" -widget_class "*.." style "treeview_header" +widget_class "*.." style "clearlooks-treeview_header" +widget_class "*.." style "clearlooks-treeview_header" +widget_class "*.." style "clearlooks-treeview_header" +widget_class "*.." style "clearlooks-treeview_header" # The window of the tooltip is called "gtk-tooltip" ################################################################## @@ -481,34 +447,5 @@ widget_class "*.." style "treeview_header" # quite a bit to get this working correctly. # (It will involve setting different priorities, etc.) ################################################################## -widget "gtk-tooltip*" style "tooltips" +widget "gtk-tooltip*" style "clearlooks-tooltips" -########################################################################## -# Following are special cases and workarounds for issues in applications. -########################################################################## - -# Workaround for the evolution ETable (bug #527532) -widget_class "*.." style "treeview_header" -# Workaround for the evolution ETree -widget_class "*.." style "treeview_header" - -# Special case the nautilus-extra-view-widget -# ToDo: A more generic approach for all applications that have a widget like this. -widget "*.nautilus-extra-view-widget" style : highest "nautilus_location" - -# Work around for http://bugzilla.gnome.org/show_bug.cgi?id=382646 -# Note that this work around assumes that the combobox is _not_ in appears-as-list mode. -widget_class "*.." style "text_is_fg_color_workaround" -# This is the part of the workaround that fixes the menus -widget "*.gtk-combobox-popup-menu.*" style "menuitem_text_is_fg_color_workaround" - -# Work around the usage of GtkLabel inside GtkListItems to display text. -# This breaks because the label is shown on a background that is based on the base color. -widget_class "**" style "fg_is_text_color_workaround" -# GtkCList also uses the fg color to draw text on top of the base colors. -widget_class "*" style "fg_is_text_color_workaround" -# Nautilus when renaming files, and maybe other places. -widget_class "*" style "fg_is_text_color_workaround" - -# See the documentation of the style. -widget_class "EShellWindow.GtkVBox.BonoboDock.BonoboDockBand.BonoboDockItem*" style "evo_new_button_workaround" diff --git a/rtdata/themes/92-Beige-DarkCyan.gtkrc b/rtdata/themes/92-Beige-DarkCyan.gtkrc index 0a0587439..fa066db71 100644 --- a/rtdata/themes/92-Beige-DarkCyan.gtkrc +++ b/rtdata/themes/92-Beige-DarkCyan.gtkrc @@ -99,6 +99,7 @@ style "clearlooks-default" { toolbarstyle = 1 animation = FALSE radius = 3.0 + # style between CLASSIC, GLOSSY, INVERTED and GUMMY style = GUMMY # Set a hint to disable backward compatibility fallbacks. @@ -116,7 +117,7 @@ style "wider" { ythickness = 3 } -style "entry" { +style "clearlooks-entry" { xthickness = 3 ythickness = 3 @@ -128,7 +129,7 @@ style "entry" { } } -style "paned" { +style "clearlooks-paned" { bg[PRELIGHT] = shade (0.9, @bg_color) @@ -137,7 +138,7 @@ style "paned" { } } -style "HSV" { +style "clearlooks-HSV" { engine "clearlooks" { hint = "HSV" @@ -145,14 +146,14 @@ style "HSV" { } } -style "spinbutton" { +style "clearlooks-spinbutton" { engine "clearlooks" { hint = "spinbutton" } } -style "scale" { +style "clearlooks-scale" { xthickness = 2 ythickness = 2 @@ -167,21 +168,21 @@ style "scale" { } } -style "vscale" { +style "clearlooks-vscale" { engine "clearlooks" { hint = "vscale" } } -style "hscale" { +style "clearlooks-hscale" { engine "clearlooks" { hint = "hscale" } } -style "scrollbar" { +style "clearlooks-scrollbar" { xthickness = 2 ythickness = 2 @@ -192,26 +193,35 @@ style "scrollbar" { } } -style "hscrollbar" { +style "clearlooks-hscrollbar" { engine "clearlooks" { hint = "hscrollbar" } } -style "vscrollbar" { +style "clearlooks-vscrollbar" { engine "clearlooks" { hint = "vscrollbar" } } -style "notebook_bg" { +style "clearlooks-notebook_bg" { bg[NORMAL] = shade (1.02, @bg_color) } -style "button" { +style "clearlooks-combobox" { + + text[NORMAL] = @fg_color + text[PRELIGHT] = @fg_color + text[SELECTED] = @selected_fg_color + text[INSENSITIVE] = mix (0.2, @fg_color, @bg_color) + text[ACTIVE] = @fg_color +} + +style "clearlooks-button" { bg[NORMAL] = shade (0.96, @bg_color) bg[PRELIGHT] = shade (1.06, @bg_color) @@ -225,19 +235,19 @@ style "button" { # The color is changed by the notebook_bg style, this style # changes the x/ythickness -style "notebook" { +style "clearlooks-notebook" { xthickness = 3 ythickness = 3 } -style "statusbar" { +style "clearlooks-statusbar" { engine "clearlooks" { hint = "statusbar" } } -style "comboboxentry" { +style "clearlooks-comboboxentry" { engine "clearlooks" { # Note: @@ -247,7 +257,7 @@ style "comboboxentry" { } } -style "expander" { +style "clearlooks-expander" { fg[NORMAL] = @selected_bg_color fg[PRELIGHT] = @selected_bg_color @@ -264,14 +274,14 @@ style "expander" { } } -style "menubar" { +style "clearlooks-menubar" { engine "clearlooks" { hint = "menubar" } } -style "menu" { +style "clearlooks-menu" { xthickness = 0 ythickness = 0 @@ -282,17 +292,19 @@ style "menu" { } } -style "menu_item" { +style "clearlooks-menu_item" { xthickness = 2 ythickness = 3 fg[PRELIGHT] = @selected_fg_color + text[NORMAL] = @fg_color + text[PRELIGHT] = @selected_fg_color } # This style is there to modify the separator menu items. The goals are: # 1. Get a specific height. # 2. The line should go to the edges (ie. no border at the left/right) -style "separator_menu_item" { +style "clearlooks-separator_menu_item" { xthickness = 1 ythickness = 0 @@ -302,12 +314,12 @@ style "separator_menu_item" { GtkWidget::separator-height = 7 } -style "frame_title" { +style "clearlooks-frame_title" { fg[NORMAL] = lighter (@fg_color) } -style "treeview" { +style "clearlooks-treeview" { # For an unkown reason, shading 7C99AD produce a redish color, so we have to set the value manually text[ACTIVE] = @text_color @@ -319,7 +331,7 @@ style "treeview" { } # The almost useless progress bar style -style "progressbar" { +style "clearlooks-progressbar" { xthickness = 1 ythickness = 1 @@ -335,16 +347,17 @@ style "progressbar" { # This style is based on the clearlooks-default style, so that the colors from the button # style are overriden again. -style "treeview_header" = "clearlooks-default" { +style "clearlooks-treeview_header" = "clearlooks-default" { xthickness = 2 ythickness = 1 engine "clearlooks" { + radius = 0.0 hint = "treeview-header" } } -style "tooltips" { +style "clearlooks-tooltips" { xthickness = 4 ythickness = 4 @@ -352,53 +365,6 @@ style "tooltips" { fg[NORMAL] = @tooltip_fg_color } -style "nautilus_location" { - - bg[NORMAL] = mix (0.60, shade (1.05, @bg_color), @selected_bg_color) -} - -# Wrokaroudn style for places where the text color is used instead of the fg color. -style "text_is_fg_color_workaround" { - - text[NORMAL] = @fg_color - text[PRELIGHT] = @fg_color - text[SELECTED] = @selected_fg_color - text[ACTIVE] = @fg_color - text[INSENSITIVE] = darker (@bg_color) -} - -# Workaround style for menus where the text color is used instead of the fg color. -style "menuitem_text_is_fg_color_workaround" { - - text[NORMAL] = @fg_color - text[PRELIGHT] = @selected_fg_color - text[SELECTED] = @selected_fg_color - text[ACTIVE] = @fg_color - text[INSENSITIVE] = darker (@bg_color) -} - -# Workaround style for places where the fg color is used instead of the text color. -style "fg_is_text_color_workaround" { - - fg[NORMAL] = @text_color - fg[PRELIGHT] = @text_color - fg[SELECTED] = @selected_fg_color - fg[ACTIVE] = @selected_fg_color - fg[INSENSITIVE] = darker (@bg_color) -} - -# Style to set the toolbar to use a flat style. This is because the "New" button in -# Evolution is not drawn transparent. So if there is a gradient in the background it will -# look really wrong. -# See http://bugzilla.gnome.org/show_bug.cgi?id=446953. -style "evo_new_button_workaround" { - - engine "clearlooks" { - toolbarstyle = 0 - } -} - - ############################################################################### # The following part of the gtkrc applies the different styles to the widgets. ############################################################################### @@ -411,54 +377,54 @@ class "GtkFrame" style "wide" class "GtkCalendar" style "wide" class "GtkCheckButton" style "wider" class "GtkRadioButton" style "wider" -class "GtkEntry" style "entry" +class "GtkEntry" style "clearlooks-entry" -class "GtkPaned" style "paned" -class "GtkSpinButton" style "spinbutton" -class "GtkScale" style "scale" -class "GtkVScale" style "vscale" -class "GtkHScale" style "hscale" -class "GtkScrollbar" style "scrollbar" -class "GtkHScrollbar" style "hscrollbar" -class "GtkVScrollbar" style "vscrollbar" +class "GtkPaned" style "clearlooks-paned" +class "GtkSpinButton" style "clearlooks-spinbutton" +class "GtkScale" style "clearlooks-scale" +class "GtkVScale" style "clearlooks-vscale" +class "GtkHScale" style "clearlooks-hscale" +class "GtkScrollbar" style "clearlooks-scrollbar" +class "GtkHScrollbar" style "clearlooks-hscrollbar" +class "GtkVScrollbar" style "clearlooks-vscrollbar" -class "GtkExpander" style "expander" -class "GtkHSV" style "HSV" +class "GtkExpander" style "clearlooks-expander" +class "GtkHSV" style "clearlooks-HSV" # General matching follows. The order is choosen so that the right styles override # each other. EG. progressbar needs to be more important than the menu match. -widget_class "*" style "notebook_bg" +widget_class "*" style "clearlooks-notebook_bg" # This is not perfect, it could be done better. # (That is modify *every* widget in the notebook, and change those back that # we really don't want changed) -widget_class "**" style "notebook_bg" -widget_class "**" style "notebook_bg" -widget_class "**" style "notebook_bg" -widget_class "**" style "notebook_bg" -widget_class "**" style "notebook_bg" +widget_class "**" style "clearlooks-notebook_bg" +widget_class "**" style "clearlooks-notebook_bg" +widget_class "**" style "clearlooks-notebook_bg" +widget_class "**" style "clearlooks-notebook_bg" +widget_class "**" style "clearlooks-notebook_bg" -widget_class "*" style "button" -widget_class "*" style "notebook" -widget_class "**" style "statusbar" +widget_class "*" style "clearlooks-button" +widget_class "*" style "clearlooks-notebook" +widget_class "**" style "clearlooks-statusbar" -widget_class "**" style "comboboxentry" -widget_class "**" style "comboboxentry" +#widget_class "**" style "clearlooks-comboboxentry" +widget_class "**" style "clearlooks-combobox" -widget_class "**" style "menubar" -widget_class "**" style "menu" -widget_class "**" style "menu_item" -widget_class "**" style "separator_menu_item" +widget_class "**" style "clearlooks-menubar" +widget_class "**" style "clearlooks-menu" +widget_class "**" style "clearlooks-menu_item" +widget_class "**" style "clearlooks-separator_menu_item" -widget_class "*.." style "frame_title" -widget_class "*.*" style "treeview" +widget_class "*.." style "clearlooks-frame_title" +widget_class "*.*" style "clearlooks-treeview" -widget_class "*" style "progressbar" +widget_class "*" style "clearlooks-progressbar" # Treeview headers (and similar stock GTK+ widgets) -widget_class "*.." style "treeview_header" -widget_class "*.." style "treeview_header" -widget_class "*.." style "treeview_header" -widget_class "*.." style "treeview_header" +widget_class "*.." style "clearlooks-treeview_header" +widget_class "*.." style "clearlooks-treeview_header" +widget_class "*.." style "clearlooks-treeview_header" +widget_class "*.." style "clearlooks-treeview_header" # The window of the tooltip is called "gtk-tooltip" ################################################################## @@ -468,34 +434,5 @@ widget_class "*.." style "treeview_header" # quite a bit to get this working correctly. # (It will involve setting different priorities, etc.) ################################################################## -widget "gtk-tooltip*" style "tooltips" +widget "gtk-tooltip*" style "clearlooks-tooltips" -########################################################################## -# Following are special cases and workarounds for issues in applications. -########################################################################## - -# Workaround for the evolution ETable (bug #527532) -widget_class "*.." style "treeview_header" -# Workaround for the evolution ETree -widget_class "*.." style "treeview_header" - -# Special case the nautilus-extra-view-widget -# ToDo: A more generic approach for all applications that have a widget like this. -widget "*.nautilus-extra-view-widget" style : highest "nautilus_location" - -# Work around for http://bugzilla.gnome.org/show_bug.cgi?id=382646 -# Note that this work around assumes that the combobox is _not_ in appears-as-list mode. -widget_class "*.." style "text_is_fg_color_workaround" -# This is the part of the workaround that fixes the menus -widget "*.gtk-combobox-popup-menu.*" style "menuitem_text_is_fg_color_workaround" - -# Work around the usage of GtkLabel inside GtkListItems to display text. -# This breaks because the label is shown on a background that is based on the base color. -widget_class "**" style "fg_is_text_color_workaround" -# GtkCList also uses the fg color to draw text on top of the base colors. -widget_class "*" style "fg_is_text_color_workaround" -# Nautilus when renaming files, and maybe other places. -widget_class "*" style "fg_is_text_color_workaround" - -# See the documentation of the style. -widget_class "EShellWindow.GtkVBox.BonoboDock.BonoboDockBand.BonoboDockItem*" style "evo_new_button_workaround" diff --git a/rtdata/themes/Default Slim b/rtdata/themes/Default Slim deleted file mode 100644 index 5dcdad261..000000000 --- a/rtdata/themes/Default Slim +++ /dev/null @@ -1,179 +0,0 @@ -# -# This file is part of RawTherapee. -# -# Copyright (c) 2004-2010 Gabor Horvath -# -# RawTherapee is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# RawTherapee is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with RawTherapee. If not, see . -# - -# colour scheme by Bytec ( http://bytec.vitanet.lv ) -# based on the default gtkrc for -# rawtherapee ( http://www.rawtherapee.com ) -# which is based on Bluecurve -# Created by Richard Stellingwerff, Emil Jacobs and Daniel Borgmann. - -style "clearlooks-default" { - - GtkButton ::default_border = { 0, 0, 0, 0 } - GtkRange ::trough_border = 0 - GtkPaned ::handle_size = 6 - GtkRange ::slider_width = 12 - GtkRange ::stepper_size = 12 - GtkScrollbar ::min_slider_length = 30 - GtkCheckButton ::indicator_size = 12 - GtkMenuBar ::internal-padding = 0 - GtkTreeView ::expander_size = 11 - GtkExpander ::expander_size = 11 - GtkScale ::slider-width = 6 - GtkScale ::slider-length = 18 - - xthickness = 1 - ythickness = 1 - - fg[NORMAL] = "#101010" - fg[PRELIGHT] = "#101010" - fg[ACTIVE] = "#000000" - fg[SELECTED] = "#999999" - fg[INSENSITIVE] = "#808080" - - bg[NORMAL] = "#808080" - bg[PRELIGHT] = "#999999" - bg[ACTIVE] = "#808080" - bg[SELECTED] = "#999999" - bg[INSENSITIVE] = "#808080" - - base[NORMAL] = "#999999" - base[PRELIGHT] = "#999999" - base[ACTIVE] = "#999999" - base[SELECTED] = "#606060" - base[INSENSITIVE] = "#808080" - - text[NORMAL] = "#000000" - text[PRELIGHT] = "#000000" - text[ACTIVE] = "#000000" - text[SELECTED] = "#000000" - text[INSENSITIVE] = "#000000" - - engine "clearlooks" { - sunkenmenubar = 1 # 0 = disable, 1 = enable - menuitemstyle = 0 # 0 = flat, 1 = 3d-ish (button) - listviewitemstyle = 0 # 0 = flat, 1 = 3d-ish (gradient) - progressbarstyle = 0 # 0 = candy bar, 1 = flat - } -} - -style "clearlooks-wide" = "clearlooks-default" -{ - xthickness = 1 - ythickness = 1 -} - -style "clearlooks-notebook" = "clearlooks-wide" -{ - bg[NORMAL] = "#808080" -} - -style "clearlooks-tasklist" = "clearlooks-default" -{ - xthickness = 5 - ythickness = 3 -} - -style "clearlooks-menu" = "clearlooks-default" -{ - xthickness = 2 - ythickness = 1 - bg[NORMAL] = "#808080" -} - -style "clearlooks-menu-item" = "clearlooks-default" -{ - xthickness = 1 - ythickness = 1 -} - -style "clearlooks-menu-itembar" = "clearlooks-default" -{ - xthickness = 1 - ythickness = 1 -} - -style "clearlooks-tree" = "clearlooks-default" -{ - xthickness = 1 - ythickness = 1 -} - -style "clearlooks-frame-title" = "clearlooks-default" -{ - fg[NORMAL] = "#404040" -} - -style "clearlooks-panel" = "clearlooks-default" -{ - xthickness = 3 - ythickness = 3 -} - -style "clearlooks-tooltips" = "clearlooks-default" -{ - xthickness = 4 - ythickness = 4 - bg[NORMAL] = { 1.0,1.0,0.75 } -} - -style "clearlooks-progressbar" = "clearlooks-default" -{ - xthickness = 1 - ythickness = 0 - - fg[PRELIGHT] = "#000000" -} - -style "clearlooks-combo" = "clearlooks-default" -{ - xthickness = 0 - ythickness = 0 -} - -style "clearlooks-scale-bg" = "clearlooks-default" -{ - xthickness = 1 - ythickness = 1 - bg[NORMAL] = "#999999" - bg[PRELIGHT] = "#BBBBBB" -} - -class "GtkWidget" style "clearlooks-default" -class "GtkButton" style "clearlooks-wide" -class "GtkRange" style "clearlooks-wide" -class "GtkFrame" style "clearlooks-wide" -class "GtkStatusbar" style "clearlooks-wide" -class "GtkMenu" style "clearlooks-menu" -class "GtkMenuItem" style "clearlooks-menu-item" -widget_class "*MenuItem.*" style "clearlooks-menu-item" -class "GtkEntry" style "clearlooks-wide" -class "GtkScale" style "clearlooks-scale-bg" -widget_class "*.tooltips.*.GtkToggleButton" style "clearlooks-tasklist" -widget_class "*.GtkTreeView.GtkButton" style "clearlooks-tree" -widget_class "*.GtkCTree.GtkButton" style "clearlooks-tree" -widget_class "*.GtkList.GtkButton" style "clearlooks-tree" -widget_class "*.GtkCList.GtkButton" style "clearlooks-tree" -widget_class "*.GtkFrame.GtkLabel" style "clearlooks-frame-title" -widget_class "BasePWidget.GtkEventBox.GtkTable.GtkFrame" style "clearlooks-panel" -widget "gtk-tooltip" style "clearlooks-tooltips" -class "GtkNotebook" style "clearlooks-notebook" -class "GtkProgressBar" style "clearlooks-progressbar" -widget_class "*.GtkComboBox.GtkButton" style "clearlooks-combo" -widget_class "*.GtkCombo.GtkButton" style "clearlooks-combo" diff --git a/rtdata/themes/Default.gtkrc b/rtdata/themes/Default.gtkrc index fe7c351b4..baa24c2dc 100644 --- a/rtdata/themes/Default.gtkrc +++ b/rtdata/themes/Default.gtkrc @@ -21,7 +21,7 @@ gtk-color-scheme = "base_color:#ffffff\nfg_color:#000000\ntooltip_fg_color:#000000\nselected_bg_color:#86ABD9\nselected_fg_color:#ffffff\ntext_color:#1A1A1A\nbg_color:#EDECEB\ntooltip_bg_color:#F5F5B5" -style "default" { +style "clearlooks-default" { xthickness = 1 ythickness = 1 @@ -97,6 +97,7 @@ style "default" { toolbarstyle = 1 animation = FALSE radius = 3.0 + # style between CLASSIC, GLOSSY, INVERTED and GUMMY style = GUMMY # Set a hint to disable backward compatibility fallbacks. @@ -114,7 +115,7 @@ style "wider" { ythickness = 3 } -style "entry" { +style "clearlooks-entry" { xthickness = 3 ythickness = 3 @@ -126,7 +127,7 @@ style "entry" { } } -style "HSV" { +style "clearlooks-HSV" { engine "clearlooks" { hint = "HSV" @@ -134,14 +135,14 @@ style "HSV" { } } -style "spinbutton" { +style "clearlooks-spinbutton" { engine "clearlooks" { hint = "spinbutton" } } -style "scale" { +style "clearlooks-scale" { xthickness = 2 ythickness = 2 @@ -150,21 +151,21 @@ style "scale" { } } -style "vscale" { +style "clearlooks-vscale" { engine "clearlooks" { hint = "vscale" } } -style "hscale" { +style "clearlooks-hscale" { engine "clearlooks" { hint = "hscale" } } -style "scrollbar" { +style "clearlooks-scrollbar" { xthickness = 2 ythickness = 2 @@ -173,26 +174,35 @@ style "scrollbar" { } } -style "hscrollbar" { +style "clearlooks-hscrollbar" { engine "clearlooks" { hint = "hscrollbar" } } -style "vscrollbar" { +style "clearlooks-vscrollbar" { engine "clearlooks" { hint = "vscrollbar" } } -style "notebook_bg" { +style "clearlooks-notebook_bg" { bg[NORMAL] = shade (1.02, @bg_color) } -style "button" { +style "clearlooks-combobox" { + + text[NORMAL] = @fg_color + text[PRELIGHT] = @fg_color + text[SELECTED] = @selected_fg_color + text[INSENSITIVE] = darker (@bg_color) + text[ACTIVE] = @fg_color +} + +style "clearlooks-button" { xthickness = 3 ythickness = 3 @@ -203,19 +213,19 @@ style "button" { # The color is changed by the notebook_bg style, this style # changes the x/ythickness -style "notebook" { +style "clearlooks-notebook" { xthickness = 3 ythickness = 3 } -style "statusbar" { +style "clearlooks-statusbar" { engine "clearlooks" { hint = "statusbar" } } -style "comboboxentry" { +style "clearlooks-comboboxentry" { engine "clearlooks" { # Note: @@ -225,14 +235,14 @@ style "comboboxentry" { } } -style "menubar" { +style "clearlooks-menubar" { engine "clearlooks" { hint = "menubar" } } -style "menu" { +style "clearlooks-menu" { xthickness = 0 ythickness = 0 @@ -243,17 +253,19 @@ style "menu" { } } -style "menu_item" { +style "clearlooks-menu_item" { xthickness = 2 ythickness = 3 fg[PRELIGHT] = @selected_fg_color + text[NORMAL] = @fg_color + text[PRELIGHT] = @selected_fg_color } # This style is there to modify the separator menu items. The goals are: # 1. Get a specific height. # 2. The line should go to the edges (ie. no border at the left/right) -style "separator_menu_item" { +style "clearlooks-separator_menu_item" { xthickness = 1 ythickness = 0 @@ -263,12 +275,12 @@ style "separator_menu_item" { GtkWidget::separator-height = 7 } -style "frame_title" { +style "clearlooks-frame_title" { fg[NORMAL] = lighter (@fg_color) } -style "treeview" { +style "clearlooks-treeview" { engine "clearlooks" { hint = "treeview" @@ -276,7 +288,7 @@ style "treeview" { } # The almost useless progress bar style -style "progressbar" { +style "clearlooks-progressbar" { xthickness = 1 ythickness = 1 @@ -290,18 +302,19 @@ style "progressbar" { } } -# This style is based on the default style, so that the colors from the button +# This style is based on the clearlooks-default style, so that the colors from the button # style are overriden again. -style "treeview_header" = "default" { +style "clearlooks-treeview_header" = "clearlooks-default" { xthickness = 2 ythickness = 1 engine "clearlooks" { + radius = 0.0 hint = "treeview-header" } } -style "tooltips" { +style "clearlooks-tooltips" { xthickness = 4 ythickness = 4 @@ -309,109 +322,62 @@ style "tooltips" { fg[NORMAL] = @tooltip_fg_color } -style "nautilus_location" { - - bg[NORMAL] = mix (0.60, shade (1.05, @bg_color), @selected_bg_color) -} - -# Wrokaroudn style for places where the text color is used instead of the fg color. -style "text_is_fg_color_workaround" { - - text[NORMAL] = @fg_color - text[PRELIGHT] = @fg_color - text[SELECTED] = @selected_fg_color - text[ACTIVE] = @fg_color - text[INSENSITIVE] = darker (@bg_color) -} - -# Workaround style for menus where the text color is used instead of the fg color. -style "menuitem_text_is_fg_color_workaround" { - - text[NORMAL] = @fg_color - text[PRELIGHT] = @selected_fg_color - text[SELECTED] = @selected_fg_color - text[ACTIVE] = @fg_color - text[INSENSITIVE] = darker (@bg_color) -} - -# Workaround style for places where the fg color is used instead of the text color. -style "fg_is_text_color_workaround" { - - fg[NORMAL] = @text_color - fg[PRELIGHT] = @text_color - fg[SELECTED] = @selected_fg_color - fg[ACTIVE] = @selected_fg_color - fg[INSENSITIVE] = darker (@bg_color) -} - -# Style to set the toolbar to use a flat style. This is because the "New" button in -# Evolution is not drawn transparent. So if there is a gradient in the background it will -# look really wrong. -# See http://bugzilla.gnome.org/show_bug.cgi?id=446953. -style "evo_new_button_workaround" { - - engine "clearlooks" { - toolbarstyle = 0 - } -} - - ############################################################################### # The following part of the gtkrc applies the different styles to the widgets. ############################################################################### -# The default style is applied to every widget -class "GtkWidget" style "default" +# The clearlooks-default style is applied to every widget +class "GtkWidget" style "clearlooks-default" class "GtkSeparator" style "wide" class "GtkFrame" style "wide" class "GtkCalendar" style "wide" -class "GtkEntry" style "entry" +class "GtkEntry" style "clearlooks-entry" -class "GtkSpinButton" style "spinbutton" -class "GtkScale" style "scale" -class "GtkVScale" style "vscale" -class "GtkHScale" style "hscale" -class "GtkScrollbar" style "scrollbar" -class "GtkHScrollbar" style "hscrollbar" -class "GtkVScrollbar" style "vscrollbar" +class "GtkSpinButton" style "clearlooks-spinbutton" +class "GtkScale" style "clearlooks-scale" +class "GtkVScale" style "clearlooks-vscale" +class "GtkHScale" style "clearlooks-hscale" +class "GtkScrollbar" style "clearlooks-scrollbar" +class "GtkHScrollbar" style "clearlooks-hscrollbar" +class "GtkVScrollbar" style "clearlooks-vscrollbar" -class "GtkHSV" style "HSV" +class "GtkHSV" style "clearlooks-HSV" # General matching follows. The order is choosen so that the right styles override # each other. EG. progressbar needs to be more important than the menu match. -widget_class "*" style "notebook_bg" +widget_class "*" style "clearlooks-notebook_bg" # This is not perfect, it could be done better. # (That is modify *every* widget in the notebook, and change those back that # we really don't want changed) -widget_class "**" style "notebook_bg" -widget_class "**" style "notebook_bg" -widget_class "**" style "notebook_bg" -widget_class "**" style "notebook_bg" -widget_class "**" style "notebook_bg" +widget_class "**" style "clearlooks-notebook_bg" +widget_class "**" style "clearlooks-notebook_bg" +widget_class "**" style "clearlooks-notebook_bg" +widget_class "**" style "clearlooks-notebook_bg" +widget_class "**" style "clearlooks-notebook_bg" -widget_class "*" style "button" -widget_class "*" style "notebook" -widget_class "**" style "statusbar" +widget_class "*" style "clearlooks-button" +widget_class "*" style "clearlooks-notebook" +widget_class "**" style "clearlooks-statusbar" -widget_class "**" style "comboboxentry" -widget_class "**" style "comboboxentry" +#widget_class "**" style "clearlooks-comboboxentry" +widget_class "**" style "clearlooks-combobox" -widget_class "**" style "menubar" -widget_class "**" style "menu" -widget_class "**" style "menu_item" -widget_class "**" style "separator_menu_item" +widget_class "**" style "clearlooks-menubar" +widget_class "**" style "clearlooks-menu" +widget_class "**" style "clearlooks-menu_item" +widget_class "**" style "clearlooks-separator_menu_item" -widget_class "*.." style "frame_title" -widget_class "*.*" style "treeview" +widget_class "*.." style "clearlooks-frame_title" +widget_class "*.*" style "clearlooks-treeview" -widget_class "*" style "progressbar" +widget_class "*" style "clearlooks-progressbar" # Treeview headers (and similar stock GTK+ widgets) -widget_class "*.." style "treeview_header" -widget_class "*.." style "treeview_header" -widget_class "*.." style "treeview_header" -widget_class "*.." style "treeview_header" +widget_class "*.." style "clearlooks-treeview_header" +widget_class "*.." style "clearlooks-treeview_header" +widget_class "*.." style "clearlooks-treeview_header" +widget_class "*.." style "clearlooks-treeview_header" # The window of the tooltip is called "gtk-tooltip" ################################################################## @@ -421,34 +387,5 @@ widget_class "*.." style "treeview_header" # quite a bit to get this working correctly. # (It will involve setting different priorities, etc.) ################################################################## -widget "gtk-tooltip*" style "tooltips" +widget "gtk-tooltip*" style "clearlooks-tooltips" -########################################################################## -# Following are special cases and workarounds for issues in applications. -########################################################################## - -# Workaround for the evolution ETable (bug #527532) -widget_class "*.." style "treeview_header" -# Workaround for the evolution ETree -widget_class "*.." style "treeview_header" - -# Special case the nautilus-extra-view-widget -# ToDo: A more generic approach for all applications that have a widget like this. -widget "*.nautilus-extra-view-widget" style : highest "nautilus_location" - -# Work around for http://bugzilla.gnome.org/show_bug.cgi?id=382646 -# Note that this work around assumes that the combobox is _not_ in appears-as-list mode. -widget_class "*.." style "text_is_fg_color_workaround" -# This is the part of the workaround that fixes the menus -widget "*.gtk-combobox-popup-menu.*" style "menuitem_text_is_fg_color_workaround" - -# Work around the usage of GtkLabel inside GtkListItems to display text. -# This breaks because the label is shown on a background that is based on the base color. -widget_class "**" style "fg_is_text_color_workaround" -# GtkCList also uses the fg color to draw text on top of the base colors. -widget_class "*" style "fg_is_text_color_workaround" -# Nautilus when renaming files, and maybe other places. -widget_class "*" style "fg_is_text_color_workaround" - -# See the documentation of the style. -widget_class "EShellWindow.GtkVBox.BonoboDock.BonoboDockBand.BonoboDockItem*" style "evo_new_button_workaround" diff --git a/rtdata/themes/Focus Slim b/rtdata/themes/Focus Slim deleted file mode 100644 index e2ead46de..000000000 --- a/rtdata/themes/Focus Slim +++ /dev/null @@ -1,181 +0,0 @@ -# -# This file is part of RawTherapee. -# -# by Oliver Duis -# -# RawTherapee is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# RawTherapee is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with RawTherapee. If not, see . -# - -style "clearlooks-default" { - - GtkFrame ::shadow-type = 2 - - GtkButton ::default_border = { 0, 0, 0, 0 } - - GtkPaned ::handle_size = 3 - - GtkRange ::trough_border = 0 - GtkRange ::slider_width = 8 - GtkRange ::stepper_size = 12 - - GtkSpinButton ::shadow-type = 0 - - GtkScale ::slider-width = 6 - GtkScale ::slider-length = 18 - - GtkScrollbar ::min_slider_length = 30 - GtkScrollbar ::slider-width = 12 - - GtkCheckButton ::indicator_size = 12 - - GtkMenuBar ::internal-padding = 0 - - GtkTreeView ::expander_size = 11 - - GtkExpander ::expander_size = 11 - - GtkComboBox ::appears-as-list = 0 - GtkComboBox ::arrow-size = 10 - GtkComboBox ::shadow-type = 0 - - GtkNotebook ::tab-curvature = 0 - - - xthickness = 1 - ythickness = 1 - - fg[NORMAL] = "#8c8c8c" # Menu items and selected tab - fg[PRELIGHT] = "#d0d0d0" # unkown - fg[ACTIVE] = "#676767" # Inactive tabs - fg[SELECTED] = "#40d040" # unkown - fg[INSENSITIVE] = "#2d2d2d" # Inactive menu items and scrollbar buttons - - bg[NORMAL] = "#404040" # main background, menu seperators - bg[PRELIGHT] = "#505050" # menu and controls on focus - bg[ACTIVE] = "#404040" # Inactive tabs, scrollbar empty region - bg[SELECTED] = "#606060" # selected picture background - bg[INSENSITIVE] = "#404040" # scrollbars insensitive buttons - - base[NORMAL] = "#484848" # control background - base[PRELIGHT] = "#4d4d4d" # unkown - base[ACTIVE] = "#606060" # selected Tree item - base[SELECTED] = "#808080" # background selected text - base[INSENSITIVE] = "#404040" # unkown - - text[NORMAL] = "#8c8c8c" # innercontrol text - text[PRELIGHT] = "#e0e0e0" # unkown - text[ACTIVE] = "#8c8c8c" # selected Tee item text - text[SELECTED] = "#101010" # selected image text - text[INSENSITIVE] = "#101010" # unkown - - engine "clearlooks" { - sunkenmenubar = 0 # 0 = disable, 1 = enable - menuitemstyle = 0 # 0 = flat, 1 = 3d-ish (button) - listviewitemstyle = 0 # 0 = flat, 1 = 3d-ish (gradient) - progressbarstyle = 0 # 0 = candy bar, 1 = flat - } -} - -style "clearlooks-tasklist" = "clearlooks-default" -{ - xthickness = 5 - ythickness = 3 -} - -style "clearlooks-menu" = "clearlooks-default" -{ - xthickness = 2 - ythickness = 1 -} - -style "clearlooks-menu-item" = "clearlooks-default" -{ - xthickness = 1 - ythickness = 1 -} - -style "clearlooks-menu-itembar" = "clearlooks-default" -{ - xthickness = 1 - ythickness = 1 -} - -style "clearlooks-tree" = "clearlooks-default" -{ - xthickness = 1 - ythickness = 1 -} - -style "clearlooks-frame-title" = "clearlooks-default" -{ - fg[NORMAL] = "#404040" -} - -style "clearlooks-panel" = "clearlooks-default" -{ - xthickness = 3 - ythickness = 3 -} - -style "clearlooks-tooltips" = "clearlooks-default" -{ - xthickness = 4 - ythickness = 4 - bg[NORMAL] = { 1.0,1.0,0.75 } -} - -style "clearlooks-progressbar" = "clearlooks-default" -{ - xthickness = 1 - ythickness = 0 - - fg[PRELIGHT] = "#000000" -} - -style "clearlooks-combo" = "clearlooks-default" -{ - xthickness = 0 - ythickness = 0 -} - -style "clearlooks-scale-bg" = "clearlooks-default" -{ - xthickness = 1 - ythickness = 1 - bg[NORMAL] = "#808080" - bg[PRELIGHT] = "#8D8D8D" -} - -class "GtkWidget" style "clearlooks-default" -class "GtkButton" style "clearlooks-default" -class "GtkRange" style "clearlooks-default" -class "GtkFrame" style "clearlooks-default" -class "GtkStatusbar" style "clearlooks-default" -class "GtkMenu" style "clearlooks-menu" -class "GtkMenuItem" style "clearlooks-menu-item" -class "GtkScale" style "clearlooks-scale-bg" -widget_class "*MenuItem.*" style "clearlooks-menu-item" -class "GtkEntry" style "clearlooks-default" -widget_class "*.tooltips.*.GtkToggleButton" style "clearlooks-tasklist" -widget_class "*.GtkTreeView.GtkButton" style "clearlooks-tree" -widget_class "*.GtkCTree.GtkButton" style "clearlooks-tree" -widget_class "*.GtkList.GtkButton" style "clearlooks-tree" -widget_class "*.GtkCList.GtkButton" style "clearlooks-tree" -widget_class "*.GtkFrame.GtkLabel" style "clearlooks-frame-title" -widget_class "BasePWidget.GtkEventBox.GtkTable.GtkFrame" style "clearlooks-panel" -widget "gtk-tooltip" style "clearlooks-tooltips" -class "GtkNotebook" style "clearlooks-default" -class "GtkProgressBar" style "clearlooks-progressbar" -widget_class "*.GtkComboBox.GtkButton" style "clearlooks-combo" -widget_class "*.GtkCombo.GtkButton" style "clearlooks-combo" diff --git a/rtdata/themes/Focus.gtkrc b/rtdata/themes/Focus.gtkrc index 061836c3a..5aa5efb04 100644 --- a/rtdata/themes/Focus.gtkrc +++ b/rtdata/themes/Focus.gtkrc @@ -1,6 +1,8 @@ # # This file is part of RawTherapee. # +# Copyright (c) 2004-2011 Gabor Horvath +# # RawTherapee is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or @@ -17,7 +19,7 @@ # Please keep this gtkrc in sync with the other ones from Clearlooks based themes. -gtk-color-scheme = "salt_pinch:#606060\nbase_color:#484848\nfg_color:#8c8c8c\ntooltip_fg_color:#D2D2D2\nselected_bg_color:#606060\nselected_fg_color:#404040\ntext_color:#8c8c8c\nbg_color:#404040\ntooltip_bg_color:#5A5A5A" +gtk-color-scheme = "salt_pinch:#606060\nbase_color:#484848\nfg_color:#8c8c8c\ntooltip_fg_color:#D2D2D2\nselected_bg_color:#606060\nselected_fg_color:#C0C0C0\ntext_color:#8c8c8c\nbg_color:#404040\ntooltip_bg_color:#5A5A5A" style "clearlooks-default" { xthickness = 1 @@ -73,13 +75,13 @@ style "clearlooks-default" { bg[ACTIVE] = shade (0.9, @bg_color) fg[NORMAL] = @fg_color - fg[PRELIGHT] = @fg_color + fg[PRELIGHT] = @selected_fg_color fg[SELECTED] = @selected_fg_color fg[INSENSITIVE] = mix (0.2, @fg_color, @bg_color) fg[ACTIVE] = @fg_color text[NORMAL] = @text_color - text[PRELIGHT] = @text_color + text[PRELIGHT] = @selected_fg_color text[SELECTED] = @selected_fg_color text[INSENSITIVE] = darker (@bg_color) text[ACTIVE] = @selected_fg_color @@ -97,6 +99,7 @@ style "clearlooks-default" { toolbarstyle = 1 animation = FALSE radius = 3.0 + # style between CLASSIC, GLOSSY, INVERTED and GUMMY style = GUMMY # Set a hint to disable backward compatibility fallbacks. @@ -114,7 +117,7 @@ style "wider" { ythickness = 3 } -style "entry" { +style "clearlooks-entry" { xthickness = 3 ythickness = 3 @@ -126,7 +129,7 @@ style "entry" { } } -style "paned" { +style "clearlooks-paned" { bg[PRELIGHT] = shade (0.9, @bg_color) @@ -135,7 +138,7 @@ style "paned" { } } -style "HSV" { +style "clearlooks-HSV" { engine "clearlooks" { hint = "HSV" @@ -143,14 +146,14 @@ style "HSV" { } } -style "spinbutton" { +style "clearlooks-spinbutton" { engine "clearlooks" { hint = "spinbutton" } } -style "scale" { +style "clearlooks-scale" { xthickness = 2 ythickness = 2 @@ -165,21 +168,21 @@ style "scale" { } } -style "vscale" { +style "clearlooks-vscale" { engine "clearlooks" { hint = "vscale" } } -style "hscale" { +style "clearlooks-hscale" { engine "clearlooks" { hint = "hscale" } } -style "scrollbar" { +style "clearlooks-scrollbar" { xthickness = 2 ythickness = 2 @@ -190,27 +193,36 @@ style "scrollbar" { } } -style "hscrollbar" { +style "clearlooks-hscrollbar" { engine "clearlooks" { hint = "hscrollbar" } } -style "vscrollbar" { +style "clearlooks-vscrollbar" { engine "clearlooks" { hint = "vscrollbar" } } -style "notebook_bg" { +style "clearlooks-notebook_bg" { bg[NORMAL] = shade (1.02, @bg_color) bg[ACTIVE] = shade (0.80, @bg_color) } -style "button" { +style "clearlooks-combobox" { + + text[NORMAL] = @fg_color + text[PRELIGHT] = @selected_fg_color + text[SELECTED] = @selected_fg_color + text[INSENSITIVE] = mix (0.2, @fg_color, @bg_color) + text[ACTIVE] = @fg_color +} + +style "clearlooks-button" { bg[NORMAL] = shade (1.25, @bg_color) bg[PRELIGHT] = shade (1.50, @bg_color) @@ -224,21 +236,21 @@ style "button" { # The color is changed by the notebook_bg style, this style # changes the x/ythickness -style "notebook" { +style "clearlooks-notebook" { xthickness = 3 ythickness = 3 bg[SELECTED] = @salt_pinch } -style "statusbar" { +style "clearlooks-statusbar" { engine "clearlooks" { hint = "statusbar" } } -style "comboboxentry" { +style "clearlooks-comboboxentry" { engine "clearlooks" { # Note: @@ -248,7 +260,7 @@ style "comboboxentry" { } } -style "expander" { +style "clearlooks-expander" { fg[NORMAL] = @salt_pinch fg[PRELIGHT] = @salt_pinch @@ -265,20 +277,20 @@ style "expander" { } } -style "expanderLabel" { +style "clearlooks-expanderLabel" { fg[NORMAL] = "#a0a0a0" fg[PRELIGHT] = "#d0d0d0" } -style "menubar" { +style "clearlooks-menubar" { engine "clearlooks" { hint = "menubar" } } -style "menu" { +style "clearlooks-menu" { xthickness = 0 ythickness = 0 @@ -289,17 +301,19 @@ style "menu" { } } -style "menu_item" { +style "clearlooks-menu_item" { xthickness = 2 ythickness = 3 fg[PRELIGHT] = @selected_fg_color + text[NORMAL] = @fg_color + text[PRELIGHT] = @selected_fg_color } # This style is there to modify the separator menu items. The goals are: # 1. Get a specific height. # 2. The line should go to the edges (ie. no border at the left/right) -style "separator_menu_item" { +style "clearlooks-separator_menu_item" { xthickness = 1 ythickness = 0 @@ -309,12 +323,12 @@ style "separator_menu_item" { GtkWidget::separator-height = 7 } -style "frame_title" { +style "clearlooks-frame_title" { fg[NORMAL] = lighter (@fg_color) } -style "treeview" { +style "clearlooks-treeview" { base[ACTIVE] = mix(0.50, @selected_bg_color, @base_color) @@ -324,7 +338,7 @@ style "treeview" { } # The almost useless progress bar style -style "progressbar" { +style "clearlooks-progressbar" { xthickness = 1 ythickness = 1 @@ -340,18 +354,19 @@ style "progressbar" { # This style is based on the clearlooks-default style, so that the colors from the button # style are overriden again. -style "treeview_header" = "clearlooks-default" { +style "clearlooks-treeview_header" = "clearlooks-default" { xthickness = 2 ythickness = 1 bg[NORMAL] = shade (0.80, @bg_color) engine "clearlooks" { + radius = 0.0 hint = "treeview-header" } } -style "tooltips" { +style "clearlooks-tooltips" { xthickness = 4 ythickness = 4 @@ -359,53 +374,6 @@ style "tooltips" { fg[NORMAL] = @tooltip_fg_color } -style "nautilus_location" { - - bg[NORMAL] = mix (0.60, shade (1.05, @bg_color), @selected_bg_color) -} - -# Wrokaroudn style for places where the text color is used instead of the fg color. -style "text_is_fg_color_workaround" { - - text[NORMAL] = @fg_color - text[PRELIGHT] = @fg_color - text[SELECTED] = @selected_fg_color - text[ACTIVE] = @fg_color - text[INSENSITIVE] = darker (@bg_color) -} - -# Workaround style for menus where the text color is used instead of the fg color. -style "menuitem_text_is_fg_color_workaround" { - - text[NORMAL] = @fg_color - text[PRELIGHT] = @selected_fg_color - text[SELECTED] = @selected_fg_color - text[ACTIVE] = @fg_color - text[INSENSITIVE] = darker (@bg_color) -} - -# Workaround style for places where the fg color is used instead of the text color. -style "fg_is_text_color_workaround" { - - fg[NORMAL] = @text_color - fg[PRELIGHT] = @text_color - fg[SELECTED] = @selected_fg_color - fg[ACTIVE] = @selected_fg_color - fg[INSENSITIVE] = darker (@bg_color) -} - -# Style to set the toolbar to use a flat style. This is because the "New" button in -# Evolution is not drawn transparent. So if there is a gradient in the background it will -# look really wrong. -# See http://bugzilla.gnome.org/show_bug.cgi?id=446953. -style "evo_new_button_workaround" { - - engine "clearlooks" { - toolbarstyle = 0 - } -} - - ############################################################################### # The following part of the gtkrc applies the different styles to the widgets. ############################################################################### @@ -418,56 +386,56 @@ class "GtkFrame" style "wide" class "GtkCalendar" style "wide" class "GtkCheckButton" style "wider" class "GtkRadioButton" style "wider" -class "GtkEntry" style "entry" +class "GtkEntry" style "clearlooks-entry" -class "GtkPaned" style "paned" -class "GtkSpinButton" style "spinbutton" -class "GtkScale" style "scale" -class "GtkVScale" style "vscale" -class "GtkHScale" style "hscale" -class "GtkScrollbar" style "scrollbar" -class "GtkHScrollbar" style "hscrollbar" -class "GtkVScrollbar" style "vscrollbar" +class "GtkPaned" style "clearlooks-paned" +class "GtkSpinButton" style "clearlooks-spinbutton" +class "GtkScale" style "clearlooks-scale" +class "GtkVScale" style "clearlooks-vscale" +class "GtkHScale" style "clearlooks-hscale" +class "GtkScrollbar" style "clearlooks-scrollbar" +class "GtkHScrollbar" style "clearlooks-hscrollbar" +class "GtkVScrollbar" style "clearlooks-vscrollbar" -class "GtkExpander" style "expander" -class "GtkHSV" style "HSV" +class "GtkExpander" style "clearlooks-expander" +class "GtkHSV" style "clearlooks-HSV" # General matching follows. The order is choosen so that the right styles override # each other. EG. progressbar needs to be more important than the menu match. -widget_class "*" style "notebook_bg" +widget_class "*" style "clearlooks-notebook_bg" # This is not perfect, it could be done better. # (That is modify *every* widget in the notebook, and change those back that # we really don't want changed) -widget_class "**" style "notebook_bg" -widget_class "**" style "notebook_bg" -widget_class "**" style "notebook_bg" -widget_class "**" style "notebook_bg" -widget_class "**" style "notebook_bg" +widget_class "**" style "clearlooks-notebook_bg" +widget_class "**" style "clearlooks-notebook_bg" +widget_class "**" style "clearlooks-notebook_bg" +widget_class "**" style "clearlooks-notebook_bg" +widget_class "**" style "clearlooks-notebook_bg" -widget_class "*" style "button" -widget_class "*" style "notebook" -widget_class "**" style "statusbar" +widget_class "*" style "clearlooks-button" +widget_class "*" style "clearlooks-notebook" +widget_class "**" style "clearlooks-statusbar" -widget_class "**" style "comboboxentry" -widget_class "**" style "comboboxentry" +#widget_class "**" style "clearlooks-comboboxentry" +widget_class "**" style "clearlooks-combobox" -widget_class "*." style "expanderLabel" +widget_class "*." style "clearlooks-expanderLabel" -widget_class "**" style "menubar" -widget_class "**" style "menu" -widget_class "**" style "menu_item" -widget_class "**" style "separator_menu_item" +widget_class "**" style "clearlooks-menubar" +widget_class "**" style "clearlooks-menu" +widget_class "**" style "clearlooks-menu_item" +widget_class "**" style "clearlooks-separator_menu_item" -widget_class "*.." style "frame_title" -widget_class "*.*" style "treeview" +widget_class "*.." style "clearlooks-frame_title" +widget_class "*.*" style "clearlooks-treeview" -widget_class "*" style "progressbar" +widget_class "*" style "clearlooks-progressbar" # Treeview headers (and similar stock GTK+ widgets) -widget_class "*.." style "treeview_header" -widget_class "*.." style "treeview_header" -widget_class "*.." style "treeview_header" -widget_class "*.." style "treeview_header" +widget_class "*.." style "clearlooks-treeview_header" +widget_class "*.." style "clearlooks-treeview_header" +widget_class "*.." style "clearlooks-treeview_header" +widget_class "*.." style "clearlooks-treeview_header" # The window of the tooltip is called "gtk-tooltip" ################################################################## @@ -477,34 +445,5 @@ widget_class "*.." style "treeview_header" # quite a bit to get this working correctly. # (It will involve setting different priorities, etc.) ################################################################## -widget "gtk-tooltip*" style "tooltips" +widget "gtk-tooltip*" style "clearlooks-tooltips" -########################################################################## -# Following are special cases and workarounds for issues in applications. -########################################################################## - -# Workaround for the evolution ETable (bug #527532) -widget_class "*.." style "treeview_header" -# Workaround for the evolution ETree -widget_class "*.." style "treeview_header" - -# Special case the nautilus-extra-view-widget -# ToDo: A more generic approach for all applications that have a widget like this. -widget "*.nautilus-extra-view-widget" style : highest "nautilus_location" - -# Work around for http://bugzilla.gnome.org/show_bug.cgi?id=382646 -# Note that this work around assumes that the combobox is _not_ in appears-as-list mode. -widget_class "*.." style "text_is_fg_color_workaround" -# This is the part of the workaround that fixes the menus -widget "*.gtk-combobox-popup-menu.*" style "menuitem_text_is_fg_color_workaround" - -# Work around the usage of GtkLabel inside GtkListItems to display text. -# This breaks because the label is shown on a background that is based on the base color. -widget_class "**" style "fg_is_text_color_workaround" -# GtkCList also uses the fg color to draw text on top of the base colors. -widget_class "*" style "fg_is_text_color_workaround" -# Nautilus when renaming files, and maybe other places. -widget_class "*" style "fg_is_text_color_workaround" - -# See the documentation of the style. -widget_class "EShellWindow.GtkVBox.BonoboDock.BonoboDockBand.BonoboDockItem*" style "evo_new_button_workaround" diff --git a/rtdata/themes/slim b/rtdata/themes/slim index 0d4cbd0ab..05da5df06 100644 --- a/rtdata/themes/slim +++ b/rtdata/themes/slim @@ -69,39 +69,39 @@ style "wider" { ythickness = 2 } -style "entry" { +style "clearlooks-entry" { xthickness = 1 ythickness = 1 } -style "scale" { +style "clearlooks-scale" { xthickness = 1 ythickness = 1 } -style "scrollbar" { +style "clearlooks-scrollbar" { xthickness = 1 ythickness = 1 } -style "button" { +style "clearlooks-button" { xthickness = 0 ythickness = 0 } # The color is changed by the notebook_bg style, this style # changes the x/ythickness -style "notebook" { +style "clearlooks-notebook" { xthickness = 1 ythickness = 1 } -style "menu" { +style "clearlooks-menu" { xthickness = 0 ythickness = 0 } -style "menu_item" { +style "clearlooks-menu_item" { xthickness = 2 ythickness = 3 } @@ -109,7 +109,7 @@ style "menu_item" { # This style is there to modify the separator menu items. The goals are: # 1. Get a specific height. # 2. The line should go to the edges (ie. no border at the left/right) -style "separator_menu_item" { +style "clearlooks-separator_menu_item" { xthickness = 1 ythickness = 0 @@ -118,14 +118,14 @@ style "separator_menu_item" { } # The almost useless progress bar style -style "progressbar" { +style "clearlooks-progressbar" { xthickness = 1 ythickness = 1 } # This style is based on the clearlooks-default style, so that the colors from the button # style are overriden again. -style "treeview_header" { +style "clearlooks-treeview_header" { xthickness = 2 ythickness = 1 }