[gimp] themes: use a common gtkrc and correctly named colors.

From: Jehan Pagès <jehanp src gnome org>
To: commits-list gnome org
Cc:
Subject: [gimp] themes: use a common gtkrc and correctly named colors.
Date: Sun, 17 Jan 2016 18:56:58 +0000 (UTC)
commit 6e109052ca8c431644ce6e75693d7865cd2f1673
Author: Jehan <jehan girinstud io>
Date:   Sun Jan 17 19:53:04 2016 +0100

    themes: use a common gtkrc and correctly named colors.
    
    All our new themes should now use a common gtkrc base. Colors only
    should be different, as included from a colorrc. This way we ensure a
    consistent behavior throughout all themes.
    Also we should use meaningful color names to make maintenance easy.

 themes/The-Dark-Side-of-Gimp/Makefile.am  |    2 +-
 themes/The-Dark-Side-of-Gimp/colorrc      |  135 ++
 themes/The-Dark-Side-of-Gimp/gtkrc        |  379 ++---
 themes/The-Light-Side-of-Gimp/Makefile.am |    6 +-
 themes/The-Light-Side-of-Gimp/colorrc     |  135 ++
 themes/The-Light-Side-of-Gimp/gtkrc       | 2476 -----------------------------
 6 files changed, 443 insertions(+), 2690 deletions(-)
---
diff --git a/themes/The-Dark-Side-of-Gimp/Makefile.am b/themes/The-Dark-Side-of-Gimp/Makefile.am
index 7a204ef..834dcb4 100644
--- a/themes/The-Dark-Side-of-Gimp/Makefile.am
+++ b/themes/The-Dark-Side-of-Gimp/Makefile.am
@@ -3,7 +3,7 @@
 themedatadir = $(gimpdatadir)/themes/The-Dark-Side-of-Gimp
 themeuidir   = $(gimpdatadir)/themes/The-Dark-Side-of-Gimp/ui
 
-themedata_DATA = gtkrc
+themedata_DATA = gtkrc colorrc
 
 themeui_DATA = \
        ui/arrow-down-insens.png        \
diff --git a/themes/The-Dark-Side-of-Gimp/colorrc b/themes/The-Dark-Side-of-Gimp/colorrc
new file mode 100644
index 0000000..c6cd32d
--- /dev/null
+++ b/themes/The-Dark-Side-of-Gimp/colorrc
@@ -0,0 +1,135 @@
+# GIMP - The GNU Image Manipulation Program
+# Copyright (C) 1995 Spencer Kimball and Peter Mattis
+#
+# The Dark Side of GIMP Theme
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+style "default-style"
+{
+  color["fg-normal"]   = "#EEEEEE"
+  color["fg-selected"] = "#DDDDDD"
+  color["fg-insensitive"] = "#C1C1C1"
+
+  color["bg-normal"] = "#222222"
+  color["bg-selected"] = "#4D4D4D"
+  color["bg-insensitive"] = "#111111"
+
+  color["base-normal"] = "#828282"
+  color["base-prelight"] = "#3b3b3b"
+  color["base-insensitive"] = "#222222"
+
+  color["text-insensitive"] = @bg-selected
+}
+
+style "tooltips-style" = "default-style"
+{
+  color["tooltip-bg-normal"]   = "#383838"
+  color["tooltip-bg-selected"] = "#828282"
+  color["tooltip-fg-normal"]   = "#CBCBCB"
+}
+
+
+style "treeview" = "default-style"
+{
+  color["treeview-row"] = "#828282"
+}
+
+style "list-header-style"
+{
+  color["treeview-row"] = "#828282"
+}
+
+style "menu" = "default-style"
+{
+  color["menu-bg-normal"]      = "#484848"
+
+  color["menu-fg-normal"]      = "#CBCBCB"
+  color["menu-fg-prelight"]    = "#FFFFFF"
+  color["menu-fg-insensitive"] = "#C1C1C1"
+}
+
+style "menu_item"
+{
+  color["menu-item-bg-normal"]      = "#484848"
+
+  color["menu-item-fg-normal"]      = "#FFF"
+  color["menu-item-fg-prelight"]    = "#FFF"
+  color["menu-item-fg-active"]      = "#FFF"
+  color["menu-item-fg-selected"]    = "#FFF"
+  color["menu-item-fg-insensitive"] = "#C1C1C1"
+}
+
+style "item"
+{
+  color["item-bg-normal"]      = "#484848"
+
+  color["item-fg-normal"]      = "#FFF"
+  color["item-fg-prelight"]    = "#FFF"
+  color["item-fg-active"]      = "#FFF"
+  color["item-fg-selected"]    = "#FFF"
+  color["item-fg-insensitive"] = "#C1C1C1"
+}
+
+style "combobox-entry-button-style"
+{
+  color["combobox-entry-fg-active"] = "#CBCBCB"
+}
+
+style "spin-scale-style"
+{
+  color["spin-scale-bg-normal"] = "#828282"
+}
+
+style "button-style"
+{
+  fg[PRELIGHT] = "#FBFBFB"
+  fg[ACTIVE] = "#9B9B9B"
+  fg[NORMAL] = "#CBCBCB"
+  fg[INSENSITIVE] = "#CBCBCB"
+}
+
+style "kde_hack_1"
+{
+  color["fg-normal"]        = "#EEEEEE"
+  color["fg-selected"]      = "#DDDDDD"
+  color["fg-insensitive"]   = "#C1C1C1"
+
+  color["base-normal"]      = "#828282"
+  color["base-prelight"]    = "#3b3b3b"
+  color["base-insensitive"] = "#222222"
+
+  color["text-insensitive"] = "#4D4D4D"
+}
+
+style "kde_hack_2"
+{
+  bg[NORMAL] = "#222" #Sets canvas BG
+}
+
+style "kde_hack_3"
+{
+  bg[NORMAL] = "#222"
+}
+
+style "overlay-scrollbar"
+{
+  bg[SELECTED] = "#CCC"
+  bg[INSENSITIVE] = "#AAA"
+  bg[ACTIVE] = "#EEE"
+  bg[NORMAL] = "#666"
+  bg[PRELIGHT] = "#666"
+
+  fg[NORMAL] = "#EEE"
+}
diff --git a/themes/The-Dark-Side-of-Gimp/gtkrc b/themes/The-Dark-Side-of-Gimp/gtkrc
index feb2e08..0f893fe 100644
--- a/themes/The-Dark-Side-of-Gimp/gtkrc
+++ b/themes/The-Dark-Side-of-Gimp/gtkrc
@@ -1,6 +1,7 @@
-############################################################################
+# GIMP - The GNU Image Manipulation Program
+# Copyright (C) 1995 Spencer Kimball and Peter Mattis
 #
