[gimp] themes: updates to TLSOG & TDSOG (prelight, text, bug fixes, (C))

From: Benoit Touchette <bentou src gnome org>
To: commits-list gnome org
Cc:
Subject: [gimp] themes: updates to TLSOG & TDSOG (prelight, text, bug fixes, (C))
Date: Sun, 14 Feb 2016 17:10:36 +0000 (UTC)
commit 0d692eadc00600e4d357bf9e0cf9b86733c11b5a
Author: Benoit Touchette <draekko software+gimp gmail com>
Date:   Sun Feb 14 12:05:10 2016 -0500

    themes: updates to TLSOG & TDSOG (prelight, text, bug fixes, (C))
    
    Updates to copyright, some button contrast for TDSOG, TDLSOG. Added comment
    for button focus area. Fixed selected text for TLSOG themes. Redid screenshots
    to match changes. Fixed menu style name. Updated copyright year. Fixed menu
    items for Ubuntu unity. Fixed prelight and fg for widget text. Updated to
    v0.1.6.

 themes/The-Dark-Side-of-Gimp/gtkrc                 |   48 +++++++++--
 .../ui/gimp-button-prelight.png                    |  Bin 4126 -> 4154 bytes
 themes/The-Light-Side-of-Gimp/gtkrc                |   87 ++++++++++++++------
 .../ui/entry-border-fill-active-item.png           |  Bin 0 -> 125 bytes
 .../ui/gimp-arrow-right-prelight.png               |  Bin 0 -> 179 bytes
 .../ui/gimp-button-prelight.png                    |  Bin 4513 -> 4605 bytes
 themes/The-Light-Side-of-Gimp/ui/menuitem.png      |  Bin 211 -> 3617 bytes
 themes/The-Light-Side-of-Gimp/ui/spin-fill-bg.png  |  Bin 0 -> 3397 bytes
 8 files changed, 101 insertions(+), 34 deletions(-)
---
diff --git a/themes/The-Dark-Side-of-Gimp/gtkrc b/themes/The-Dark-Side-of-Gimp/gtkrc
index 2068142..97783f0 100644
--- a/themes/The-Dark-Side-of-Gimp/gtkrc
+++ b/themes/The-Dark-Side-of-Gimp/gtkrc
@@ -1,9 +1,9 @@
 ############################################################################
 #
 # The Dark Side of GIMP Theme
-# Version 0.1.3
+# Version 0.1.6
 #
-# Copyright 2015, Benoit Touchette
+# Copyright 2015-2016, Benoit Touchette
 #
 # 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
@@ -75,10 +75,11 @@ style "tdsog-default-style"
   color["clr7"] = "#3b3b3b"
   color["clr8"] = "#222222"
   color["clr9"] = "#4D4D4D"
+  color["clr10"] = "#FFFFFF"
 
   fg[NORMAL] = @clr1
-  fg[PRELIGHT] = @clr1
-  fg[ACTIVE] = @clr1
+  fg[PRELIGHT] = @clr10
+  fg[ACTIVE] = @clr3
   fg[SELECTED] = @clr2
   fg[INSENSITIVE] = @clr3
 
@@ -131,6 +132,14 @@ style "tdsog-default-style"
   GtkComboBox::appears-as-list = 0
   GtkComboBoxEntry::appears-as-list = 0
   GtkComboBoxText::appears-as-list = 0
+
+  #
+  # To adjust to default button spacing:
+  #
+  # Set focus-padding to 2
+  # Set focus-line to 1
+  #
+
   GtkButton::focus-line_width = 0
   GtkButton::focus-padding = 0
 
@@ -807,7 +816,7 @@ widget_class "*<GtkMenuBar>.<GtkMenuItem>*" style "tdsog-menu-bar"
 
 ###########################################################
 
-style "menu_item"
+style "tdsog-menu-item"
 {
   xthickness = 2
   ythickness = 4
@@ -890,8 +899,8 @@ style "menu_item"
     }
 }
 
