gnome-themes r1513 - in trunk: . gtk-themes/ClearlooksClassic gtk-themes/Glossy gtk-themes/Inverted



Author: bberg
Date: Tue Aug 19 18:10:49 2008
New Revision: 1513
URL: http://svn.gnome.org/viewvc/gnome-themes?rev=1513&view=rev

Log:
2008-08-19  Benjamin Berg  <benjamin sipsolutions net>

	* gtk-themes/ClearlooksClassic/gtkrc:
	* gtk-themes/Glossy/gtkrc:
	* gtk-themes/Inverted/gtkrc:
	Rework the gtkrcs so that all clearlooks based gtkrcs match better.


Modified:
   trunk/ChangeLog
   trunk/gtk-themes/ClearlooksClassic/gtkrc
   trunk/gtk-themes/Glossy/gtkrc
   trunk/gtk-themes/Inverted/gtkrc

Modified: trunk/gtk-themes/ClearlooksClassic/gtkrc
==============================================================================
--- trunk/gtk-themes/ClearlooksClassic/gtkrc	(original)
+++ trunk/gtk-themes/ClearlooksClassic/gtkrc	Tue Aug 19 18:10:49 2008
@@ -1,298 +1,386 @@
 
-gtk_color_scheme = "fg_color:#000\nbg_color:#ede9e3\nbase_color:#fff\ntext_color:#000\nselected_bg_color:#5598d7\nselected_fg_color:#fff\ntooltip_bg_color:#FFFFBF\ntooltip_fg_color:#000000"
+# Please keep this gtkrc in sync with the other ones from Clearlooks based themes.
 
-style "clearlooks-default"
-{
-  GtkButton      ::default_border    = { 0, 0, 0, 0 }
-  GtkRange       ::trough_border     = 0
-  GtkPaned       ::handle_size       = 6
-  GtkRange       ::slider_width      = 15
-  GtkRange       ::stepper_size      = 15
+gtk-color-scheme = "base_color:#ffffff\nfg_color:#000000\ntooltip_fg_color:#000000\nselected_bg_color:#5598d7\nselected_fg_color:#ffffff\ntext_color:#000000\nbg_color:#ede9e3\ntooltip_bg_color:#FFFFBF"
 
-  GtkScrollbar   ::min_slider_length = 30
-  GtkCheckButton ::indicator_size    = 14
-  GtkMenuBar     ::internal-padding  = 0
-  GtkTreeView    ::expander_size     = 14
-  GtkExpander    ::expander_size     = 16
-  GtkScale       ::slider-length     = 27
-#  GtkToolbar     ::button-relief     = GTK_RELIEF_NORMAL
-#  GtkMenuBar     ::shadow-type       = GTK_SHADOW_OUT
-#  GtkScrollbar   ::has-secondary-forward-stepper = 1
-#  GtkScrollbar   ::has-secondary-backward-stepper = 1
+style "default" {
+	xthickness = 1
+	ythickness = 1
 
-  GtkButton      ::child-displacement-x = 1
-  GtkButton      ::child-displacement-y = 1
+	#######################
+	# Style Properties
+	#######################
+	GtkButton::child-displacement-x = 1
+	GtkButton::child-displacement-y = 1
+	GtkButton::default-border = { 0, 0, 0, 0 }
 
-  WnckTasklist   ::fade-overlay-rect = 0
+	GtkCheckButton::indicator-size = 14
 
-  GtkMenu::vertical_padding = 0
-  GtkMenu::horizontal_padding = 0
+	GtkPaned::handle-size = 6
 
-  # 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
+	GtkRange::trough-border = 0
+	GtkRange::slider-width = 15
+	GtkRange::stepper-size = 15
 
-  xthickness = 1
-  ythickness = 1
+	GtkScale::slider-length = 27
+	GtkScale::trough-side-details = 1
 
+	GtkScrollbar::min-slider-length = 30
+	GtkMenuBar::internal-padding = 0
+	GtkExpander::expander-size = 16
+	GtkTreeView::expander-size = 14
+	GtkTreeView::vertical-separator = 0
 
-  fg[NORMAL]        = @fg_color #"#000000" # black
-  fg[PRELIGHT]      = @fg_color #"#000000" # black
-  fg[SELECTED]      = @selected_fg_color #"#ffffff" # white 
-  fg[ACTIVE]        = @fg_color #"#000000" # black
-  fg[INSENSITIVE]   = darker (@bg_color) #"#b5b3ac" # dark beige
+	GtkMenu::horizontal-padding = 0
+	GtkMenu::vertical-padding = 0
 
-  bg[NORMAL]        = @bg_color # "#ede9e3"
-  bg[PRELIGHT]      = shade (1.02, @bg_color) #"#f9f7f3" # very light beige
-  bg[SELECTED]	    = @selected_bg_color # "#5598d7" # deepsky
-  bg[INSENSITIVE]   = @bg_color # "#efebe5" # beige
-  bg[ACTIVE]        = shade (0.9, @bg_color) #"#dcd4c9" #"#d7d3ca" # dark beige
+	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
+	GtkMenuBar::internal-padding = 0
 
-  base[NORMAL]      = @base_color # "#ffffff" # white 
-  base[PRELIGHT]    = shade (0.95, @bg_color) # "#5f8ec4" # dark beige
-  base[ACTIVE]      = shade (0.9, @selected_bg_color) # "#a69f91" # darker deepsky
-  base[SELECTED]    = @selected_bg_color # "#5598d7" # deepsky
-  base[INSENSITIVE] = @bg_color # "#e8e5de" # beige
+	####################
+	# 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)
 
-  text[NORMAL]      = @text_color # "#000000" # black
-  text[PRELIGHT]    = @text_color # "#000000" # black
-  text[ACTIVE]      = @selected_fg_color # "#ffffff" # white
-  text[SELECTED]    = @selected_fg_color # "#ffffff" # white
-  text[INSENSITIVE] = darker (@bg_color) # "#b5b3ac" # dark beige
+	fg[NORMAL]        = @fg_color
+	fg[PRELIGHT]      = @fg_color
+	fg[SELECTED]      = @selected_fg_color
+	fg[INSENSITIVE]   = darker (@bg_color)
+	fg[ACTIVE]        = @fg_color
 
-  engine "clearlooks" 
-  {
-    #scrollbar_color   = "#76acde"
-    colorize_scrollbar = FALSE
-    menubarstyle      = 2       # 0 = flat, 1 = sunken, 2 = flat gradient
-    animation         = FALSE
-    style             = CLASSIC
-    radius            = 3.0
-  }
+	text[NORMAL]      = @text_color
+	text[PRELIGHT]    = @text_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 = FALSE
+		reliefstyle = 1
+		menubarstyle = 2
+		toolbarstyle = 0
+		animation = FALSE
+		radius = 3.0
+		style = CLASSIC
+
+		# Set a hint to disable backward compatibility fallbacks.
+		hint = "use-hints"
+	}
+}
+
+style "wide" {
+	xthickness = 2
+	ythickness = 2
+}
+
+style "wider" {
+	xthickness = 3
+	ythickness = 3
+}
+
+style "spinbutton" {
+
+	engine "clearlooks" {
+		hint = "spinbutton"
+	}
+}
+
+style "scale" = "button" {
+	xthickness = 2
+	ythickness = 2
+
+	engine "clearlooks" {
+		hint = "scale"
+	}
+}
+
+style "vscale" {
+
+	engine "clearlooks" {
+		hint = "vscale"
+	}
 }
 
