Golden Delicious client theme, version 2

10 files changed, 64 insertions, 47 deletions

diff --git a/data/themes/golden-delicious/CHANGELOG.txt b/data/themes/golden-delicious/CHANGELOG.txt
index 9b98181a7..d96d94dba 100644
--- a/data/themes/golden-delicious/CHANGELOG.txt
+++ b/data/themes/golden-delicious/CHANGELOG.txt
@@ -1,7 +1,25 @@
 Legend:
-[!] Bug fixed (usability issues/visual defects/etc).
-[*] Some changes or misc. stuff.
-[+] Something new.
+ [!] Bug fixed (usability issues/visual defects/etc).
+ [*] Some changes or misc. stuff.
+ [+] Something new.
+
+Version 2. Five years later I've revisited TMW and randomly crafted
+glossy button. So I've got curious how far I can get. The story continues.
+
+Changes:
+ [+] Far more complicated and glamourous window title. I like it.
+     NB: window title is kind of cheat. It uses slightly incorrect lighting.
+     Good luck to notice it though.
+ [+] Glass-like buttons FTW. Looks much better. Buttons also look a bit larger.
+ [+] Minor color tweaks in few places.
+ [+] Some elements size tweaked & some repixeled for better usability.
+ [+] Cursors were recolored a bit to better match overall theme.
+
+TODO:
+ [*] My hourglass isn't best pixel art ever. Still need something better.
+ [*] Progressbars could use bitmaps. This apparently allows superb
+     appearance of progressbars. Should give it a try!
+ [*] Target "ring" could be more stylish/themed.
 
 Version 0.3. Three years later I've finally spotted obvious bugs.
 Changes;
@@ -19,11 +37,6 @@ Changes;
      now also move accordingly.
  [*] Buttons of drop-downs repix'd to look better (they were too small).
 
-TODO:
- [*] My hourglass isn't best pixel art ever and could be improved.
- [*] Now progressbars could use bitmaps. This apparently allows superb
-     appearance of progressbars. Should give it a try!
- [*] Mouse cursors could match theme a bit better than that.
 
 Version 0.2. Reworked lot stuff and recolored a bit. 
 Load of "new" ManaPlus compatibility improvements.
diff --git a/data/themes/golden-delicious/button.xml b/data/themes/golden-delicious/button.xml
index 81ba167f6..8401c98e7 100644
--- a/data/themes/golden-delicious/button.xml
+++ b/data/themes/golden-delicious/button.xml
@@ -1,21 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
     <widget type="Window" xpos="41" ypos="0">
-        <option name="padding" value="6" />
+        <option name="padding" value="5" />
+        <option name="spacing" value="4" />
 
         <!-- Top Row -->
-        <part type="top-left-corner" xpos="0" ypos="0" width="10" height="10" />
-        <part type="top-edge" xpos="11" ypos="0" width="4" height="10" />
-        <part type="top-right-corner" xpos="16" ypos="0" width="10" height="10" />
+        <part type="top-left-corner" xpos="0" ypos="0" width="10" height="5" />
+        <part type="top-edge" xpos="10" ypos="0" width="6" height="5" />
+        <part type="top-right-corner" xpos="16" ypos="0" width="10" height="5" />
 
         <!-- Middle Row -->
-        <part type="left-edge" xpos="0" ypos="11" width="10" height="2" />
-        <part type="bg-quad" xpos="11" ypos="11" width="4" height="2" />
-        <part type="right-edge" xpos="16" ypos="11" width="10" height="2" />
+        <part type="left-edge" xpos="0" ypos="4" width="10" height="16" />
+        <part type="bg-quad" xpos="10" ypos="4" width="6" height="16" />
+        <part type="right-edge" xpos="16" ypos="4" width="10" height="16" />
 
         <!-- Bottom Row -->
-        <part type="bottom-left-corner" xpos="0" ypos="14" width="10" height="10" />
-        <part type="bottom-edge" xpos="11" ypos="14" width="4" height="10" />
-        <part type="bottom-right-corner" xpos="16" ypos="14" width="10" height="10" />
+        <part type="bottom-left-corner" xpos="0" ypos="19" width="10" height="5" />
+        <part type="bottom-edge" xpos="10" ypos="19" width="6" height="5" />
+        <part type="bottom-right-corner" xpos="16" ypos="19" width="10" height="5" />
     </widget>
 </skinset>