-# The Dark Side of GIMP Theme
+# GIMP themes: base gtkrc.
 # Version 0.1.3
 #
 # Copyright 2015, Benoit Touchette
@@ -50,6 +51,9 @@
 #
 ############################################################################
 
+# Include style features specific to the theme.
+include "colorrc"
+
 gtk-menu-images = 1
 gtk-button-images = 0
 gtk-auto-mnemonics = 1
@@ -62,43 +66,33 @@ gtk-application-prefer-dark-theme = true
 # KDE hack to match gtk/gnome defaults
 gtk-button-images = 0
 
-style "tdsog-default-style"
+style "default-style"
 {
 #  font_name = "Sans 11"
 
-  color["clr1"] = "#EEEEEE"
-  color["clr2"] = "#DDDDDD"
-  color["clr3"] = "#C1C1C1"
-  color["clr4"] = "#222222"
-  color["clr5"] = "#111111"
-  color["clr6"] = "#828282"
-  color["clr7"] = "#3b3b3b"
-  color["clr8"] = "#222222"
-  color["clr9"] = "#4D4D4D"
-
-  fg[NORMAL] = @clr1
-  fg[PRELIGHT] = @clr1
-  fg[ACTIVE] = @clr1
-  fg[SELECTED] = @clr2
-  fg[INSENSITIVE] = @clr3
-
-  bg[NORMAL] = @clr4
-  bg[PRELIGHT] = @clr4
-  bg[ACTIVE] = @clr4
-  bg[SELECTED] = @clr9
-  bg[INSENSITIVE] = @clr5
-
-  base[NORMAL] = @clr6
-  base[PRELIGHT] = @clr7
-  base[ACTIVE] = @clr7
-  base[SELECTED] = @clr7
-  base[INSENSITIVE] = @clr8
-
-  text[NORMAL] = @clr1
-  text[PRELIGHT] = @clr1
-  text[ACTIVE] = @clr1
-  text[SELECTED] = @clr1
-  text[INSENSITIVE] = @clr9
+  fg[NORMAL]        = @fg-normal
+  fg[PRELIGHT]      = @fg-normal
+  fg[ACTIVE]        = @fg-normal
+  fg[SELECTED]      = @fg-selected
+  fg[INSENSITIVE]   = @fg-insensitive
+
+  bg[NORMAL]        = @bg-normal
+  bg[PRELIGHT]      = @bg-normal
+  bg[ACTIVE]        = @bg-normal
+  bg[SELECTED]      = @bg-selected
+  bg[INSENSITIVE]   = @bg-insensitive
+
+  base[NORMAL]      = @base-normal
+  base[PRELIGHT]    = @base-prelight
+  base[ACTIVE]      = @base-prelight
+  base[SELECTED]    = @base-prelight
+  base[INSENSITIVE] = @base-insensitive
+
+  text[NORMAL]      = @fg-normal
+  text[PRELIGHT]    = @fg-normal
+  text[ACTIVE]      = @fg-normal
+  text[SELECTED]    = @fg-normal
+  text[INSENSITIVE] = @text-insensitive
 
   GtkOptionMenu::indicator-size = { 5, 11 }
   GtkOptionMenu::indicator-spacing = { 4, 3, 1, 1 }
@@ -304,40 +298,40 @@ style "tdsog-default-style"
     }
 }
 