-class "GtkMenuItem" style "menu_item"
-widget_class "*<GtkMenuItem>*" style "menu_item"
+class "GtkMenuItem" style "tdsog-menu-item"
+widget_class "*<GtkMenuItem>*" style "tdsog-menu-item"
 
 ###########################################################
 
@@ -2194,10 +2203,11 @@ style "kde_hack_1"
   color["clr7"] = "#3b3b3b"
   color["clr8"] = "#222222"
   color["clr9"] = "#4D4D4D"
+  color["clr10"] = "#FFFFFF"
 
   fg[NORMAL] = @clr1
-  fg[PRELIGHT] = @clr1
-  fg[ACTIVE] = @clr1
+  fg[PRELIGHT] = @clr10
+  fg[ACTIVE] = @clr3
   fg[SELECTED] = @clr2
   fg[INSENSITIVE] = @clr3
 
@@ -2469,4 +2479,24 @@ widget_class "*<GtkScrolledWindow>*<GtkViewport>" style "tlsog-plugin-scrolled-w
 
 ###########################################################
 
+# Menu prelight fix for Ubuntu Unity
+style "ubuntu-fix-menu-item"
+{
+  engine "pixmap"
+    {
+      image
+        {
+          function = BOX
+          state = PRELIGHT
+          file = "ui/entry-border-fill-active.png"
+          border = { 1, 0, 1, 0 }
+          stretch = TRUE
+        }
+    }
+}
+
+widget "GtkMenuItem" style "ubuntu-fix-menu-item"
+
+###########################################################
+
 # EOF
diff --git a/themes/The-Dark-Side-of-Gimp/ui/gimp-button-prelight.png 
b/themes/The-Dark-Side-of-Gimp/ui/gimp-button-prelight.png
index cd5f427..af848eb 100644
Binary files a/themes/The-Dark-Side-of-Gimp/ui/gimp-button-prelight.png and 
b/themes/The-Dark-Side-of-Gimp/ui/gimp-button-prelight.png differ
diff --git a/themes/The-Light-Side-of-Gimp/gtkrc b/themes/The-Light-Side-of-Gimp/gtkrc
index 4c9e3f5..98b397c 100644
--- a/themes/The-Light-Side-of-Gimp/gtkrc
+++ b/themes/The-Light-Side-of-Gimp/gtkrc
@@ -2,9 +2,9 @@
 #
 # The Light Side of GIMP Theme
 #
-# Version 0.1.3
+# Version 0.1.6
 #
-# Copyright 2015, Benoit Touchette
+# Copyright 2015-2016, Benoit Touchette
 #
 # 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
@@ -76,11 +76,12 @@ style "tlsog-default-style"
   color["clr7"] = "#3b3b3b"
   color["clr8"] = "#DDDDDD"
   color["clr9"] = "#B2B2B2"
+  color["clr10"] = "#000000"
 
-  fg[NORMAL] = @clr1
-  fg[PRELIGHT] = @clr1
-  fg[ACTIVE] = @clr1
-  fg[SELECTED] = @clr2
+  fg[NORMAL] = @clr3
+  fg[PRELIGHT] = @clr10
+  fg[ACTIVE] = @clr2
+  fg[SELECTED] = @clr1
   fg[INSENSITIVE] = @clr3
 
   bg[NORMAL] = @clr4
@@ -91,12 +92,12 @@ style "tlsog-default-style"
 
   base[NORMAL] = @clr6
   base[PRELIGHT] = @clr8
-  base[ACTIVE] = @clr8
-  base[SELECTED] = @clr8
+  base[ACTIVE] = @clr5
+  base[SELECTED] = @clr5
   base[INSENSITIVE] = @clr8
 
   text[NORMAL] = @clr1