diff --git a/data/themes/golden-delicious/button_disabled.xml b/data/themes/golden-delicious/button_disabled.xml
index 4a626aa3d..4a82e088c 100644
--- a/data/themes/golden-delicious/button_disabled.xml
+++ b/data/themes/golden-delicious/button_disabled.xml
@@ -2,20 +2,21 @@
 <skinset name="Default" image="window.png">
     <widget type="Window" xpos="41" ypos="75">
         <option name="padding" value="5" />
+        <option name="spacing" value="4" />
 
         <!-- Top Row -->
-        <part type="top-left-corner" xpos="0" ypos="0" width="10" height="10" />
-        <part type="top-edge" xpos="11" ypos="0" width="4" height="10" />
-        <part type="top-right-corner" xpos="16" ypos="0" width="10" height="10" />
+        <part type="top-left-corner" xpos="0" ypos="0" width="10" height="5" />
+        <part type="top-edge" xpos="10" ypos="0" width="6" height="5" />
+        <part type="top-right-corner" xpos="16" ypos="0" width="10" height="5" />
 
         <!-- Middle Row -->
-        <part type="left-edge" xpos="0" ypos="11" width="10" height="2" />
-        <part type="bg-quad" xpos="11" ypos="11" width="4" height="2" />
-        <part type="right-edge" xpos="16" ypos="11" width="10" height="2" />
+        <part type="left-edge" xpos="0" ypos="4" width="10" height="16" />
+        <part type="bg-quad" xpos="10" ypos="4" width="6" height="16" />
+        <part type="right-edge" xpos="16" ypos="4" width="10" height="16" />
 
         <!-- Bottom Row -->
-        <part type="bottom-left-corner" xpos="0" ypos="14" width="10" height="10" />
-        <part type="bottom-edge" xpos="11" ypos="14" width="4" height="10" />
-        <part type="bottom-right-corner" xpos="16" ypos="14" width="10" height="10" />
+        <part type="bottom-left-corner" xpos="0" ypos="19" width="10" height="5" />
+        <part type="bottom-edge" xpos="10" ypos="19" width="6" height="5" />
+        <part type="bottom-right-corner" xpos="16" ypos="19" width="10" height="5" />
     </widget>
 </skinset>
diff --git a/data/themes/golden-delicious/button_highlighted.xml b/data/themes/golden-delicious/button_highlighted.xml
index c2018dc89..1b78b1290 100644
--- a/data/themes/golden-delicious/button_highlighted.xml
+++ b/data/themes/golden-delicious/button_highlighted.xml
@@ -2,20 +2,21 @@
 <skinset name="Default" image="window.png">
     <widget type="Window" xpos="41" ypos="25">
         <option name="padding" value="5" />
+        <option name="spacing" value="4" />
 
         <!-- Top Row -->
-        <part type="top-left-corner" xpos="0" ypos="0" width="10" height="10" />
-        <part type="top-edge" xpos="11" ypos="0" width="4" height="10" />
-        <part type="top-right-corner" xpos="16" ypos="0" width="10" height="10" />
+        <part type="top-left-corner" xpos="0" ypos="0" width="10" height="5" />
+        <part type="top-edge" xpos="10" ypos="0" width="6" height="5" />
+        <part type="top-right-corner" xpos="16" ypos="0" width="10" height="5" />
 
         <!-- Middle Row -->
-        <part type="left-edge" xpos="0" ypos="11" width="10" height="2" />
-        <part type="bg-quad" xpos="11" ypos="11" width="4" height="2" />
-        <part type="right-edge" xpos="16" ypos="11" width="10" height="2" />
+        <part type="left-edge" xpos="0" ypos="4" width="10" height="16" />
+        <part type="bg-quad" xpos="10" ypos="4" width="6" height="16" />
+        <part type="right-edge" xpos="16" ypos="4" width="10" height="16" />
 
         <!-- Bottom Row -->
-        <part type="bottom-left-corner" xpos="0" ypos="14" width="10" height="10" />
-        <part type="bottom-edge" xpos="11" ypos="14" width="4" height="10" />
-        <part type="bottom-right-corner" xpos="16" ypos="14" width="10" height="10" />
+        <part type="bottom-left-corner" xpos="0" ypos="19" width="10" height="5" />
+        <part type="bottom-edge" xpos="10" ypos="19" width="6" height="5" />
+        <part type="bottom-right-corner" xpos="16" ypos="19" width="10" height="5" />
     </widget>
 </skinset>