-class "GtkWidget" style "tdsog-default-style"
+class "GtkWidget" style "default-style"
 
 ###########################################################
 
-style "tdsog-tool-dialog-style" = "tdsog-default-style"
+style "tool-dialog-style" = "default-style"
 {
   GtkDialog::action-area-border = 6
 }
 
-class "GimpToolDialog" style "tdsog-tool-dialog-style"
+class "GimpToolDialog" style "tool-dialog-style"
 
 ###########################################################
 
-style "tdsog-grid-view-style" = "tdsog-default-style"
+style "grid-view-style" = "default-style"
 {
   bg[NORMAL] = { 1.0, 1.0, 1.0 }
 }
 
-widget "*GimpContainerGridView*GtkViewport*" style "tdsog-grid-view-style"
+widget "*GimpContainerGridView*GtkViewport*" style "grid-view-style"
 
 ###########################################################
 
-style "tdsog-dockable-style" = "tdsog-default-style"
+style "dockable-style" = "default-style"
 {
   GimpFrame::label-bold = 0
   GtkButton::focus-line_width = 1
   GtkButton::focus-padding = 0
 }
 
-widget "*GimpDockable.*" style "tdsog-dockable-style"
+widget "*GimpDockable.*" style "dockable-style"
 
 ###########################################################
 
-style "tdsog-display-style" = "tdsog-default-style"
+style "display-style" = "default-style"
 {
   GimpRuler::font-scale = 0.6444
   GimpUnitComboBox::label-scale = 0.8333
@@ -348,20 +342,20 @@ style "tdsog-display-style" = "tdsog-default-style"
   GtkButton::focus-padding = 0
 }
 
-widget "*GimpDisplayShell.*" style "tdsog-display-style"
+widget "*GimpDisplayShell.*" style "display-style"
 
 ###########################################################
 
-style "tdsog-overlay-style" = "gimp-display-style"
+style "overlay-style" = "gimp-display-style"
 {
   GtkButton::focus-line_width = 1
 }
 
-widget_class "*<GimpOverlayFrame>*" style "tdsog-overlay-style"
+widget_class "*<GimpOverlayFrame>*" style "overlay-style"
 
 ###########################################################
 
-style "tdsog-gtkbutton-style" = "tdsog-default-style"
+style "gtkbutton-style" = "default-style"
 {
   xthickness = 3
   ythickness = 3
@@ -416,31 +410,31 @@ style "tdsog-gtkbutton-style" = "tdsog-default-style"
     }
 }
 
-class "GtkButton" style "tdsog-gtkbutton-style"
+class "GtkButton" style "gtkbutton-style"
 
 ###########################################################
 
-style "tdsog-tooltips-style" = "tdsog-default-style"
+style "tooltips-style" = "default-style"
 {
+  bg[NORMAL]   = @tooltip-bg-normal
+  bg[SELECTED] = @tooltip-bg-selected
+  fg[NORMAL]   = @tooltip-fg-normal
+
   xthickness = 4
   ythickness = 4
-
-  bg[NORMAL] = "#383838"
-  bg[SELECTED] = "#828282"
-  fg[NORMAL] = "#CBCBCB"
 }
 
-widget "gtk-tooltip*" style "tdsog-tooltips-style"
+widget "gtk-tooltip*" style "tooltips-style"
 
 ###########################################################
 
-style "tdsog-treeview" = "tdsog-default-style"
+style "treeview" = "default-style"
 {
   xthickness = 2
   ythickness = 0
 
-  GtkTreeView::odd_row_color = "#828282"
-  GtkTreeView::even_row_color = "#828282"
+  GtkTreeView::odd_row_color  = @treeview-row
+  GtkTreeView::even_row_color = @treeview-row
 
   #
   # set custom text color here
@@ -501,17 +495,17 @@ style "tdsog-treeview" = "tdsog-default-style"
     }
 }
 
-class "GtkTreeView" style "tdsog-treeview"
+class "GtkTreeView" style "treeview"
 
 ###########################################################
 
-style "tdsog-list-header-style"
+style "list-header-style"
 {
   #Comment out the ythickness setting below for thicker column headers.
   #ythickness = 0
 
-  GtkTreeView::odd_row_color = "#828282"
-  GtkTreeView::even_row_color = "#828282"
+  GtkTreeView::odd_row_color  = @treeview-row
+  GtkTreeView::even_row_color = @treeview-row
 
   #
   # set custom header text color here
@@ -581,13 +575,13 @@ style "tdsog-list-header-style"
     }
 }
 
-widget_class "*List" style "tdsog-list-header-style"
-widget_class "*GtkTree*" style "tdsog-list-header-style"
-widget_class "*GtkCList" style "tdsog-list-header-style"
+widget_class "*List" style "list-header-style"
+widget_class "*GtkTree*" style "list-header-style"
+widget_class "*GtkCList" style "list-header-style"
 
 ###########################################################
 