-  text[PRELIGHT] = @clr1
+  text[PRELIGHT] = @clr10
   text[ACTIVE] = @clr1
   text[SELECTED] = @clr1
   text[INSENSITIVE] = @clr9
@@ -132,6 +133,14 @@ style "tlsog-default-style"
   GtkComboBox::appears-as-list = 0
   GtkComboBoxEntry::appears-as-list = 0
   GtkComboBoxText::appears-as-list = 0
+
+  #
+  # To adjust to default button spacing:
+  #
+  # Set focus-padding to 2
+  # Set focus-line to 1
+  #
+
   GtkButton::focus-line_width = 0
   GtkButton::focus-padding = 0
 
@@ -170,7 +179,6 @@ style "tlsog-default-style"
   GtkComboBox::shadow_type = GTK_SHADOW_NONE
   GtkComboBoxEntry::shadow_type = GTK_SHADOW_NONE
   GtkScrolledWindow::shadow-type = GTK_SHADOW_NONE
-  GtkComboBoxText::shadow_type = GTK_SHADOW_NONE
   GtkVScale::shadow_type = GTK_SHADOW_NONE
   GtkHScale::shadow_type = GTK_SHADOW_NONE
 
@@ -495,7 +503,7 @@ style "tlsog-treeview" = "tlsog-default-style"
         {
           function = FLAT_BOX
           state = SELECTED
-          file = "ui/menuitem.png"
+          file = "ui/menuitem-prelight.png"
           border = {1,1,1,1}
           stretch = TRUE
         }
@@ -808,7 +816,7 @@ widget_class "*<GtkMenuBar>.<GtkMenuItem>*" style "tlsog-menu-bar"
 
 ###########################################################
 
-style "menu_item"
+style "tlsog-menu-item"
 {
   xthickness = 2
   ythickness = 4
@@ -827,7 +835,7 @@ style "menu_item"
         {
           function = BOX
           state = PRELIGHT
-          file = "ui/menuitem-prelight.png"
+          file = "ui/menu-item-prelight.png"
           border = { 1, 0, 1, 0 }
           stretch = TRUE
         }
@@ -891,8 +899,8 @@ style "menu_item"
     }
 }
 
-class "GtkMenuItem" style "menu_item"
-widget_class "*<GtkMenuItem>*" style "menu_item"
+class "GtkMenuItem" style "tlsog-menu-item"
+widget_class "*<GtkMenuItem>*" style "tlsog-menu-item"
 
 ###########################################################
 
@@ -1824,6 +1832,7 @@ class "GtkRange" style "tlsog-range-style"
 style "tlsog-spin-scale-style"
 {
   bg[NORMAL] = "#BDBDBD"
+  bg[SELECTED] = "#CCC"
 
   engine "pixmap"
     {
@@ -1832,6 +1841,9 @@ style "tlsog-spin-scale-style"
           function = FLAT_BOX
           detail = "entry_bg"
           state = NORMAL
+          file = "ui/spin-fill-bg.png"
+          border = { 0, 0, 0, 0 }
+          stretch = TRUE
         }
 
       image
@@ -1839,6 +1851,9 @@ style "tlsog-spin-scale-style"
           function = FLAT_BOX
           detail = "entry_bg"
           state = ACTIVE
+          file = "ui/spin-fill-bg.png"
+          border = { 0, 0, 0, 0 }
+          stretch = TRUE
         }
 
       image
@@ -1916,6 +1931,7 @@ style "tlsog-spin-scale-style"
 }
 
 class "GimpSpinScale" style "tlsog-spin-scale-style"
+widget "*GimpSpinScale*" style "tlsog-spin-scale-style"
 
 ###########################################################
 
@@ -2195,27 +2211,28 @@ style "kde_hack_1"
   color["clr4"] = "#DDDDDD"
   color["clr5"] = "#EEEEEE"
   color["clr6"] = "#BDBDBD"
