diff --git a/deb-installer/graphics/logo_debian.png b/deb-installer/graphics/logo_debian.png index 7aa4958d..da77aafb 100644 Binary files a/deb-installer/graphics/logo_debian.png and b/deb-installer/graphics/logo_debian.png differ diff --git a/deb-installer/graphics/logo_debian_dark.png b/deb-installer/graphics/logo_debian_dark.png index 7aa4958d..da77aafb 100644 Binary files a/deb-installer/graphics/logo_debian_dark.png and b/deb-installer/graphics/logo_debian_dark.png differ diff --git a/deb-installer/graphics/logo_installer.png b/deb-installer/graphics/logo_installer.png deleted file mode 120000 index 5bbf0669..00000000 --- a/deb-installer/graphics/logo_installer.png +++ /dev/null @@ -1 +0,0 @@ -logo_debian.png \ No newline at end of file diff --git a/deb-installer/graphics/logo_installer.png b/deb-installer/graphics/logo_installer.png new file mode 100644 index 00000000..da77aafb Binary files /dev/null and b/deb-installer/graphics/logo_installer.png differ diff --git a/deb-installer/graphics/logo_installer_dark.png b/deb-installer/graphics/logo_installer_dark.png deleted file mode 120000 index f7f8f563..00000000 --- a/deb-installer/graphics/logo_installer_dark.png +++ /dev/null @@ -1 +0,0 @@ -logo_debian_dark.png \ No newline at end of file diff --git a/deb-installer/graphics/logo_installer_dark.png b/deb-installer/graphics/logo_installer_dark.png new file mode 100644 index 00000000..da77aafb Binary files /dev/null and b/deb-installer/graphics/logo_installer_dark.png differ diff --git a/deb-installer/themes/Clearlooks/gtk-2.0/gtkrc b/deb-installer/themes/Clearlooks/gtk-2.0/gtkrc index 0ab6ab93..6b6ea7c6 100755 --- a/deb-installer/themes/Clearlooks/gtk-2.0/gtkrc +++ b/deb-installer/themes/Clearlooks/gtk-2.0/gtkrc @@ -1,55 +1,55 @@ -# Author: BSM +# Credit: A few of the modeifications here were taken from the BSM Simple 0.8 theme by Bruno Schmidt Marques. +# Please keep this gtkrc in sync with the other ones from Clearlooks based themes. -gtk_color_scheme = "fg_color:#101010101010\nbg_color:#C0C0C0\ntext_color:#1a1a1a1a1a1a\nbase_color:#ffffffffffff\nselected_fg_color:#ffffff\nselected_bg_color:#F62817\ntooltip_fg_color:#000000000000\ntooltip_bg_color:#f1f1f1"######### -gtk-icon-sizes = "gtk-large-toolbar=24,24:gtk-small-toolbar=16,16:gtk-button=24,24" # This enables "compact-mode". -gtk-button-images = 0 # Enables or disables icons on buttons (OS X-like). +gtk-color-scheme = "base_color:#ffffff\nfg_color:#101010\ntooltip_fg_color:#000000\nselected_bg_color:#80A0C3\nselected_fg_color:#ffffff\ntext_color:#1A1A1A\nbg_color:#e0e0e0\ntooltip_bg_color:#f1f1f1" include "panel.rc" -########################## -# GENERAL THEME SETTINGS -########################## -style "clearlooks-default" -{ - GtkButton ::child-displacement-x = 0 # Pressed button icon displacement. - GtkButton ::child-displacement-y = 0 # Pressed button icon displacement. - GtkButton ::default-border = { 0, 0, 0, 0 } - GtkCheckButton ::indicator-size = 12 # Size for check buttons. - GtkRadioButton ::indicator-size = 12 # Size for radio buttons. - GtkPaned ::handle-size = 3 # Width of handles. - - GtkRange ::trough-border = 0 - GtkRange ::slider-width = 14 - GtkRange ::stepper-size = 12 - - GtkScale ::slider-length = 24 # Length of sliders. - GtkScale ::trough-side-details = 1 - GtkScrollbar ::min-slider-length = 30 # Min. length of scrollbars. - - GtkMenuBar ::internal-padding = 0 - GtkExpander ::expander-size = 10 - GtkToolbar ::internal-padding = 0 # Toolbar padding. - GtkTreeView ::expander-size = 12 - GtkTreeView ::vertical-separator = 0 - - GtkMenu ::horizontal-padding = 0 - GtkMenu ::vertical-padding = 0 - - WnckTasklist ::fade-overlay-rect = 0 - - GtkButton ::focus-padding = 0 # This can give you a more compact appearance. - GtkScrolledWindow ::scrollbar-spacing = 1 # This sets the spacing between scrollbars. - GtkTreeView::odd_row_color = mix(0.98, shade (0.93,@base_color), @selected_bg_color) # This sets the color for odd row items. - - GtkEntry::honors-transparent-bg-hint = 1 - -# Uncomment one or both of the following for flat/unified menus or toolbars: -# GtkToolbar ::shadow-type = GTK_SHADOW_NONE # Makes toolbars flat and unified. -# GtkMenuBar ::shadow-type = GTK_SHADOW_NONE # Makes menus flat and unified. - +style "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-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 + + GtkEntry::progress-border = { 2, 2, 2, 2 } + + #################### + # Color Definitions + #################### fg[NORMAL] = @fg_color fg[PRELIGHT] = @fg_color fg[SELECTED] = @selected_fg_color @@ -64,8 +64,8 @@ style "clearlooks-default" base[NORMAL] = @base_color base[PRELIGHT] = shade (0.95, @bg_color) - base[ACTIVE] = shade (2.0, @selected_bg_color) - base[SELECTED] = shade (1.25, @selected_bg_color) # Color for selected base items. + base[ACTIVE] = "#80A0C3" + base[SELECTED] = "#80A0C3" # Color for selected base items. base[INSENSITIVE] = @bg_color text[NORMAL] = @text_color @@ -74,111 +74,141 @@ style "clearlooks-default" text[SELECTED] = @selected_fg_color text[INSENSITIVE] = darker (@bg_color) - engine "clearlooks" - { - reliefstyle = 0 # 0 makes buttons/widgets less raised. - menubarstyle = 2 # Gradient menubar, use tweak in line 66 for flat menubars. - toolbarstyle = 1 # 0 makes bad toolbars flat. - animation = TRUE # FALSE disables progressbar animations. - style = GUMMY # Could also be set to GLOSSY. - radius = 1.0 # Roundness of widgets. - hint = "use-hints" # Set a hint to disable backward compatibility fallbacks. - } - -} - -################# -# THEME MODULES -################# -style "evolution-hack" = "clearlooks-default" # Hacks for Evolution Mail. -{ - bg[NORMAL] = shade (1.04, @bg_color) # Color for evo treeview headers. - bg[PRELIGHT] = shade (1.08, @bg_color) # Color for evo treeview header prelight. - bg[ACTIVE] = shade (0.90, @bg_color) # Color for unfocused evo selected items. - bg[SELECTED] = shade (1.25, @selected_bg_color) # Color for evo selected items. - fg[ACTIVE] = @selected_fg_color # Color for evo active text. - fg[SELECTED] = @selected_fg_color # Color for evo selected text. -} - -style "clearlooks-wide" -{ - xthickness = 2 # Can't change, or clowns will eat you. - ythickness = 2 # Can't change, or clowns will eat you. -} - -style "clearlooks-wider" -{ - xthickness = 3 # Can't change, or clowns will eat you. - ythickness = 3 # Can't change, or clowns will eat you. - engine "clearlooks" - { - radius = 2.5 # Firefox > 3.0.6 location bar's bug fix - } -} - -style "clearlooks-button" = "clearlooks-wider" -{ - xthickness = 3 # Can't change, or clowns will eat you. - ythickness = 3 # Can't change, or clowns will eat you. - bg[NORMAL] = shade (1.05, @bg_color) # Color for buttons. - bg[SELECTED] = @selected_bg_color - fg[SELECTED] = @selected_fg_color - bg[PRELIGHT] = shade (1.20, @bg_color) # Color for button-prelight. - bg[ACTIVE] = shade (0.85, @bg_color) # Color for pressed-buttons. - engine "clearlooks"{ + engine "clearlooks" { + colorize_scrollbar = FALSE + reliefstyle = 1 + menubarstyle = 2 + toolbarstyle = 1 + animation = TRUE + radius = 3.0 style = GUMMY - radius = 2.5 + + # Set a hint to disable backward compatibility fallbacks. + hint = "use-hints" } } -style "clearlooks-notebook-bg" -{ - bg[NORMAL] = shade (1.10, @bg_color) # Tab background. - bg[ACTIVE] = shade (0.94, @bg_color) # Unfocused tab background. -} - -style "clearlooks-notebook" = "clearlooks-notebook-bg" -{ - xthickness = 2 # Width of tabs and notebook borders. - ythickness = 1 # Height of tabs and notebook borders. - - bg[SELECTED] = shade (1.10, @bg_color) - - engine "clearlooks" - { - radius = 2.0 # Roundness of menu items. - style = GLOSSY - } -} - -style "clearlooks-menu" = "clearlooks-wider" -{ - bg[NORMAL] = shade (1.05, @bg_color) # Color of menu background. - engine "clearlooks" - { - radius = 1.0 # Roundness of menu items. - } -} - -style "clearlooks-menu-item" = "clearlooks-wider" -{ - - fg[PRELIGHT] = @selected_fg_color # Color of selected menu item text. - bg[SELECTED] = shade (1.25, @selected_bg_color) # Color of menu items. - bg[PRELIGHT] = shade (1.25, @selected_bg_color) # Color of menu items. - xthickness = 0 - ythickness = 4 -} - -style "clearlooks-separator-menu-item" -{ - bg[NORMAL] = "#ffffff" - xthickness = 0 +style "wide" { + xthickness = 2 ythickness = 2 } -style "clearlooks-menubar" +style "wider" { + xthickness = 3 + ythickness = 3 +} + +style "entry" { + xthickness = 3 + ythickness = 3 + + bg[SELECTED] = @selected_bg_color + fg[SELECTED] = @text_color + + engine "clearlooks" { + focus_color = @selected_bg_color + } +} + +style "spinbutton" { + + engine "clearlooks" { + hint = "spinbutton" + } +} + +style "scale" { + xthickness = 2 + ythickness = 2 + + engine "clearlooks" {#80A0C3 + 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.02, @bg_color) +} + +style "button" { + xthickness = 3 + ythickness = 3 + + bg[NORMAL] = shade (1.04, @bg_color) + bg[PRELIGHT] = shade (1.06, @bg_color) + bg[ACTIVE] = shade (0.85, @bg_color) +} + +# The color is changed by the notebook_bg style, this style +# changes the x/ythickness +style "notebook" { + xthickness = 3 + ythickness = 3 +} + +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" { + bg[NORMAL] = shade(0.282,@bg_color) + + fg[NORMAL] = "#D0D0D0" + fg[ACTIVE] = "#F0F0F0" + fg[PRELIGHT] = "#FFFFFF" + fg[SELECTED] = "#D0D0D0" xthickness = 1 ythickness = 0 engine "clearlooks" @@ -187,324 +217,228 @@ style "clearlooks-menubar" } } -style "clearlooks-treeview" +style "menu" { - bg[SELECTED] = shade (1.25, @selected_bg_color) - - GtkTreeView::odd_row_color = shade(1.03,@tooltip_bg_color) - GtkTreeView::even_row_color = @tooltip_bg_color - -# GtkTreeView::odd_col_color = shade(0.95,@tooltip_bg_color) -# GtkTreeView::even_col_color = @tooltip_bg_color - - engine "clearlooks" + bg[NORMAL] = "#F8F7F6" # Color of menu background. + fg[NORMAL] = "#101010" + engine "clearlooks" { - hint = "treeview" - radius = 0.0 # This makes treeview progressbars square. + radius = 1.0 # Roundness of menu items. } } -style "clearlooks-treeview-header" = "clearlooks-default" +style "menu_item" { + + fg[PRELIGHT] = @selected_fg_color # Color of selected menu item text. + bg[SELECTED] = @selected_bg_color # Color of menu items. + bg[PRELIGHT] = @selected_bg_color # Color of menu items. + + #fg[NORMAL] = "#101010" + fg[ACTIVE] = "#F0F0F0" + fg[PRELIGHT] = "#FFFFFF" + fg[SELECTED] = "#D0D0D0" + xthickness = 0 + ythickness = 4 +} + +# 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" { + xthickness = 1 + ythickness = 0 + + GtkSeparatorMenuItem::horizontal-padding = 0 + GtkWidget::wide-separators = 1 + GtkWidget::separator-width = 1 + GtkWidget::separator-height = 7 +} + +style "frame_title" { + + fg[NORMAL] = lighter (@fg_color) +} + +style "treeview" { + + engine "clearlooks" { + hint = "treeview" + } +} + +# The almost useless progress bar style +style "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 default style, so that the colors from the button +# style are overriden again. +style "treeview_header" = "default" { xthickness = 2 ythickness = 1 - bg[NORMAL] = shade (1.04, @bg_color) # Color for treeview headers. - bg[PRELIGHT] = shade (1.08, @bg_color) # Color for treeview header prelight. - bg[ACTIVE] = shade (0.85, @bg_color) # Color for pressed-treeview. + engine "clearlooks" { hint = "treeview-header" } - bg[NORMAL] = shade(0.92,@bg_color) } -style "clearlooks-frame-title" -{ - fg[NORMAL] = lighter (@fg_color) +style "tooltips" { + xthickness = 4 + ythickness = 4 + + bg[NORMAL] = @tooltip_bg_color + fg[NORMAL] = @tooltip_fg_color } -style "clearlooks-tooltips" = "clearlooks-wider" -{ - bg[NORMAL] = lighter(@tooltip_fg_color) - fg[NORMAL] = @tooltip_bg_color +style "nautilus_location" { + bg[NORMAL] = mix (0.60, shade (1.05, @bg_color), @selected_bg_color) } -style "metacity-frame"# = "clearlooks-default" -{ - bg[NORMAL] = @bg_color # Color for metacity borders. -} +# Wrokaroudn style for places where the text color is used instead of the fg color. +style "text_is_fg_color_workaround" { -style "clearlooks-progressbar" -{ - xthickness = 1 - ythickness = 1 - fg[PRELIGHT] = @base_color # Progressbar prelighted text. - engine "clearlooks" - { - radius = 1.0 # Roundness of progressbars. - hint = "progressbar" - } -} - -style "clearlooks-statusbar" -{ - engine "clearlooks" - { - hint = "statusbar" - } -} - -style "clearlooks-comboboxentry" -{ - engine "clearlooks" - { - hint = "comboboxentry" - } -} - -style "clearlooks-spinbutton" -{ - bg[NORMAL] = shade (1.04, @bg_color) # Color for spinbuttons. - bg[PRELIGHT] = shade (1.08, @bg_color) # Color for spinbutton prelight. - bg[ACTIVE] = shade (0.85, @bg_color) # Color for pressed-spinbuttons. - engine "clearlooks" - { - hint = "spinbutton" - } -} - -style "clearlooks-scale" = "clearlooks-button" -{ - bg[NORMAL] = shade (1.04, @bg_color) # Color for sliders. - bg[PRELIGHT] = shade (1.08, @bg_color) # Color for slider prelight. - bg[ACTIVE] = shade (0.85, @bg_color) # Color for pressed-sliders. - engine "clearlooks" - { - hint = "scale" - } -} - -style "clearlooks-hscale" = "clearlooks-scale" -{ - engine "clearlooks" - { - hint = "hscale" - } -} - -style "clearlooks-vscale" = "clearlooks-scale" -{ - engine "clearlooks" - { - hint = "vscale" - } -} - -style "clearlooks-nautilus-location" # Workaround for nautilus' messages. -{ - bg[NORMAL] = shade (1.25, @selected_bg_color) -} - -style "clearlooks-radiocheck" = "clearlooks-default" -{ - text[NORMAL] = shade (0.8, @selected_bg_color) # Color for checks/radio items. -# bg[SELECTED] = lighter (@selected_bg_color) # Color for prelight of check/radio buttons. -} - -############## -# SCROLLBARS -############## -style "clearlooks-scrollbar" -{ - bg[NORMAL] = shade (1.04, @bg_color) # Color for non-colored scrollbars. - bg[PRELIGHT] = shade (1.08, @bg_color) # Color for scrollbar prelight? (probably obsolete) - bg[ACTIVE] = shade (0.85, @bg_color) # Color for pressed scrollbar buttons. -# bg[SELECTED] = @selected_bg_color # You can change the color of colorized scrollbars here. - engine "clearlooks" - { -# colorize_scrollbar = TRUE # Uncommenting this gives you colorful scrollbars. - radius = 1.0 # Roundness of scrollbars. - hint = "scrollbar" - } -} - -style "clearlooks-hscrollbar" = "clearlooks-scrollbar" -{ - engine "clearlooks" - { - hint = "hscrollbar" - } -} - -style "clearlooks-vscrollbar" = "clearlooks-scrollbar" -{ - engine "clearlooks" - { - hint = "vscrollbar" - } -} - -############ -# TOOLBARS -############ -#Gradient toolbars are enabled for this theme. - -style "clearlooks-toolbar" = "clearlooks-default" -{ - bg[NORMAL] = "#E1E1E1" - #bg[NORMAL] = shade (0.965, @bg_color) # Darkens gradient toolbars to match with unified metacity theme. - #engine "clearlooks" - #{ - # toolbarstyle = 0 - #} - -} - -style "clearlooks-evo-new-button-workaround" -{ - bg[NORMAL] = shade (0.965, @bg_color) - engine "clearlooks" - { - toolbarstyle = 0 - } -} - -style "opera" -{ - #GtkToolbar ::shadow-type = GTK_SHADOW_NONE # Makes toolbars flat and unified. - bg[NORMAL] = "#CDCDCD" - #bg[ACTIVE] = "#cdcdcd" -} - -widget_class "EShellWindow.GtkVBox.BonoboDock.BonoboDockBand.BonoboDockItem*" style "clearlooks-evo-new-button-workaround" - -class "GtkHandleBox" style "clearlooks-toolbar" - -######################################### -# Matches -######################################### - -# Clearlooks default style is applied to every widget. -class "GtkWidget" style "clearlooks-default" - -# Increase the x/ythickness in some widgets. -class "GtkToolbar" style "clearlooks-toolbar" -class "GtkFrame" style "clearlooks-wide" -class "GtkEntry" style "clearlooks-wider" -class "GtkXFWM" style "metacity-frame" -#class "MetaFrames" style "metacity-frame" -class "GtkSeparator" style "clearlooks-wide" -#class "GtkWindow" style "metacity-frame" -class "GtkCalendar" style "clearlooks-wide" - -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 "GtkVScrollbar" style "clearlooks-vscrollbar" -class "GtkHScrollbar" style "clearlooks-hscrollbar" - -class "GtkRadio*" style "clearlooks-radiocheck" -class "GtkCheck*" style "clearlooks-radiocheck" - -# General matching following, the order is choosen so that the right styles override each other eg. progressbar needs to be more important then the menu match. - -# 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 "*.GtkNotebook.*.GtkViewport" style "clearlooks-notebook" - -widget_class "*" style "clearlooks-button" -widget_class "*" style "clearlooks-notebook" -widget_class "**" style "clearlooks-statusbar" - -widget_class "**" style "clearlooks-comboboxentry" -widget_class "**" style "clearlooks-comboboxentry" - -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 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" - -# Workarounds for Evolution -widget_class "*.ETable.ECanvas" style "clearlooks-treeview-header" -widget_class "*.ETree.ECanvas" style "clearlooks-treeview-header" -widget_class "*GtkCTree*" style "evolution-hack" -widget_class "*GtkList*" style "evolution-hack" -widget_class "*GtkCList*" style "evolution-hack" -widget_class "*.ETree.*" style "evolution-hack" -widget_class "*EInfoLabel*" style "evolution-hack" - -# 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" - -################################################### -# SPECIAL CASES AND WORKAROUNDS -################################################### - -# 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 "clearlooks-nautilus-location" - -# 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 "*.." 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) +# 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) } -widget "*.gtk-combobox-popup-menu.*" style "clearlooks-menuitem-text-is-fg-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 "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" + +# 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" +# 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 "button" +widget_class "*" style "notebook" +widget_class "**" style "statusbar" + +widget_class "**" style "comboboxentry" +widget_class "**" style "comboboxentry" + +widget_class "**" style "menubar" +widget_class "**" style "menu" +widget_class "**" style "menu_item" +widget_class "**" style "separator_menu_item" + +widget_class "*.." style "frame_title" +widget_class "*.*" style "treeview" + +widget_class "*" style "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" + +# 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 "*.." 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 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 "**" 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 "*" style "clearlooks-fg-is-text-color-workaround" -widget_class "*" style "clearlooks-fg-is-text-color-workaround" +# 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" -#widget "*GtkToolbar*" style "opera" #Enable this if you use Opera - -# The answer to the ultimate question of life, the universe, and everything is 42. +# See the documentation of the style. +widget_class "EShellWindow.GtkVBox.BonoboDock.BonoboDockBand.BonoboDockItem*" style "evo_new_button_workaround" diff --git a/deb-installer/themes/dark/gtk-2.0/gtkrc b/deb-installer/themes/dark/gtk-2.0/gtkrc index a8ea61fc..ec15a3a3 100644 --- a/deb-installer/themes/dark/gtk-2.0/gtkrc +++ b/deb-installer/themes/dark/gtk-2.0/gtkrc @@ -1,235 +1,444 @@ -gtk_color_scheme = "fg_color:#fff\nbg_color:#2f2f2f\nbase_color:#444\ntext_color:#fff\nselected_bg_color:#fb7575\nselected_fg_color:#000\ntooltip_bg_color:#000\ntooltip_fg_color:#fff" +# Credit: A few of the modeifications here were taken from the BSM Simple 0.8 theme by Bruno Schmidt Marques. +# Please keep this gtkrc in sync with the other ones from Clearlooks based themes. -style "default" -{ +gtk-color-scheme = "base_color:#ffffff\nfg_color:#101010\ntooltip_fg_color:#000000\nselected_bg_color:#AF9479\nselected_fg_color:#ffffff\ntext_color:#1A1A1A\nbg_color:#e0e0e0\ntooltip_bg_color:#f1f1f1" + +include "panel.rc" + +style "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-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 + + GtkEntry::progress-border = { 2, 2, 2, 2 } + + #################### + # Color Definitions + #################### + fg[NORMAL] = @fg_color + fg[PRELIGHT] = @fg_color + fg[SELECTED] = @selected_fg_color + fg[ACTIVE] = @fg_color + fg[INSENSITIVE] = darker (@bg_color) + + bg[NORMAL] = shade(0.92,@bg_color) + bg[PRELIGHT] = shade (1.02, @bg_color) + bg[SELECTED] = @selected_bg_color # Color for selected items. + bg[INSENSITIVE] = @bg_color + bg[ACTIVE] = shade (0.90, @bg_color) + + base[NORMAL] = @base_color + base[PRELIGHT] = shade (0.95, @bg_color) + base[ACTIVE] = "#AF9479" + base[SELECTED] = "#AF9479" # Color for selected base items. + base[INSENSITIVE] = @bg_color + + text[NORMAL] = @text_color + text[PRELIGHT] = @text_color + text[ACTIVE] = @selected_fg_color + text[SELECTED] = @selected_fg_color + text[INSENSITIVE] = darker (@bg_color) + + engine "clearlooks" { + colorize_scrollbar = FALSE + reliefstyle = 1 + menubarstyle = 2 + toolbarstyle = 1 + animation = TRUE + radius = 3.0 + 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 "entry" { + xthickness = 3 + ythickness = 3 + + bg[SELECTED] = @selected_bg_color + fg[SELECTED] = @text_color + + engine "clearlooks" { + focus_color = @selected_bg_color + } +} + +style "spinbutton" { + + engine "clearlooks" { + hint = "spinbutton" + } +} + +style "scale" { xthickness = 2 ythickness = 2 - GtkEntry::cursor_color = @fg_color - GtkEntry::cursor_aspect_ratio = 0.05 - - GtkRange::stepper-size = 20 - GtkScale ::slider-length = 20 - GtkScale ::trough-side-details = 0 # 0 = thin slider, >0 = thick slider - - GtkTextView::cursor_aspect_ratio = 0.1 - GtkTextView::cursor_color = @fg_color - - GtkTreeView::expander-size = 16 - - GtkWidget::focus-padding = 0 - GtkWidget::interior_focus = 2 - GtkWidget::link-color = @selected_bg_color - GtkWidget::visited-link-color = shade(0.8,@selected_bg_color) - - GtkToolbar :: shadow-type = GTK_SHADOW_NONE - GtkMenuBar :: shadow-type = GTK_SHADOW_NONE - - GtkToolbar ::internal-padding = 4 - - GtkScrollbar ::has-backward-stepper = 0 - GtkScrollbar ::has-forward-stepper = 0 - - GtkCheckButton ::indicator-size = 16 - - GtkProgressBar ::min-vertical-bar-width = 6 - GtkProgressBar ::min-horizontal-bar-height = 6 - - fg[NORMAL] = @fg_color # this is the color of borders - text[NORMAL] = @fg_color - fg[PRELIGHT] = @fg_color - text[PRELIGHT] = @fg_color - fg[ACTIVE] = @fg_color - text[ACTIVE] = @fg_color - fg[SELECTED] = @fg_color - text[SELECTED] = @fg_color - fg[INSENSITIVE] = mix(0.5, @base_color, @fg_color) - text[INSENSITIVE] = mix(0.5, @base_color, @fg_color) - - bg[NORMAL] = @bg_color - base[NORMAL] = @base_color - bg[PRELIGHT] = @bg_color - base[PRELIGHT] = @bg_color - bg[ACTIVE] = mix(0.25,@fg_color,@bg_color) - base[ACTIVE] = mix(0.1,@fg_color,@base_color) - bg[SELECTED] = @selected_bg_color - base[SELECTED] = mix(0.1,@fg_color,@base_color) - bg[INSENSITIVE] = @bg_color - base[INSENSITIVE] = @bg_color -{ - contrast = 5.0 - arrowstyle = 2 #to draw filled arrows. - glazestyle = 0 # 0 = flat highlight, 1 = curved highlight, 2 = concave style, 3 = top curved highlight, 4 = beryl highlight - gradient_shades = {1.0, 1.0, 1.0, 1.0} # default: {1.1,1.0,1.0,1.1} - highlight_shade = 1.0 # set highlight amount for buttons or widgets - lightborder_shade = 1.0 # sets lightborder amount for buttons or widgets - lightborderstyle = 1 # 0 = lightborder on top side, 1 = lightborder on all sides - focusstyle = 1 - reliefstyle = 0 - menustyle = 0 - menubaritemstyle = 0 # 0 = menuitem look, 1 = button look - menubarstyle = 0 # 0 = flat, 1 = glassy, 2 = gradient, 3 = striped - menuitemstyle = 0 # 0 = flat, 1 = glassy, 2 = striped - progressbarstyle = 0 - border_shades = { 1.0, 1.0 } # this for light borders + engine "clearlooks" { + hint = "scale" + } } +style "vscale" { + + engine "clearlooks" { + hint = "vscale" + } } -style "entry" -{ - xthickness = 4 - ythickness = 4 +style "hscale" { + + engine "clearlooks" { + hint = "hscale" + } } -style "button" -{ - xthickness = 4 - ythickness = 4 +style "scrollbar" { + xthickness = 2 + ythickness = 2 - bg[NORMAL] = @base_color - bg[PRELIGHT] = mix(0.05, @fg_color,@base_color) - bg[ACTIVE] = mix(0.1, @fg_color,@base_color) + engine "clearlooks" { + hint = "scrollbar" + } } -style "radiocheck" -{ - text[NORMAL] = @selected_fg_color # Text in window - text[PRELIGHT] = @selected_fg_color # Text on Mouseover - text[ACTIVE] = @selected_fg_color # Text on click +style "hscrollbar" { - bg[SELECTED] = @selected_bg_color + engine "clearlooks" { + hint = "hscrollbar" + } } -style "progressbar" -{ - xthickness = 0 - ythickness = 0 - - fg[PRELIGHT] = @selected_fg_color +style "vscrollbar" { + + engine "clearlooks" { + hint = "vscrollbar" + } } -style "scale" -{ - GtkRange ::slider-width = 14 - GtkScale ::slider-length = 14 - GtkScale ::trough-side-details = 1 - - bg[NORMAL] = @selected_bg_color - bg[PRELIGHT] = @selected_bg_color +style "notebook_bg" { + + bg[NORMAL] = shade (1.02, @bg_color) +} + +style "button" { + xthickness = 3 + ythickness = 3 + + bg[NORMAL] = shade (1.04, @bg_color) + bg[PRELIGHT] = shade (1.06, @bg_color) + bg[ACTIVE] = shade (0.85, @bg_color) +} + +# The color is changed by the notebook_bg style, this style +# changes the x/ythickness +style "notebook" { + xthickness = 3 + ythickness = 3 +} + +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" { -} - -style "menubaritem" -{ - fg[NORMAL] = @fg_color + bg[NORMAL] = shade(0.282,@bg_color) + + fg[NORMAL] = "#D0D0D0" + fg[ACTIVE] = "#F0F0F0" + fg[PRELIGHT] = "#FFFFFF" + fg[SELECTED] = "#D0D0D0" + xthickness = 1 + ythickness = 0 + engine "clearlooks" + { + hint = "menubar" + } } style "menu" { + bg[NORMAL] = "#F8F7F6" # Color of menu background. + fg[NORMAL] = "#101010" + engine "clearlooks" + { + radius = 1.0 # Roundness of menu items. + } +} + +style "menu_item" +{ + + fg[PRELIGHT] = @selected_fg_color # Color of selected menu item text. + bg[SELECTED] = @selected_bg_color # Color of menu items. + bg[PRELIGHT] = @selected_bg_color # Color of menu items. + + #fg[NORMAL] = "#101010" + fg[ACTIVE] = "#F0F0F0" + fg[PRELIGHT] = "#FFFFFF" + fg[SELECTED] = "#D0D0D0" + xthickness = 0 + ythickness = 4 +} + +# 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" { xthickness = 1 - ythickness = 4 + ythickness = 0 - bg[NORMAL] = @bg_color - -} - -style "menuitem" -{ - xthickness = 4 - ythickness = 4 - - engine "murrine" { contrast = 0.0} - - bg[SELECTED] = mix(0.1,@fg_color,@bg_color) - - text[NORMAL] = @fg_color - text[PRELIGHT] = @fg_color - fg[PRELIGHT] = @fg_color -} - -style "menu-separator" -{ GtkSeparatorMenuItem::horizontal-padding = 0 GtkWidget::wide-separators = 1 GtkWidget::separator-width = 1 - GtkWidget::separator-height = 1 + GtkWidget::separator-height = 7 +} + +style "frame_title" { + + fg[NORMAL] = lighter (@fg_color) +} + +style "treeview" { + + engine "clearlooks" { + hint = "treeview" + } +} + +# The almost useless progress bar style +style "progressbar" { xthickness = 1 - ythickness = 2 - - engine "hcengine" { edge_thickness = 1} - fg[NORMAL] = "#000" + 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" + } } -style "separator" -{ - engine "hcengine" { edge_thickness = 1} - fg[NORMAL] = "#000" +# 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 "toolbar" -{ +style "tooltips" { + xthickness = 4 + ythickness = 4 + bg[NORMAL] = @tooltip_bg_color + fg[NORMAL] = @tooltip_fg_color } -style "scrollbar" -{ - engine "murrine" { contrast = 0.0 border_shades = { 0.7, 0.7 } gradient_shades = {1.0, 1.0, 1.0, 1.0} } - bg[SELECTED] = mix(0.5,@fg_color, @base_color) +style "nautilus_location" { + + bg[NORMAL] = mix (0.60, shade (1.05, @bg_color), @selected_bg_color) } -style "notebook" -{ - xthickness = 5 - ythickness = 2 +# Wrokaroudn style for places where the text color is used instead of the fg color. +style "text_is_fg_color_workaround" { - bg[NORMAL] = @base_color - bg[ACTIVE] = @bg_color + text[NORMAL] = @fg_color + text[PRELIGHT] = @fg_color + text[SELECTED] = @selected_fg_color + text[ACTIVE] = @fg_color + text[INSENSITIVE] = darker (@bg_color) } -style "notebook_viewport" { - bg[NORMAL] = @base_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) } -style "tooltips" -{ - xthickness = 6 - ythickness = 6 +# Workaround style for places where the fg color is used instead of the text color. +style "fg_is_text_color_workaround" { - bg[NORMAL] = @tooltip_bg_color - fg[NORMAL] = @tooltip_fg_color + 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 "entry" -widget_class "*" style "button" -class "GtkRadio*" style "radiocheck" -class "GtkCheck*" style "radiocheck" -widget_class "*" style "progressbar" + +class "GtkSpinButton" style "spinbutton" class "GtkScale" style "scale" - -class "GtkFrame" style "separator" -class "GtkSeparator" style "separator" -class "GtkVSeparator" style "separator" -class "GtkHSeparator" style "separator" -class "GtkSeparatorToolItem" style "separator" - -class "GtkMenuBar" style "menubar" -widget_class "*MenuBar.*" style "menubaritem" -class "GtkMenu" style "menu" -widget_class "**" style "menuitem" -widget_class "**" style "menu-separator" - -class "GtkToolbar" style "toolbar" +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 "*" 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 "**" 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 "button" +widget_class "*" style "notebook" +widget_class "**" style "statusbar" + +widget_class "**" style "comboboxentry" +widget_class "**" style "comboboxentry" + +widget_class "**" style "menubar" +widget_class "**" style "menu" +widget_class "**" style "menu_item" +widget_class "**" style "separator_menu_item" + +widget_class "*.." style "frame_title" +widget_class "*.*" style "treeview" + +widget_class "*" style "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" + +# 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" -widget_class "**" style "notebook" -widget_class "**" style "notebook" -widget_class "**" style "notebook" -widget_class "***" style "notebook_viewport" -widget_class "*" style "notebook" +########################################################################## +# 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 "*.." 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"