-style "tdsog-notebook-style" = "tdsog-default-style"
+style "notebook-style" = "default-style"
 {
   engine "pixmap"
     {
@@ -743,17 +737,17 @@ style "tdsog-notebook-style" = "tdsog-default-style"
     }
 }
 
-class "GtkNotebook" style "tdsog-notebook-style"
+class "GtkNotebook" style "notebook-style"
 
 ###########################################################
 
-style "tdsog-menu" = "tdsog-default-style"
+style "menu" = "default-style"
 {
-  bg[NORMAL] = "#484848"
+  bg[NORMAL]      = @menu-bg-normal
 
-  fg[NORMAL] = "#CBCBCB"
-  fg[PRELIGHT] = "#FFFFFF"
-  fg[INSENSITIVE] = "#C1C1C1"
+  fg[NORMAL]      = @menu-fg-normal
+  fg[PRELIGHT]    = @menu-fg-prelight
+  fg[INSENSITIVE] = @menu-fg-insensitive
 
   engine "pixmap"
     {
@@ -777,17 +771,17 @@ style "tdsog-menu" = "tdsog-default-style"
     }
 }
 
-class "GtkMenu" style "tdsog-menu"
-widget_class "*<GtkMenu>*" style "tdsog-menu"
+class "GtkMenu" style "menu"
+widget_class "*<GtkMenu>*" style "menu"
 
 ###########################################################
 
-style "tdsog-menu-bar" = "tdsog-default-style"
+style "menu-bar" = "default-style"
 {
   xthickness = 4
   ythickness = 2
 
-  fg[NORMAL] = "#EEEEEE"
+  fg[NORMAL] = @fg-normal
 
   engine "pixmap"
     {
@@ -801,9 +795,9 @@ style "tdsog-menu-bar" = "tdsog-default-style"
     }
 }
 
-class "GtkMenuBar" style "tdsog-menu-bar"
-widget_class "*<GtkMenuBar>*" style "tdsog-menu-bar"
-widget_class "*<GtkMenuBar>.<GtkMenuItem>*" style "tdsog-menu-bar"
+class "GtkMenuBar" style "menu-bar"
+widget_class "*<GtkMenuBar>*" style "menu-bar"
+widget_class "*<GtkMenuBar>.<GtkMenuItem>*" style "menu-bar"
 
 ###########################################################
 
@@ -812,13 +806,13 @@ style "menu_item"
   xthickness = 2
   ythickness = 4
 
-  bg[NORMAL] = "#484848"
+  bg[NORMAL]      = @menu-item-bg-normal
 
-  fg[NORMAL] = "#FFF"
-  fg[PRELIGHT] = "#FFF"
-  fg[ACTIVE] = "#FFF"
-  fg[SELECTED] = "#FFF"
-  fg[INSENSITIVE] = "#C1C1C1"
+  fg[NORMAL]      = @menu-item-fg-normal
+  fg[PRELIGHT]    = @menu-item-fg-prelight
+  fg[ACTIVE]      = @menu-item-fg-active
+  fg[SELECTED]    = @menu-item-fg-selected
+  fg[INSENSITIVE] = @menu-item-fg-insensitive
 
   engine "pixmap"
     {
@@ -895,17 +889,17 @@ widget_class "*<GtkMenuItem>*" style "menu_item"
 
 ###########################################################
 
-style "tdsog-item"
+style "item"
 {
   xthickness = 4
 
-  bg[NORMAL] = "#484848"
+  bg[NORMAL]      = @item-bg-normal
 
-  fg[NORMAL] = "#FFF"
-  fg[PRELIGHT] = "#FFF"
-  fg[ACTIVE] = "#FFF"
-  fg[SELECTED] = "#FFF"
-  fg[INSENSITIVE] = "#C1C1C1"
+  fg[NORMAL]      = @item-fg-normal
+  fg[PRELIGHT]    = @item-fg-prelight
+  fg[ACTIVE]      = @item-fg-active
+  fg[SELECTED]    = @item-fg-selected
+  fg[INSENSITIVE] = @item-fg-insensitive
 
   engine "pixmap"
     {
@@ -940,12 +934,12 @@ style "tdsog-item"
     }
 }
 
-class "GtkItem" style "tdsog-item"
+class "GtkItem" style "item"
 
 ###########################################################
 
 
-style "tdsog-entry" = "tdsog-default-style"
+style "entry" = "default-style"
 {
   GtkWidget::interior_focus = 1
 
@@ -992,13 +986,13 @@ style "tdsog-entry" = "tdsog-default-style"
     }
 }
 
-class "GtkEntry" style "tdsog-entry"
-class "GtkOldEditable" style "tdsog-entry"
+class "GtkEntry" style "entry"
+class "GtkOldEditable" style "entry"
 
 ###########################################################
 
 
-style "tdsog-spin-button" = "tdsog-entry"
+style "spin-button" = "entry"
 {
   engine "pixmap"
     {
@@ -1113,11 +1107,11 @@ style "tdsog-spin-button" = "tdsog-entry"
     }
 }
 
-class "GtkSpinButton" style "tdsog-spin-button"
+class "GtkSpinButton" style "spin-button"
 
 ###########################################################
 