-  color["clr7"] = "#3b3b3b"
+  color["clr7"] = "#3B3B3B"
   color["clr8"] = "#DDDDDD"
   color["clr9"] = "#B2B2B2"
+  color["clr10"] = "#000000"
 
-  fg[NORMAL] = @clr1
-  fg[PRELIGHT] = @clr1
-  fg[ACTIVE] = @clr1
-  fg[SELECTED] = @clr2
+  fg[NORMAL] = @clr3
+  fg[PRELIGHT] = @clr10
+  fg[ACTIVE] = @clr2
+  fg[SELECTED] = @clr1
   fg[INSENSITIVE] = @clr3
 
   base[NORMAL] = @clr6
-  base[PRELIGHT] = @clr7
-  base[ACTIVE] = @clr7
-  base[SELECTED] = @clr7
+  base[PRELIGHT] = @clr8
+  base[ACTIVE] = @clr5
+  base[SELECTED] = @clr5
   base[INSENSITIVE] = @clr8
 
   text[NORMAL] = @clr1
-  text[PRELIGHT] = @clr1
+  text[PRELIGHT] = @clr10
   text[ACTIVE] = @clr1
   text[SELECTED] = @clr1
-  text[INSENSITIVE] = @clr9
+  text[INSENSITIVE] = @clr7
 }
 
 widget_class "*" style "kde_hack_1"
@@ -2473,4 +2490,24 @@ widget_class "*<GtkScrolledWindow>*<GtkViewport>" style "tlsog-plugin-scrolled-w
 
 ###########################################################
 
+# Menu prelight fix for Ubuntu Unity
+style "ubuntu-fix-menu-item"
+{
+  engine "pixmap"
+    {
+      image
+        {
+          function = BOX
+          state = PRELIGHT
+          file = "ui/entry-border-fill-active.png"
+          border = { 1, 0, 1, 0 }
+          stretch = TRUE
+        }
+    }
+}
+
+widget "GtkMenuItem" style "ubuntu-fix-menu-item"
+
+###########################################################
+
 # EOF
diff --git a/themes/The-Light-Side-of-Gimp/ui/entry-border-fill-active-item.png 
b/themes/The-Light-Side-of-Gimp/ui/entry-border-fill-active-item.png
new file mode 100644
index 0000000..454ed11
Binary files /dev/null and b/themes/The-Light-Side-of-Gimp/ui/entry-border-fill-active-item.png differ
diff --git a/themes/The-Light-Side-of-Gimp/ui/gimp-arrow-right-prelight.png 
b/themes/The-Light-Side-of-Gimp/ui/gimp-arrow-right-prelight.png
new file mode 100644
index 0000000..f7c3b94
Binary files /dev/null and b/themes/The-Light-Side-of-Gimp/ui/gimp-arrow-right-prelight.png differ
diff --git a/themes/The-Light-Side-of-Gimp/ui/gimp-button-prelight.png 
b/themes/The-Light-Side-of-Gimp/ui/gimp-button-prelight.png
index 53babb5..f9e6c11 100644
Binary files a/themes/The-Light-Side-of-Gimp/ui/gimp-button-prelight.png and 
b/themes/The-Light-Side-of-Gimp/ui/gimp-button-prelight.png differ
diff --git a/themes/The-Light-Side-of-Gimp/ui/menuitem.png b/themes/The-Light-Side-of-Gimp/ui/menuitem.png
index 60d4434..26ef1cf 100644
Binary files a/themes/The-Light-Side-of-Gimp/ui/menuitem.png and 
b/themes/The-Light-Side-of-Gimp/ui/menuitem.png differ
diff --git a/themes/The-Light-Side-of-Gimp/ui/spin-fill-bg.png 
b/themes/The-Light-Side-of-Gimp/ui/spin-fill-bg.png
new file mode 100644
index 0000000..d2d46f1
Binary files /dev/null and b/themes/The-Light-Side-of-Gimp/ui/spin-fill-bg.png differ
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]