+style "hscale" {
 
-style "clearlooks-wide" = "clearlooks-default"
-{
-  xthickness = 2
-  ythickness = 2
+	engine "clearlooks" {
+		hint = "hscale"
+	}
 }
 
-style "clearlooks-wider" = "clearlooks-default"
-{
-  xthickness = 3
-  ythickness = 3
+style "scrollbar" {
+	xthickness = 2
+	ythickness = 2
+
+	engine "clearlooks" {
+		hint = "scrollbar"
+	}
+}
+
+style "hscrollbar" {
+
+	engine "clearlooks" {
+		hint = "hscrollbar"
+	}
 }
 
-style "clearlooks-button" = "clearlooks-wider"
-{
-  bg[NORMAL]        = shade (1.05, @bg_color) # "#f6f4f1"
-  bg[INSENSITIVE]   = shade (1.04, @bg_color) # "#f2efeb"
-  bg[PRELIGHT]      = shade (1.08, @bg_color) # "#faf9f8"
+style "vscrollbar" {
+
+	engine "clearlooks" {
+		hint = "vscrollbar"
+	}
+}
+
+style "notebook_bg" {
 }
 
-style "clearlooks-notebook" = "clearlooks-wide"
-{
-#  bg[NORMAL]      = "#efebe5"
-#  bg[INSENSITIVE] = "#efebe5"
+style "button" {
+	xthickness = 3
+	ythickness = 3
+
+	bg[NORMAL]        = shade (1.05, @bg_color)
+	bg[INSENSITIVE]   = shade (1.04, @bg_color)
+	bg[PRELIGHT]      = shade (1.08, @bg_color)
 }
 
-style "clearlooks-tasklist" = "clearlooks-default"
-{
-  xthickness = 5
-  ythickness = 3
+style "notebook" {
+	xthickness = 2
+	ythickness = 2
 }
 
-style "clearlooks-menu" = "clearlooks-default"
-{
-  xthickness = 2
-  ythickness = 2
-  bg[NORMAL] = shade (1.08, @bg_color) # "#f9f7f3"
+style "statusbar" {
+
+	engine "clearlooks" {
+		hint = "statusbar"
+	}
 }
 
-style "clearlooks-menubar-item" = "clearlooks-button"
-{
-#    fg[PRELIGHT] = "#000000"
+style "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-menu-item" = "clearlooks-default"
-{
-  xthickness = 2
-  ythickness = 3
-  fg[PRELIGHT] = @selected_fg_color
+style "menubar" {
+
+	engine "clearlooks" {
+		hint = "menubar"
+	}
 }
 
-style "clearlooks-tree" = "clearlooks-default"
-{
-  xthickness = 2
-  ythickness = 2
+style "menu" {
+	xthickness = 2
+	ythickness = 2
+
+	bg[NORMAL]        = shade (1.08, @bg_color)
 }
 
-style "clearlooks-frame-title" = "clearlooks-default"
-{
-  fg[NORMAL] = lighter (@fg_color) # "#404040"
+style "menu_item" {
+	xthickness = 2
+	ythickness = 3
+
+	fg[PRELIGHT]      = @selected_fg_color
 }
 
-style "clearlooks-progressbar" = "clearlooks-wide"
-{
-  xthickness = 1
-  ythickness = 1
-  fg[PRELIGHT]  = @selected_fg_color
+style "frame_title" {
 
-  engine "clearlooks"
-  {
-    radius = 1.5
-  }
+	fg[NORMAL]        = lighter (@fg_color)
 }
 
-style "clearlooks-combo" = "clearlooks-button"
-{
+style "treeview" {
+	xthickness = 2
+	ythickness = 2
+
+	engine "clearlooks" {
+		hint = "treeview"
+	}
 }
 
-style "clearlooks-menubar" = "blackrock-default"
-{
-#  bg[NORMAL]   = "#bacedb"
+style "progressbar" {
+	xthickness = 1
+	ythickness = 1
+
+	fg[PRELIGHT]      = @selected_fg_color
+
+	engine "clearlooks" {
+		radius = 1.5
+
+		hint = "progressbar"
+	}
 }
 
-style "clearlooks-scale" = "clearooks-button"
-{
-	GtkRange::trough-side-details = 1
-}	
+# This style is based on the default style, so that the colors from the button
+# style are overriden again.
+style "treeview_header" = "default" {
+	xthickness = 2
+	ythickness = 1
+
+	engine "clearlooks" {
+		hint = "treeview-header"
+	}
+}
 
-style "clearlooks-tooltips"
-{
+style "tooltips" {
 	xthickness = 4
 	ythickness = 4
 
-	bg[NORMAL] = @tooltip_bg_color
-	fg[NORMAL] = @tooltip_fg_color
+	bg[NORMAL]        = @tooltip_bg_color
+	fg[NORMAL]        = @tooltip_fg_color
 }
 
-style "nautilus-location" {
-  bg[NORMAL] = mix(0.60, shade (1.05,@bg_color), @selected_bg_color)
+style "nautilus_location" {
+
+	bg[NORMAL]        = mix (0.60, shade (1.05, @bg_color), @selected_bg_color)
 }
-widget "*.nautilus-extra-view-widget" style:highest "nautilus-location"
 
-# widget styles
-class "GtkWidget"    style "clearlooks-default"
-class "GtkButton"    style "clearlooks-button"
-class "GtkScale"     style "clearlooks-scale"
-class "GtkCombo"     style "clearlooks-button"
-class "GtkRange"     style "clearlooks-wide"
-class "GtkFrame"     style "clearlooks-wide"
-class "GtkSeparator" style "clearlooks-wide"
-class "GtkMenu"      style "clearlooks-menu"
-class "GtkEntry"     style "clearlooks-wider"
-class "GtkMenuItem"    style "clearlooks-menu-item"
-class "GtkNotebook"    style "clearlooks-notebook"
-
-#class "GtkMenuBar" style "clearlooks-menubar"
-
-widget_class "*MenuItem.*" style "clearlooks-menu-item"
-#widget_class "*.GtkMenuBar.*MenuItem.*" style "clearlooks-menubar-item"
-
-# combobox stuff
-widget_class "*.GtkComboBox.GtkButton" style "clearlooks-combo"
-widget_class "*.GtkCombo.GtkButton"    style "clearlooks-combo"
-# For appears-as-list mode, there is not a real entry, but a GtkFrame
-widget_class "*.GtkComboBox.GtkFrame"  style "clearlooks-wider"
-
-# treeview stuff
-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"
-
-# notebook stuff
-widget_class "*.GtkNotebook.*.GtkEventBox" style "clearlooks-notebook"
-widget_class "*.GtkNotebook.*.GtkViewport" style "clearlooks-notebook"
-
-widget_class "*<GtkProgressBar>" style "clearlooks-progressbar"
- 
-widget "*gtk-tooltip*" style "clearlooks-tooltips"
+# Wrokaroudn style for places where the text color is used instead of the fg color.
+style "text_is_fg_color_workaround" {
 
-# Work around for http://bugzilla.gnome.org/show_bug.cgi?id=382646
-# Note that the work around assumes that the combobox is _not_ in
-# appears-as-list mode.
-# This style does not affect GtkComboBoxEntry, it does have an effect
-# on comboboxes in appears-as-list mode though.
-style "clearlooks-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)
-}
-widget_class "*.<GtkComboBox>.<GtkCellView>"   style "clearlooks-text-is-fg-color-workaround"
-
-style "clearlooks-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)
+	text[NORMAL]      = @fg_color
+	text[PRELIGHT]    = @fg_color
+	text[SELECTED]    = @selected_fg_color
+	text[ACTIVE]      = @fg_color
+	text[INSENSITIVE] = darker (@bg_color)
 }
-widget "*.gtk-combobox-popup-menu.*"   style "clearlooks-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 set.
-style "clearlooks-fg-is-text-color-workaround"
-{
-	fg[NORMAL]      = @text_color
-	fg[PRELIGHT]    = @text_color
-	fg[ACTIVE]      = @selected_fg_color
-	fg[SELECTED]    = @selected_fg_color
-	fg[INSENSITIVE] = darker (@bg_color)
-}
-widget_class "*<GtkListItem>*" style "clearlooks-fg-is-text-color-workaround"
-# The same problem also exists for GtkCList and GtkCTree
-# Only match GtkCList and not the parent widgets, because that would also change the headers.
-widget_class "*<GtkCList>" style "clearlooks-fg-is-text-color-workaround"
+# Workaround style for menus where the text color is used instead of the fg color.
+style "menuitem_text_is_fg_color_workaround" {
 
-# Work around for http://bugzilla.gnome.org/show_bug.cgi?id=382646
-# Note that the work around assumes that the combobox is _not_ in
-# appears-as-list mode.
-# This style does not affect GtkComboBoxEntry, it does have an effect
-# on comboboxes in appears-as-list mode though.
-style "clearlooks-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)
-}
-widget_class "*.<GtkComboBox>.<GtkCellView>"   style "clearlooks-text-is-fg-color-workaround"
-
-style "clearlooks-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)
+	text[NORMAL]      = @fg_color
+	text[PRELIGHT]    = @selected_fg_color
+	text[SELECTED]    = @selected_fg_color
+	text[ACTIVE]      = @fg_color
+	text[INSENSITIVE] = darker (@bg_color)
 }
-widget "*.gtk-combobox-popup-menu.*"   style "clearlooks-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 set.
-style "clearlooks-fg-is-text-color-workaround"
-{
-	fg[NORMAL]      = @text_color
-	fg[PRELIGHT]    = @text_color
-	fg[ACTIVE]      = @selected_fg_color
-	fg[SELECTED]    = @selected_fg_color
-	fg[INSENSITIVE] = darker (@bg_color)
-}
-widget_class "*<GtkListItem>*" style "clearlooks-fg-is-text-color-workaround"
-# The same problem also exists for GtkCList and GtkCTree
-# Only match GtkCList and not the parent widgets, because that would also change the headers.
-widget_class "*<GtkCList>" style "clearlooks-fg-is-text-color-workaround"
+# 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"
 
+class "GtkSeparator" style "wide"
+class "GtkFrame" style "wide"
+class "GtkCalendar" style "wide"
+class "GtkEntry" style "wider"
+
+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"
+
+# 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 "*<GtkNotebook>" style "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 "*<GtkNotebook>*<GtkEventBox>" style "notebook_bg"
+widget_class "*<GtkNotebook>*<GtkDrawingArea>" style "notebook_bg"
+widget_class "*<GtkNotebook>*<GtkLayout>" style "notebook_bg"
+
+widget_class "*<GtkButton>" style "button"
+widget_class "*<GtkNotebook>" style "notebook"
+widget_class "*<GtkStatusbar>*" style "statusbar"
+
+widget_class "*<GtkComboBoxEntry>*" style "comboboxentry"
+widget_class "*<GtkCombo>*" style "comboboxentry"
+
+widget_class "*<GtkMenuBar>*" style "menubar"
+widget_class "*<GtkMenu>*" style "menu"
+widget_class "*<GtkMenuItem>*" style "menu_item"
+
+widget_class "*.<GtkFrame>.<GtkLabel>" style "frame_title"
+widget_class "*.<GtkTreeView>*" style "treeview"
+
+widget_class "*<GtkProgress>" style "progressbar"
+
+# Treeview headers (and similar stock GTK+ widgets)
+widget_class "*.<GtkTreeView>.<GtkButton>" style "treeview_header"
+widget_class "*.<GtkCTree>.<GtkButton>" style "treeview_header"
+widget_class "*.<GtkList>.<GtkButton>" style "treeview_header"
+widget_class "*.<GtkCList>.<GtkButton>" style "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 "tooltips"
+
+##########################################################################
+# Following are special cases and workarounds for issues in applications.
+##########################################################################
+
+# Workaround for the evolution ETable (bug #527532)
+widget_class "*.ETable.ECanvas" style "treeview_header"
+# Workaround for the evolution ETree
+widget_class "*.ETree.ECanvas" 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 "*.<GtkComboBox>.<GtkCellView>" 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 "*<GtkListItem>*" style "fg_is_text_color_workaround"
+# GtkCList also uses the fg color to draw text on top of the base colors.
+widget_class "*<GtkCList>" style "fg_is_text_color_workaround"
+# Nautilus when renaming files, and maybe other places.
+widget_class "*<EelEditableLabel>" style "fg_is_text_color_workaround"
 
+# See the documentation of the style.
+widget_class "EShellWindow.GtkVBox.BonoboDock.BonoboDockBand.BonoboDockItem*" style "evo_new_button_workaround"

Modified: trunk/gtk-themes/Glossy/gtkrc
==============================================================================
--- trunk/gtk-themes/Glossy/gtkrc	(original)
+++ trunk/gtk-themes/Glossy/gtkrc	Tue Aug 19 18:10:49 2008
@@ -1,272 +1,387 @@
 
-gtk_color_scheme = "fg_color:#000\nbg_color:#E6E7E8\nbase_color:#fff\ntext_color:#000\nselected_bg_color:#589ADB\nselected_fg_color:#fff"
+# Please keep this gtkrc in sync with the other ones from Clearlooks based themes.
 
-style "clearlooks-default"
-{
-  GtkButton      ::default_border    = { 0, 0, 0, 0 }
-  GtkRange       ::trough_border     = 0
-  GtkPaned       ::handle_size       = 6
-  GtkRange       ::slider_width      = 15
-  GtkRange       ::stepper_size      = 15
-
-  GtkScrollbar   ::min_slider_length = 30
-  GtkCheckButton ::indicator_size    = 14
-  GtkMenuBar     ::internal-padding  = 0
-  GtkTreeView    ::expander_size     = 14
-  GtkExpander    ::expander_size     = 16
-  GtkScale       ::slider-length     = 15
-#  GtkToolbar     ::button-relief     = GTK_RELIEF_NORMAL
-#  GtkMenuBar     ::shadow-type       = GTK_SHADOW_OUT
-#  GtkScrollbar   ::has-secondary-forward-stepper = 1
-#  GtkScrollbar   ::has-secondary-backward-stepper = 1
-
-  GtkButton      ::child-displacement-x = 1
-  GtkButton      ::child-displacement-y = 1
-
-  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
-
-  xthickness = 1
-  ythickness = 1
-
-
-  fg[NORMAL]        = @fg_color #"#000000" # black
-  fg[PRELIGHT]      = @fg_color #"#000000" # black
-  fg[SELECTED]      = @selected_fg_color #"#ffffff" # white 
-  fg[ACTIVE]        = @fg_color #"#000000" # black
-  fg[INSENSITIVE]   = darker (@bg_color) #"#b5b3ac" # dark beige
-
-  bg[NORMAL]        = @bg_color # "#ede9e3"
-  bg[PRELIGHT]      = shade (1.02, @bg_color) #"#f9f7f3" # very light beige
-  bg[SELECTED]	    = @selected_bg_color # "#5598d7" # deepsky
-  bg[INSENSITIVE]   = @bg_color # "#efebe5" # beige
-  bg[ACTIVE]        = shade (0.9, @bg_color) #"#dcd4c9" #"#d7d3ca" # dark beige
-
-  base[NORMAL]      = @base_color # "#ffffff" # white 
-  base[PRELIGHT]    = shade (0.95, @bg_color) # "#5f8ec4" # dark beige
-  base[ACTIVE]      = shade (0.9, @selected_bg_color) # "#a69f91" # darker deepsky
-  base[SELECTED]    = @selected_bg_color # "#5598d7" # deepsky
-  base[INSENSITIVE] = @bg_color # "#e8e5de" # beige
-
-  text[NORMAL]      = @text_color # "#000000" # black
-  text[PRELIGHT]    = @text_color # "#000000" # black
-  text[ACTIVE]      = @selected_fg_color # "#ffffff" # white
-  text[SELECTED]    = @selected_fg_color # "#ffffff" # white
-  text[INSENSITIVE] = darker (@bg_color) # "#b5b3ac" # dark beige
-
-  engine "clearlooks" 
-  {
-    #scrollbar_color   = "#76acde"
-    colorize_scrollbar = TRUE
-    menubarstyle      = 2 # 0 = flat, 1 = sunken, 2 = flat gradient
-    toolbarstyle      = 0 # 0 = flat, 1 = enable effects
-    animation         = FALSE
-    style             = GLOSSY
-  }
-}
-
-
-style "clearlooks-wide" = "clearlooks-default"
-{
-  xthickness = 2
-  ythickness = 2
-}
-
-style "clearlooks-wider" = "clearlooks-default"
-{
-  xthickness = 3
-  ythickness = 3
-}
-
-style "clearlooks-button" = "clearlooks-wider"
-{
-  bg[NORMAL]        = shade (1.05, @bg_color) # "#f6f4f1"
-#  bg[INSENSITIVE]   = shade (1.04, @bg_color) # "#f2efeb"
-  bg[PRELIGHT]      =  mix(0.60, shade (1.05,@bg_color), @selected_bg_color)
-#  bg[PRELIGHT]      = shade (1.08, @bg_color) # "#faf9f8"
-  bg[ACTIVE]        = shade (0.85, @bg_color)
-}
-
-style "clearlooks-notebook" = "clearlooks-wide"
-{
-#  bg[NORMAL]      = "#efebe5"
-#  bg[INSENSITIVE] = "#efebe5"
-  bg[NORMAL]        = shade (1.04, @bg_color)
-}
-
-style "clearlooks-tasklist" = "clearlooks-default"
-{
-  xthickness = 5
-  ythickness = 3
-}
-
-style "clearlooks-toolbar" = "clearlooks-wide"
-{
-  bg[NORMAL]       = shade (1.02, @bg_color)
-}
-
-style "clearlooks-menu" = "clearlooks-default"
-{
-  xthickness = 0
-  ythickness = 0
-  bg[NORMAL] = shade (1.08, @bg_color) # "#f9f7f3"
-}
-
-style "clearlooks-menubar-item" = "clearlooks-default"
-{
-  xthickness = 2
-  ythickness = 3
-  fg[PRELIGHT] = @selected_fg_color
-  engine "clearlooks" {
-    radius = 3.0
-    style  = GLOSSY
-  }
-}
-                  
-style "clearlooks-menu-item" = "clearlooks-default"
-{
-  xthickness = 2
-  ythickness = 3
-  fg[PRELIGHT] = @selected_fg_color  
-  engine "clearlooks" {
-    radius = 0.0
-    style  = GLOSSY
-  }
-}
-
-
-style "clearlooks-tree" = "clearlooks-default"
-{
-  xthickness = 2
-  ythickness = 1
-}
-
-style "clearlooks-frame-title" = "clearlooks-default"
-{
-  fg[NORMAL] = lighter (@fg_color) # "#404040"
-}
-
-style "clearlooks-tooltips" = "clearlooks-default"
-{
-  xthickness = 4
-  ythickness = 4
-  bg[NORMAL] = mix(0.60, shade (1.05,@bg_color), @selected_bg_color)
-}
-
-style "clearlooks-progressbar" = "clearlooks-wide"
-{
-  xthickness = 1
-  ythickness = 1
-  # fg[PRELIGHT]  = "#ffffff"
-}
-
-style "clearlooks-combo" = "clearlooks-button"
-{
-}
-
-style "clearlooks-menubar" = "blackrock-default"
-{
-#  bg[NORMAL]   = "#bacedb"
-}
-
-style "clearlooks-scale" = "clearooks-button"
-{
-	GtkRange::trough-side-details = 1
-}	
-
-style "nautilus-location" {
-  bg[NORMAL] = mix(0.60, shade (1.05,@bg_color), @selected_bg_color)
-}
-widget "*.nautilus-extra-view-widget" style:highest "nautilus-location"
-
-# widget styles
-class "GtkWidget"    style "clearlooks-default"
-class "GtkButton"    style "clearlooks-button"
-class "GtkScale"     style "clearlooks-scale"
-class "GtkCombo"     style "clearlooks-button"
-class "GtkRange"     style "clearlooks-wide"
-class "GtkFrame"     style "clearlooks-wide"
-class "GtkSeparator" style "clearlooks-wide"
-class "GtkMenu"      style "clearlooks-menu"
-class "GtkEntry"     style "clearlooks-wider"
-class "GtkNotebook"    style "clearlooks-notebook"
-class "GtkToolbar"   style "clearlooks-toolbar" 
-#class "GtkMenuBar" style "clearlooks-menubar"
-
-widget_class "*.<GtkMenuItem>*" style "clearlooks-menu-item"
-widget_class "*.<GtkMenuBar>.*" style "clearlooks-menubar-item"
-
-# combobox stuff
-widget_class "*.GtkComboBox.GtkButton" style "clearlooks-combo"
-widget_class "*.GtkCombo.GtkButton"    style "clearlooks-combo"
-
-# tooltips stuff
-widget_class "*.tooltips.*.GtkToggleButton" style "clearlooks-tasklist"
-widget "gtk-tooltip*" style "clearlooks-tooltips"
-
-# treeview stuff
-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"
+gtk-color-scheme = "base_color:#ffffff\nfg_color:#000000\ntooltip_fg_color:#000000\nselected_bg_color:#5598d7\nselected_fg_color:#ffffff\ntext_color:#000000\nbg_color:#ede9e3\ntooltip_bg_color:#FFFFBF"
 
-# 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 "*<GtkNotebook>*<GtkEventBox>"     style "clearlooks-notebook"
-widget_class "*<GtkNotebook>*<GtkDrawingArea>"  style "clearlooks-notebook"
-widget_class "*<GtkNotebook>*<GtkLayout>"       style "clearlooks-notebook"
+style "default" {
+	xthickness = 1
+	ythickness = 1
 
-class "GtkProgressBar" style "clearlooks-progressbar"
+	#######################
+	# Style Properties
+	#######################
+	GtkButton::child-displacement-x = 1
+	GtkButton::child-displacement-y = 1
+	GtkButton::default-border = { 0, 0, 0, 0 }
 
+	GtkCheckButton::indicator-size = 14
 
-# Work around for http://bugzilla.gnome.org/show_bug.cgi?id=382646
-# Note that the work around assumes that the combobox is _not_ in
-# appears-as-list mode.
-# This style does not affect GtkComboBoxEntry, it does have an effect
-# on comboboxes in appears-as-list mode though.
-style "clearlooks-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)
-}
-widget_class "*.<GtkComboBox>.<GtkCellView>"   style "clearlooks-text-is-fg-color-workaround"
-
-style "clearlooks-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)
+	GtkPaned::handle-size = 6
+
+	GtkRange::trough-border = 0
+	GtkRange::slider-width = 15
+	GtkRange::stepper-size = 15
+
+	GtkScale::slider-length = 23
+	GtkScale::trough-side-details = 1
+
+	GtkScrollbar::min-slider-length = 30
+	GtkMenuBar::internal-padding = 0
+	GtkExpander::expander-size = 16
+	GtkToolbar::internal-padding = 1
+	GtkTreeView::expander-size = 14
+	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
+
+	####################
+	# 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]      = @fg_color
+	fg[SELECTED]      = @selected_fg_color
+	fg[INSENSITIVE]   = darker (@bg_color)
+	fg[ACTIVE]        = @fg_color
+
+	text[NORMAL]      = @text_color
+	text[PRELIGHT]    = @text_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 = GLOSSY
+
+		# Set a hint to disable backward compatibility fallbacks.
+		hint = "use-hints"
+	}
 }
-widget "*.gtk-combobox-popup-menu.*"   style "clearlooks-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 set.
-style "clearlooks-fg-is-text-color-workaround"
-{
-	fg[NORMAL]      = @text_color
-	fg[PRELIGHT]    = @text_color
-	fg[ACTIVE]      = @selected_fg_color
-	fg[SELECTED]    = @selected_fg_color
-	fg[INSENSITIVE] = darker (@bg_color)
-}
-widget_class "*<GtkListItem>*" style "clearlooks-fg-is-text-color-workaround"
-# The same problem also exists for GtkCList and GtkCTree
-# Only match GtkCList and not the parent widgets, because that would also change the headers.
-widget_class "*<GtkCList>" style "clearlooks-fg-is-text-color-workaround"
+style "wide" {
+	xthickness = 2
+	ythickness = 2
+}
+
+style "wider" {
+	xthickness = 3
+	ythickness = 3
+}
+
+style "spinbutton" {
+
+	engine "clearlooks" {
+		hint = "spinbutton"
+	}
+}
+
+style "scale" = "button" {
+	xthickness = 2
+	ythickness = 2
+
+	engine "clearlooks" {
+		hint = "scale"
+	}
+}
+
+style "vscale" {
+
+	engine "clearlooks" {
+		hint = "vscale"
+	}
+}
+
+style "hscale" {
+
+	engine "clearlooks" {
+		hint = "hscale"
+	}
+}
+
+style "scrollbar" {
+	xthickness = 2
+	ythickness = 2
+
+	engine "clearlooks" {
+		hint = "scrollbar"
+	}
+}
+
+style "hscrollbar" {
+
+	engine "clearlooks" {
+		hint = "hscrollbar"
+	}
+}
+
+style "vscrollbar" {
+
+	engine "clearlooks" {
+		hint = "vscrollbar"
+	}
+}
+
+style "notebook_bg" {
+
+	bg[NORMAL]        = shade (1.04, @bg_color)
+}
+
+style "button" {
+	xthickness = 3
+	ythickness = 3
+
+	bg[NORMAL]        = shade (1.05, @bg_color)
+	bg[PRELIGHT]      = mix(0.60, shade (1.05,@bg_color), @selected_bg_color)
+}
+
+style "notebook" {
+	xthickness = 2
+	ythickness = 2
+}
+
+style "statusbar" {
+
+	engine "clearlooks" {
+		hint = "statusbar"
+	}
+}
+
+style "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 "menubar" {
+
+	engine "clearlooks" {
+		hint = "menubar"
+	}
+}
+
+style "menu" {
+	xthickness = 2
+	ythickness = 2
+
+	bg[NORMAL]        = shade (1.08, @bg_color)
+}
+
+style "menu_item" {
+	xthickness = 2
+	ythickness = 3
+
+	fg[PRELIGHT]      = @selected_fg_color
+}
+
+style "frame_title" {
+
+	fg[NORMAL]        = lighter (@fg_color)
+}
+
+style "treeview" {
+	xthickness = 2
+	ythickness = 2
+
+	engine "clearlooks" {
+		hint = "treeview"
+	}
+}
+
+style "progressbar" {
+	xthickness = 1
+	ythickness = 1
+
+	fg[PRELIGHT]      = @selected_fg_color
+
+	engine "clearlooks" {
+		radius = 1.5
+
+		hint = "progressbar"
+	}
+}
+
+# This style is based on the default style, so that the colors from the button
+# style are overriden again.
+style "treeview_header" = "default" {
+	xthickness = 2
+	ythickness = 1
+
+	engine "clearlooks" {
+		hint = "treeview-header"
+	}
+}
+
+style "tooltips" {
+	xthickness = 4
+	ythickness = 4
+
+	bg[NORMAL]        = @tooltip_bg_color
+	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"
+
+class "GtkSeparator" style "wide"
+class "GtkFrame" style "wide"
+class "GtkCalendar" style "wide"
+class "GtkEntry" style "wider"
+
+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"
+
+# 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 "*<GtkNotebook>" style "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 "*<GtkNotebook>*<GtkEventBox>" style "notebook_bg"
+widget_class "*<GtkNotebook>*<GtkDrawingArea>" style "notebook_bg"
+widget_class "*<GtkNotebook>*<GtkLayout>" style "notebook_bg"
+
+widget_class "*<GtkButton>" style "button"
+widget_class "*<GtkNotebook>" style "notebook"
+widget_class "*<GtkStatusbar>*" style "statusbar"
+
+widget_class "*<GtkComboBoxEntry>*" style "comboboxentry"
+widget_class "*<GtkCombo>*" style "comboboxentry"
+
+widget_class "*<GtkMenuBar>*" style "menubar"
+widget_class "*<GtkMenu>*" style "menu"
+widget_class "*<GtkMenuItem>*" style "menu_item"
+
+widget_class "*.<GtkFrame>.<GtkLabel>" style "frame_title"
+widget_class "*.<GtkTreeView>*" style "treeview"
+
+widget_class "*<GtkProgress>" style "progressbar"
+
+# Treeview headers (and similar stock GTK+ widgets)
+widget_class "*.<GtkTreeView>.<GtkButton>" style "treeview_header"
+widget_class "*.<GtkCTree>.<GtkButton>" style "treeview_header"
+widget_class "*.<GtkList>.<GtkButton>" style "treeview_header"
+widget_class "*.<GtkCList>.<GtkButton>" style "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 "tooltips"
+
+##########################################################################
+# Following are special cases and workarounds for issues in applications.
+##########################################################################
+
+# Workaround for the evolution ETable (bug #527532)
+widget_class "*.ETable.ECanvas" style "treeview_header"
+# Workaround for the evolution ETree
+widget_class "*.ETree.ECanvas" 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 "*.<GtkComboBox>.<GtkCellView>" 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 "*<GtkListItem>*" style "fg_is_text_color_workaround"
+# GtkCList also uses the fg color to draw text on top of the base colors.
+widget_class "*<GtkCList>" style "fg_is_text_color_workaround"
+# Nautilus when renaming files, and maybe other places.
+widget_class "*<EelEditableLabel>" style "fg_is_text_color_workaround"
 
+# See the documentation of the style.
+widget_class "EShellWindow.GtkVBox.BonoboDock.BonoboDockBand.BonoboDockItem*" style "evo_new_button_workaround"

Modified: trunk/gtk-themes/Inverted/gtkrc
==============================================================================
--- trunk/gtk-themes/Inverted/gtkrc	(original)
+++ trunk/gtk-themes/Inverted/gtkrc	Tue Aug 19 18:10:49 2008
@@ -1,242 +1,385 @@
 
-gtk_color_scheme = "fg_color:#000\nbg_color:#ede9e3\nbase_color:#fff\ntext_color:#000\nselected_bg_color:#716968\nselected_fg_color:#fff"
+# Please keep this gtkrc in sync with the other ones from Clearlooks based themes.
 
-style "clearlooks-default"
-{
-  GtkButton      ::default_border    = { 0, 0, 0, 0 }
-  GtkRange       ::trough_border     = 0
-  GtkPaned       ::handle_size       = 6
-  GtkRange       ::slider_width      = 15
-  GtkRange       ::stepper_size      = 15
+gtk-color-scheme = "base_color:#ffffff\nfg_color:#000000\ntooltip_fg_color:#000000\nselected_bg_color:#716968\nselected_fg_color:#ffffff\ntext_color:#000000\nbg_color:#ede9e3\ntooltip_bg_color:#FFFFBF"
 
-  GtkScrollbar   ::min_slider_length = 30
-  GtkCheckButton ::indicator_size    = 14
-  GtkMenuBar     ::internal-padding  = 0
-  GtkTreeView    ::expander_size     = 14
-  GtkExpander    ::expander_size     = 16
-  GtkScale       ::slider-length     = 27
-#  GtkToolbar     ::button-relief     = GTK_RELIEF_NORMAL
-#  GtkMenuBar     ::shadow-type       = GTK_SHADOW_OUT
-#  GtkScrollbar   ::has-secondary-forward-stepper = 1
-#  GtkScrollbar   ::has-secondary-backward-stepper = 1
+style "default" {
+	xthickness = 1
+	ythickness = 1
 
-  GtkButton      ::child-displacement-x = 1
-  GtkButton      ::child-displacement-y = 1
+	#######################
+	# Style Properties
+	#######################
+	GtkButton::child-displacement-x = 1
+	GtkButton::child-displacement-y = 1
+	GtkButton::default-border = { 0, 0, 0, 0 }
 
-  WnckTasklist   ::fade-overlay-rect = 0
+	GtkCheckButton::indicator-size = 14
 
-  GtkMenu::vertical_padding = 0
-  GtkMenu::horizontal_padding = 0
+	GtkPaned::handle-size = 6
 
-  # 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
+	GtkRange::trough-border = 0
+	GtkRange::slider-width = 15
+	GtkRange::stepper-size = 15
 
-  xthickness = 1
-  ythickness = 1
+	GtkScale::slider-length = 27
+	GtkScale::trough-side-details = 1
 
+	GtkScrollbar::min-slider-length = 30
+	GtkMenuBar::internal-padding = 0
+	GtkExpander::expander-size = 16
+	GtkTreeView::expander-size = 14
+	GtkTreeView::vertical-separator = 0
 
-  fg[NORMAL]        = @fg_color #"#000000" # black
-  fg[PRELIGHT]      = @fg_color #"#000000" # black
-  fg[SELECTED]      = @selected_fg_color #"#ffffff" # white 
-  fg[ACTIVE]        = @fg_color #"#000000" # black
-  fg[INSENSITIVE]   = darker (@bg_color) #"#b5b3ac" # dark beige
+	GtkMenu::horizontal-padding = 0
+	GtkMenu::vertical-padding = 0
 
-  bg[NORMAL]        = @bg_color # "#ede9e3"
-  bg[PRELIGHT]      = shade (1.02, @bg_color) #"#f9f7f3" # very light beige
-  bg[SELECTED]	    = @selected_bg_color # "#5598d7" # deepsky
-  bg[INSENSITIVE]   = @bg_color # "#efebe5" # beige
-  bg[ACTIVE]        = shade (0.9, @bg_color) #"#dcd4c9" #"#d7d3ca" # dark beige
+	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
 
-  base[NORMAL]      = @base_color # "#ffffff" # white 
-  base[PRELIGHT]    = shade (0.95, @bg_color) # "#5f8ec4" # dark beige
-  base[ACTIVE]      = shade (0.9, @selected_bg_color) # "#a69f91" # darker deepsky
-  base[SELECTED]    = @selected_bg_color # "#5598d7" # deepsky
-  base[INSENSITIVE] = @bg_color # "#e8e5de" # beige
+	####################
+	# 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)
 
-  text[NORMAL]      = @text_color # "#000000" # black
-  text[PRELIGHT]    = @text_color # "#000000" # black
-  text[ACTIVE]      = @selected_fg_color # "#ffffff" # white
-  text[SELECTED]    = @selected_fg_color # "#ffffff" # white
-  text[INSENSITIVE] = darker (@bg_color) # "#b5b3ac" # dark beige
+	fg[NORMAL]        = @fg_color
+	fg[PRELIGHT]      = @fg_color
+	fg[SELECTED]      = @selected_fg_color
+	fg[INSENSITIVE]   = darker (@bg_color)
+	fg[ACTIVE]        = @fg_color
 
-  engine "clearlooks" 
-  {
-    #scrollbar_color   = "#76acde"
-    colorize_scrollbar = FALSE
-    menubarstyle      = 2       # 0 = flat, 1 = sunken, 2 = flat gradient
-    animation         = FALSE
-    style             = INVERTED
-    radius            = 2.5
-  }
+	text[NORMAL]      = @text_color
+	text[PRELIGHT]    = @text_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 = FALSE
+		reliefstyle = 1
+		menubarstyle = 2
+		toolbarstyle = 1
+		animation = FALSE
+		radius = 2.5
+		style = INVERTED
+
+		# Set a hint to disable backward compatibility fallbacks.
+		hint = "use-hints"
+	}
+}
+
+style "wide" {
+	xthickness = 2
+	ythickness = 2
+}
+
+style "wider" {
+	xthickness = 3
+	ythickness = 3
+}
+
+style "spinbutton" {
+
+	engine "clearlooks" {
+		hint = "spinbutton"
+	}
+}
+
+style "scale" = "button" {
+	xthickness = 2
+	ythickness = 2
+
+	engine "clearlooks" {
+		hint = "scale"
+	}
+}
+
+style "vscale" {
+
+	engine "clearlooks" {
+		hint = "vscale"
+	}
 }
 
+style "hscale" {
 
-style "clearlooks-wide" = "clearlooks-default"
-{
-  xthickness = 2
-  ythickness = 2
+	engine "clearlooks" {
+		hint = "hscale"
+	}
 }
 
-style "clearlooks-wider" = "clearlooks-default"
-{
-  xthickness = 3
-  ythickness = 3
+style "scrollbar" {
+	xthickness = 2
+	ythickness = 2
+
+	engine "clearlooks" {
+		hint = "scrollbar"
+	}
 }
 
-style "clearlooks-button" = "clearlooks-wider"
-{
-  bg[NORMAL]        = shade (1.05, @bg_color) # "#f6f4f1"
-  bg[INSENSITIVE]   = shade (1.04, @bg_color) # "#f2efeb"
-  bg[PRELIGHT]      = shade (1.08, @bg_color) # "#faf9f8"
+style "hscrollbar" {
+
+	engine "clearlooks" {
+		hint = "hscrollbar"
+	}
 }
 
-style "clearlooks-notebook" = "clearlooks-wide"
-{
-#  bg[NORMAL]      = "#efebe5"
-#  bg[INSENSITIVE] = "#efebe5"
+style "vscrollbar" {
+
+	engine "clearlooks" {
+		hint = "vscrollbar"
+	}
 }
 
-style "clearlooks-tasklist" = "clearlooks-default"
-{
-  xthickness = 5
-  ythickness = 3
+style "notebook_bg" {
 }
 
-style "clearlooks-menu" = "clearlooks-default"
-{
-  xthickness = 2
-  ythickness = 2
-  bg[NORMAL] = shade (1.08, @bg_color) # "#f9f7f3"
+style "button" {
+	xthickness = 3
+	ythickness = 3
+
+	bg[NORMAL]        = shade (1.05, @bg_color)
+	bg[INSENSITIVE]   = shade (1.04, @bg_color)
+	bg[PRELIGHT]      = shade (1.08, @bg_color)
 }
 
-style "clearlooks-menubar-item" = "clearlooks-button"
-{
-#    fg[PRELIGHT] = "#000000"
+style "notebook" {
+	xthickness = 2
+	ythickness = 2
 }
 
-style "clearlooks-menu-item" = "clearlooks-default"
-{
-  xthickness = 2
-  ythickness = 3
-  fg[PRELIGHT] = @selected_fg_color
+style "statusbar" {
+
+	engine "clearlooks" {
+		hint = "statusbar"
+	}
 }
 
-style "clearlooks-tree" = "clearlooks-default"
-{
-  xthickness = 2
-  ythickness = 2
+style "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-frame-title" = "clearlooks-default"
-{
-  fg[NORMAL] = lighter (@fg_color) # "#404040"
+style "menubar" {
+
+	engine "clearlooks" {
+		hint = "menubar"
+	}
 }
 
-style "clearlooks-progressbar" = "clearlooks-wide"
-{
-  xthickness = 1
-  ythickness = 1
-  fg[PRELIGHT]  = @selected_fg_color
+style "menu" {
+	xthickness = 2
+	ythickness = 2
 
-  engine "clearlooks"
-  {
-    radius = 1.5
-  }
+	bg[NORMAL]        = shade (1.08, @bg_color)
 }
 
-style "clearlooks-combo" = "clearlooks-button"
-{
+style "menu_item" {
+	xthickness = 2
+	ythickness = 3
+
+	fg[PRELIGHT]      = @selected_fg_color
 }
 
-style "clearlooks-menubar" = "blackrock-default"
-{
-#  bg[NORMAL]   = "#bacedb"
+style "frame_title" {
+
+	fg[NORMAL]        = lighter (@fg_color)
 }
 
-style "clearlooks-scale" = "clearooks-button"
-{
-	GtkRange::trough-side-details = 1
-}	
+style "treeview" {
+	xthickness = 2
+	ythickness = 2
 
-style "nautilus-location" {
-  bg[NORMAL] = mix(0.60, shade (1.05,@bg_color), @selected_bg_color)
+	engine "clearlooks" {
+		hint = "treeview"
+	}
 }
-widget "*.nautilus-extra-view-widget" style:highest "nautilus-location"
 
-# widget styles
-class "GtkWidget"    style "clearlooks-default"
-class "GtkButton"    style "clearlooks-button"
-class "GtkScale"     style "clearlooks-scale"
-class "GtkCombo"     style "clearlooks-button"
-class "GtkRange"     style "clearlooks-wide"
-class "GtkFrame"     style "clearlooks-wide"
-class "GtkSeparator" style "clearlooks-wide"
-class "GtkMenu"      style "clearlooks-menu"
-class "GtkEntry"     style "clearlooks-wider"
-class "GtkMenuItem"    style "clearlooks-menu-item"
-class "GtkNotebook"    style "clearlooks-notebook"
-#class "GtkMenuBar" style "clearlooks-menubar"
+style "progressbar" {
+	xthickness = 1
+	ythickness = 1
 
-widget_class "*MenuItem.*" style "clearlooks-menu-item"
-#widget_class "*.GtkMenuBar.*MenuItem.*" style "clearlooks-menubar-item"
+	fg[PRELIGHT]      = @selected_fg_color
 
-# combobox stuff
-widget_class "*.GtkComboBox.GtkButton" style "clearlooks-combo"
-widget_class "*.GtkCombo.GtkButton"    style "clearlooks-combo"
-# For appears-as-list mode, there is not a real entry, but a GtkFrame
-widget_class "*.GtkComboBox.GtkFrame"  style "clearlooks-wider"
+	engine "clearlooks" {
+		radius = 1.5
 
-# treeview stuff
-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"
+		hint = "progressbar"
+	}
+}
 
-class "GtkProgressBar" style "clearlooks-progressbar"
+# This style is based on the default style, so that the colors from the button
+# style are overriden again.
+style "treeview_header" = "default" {
+	xthickness = 2
+	ythickness = 1
 
+	engine "clearlooks" {
+		hint = "treeview-header"
+	}
+}
 
-# Work around for http://bugzilla.gnome.org/show_bug.cgi?id=382646
-# Note that the work around assumes that the combobox is _not_ in
-# appears-as-list mode.
-# This style does not affect GtkComboBoxEntry, it does have an effect
-# on comboboxes in appears-as-list mode though.
-style "clearlooks-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)
-}
-widget_class "*.<GtkComboBox>.<GtkCellView>"   style "clearlooks-text-is-fg-color-workaround"
-
-style "clearlooks-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)
+style "tooltips" {
+	xthickness = 4
+	ythickness = 4
+
+	bg[NORMAL]        = @tooltip_bg_color
+	fg[NORMAL]        = @tooltip_fg_color
 }
-widget "*.gtk-combobox-popup-menu.*"   style "clearlooks-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 set.
-style "clearlooks-fg-is-text-color-workaround"
-{
-	fg[NORMAL]      = @text_color
-	fg[PRELIGHT]    = @text_color
-	fg[ACTIVE]      = @selected_fg_color
-	fg[SELECTED]    = @selected_fg_color
-	fg[INSENSITIVE] = darker (@bg_color)
-}
-widget_class "*<GtkListItem>*" style "clearlooks-fg-is-text-color-workaround"
-# The same problem also exists for GtkCList and GtkCTree
-# Only match GtkCList and not the parent widgets, because that would also change the headers.
-widget_class "*<GtkCList>" style "clearlooks-fg-is-text-color-workaround"
+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"
+
+class "GtkSeparator" style "wide"
+class "GtkFrame" style "wide"
+class "GtkCalendar" style "wide"
+class "GtkEntry" style "wider"
+
+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"
+
+# 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 "*<GtkNotebook>" style "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 "*<GtkNotebook>*<GtkEventBox>" style "notebook_bg"
+widget_class "*<GtkNotebook>*<GtkDrawingArea>" style "notebook_bg"
+widget_class "*<GtkNotebook>*<GtkLayout>" style "notebook_bg"
+
+widget_class "*<GtkButton>" style "button"
+widget_class "*<GtkNotebook>" style "notebook"
+widget_class "*<GtkStatusbar>*" style "statusbar"
+
+widget_class "*<GtkComboBoxEntry>*" style "comboboxentry"
+widget_class "*<GtkCombo>*" style "comboboxentry"
+
+widget_class "*<GtkMenuBar>*" style "menubar"
+widget_class "*<GtkMenu>*" style "menu"
+widget_class "*<GtkMenuItem>*" style "menu_item"
+
+widget_class "*.<GtkFrame>.<GtkLabel>" style "frame_title"
+widget_class "*.<GtkTreeView>*" style "treeview"
+
+widget_class "*<GtkProgress>" style "progressbar"
+
+# Treeview headers (and similar stock GTK+ widgets)
+widget_class "*.<GtkTreeView>.<GtkButton>" style "treeview_header"
+widget_class "*.<GtkCTree>.<GtkButton>" style "treeview_header"
+widget_class "*.<GtkList>.<GtkButton>" style "treeview_header"
+widget_class "*.<GtkCList>.<GtkButton>" style "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 "tooltips"
+
+##########################################################################
+# Following are special cases and workarounds for issues in applications.
+##########################################################################
+
+# Workaround for the evolution ETable (bug #527532)
+widget_class "*.ETable.ECanvas" style "treeview_header"
+# Workaround for the evolution ETree
+widget_class "*.ETree.ECanvas" 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 "*.<GtkComboBox>.<GtkCellView>" 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 "*<GtkListItem>*" style "fg_is_text_color_workaround"
+# GtkCList also uses the fg color to draw text on top of the base colors.
+widget_class "*<GtkCList>" style "fg_is_text_color_workaround"
+# Nautilus when renaming files, and maybe other places.
+widget_class "*<EelEditableLabel>" style "fg_is_text_color_workaround"
 
+# See the documentation of the style.
+widget_class "EShellWindow.GtkVBox.BonoboDock.BonoboDockBand.BonoboDockItem*" style "evo_new_button_workaround"



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]