-style "tdsog-scroll-bar"
+style "scroll-bar"
 {
   GtkRange::trough_border = 0
   GtkVScale::slider_length = 16
@@ -1359,11 +1353,11 @@ style "tdsog-scroll-bar"
     }
 }
 
-class "GtkScrollbar" style "tdsog-scroll-bar"
+class "GtkScrollbar" style "scroll-bar"
 
 ###########################################################
 
-style "tdsog-radio-button" = "tdsog-default-style"
+style "radio-button" = "default-style"
 {
   engine "pixmap"
     {
@@ -1396,12 +1390,12 @@ style "tdsog-radio-button" = "tdsog-default-style"
     }
 }
 
-class "GtkRadioButton"   style "tdsog-radio-button"
-class "GtkRadioMenuItem"  style "tdsog-radio-button"
+class "GtkRadioButton"   style "radio-button"
+class "GtkRadioMenuItem"  style "radio-button"
 
 ###########################################################
 
-style "tdsog-check-button" = "tdsog-default-style"
+style "check-button" = "default-style"
 {
   engine "pixmap"
     {
@@ -1437,12 +1431,12 @@ style "tdsog-check-button" = "tdsog-default-style"
     }
 }
 
-class "GtkCheckButton"   style "tdsog-check-button"
-class "GtkCheckMenuItem"   style "tdsog-check-button"
+class "GtkCheckButton"   style "check-button"
+class "GtkCheckMenuItem"   style "check-button"
 
 ###########################################################
 
-style "tdsog-progress-bar" = "tdsog-default-style"
+style "progress-bar" = "default-style"
 {
   xthickness = 1
   ythickness = 1
@@ -1472,11 +1466,11 @@ style "tdsog-progress-bar" = "tdsog-default-style"
     }
 }
 
-class "GtkProgressBar" style "tdsog-progress-bar"
+class "GtkProgressBar" style "progress-bar"
 
 ###########################################################
 
-style "tdsog-separator-menu-item"
+style "separator-menu-item"
 {
   engine "pixmap"
     {
@@ -1490,11 +1484,11 @@ style "tdsog-separator-menu-item"
     }
 }
 
-class "GtkSeparatorMenuItem" style "tdsog-separator-menu-item"
+class "GtkSeparatorMenuItem" style "separator-menu-item"
 
 ###########################################################
 
-style "tdsog-notebook-entry-style"
+style "notebook-entry-style"
 {
   engine "pixmap"
     {
@@ -1532,11 +1526,11 @@ style "tdsog-notebook-entry-style"
     }
 }
 
-widget_class "*<GtkNotebook>*<GtkEntry>" style "tdsog-notebook-entry-style"
+widget_class "*<GtkNotebook>*<GtkEntry>" style "notebook-entry-style"
 
 ###########################################################
 
-style "tdsog-notebook-combobox-entry-style"
+style "notebook-combobox-entry-style"
 {
   engine "pixmap"
     {
@@ -1614,15 +1608,15 @@ style "tdsog-notebook-combobox-entry-style"
     }
 }
 
-widget_class "*<GtkNotebook>*<GtkComboBoxEntry>*<GtkEntry>" style "tdsog-notebook-combobox-entry-style"
+widget_class "*<GtkNotebook>*<GtkComboBoxEntry>*<GtkEntry>" style "notebook-combobox-entry-style"
 
 ###########################################################
 
-style "tdsog-combobox-entry-button-style"
+style "combobox-entry-button-style"
 {
   xthickness = 6
 
-  fg[ACTIVE] = "#CBCBCB"
+  fg[ACTIVE] = @combobox-entry-fg-active
 
   engine "pixmap"
     {
@@ -1710,13 +1704,13 @@ style "tdsog-combobox-entry-button-style"
     }
 }
 
-widget_class "*<GtkComboBoxEntry>*<GtkEntry>" style "tdsog-combobox-entry-button-style"
-widget_class "*<GtkNotebook>*<GtkEventBox>*<GtkComboBoxEntry>*<GtkEntry>" style 
"tdsog-combobox-entry-button-style"
-widget_class "*<GtkComboBoxEntry>*<GtkButton>" style "tdsog-combobox-entry-button-style"
+widget_class "*<GtkComboBoxEntry>*<GtkEntry>" style "combobox-entry-button-style"
+widget_class "*<GtkNotebook>*<GtkEventBox>*<GtkComboBoxEntry>*<GtkEntry>" style "combobox-entry-button-style"
+widget_class "*<GtkComboBoxEntry>*<GtkButton>" style "combobox-entry-button-style"
 
 ###########################################################
 
-style "tdsog-range-style"
+style "range-style"
 {
   engine "pixmap"
     {
@@ -1813,13 +1807,13 @@ style "tdsog-range-style"
     }
 }
 
-class "GtkRange" style "tdsog-range-style"
+class "GtkRange" style "range-style"
 
 ###########################################################
 