diff --git a/data/themes/golden-delicious/button_pressed.xml b/data/themes/golden-delicious/button_pressed.xml
index c3db6da2d..8c9680e43 100644
--- a/data/themes/golden-delicious/button_pressed.xml
+++ b/data/themes/golden-delicious/button_pressed.xml
@@ -2,20 +2,21 @@
 <skinset name="Default" image="window.png">
     <widget type="Window" xpos="41" ypos="50">
         <option name="padding" value="5" />
+        <option name="spacing" value="4" />
 
         <!-- Top Row -->
-        <part type="top-left-corner" xpos="0" ypos="0" width="10" height="10" />
-        <part type="top-edge" xpos="11" ypos="0" width="4" height="10" />
-        <part type="top-right-corner" xpos="16" ypos="0" width="10" height="10" />
+        <part type="top-left-corner" xpos="0" ypos="0" width="10" height="5" />
+        <part type="top-edge" xpos="10" ypos="0" width="6" height="5" />
+        <part type="top-right-corner" xpos="16" ypos="0" width="10" height="5" />
 
         <!-- Middle Row -->
-        <part type="left-edge" xpos="0" ypos="11" width="10" height="2" />
-        <part type="bg-quad" xpos="11" ypos="11" width="4" height="2" />
-        <part type="right-edge" xpos="16" ypos="11" width="10" height="2" />
+        <part type="left-edge" xpos="0" ypos="4" width="10" height="16" />
+        <part type="bg-quad" xpos="10" ypos="4" width="6" height="16" />
+        <part type="right-edge" xpos="16" ypos="4" width="10" height="16" />
 
         <!-- Bottom Row -->
-        <part type="bottom-left-corner" xpos="0" ypos="14" width="10" height="10" />
-        <part type="bottom-edge" xpos="11" ypos="14" width="4" height="10" />
-        <part type="bottom-right-corner" xpos="16" ypos="14" width="10" height="10" />
+        <part type="bottom-left-corner" xpos="0" ypos="19" width="10" height="5" />
+        <part type="bottom-edge" xpos="10" ypos="19" width="6" height="5" />
+        <part type="bottom-right-corner" xpos="16" ypos="19" width="10" height="5" />
     </widget>
 </skinset>
diff --git a/data/themes/golden-delicious/equipmentbox.png b/data/themes/golden-delicious/equipmentbox.png
index c61ce5140..62ab4b676 100644
--- a/data/themes/golden-delicious/equipmentbox.png
+++ b/data/themes/golden-delicious/equipmentbox.png
diff --git a/data/themes/golden-delicious/info.xml b/data/themes/golden-delicious/info.xml
index 3c7ffccbe..fcf4fa19d 100644
--- a/data/themes/golden-delicious/info.xml
+++ b/data/themes/golden-delicious/info.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <info>
-    <name>Golden Delicious (remake) </name>
-    <copyright>2013 by t3st3r [aka Hello=)]\n2012-2013 Hal9000\n2012-2016 ManaPlus developers</copyright>
+    <name>Golden Delicious (v2) </name>
+    <copyright>2013-2020 by t3st3r [aka Hello=)]\n2012-2013 Hal9000\n2012-2016 ManaPlus developers</copyright>
     <guialpha>1.0</guialpha>
 </info>
diff --git a/data/themes/golden-delicious/mouse.png b/data/themes/golden-delicious/mouse.png
index 9fba58d24..af10c87ab 100644
--- a/data/themes/golden-delicious/mouse.png
+++ b/data/themes/golden-delicious/mouse.png
diff --git a/data/themes/golden-delicious/progress-indicator.png b/data/themes/golden-delicious/progress-indicator.png
index 7443ca6a5..e34ca2de2 100644
--- a/data/themes/golden-delicious/progress-indicator.png
+++ b/data/themes/golden-delicious/progress-indicator.png
diff --git a/data/themes/golden-delicious/window.png b/data/themes/golden-delicious/window.png
index eaa4d4681..032be9110 100644
--- a/data/themes/golden-delicious/window.png
+++ b/data/themes/golden-delicious/window.png