-style "tdsog-spin-scale-style"
+style "spin-scale-style"
 {
-  bg[NORMAL] = "#828282"
+  bg[NORMAL] = @spin-scale-bg-normal
 
   engine "pixmap"
     {
@@ -1911,11 +1905,11 @@ style "tdsog-spin-scale-style"
     }
 }
 
-class "GimpSpinScale" style "tdsog-spin-scale-style"
+class "GimpSpinScale" style "spin-scale-style"
 
 ###########################################################
 
-style "tdsog-scrolled-window-style"
+style "scrolled-window-style"
 {
   xthickness = 1
   ythickness = 1
@@ -1932,11 +1926,11 @@ style "tdsog-scrolled-window-style"
     }
 }
 
-class "GtkScrolledWindow" style "tdsog-scrolled-window-style"
+class "GtkScrolledWindow" style "scrolled-window-style"
 
 ###########################################################
 
-style "tdsog-frame-style"
+style "frame-style"
 {
   xthickness = 1
   ythickness = 1
@@ -2033,11 +2027,11 @@ style "tdsog-frame-style"
     }
 }
 
-class "GtkFrame" style "tdsog-frame-style"
+class "GtkFrame" style "frame-style"
 
 ###########################################################
 
-style "tdsog-toolbox-frame-style"
+style "toolbox-frame-style"
 {
   engine "pixmap"
     {
@@ -2048,11 +2042,11 @@ style "tdsog-toolbox-frame-style"
     }
 }
 
-widget_class "*<GimpToolbox>*<GtkFrame>" style "tdsog-toolbox-frame-style"
+widget_class "*<GimpToolbox>*<GtkFrame>" style "toolbox-frame-style"
 
 ###########################################################
 
-style "tdsog-toolbar-style"
+style "toolbar-style"
 {
   engine "pixmap"
     {
@@ -2110,43 +2104,43 @@ style "tdsog-toolbar-style"
     }
 }
 
-class "GtkToolbar" style "tdsog-toolbar-style"
-class "*HandleBox*" style "tdsog-toolbar-style"
+class "GtkToolbar" style "toolbar-style"
+class "*HandleBox*" style "toolbar-style"
 
 ###########################################################
 
-style "tdsog-combobox-separator-style"
+style "combobox-separator-style"
 {
   xthickness = 0
   ythickness = 0
   GtkWidget::wide-separators = 1
 }
 
-widget_class "*<GtkComboBox>*<GtkSeparator>" style "tdsog-combobox-separator-style"
+widget_class "*<GtkComboBox>*<GtkSeparator>" style "combobox-separator-style"
 
 ###########################################################
 
-style "tdsog-combobox-button-style"
+style "combobox-button-style"
 {
   xthickness = 3
   ythickness = 3
 }
 
-widget_class "*<GtkComboBox>*<GtkButton>" style "tdsog-combobox-button-style"
+widget_class "*<GtkComboBox>*<GtkButton>" style "combobox-button-style"
 
 ###########################################################
 
-style "tdsog-combobox-style"
+style "combobox-style"
 {
   xthickness = 0
   ythickness = 0
 }
 
-widget_class "*<GtkComboBox>" style "tdsog-combobox-style"
+widget_class "*<GtkComboBox>" style "combobox-style"
 
 ###########################################################
 
-style "tdsog-combobox-style1"
+style "combobox-style1"
 {
   xthickness = 0
   ythickness = 0
@@ -2163,19 +2157,11 @@ style "tdsog-combobox-style1"
     }
 }
 
-widget_class "*<GtkEntry>*<GtkButton>*" style "tdsog-combobox-style1"
+widget_class "*<GtkEntry>*<GtkButton>*" style "combobox-style1"
 
 ###########################################################
 
-style "tdsog-button-style"
-{
-  fg[PRELIGHT] = "#FBFBFB"
-  fg[ACTIVE] = "#9B9B9B"
-  fg[NORMAL] = "#CBCBCB"
-  fg[INSENSITIVE] = "#CBCBCB"
-}
-
-widget_class "*<GtkButton>*" style "tdsog-button-style"
+widget_class "*<GtkButton>*" style "button-style"
 
 ###########################################################
 
@@ -2185,53 +2171,33 @@ style "kde_hack_1"
   GtkComboBoxEntry::appears-as-list = 0
   GtkComboBoxText::appears-as-list = 0
 
-  color["clr1"] = "#EEEEEE"
-  color["clr2"] = "#DDDDDD"
-  color["clr3"] = "#C1C1C1"
-  color["clr4"] = "#222222"
-  color["clr5"] = "#111111"
-  color["clr6"] = "#828282"
-  color["clr7"] = "#3b3b3b"
-  color["clr8"] = "#222222"
-  color["clr9"] = "#4D4D4D"
-
-  fg[NORMAL] = @clr1
-  fg[PRELIGHT] = @clr1
-  fg[ACTIVE] = @clr1
-  fg[SELECTED] = @clr2
-  fg[INSENSITIVE] = @clr3
-
-  base[NORMAL] = @clr6
-  base[PRELIGHT] = @clr7
-  base[ACTIVE] = @clr7
-  base[SELECTED] = @clr7
-  base[INSENSITIVE] = @clr8
-
-  text[NORMAL] = @clr1
-  text[PRELIGHT] = @clr1
-  text[ACTIVE] = @clr1
-  text[SELECTED] = @clr1
-  text[INSENSITIVE] = @clr9
+  fg[NORMAL]        = @fg-normal
+  fg[PRELIGHT]      = @fg-normal
+  fg[ACTIVE]        = @fg-normal
+  fg[SELECTED]      = @fg-selected
+  fg[INSENSITIVE]   = @fg-insensitive
+
+  base[NORMAL]      = @base-normal
+  base[PRELIGHT]    = @base-prelight
+  base[ACTIVE]      = @base-prelight
+  base[SELECTED]    = @base-prelight
+  base[INSENSITIVE] = @base-insensitive
+
+  text[NORMAL]      = @fg-normal
+  text[PRELIGHT]    = @fg-normal
+  text[ACTIVE]      = @fg-normal
+  text[SELECTED]    = @fg-normal
+  text[INSENSITIVE] = @text-insensitive
 }
 
 widget_class "*" style "kde_hack_1"
 
 ###########################################################
 
-style "kde_hack_2"
-{
-  bg[NORMAL] = "#222" #Sets canvas BG
-}
-
 widget "*GimpDisplayShell.*" style "kde_hack_2"
 
 ###########################################################
 
-style "kde_hack_3"
-{
-  bg[NORMAL] = "#222"
-}
-
 class "GtkFrame" style "kde_hack_3"
 widget_class "*<GimpDisplay>*" style "kde_hack_3"
 
@@ -2305,7 +2271,7 @@ widget_class "*<GtkWidget>*" style "kde_hack_4"
 ###########################################################
 
 # KDE Hack 5
-widget_class "*<GtkToolbar>*" style "tdsog-toolbar-style"
+widget_class "*<GtkToolbar>*" style "toolbar-style"
 
 ###########################################################
 
@@ -2364,18 +2330,18 @@ widget_class "*<GtkTreeView>*<GtkButton>*" style "kde_hack_6"
 ###########################################################
 
 # KDE & oxygen-gtk fix for BG
-style "tdsog-oxygen-default-style" = "tdsog-default-style"
+style "oxygen-default-style" = "default-style"
 {
   GtkComboBox::appears-as-list = 0
   GtkComboBoxEntry::appears-as-list = 0
   GtkComboBoxText::appears-as-list = 0
 }
 
-class "*" style "tdsog-oxygen-default-style"
+class "*" style "oxygen-default-style"
 
 ###########################################################
 
-style "tdsog-gtkscale-style"
+style "gtkscale-style"
 {
   engine "pixmap"
     {
@@ -2421,33 +2387,22 @@ style "tdsog-gtkscale-style"
     }
 }
 
-class "GtkScale" style "tdsog-gtkscale-style"
-class "GtkVScale" style "tdsog-gtkscale-style"
-class "GtkHScale" style "tdsog-gtkscale-style"
-widget_class "*GtkScale*" style "tdsog-gtkscale-style"
-widget_class "*GtkVScale*" style "tdsog-gtkscale-style"
-widget_class "*GtkHScale*" style "tdsog-gtkscale-style"
+class "GtkScale" style "gtkscale-style"
+class "GtkVScale" style "gtkscale-style"
+class "GtkHScale" style "gtkscale-style"
+widget_class "*GtkScale*" style "gtkscale-style"
+widget_class "*GtkVScale*" style "gtkscale-style"
+widget_class "*GtkHScale*" style "gtkscale-style"
 
 ###########################################################
 
-style "tdsog-overlay-scrollbar"
-{
-  bg[SELECTED] = "#CCC"
-  bg[INSENSITIVE] = "#AAA"
-  bg[ACTIVE] = "#EEE"
-  bg[NORMAL] = "#666"
-  bg[PRELIGHT] = "#666"
-
-  fg[NORMAL] = "#EEE"
-}
-
-widget_class "*<OsScrollbar>" style "tdsog-overlay-scrollbar"
-widget_class "*<OsThumb>" style "tdsog-overlay-scrollbar"
+widget_class "*<OsScrollbar>" style "overlay-scrollbar"
+widget_class "*<OsThumb>" style "overlay-scrollbar"
 
 ###########################################################
 
 # Fix for GMIC/plugins
-style "tlsog-plugin-scrolled-window-style"
+style "plugin-scrolled-window-style"
 {
   xthickness = 1
   ythickness = 1
@@ -2465,7 +2420,7 @@ style "tlsog-plugin-scrolled-window-style"
     }
 }
 
-widget_class "*<GtkScrolledWindow>*<GtkViewport>" style "tlsog-plugin-scrolled-window-style"
+widget_class "*<GtkScrolledWindow>*<GtkViewport>" style "plugin-scrolled-window-style"
 
 ###########################################################
 
diff --git a/themes/The-Light-Side-of-Gimp/Makefile.am b/themes/The-Light-Side-of-Gimp/Makefile.am
index 293231c..a904ab2 100644
--- a/themes/The-Light-Side-of-Gimp/Makefile.am
+++ b/themes/The-Light-Side-of-Gimp/Makefile.am
@@ -3,7 +3,11 @@
 themedatadir = $(gimpdatadir)/themes/The-Light-Side-of-Gimp
 themeuidir   = $(gimpdatadir)/themes/The-Light-Side-of-Gimp/ui
 
-themedata_DATA = gtkrc
+themedata_DATA = gtkrc colorrc
+
+# We use a single base gtkrc for all themes.
+gtkrc: $(top_srcdir)/themes/The-Dark-Side-of-Gimp/gtkrc
+       cp -f $< $@
 
 themeui_DATA = \
        ui/arrow-down-insens.png        \
diff --git a/themes/The-Light-Side-of-Gimp/colorrc b/themes/The-Light-Side-of-Gimp/colorrc
new file mode 100644
index 0000000..25cd3b6
--- /dev/null
+++ b/themes/The-Light-Side-of-Gimp/colorrc
@@ -0,0 +1,135 @@
+# GIMP - The GNU Image Manipulation Program
+# Copyright (C) 1995 Spencer Kimball and Peter Mattis
+#
+# The Light Side of GIMP Theme
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+style "default-style"
+{
+  color["fg-normal"]        = "#343434"
+  color["fg-selected"]      = "#222222"
+  color["fg-insensitive"]   = "#3E3E3E"
+
+  color["bg-normal"]        = "#DDDDDD"
+  color["bg-selected"]      = "#B2B2B2"
+  color["bg-insensitive"]   = "#EEEEEE"
+
+  color["base-normal"]      = "#BDBDBD"
+  color["base-prelight"]    = "#3b3b3b"
+  color["base-insensitive"] = "#DDDDDD"
+
+  color["text-insensitive"] = @bg-selected
+}
+
+style "tooltips-style" = "default-style"
+{
+  color["tooltip-bg-normal"]   = "#C7C7C7"
+  color["tooltip-bg-selected"] = "#BDBDBD"
+  color["tooltip-fg-normal"]   = "#343434"
+}
+
+
+style "treeview" = "default-style"
+{
+  color["treeview-row"] = "#BDBDBD"
+}
+
+style "list-header-style"
+{
+  color["treeview-row"] = "#BDBDBD"
+}
+
+style "menu" = "default-style"
+{
+  color["menu-bg-normal"]      = "#B7B7B7"
+
+  color["menu-fg-normal"]      = "#343434"
+  color["menu-fg-prelight"]    = "#000000"
+  color["menu-fg-insensitive"] = "#3E3E3E"
+}
+
+style "menu_item"
+{
+  color["menu-item-bg-normal"]      = "#B7B7B7"
+
+  color["menu-item-fg-normal"]      = "#343434"
+  color["menu-item-fg-prelight"]    = "#DFDFDF"
+  color["menu-item-fg-active"]      = "#343434"
+  color["menu-item-fg-selected"]    = "#000000"
+  color["menu-item-fg-insensitive"] = "#3E3E3E"
+}
+
+style "item"
+{
+  color["item-bg-normal"]      = "#B7B7B7"
+
+  color["item-fg-normal"]      = "#343434"
+  color["item-fg-prelight"]    = "#DFDFDF"
+  color["item-fg-active"]      = "#343434"
+  color["item-fg-selected"]    = "#000000"
+  color["item-fg-insensitive"] = "#3E3E3E"
+}
+
+style "combobox-entry-button-style"
+{
+  color["combobox-entry-fg-active"] = "#343434"
+}
+
+style "spin-scale-style"
+{
+  color["spin-scale-bg-normal"] = "#BDBDBD"
+}
+
+style "button-style"
+{
+  fg[PRELIGHT] = "#040404"
+  fg[ACTIVE] = "#646464"
+  fg[NORMAL] = "#343434"
+  fg[INSENSITIVE] = "#343434"
+}
+
+style "kde_hack_1"
+{
+  color["fg-normal"]        = "#343434"
+  color["fg-selected"]      = "#222222"
+  color["fg-insensitive"]   = "#3E3E3E"
+
+  color["base-normal"]      = "#BDBDBD"
+  color["base-prelight"]    = "#3b3b3b"
+  color["base-insensitive"] = "#DDDDDD"
+
+  color["text-insensitive"] = "#B2B2B2"
+}
+
+style "kde_hack_2"
+{
+  bg[NORMAL] = "#DDDDDD" #Sets canvas BG
+}
+
+style "kde_hack_3"
+{
+  bg[NORMAL] = "#DDDDDD"
+}
+
+style "overlay-scrollbar"
+{
+  bg[SELECTED] = "#555"
+  bg[INSENSITIVE] = "#777"
+  bg[ACTIVE] = "#333"
+  bg[NORMAL] = "#CCC"
+  bg[PRELIGHT] = "#CCC"
+
+  fg[NORMAL] = "#333"
+}
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]