diff options
25 files changed, 121 insertions, 99 deletions
diff --git a/data/themes/golden-delicious/CHANGELOG.txt b/data/themes/golden-delicious/CHANGELOG.txt index 62961ab71..8e81b55c6 100644 --- a/data/themes/golden-delicious/CHANGELOG.txt +++ b/data/themes/golden-delicious/CHANGELOG.txt @@ -1,4 +1,4 @@ -Legend: +Legend: [!] Bug fixed (usability issues/visual defects/etc). [*] Some changes or misc. stuff. [+] Something new. @@ -7,18 +7,18 @@ Version 0.3. Three years later I've finally spotted obvious bugs. Changes; [!] Fixed items window theming: selected slot had odd appearance. [+] Redrawn checkboxes in hope to improve their appearance. + [+] Backported highlighted [X] button glow from XFWM4 theme. + Took shitload of coordinates fixups and bug hunting. + [*] Windows had very large titlebars, chopped largest of 'em a bit. [*] Misc fixes/improvements for buttons and tabs. Tabs use more consistent bit patterns, highlight strengtened a bit. Buttons are also using more consistent patterns, bevels are less bright and pressing buttons are a bit more convincing since bit patterns now also move accordingly. - + [*] Buttons of drop-downs repix'd to look better (they were too small). TODO: - [*] Backport "glamourous" close button highlight from XFWM4 version - of this theme (yes, it exists). Not a low-hanging fruit: should - recompute button positions, could cause some visual glitches. - [*] Theme should use different colors for "channel" and "whisper" tabs! + [*] (WIP) Theme should use different colors for "channel" and "whisper" tabs! [*] 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! diff --git a/data/themes/golden-delicious/buy.xml b/data/themes/golden-delicious/buy.xml index dc0f877a3..9c8a9b857 100644 --- a/data/themes/golden-delicious/buy.xml +++ b/data/themes/golden-delicious/buy.xml @@ -3,9 +3,9 @@ <widget type="Window" xpos="260" ypos="0"> <option name="showbackground" value="1" /> <option name="captionoffsetx" value="20" /> - <option name="captionoffsety" value="7" /> + <option name="captionoffsety" value="8" /> <option name="titlebarBold" value="1" /> - <option name="titlebarHeight" value="35" /> + <option name="titlebarHeight" value="27" /> <option name="padding" value="10" /> <!-- Top Row --> @@ -23,7 +23,8 @@ <part type="bottom-edge" xpos="31" ypos="79" width="48" height="28" /> <part type="bottom-right-corner" xpos="80" ypos="79" width="30" height="28" /> - <part type="closeImage" xpos="-163" ypos="0" width="22" height="22" /> - <part type="closeImageHighlighted" xpos="-138" ypos="0" width="22" height="22" /> + <!-- Buttons --> + <part type="closeImage" xpos="-163" ypos="2" width="22" height="27" /> + <part type="closeImageHighlighted" xpos="-138" ypos="2" width="22" height="27" /> </widget> </skinset> diff --git a/data/themes/golden-delicious/charcreate.xml b/data/themes/golden-delicious/charcreate.xml index 4a89fe438..a7b992ff1 100644 --- a/data/themes/golden-delicious/charcreate.xml +++ b/data/themes/golden-delicious/charcreate.xml @@ -2,9 +2,9 @@ <skinset name="Default" image="window.png"> <widget type="Window" xpos="260" ypos="0"> <option name="captionoffsetx" value="20" /> - <option name="captionoffsety" value="7" /> + <option name="captionoffsety" value="8" /> <option name="titlebarBold" value="1" /> - <option name="titlebarHeight" value="30" /> + <option name="titlebarHeight" value="32" /> <option name="labelPadding" value="2" /> <!--10--> @@ -26,8 +26,9 @@ <part type="bottom-edge" xpos="31" ypos="79" width="48" height="28" /> <part type="bottom-right-corner" xpos="80" ypos="79" width="30" height="28" /> - <part type="closeImage" xpos="-163" ypos="0" width="22" height="22" /> - <part type="closeImageHighlighted" xpos="-138" ypos="0" width="22" height="22" /> + <!-- Buttons --> + <part type="closeImage" xpos="-163" ypos="2" width="22" height="27" /> + <part type="closeImageHighlighted" xpos="-138" ypos="2" width="22" height="27" /> <part type="stickyImageUp" xpos="-130" ypos="51" width="19" height="22" /> <part type="stickyImageDown" xpos="-99" ypos="51" width="19" height="22" /> </widget> diff --git a/data/themes/golden-delicious/cutin.xml b/data/themes/golden-delicious/cutin.xml index da98ab6bd..f13a39f54 100644 --- a/data/themes/golden-delicious/cutin.xml +++ b/data/themes/golden-delicious/cutin.xml @@ -2,9 +2,9 @@ <skinset name="Default" image="window.png"> <widget type="Window" xpos="260" ypos="0"> <option name="captionoffsetx" value="20" /> - <option name="captionoffsety" value="7" /> + <option name="captionoffsety" value="8" /> <option name="titlebarBold" value="1" /> - <option name="titlebarHeight" value="30" /> + <option name="titlebarHeight" value="32" /> <!--10--> <option name="padding" value="5" /> <option name="stickySpacing" value="6" /> @@ -24,8 +24,9 @@ <part type="bottom-edge" xpos="31" ypos="79" width="48" height="28" /> <part type="bottom-right-corner" xpos="80" ypos="79" width="30" height="28" /> - <part type="closeImage" xpos="-163" ypos="0" width="22" height="22" /> - <part type="closeImageHighlighted" xpos="-138" ypos="0" width="22" height="22" /> + <!-- Buttons --> + <part type="closeImage" xpos="-163" ypos="2" width="22" height="27" /> + <part type="closeImageHighlighted" xpos="-138" ypos="2" width="22" height="27" /> <part type="stickyImageUp" xpos="-130" ypos="51" width="19" height="22" /> <part type="stickyImageDown" xpos="-99" ypos="51" width="19" height="22" /> </widget> diff --git a/data/themes/golden-delicious/didyouknow.xml b/data/themes/golden-delicious/didyouknow.xml index 3bc11247e..c65b0a0e6 100644 --- a/data/themes/golden-delicious/didyouknow.xml +++ b/data/themes/golden-delicious/didyouknow.xml @@ -2,8 +2,8 @@ <skinset name="Default" image="window.png"> <widget type="Window" xpos="260" ypos="0"> <option name="captionoffsetx" value="20" /> - <option name="captionoffsety" value="7" /> - <option name="titlebarHeight" value="35" /> + <option name="captionoffsety" value="8" /> + <option name="titlebarHeight" value="27" /> <option name="titlebarBold" value="1" /> <option name="padding" value="10" /> <option name="stickySpacing" value="6" /> @@ -23,8 +23,9 @@ <part type="bottom-edge" xpos="31" ypos="79" width="48" height="28" /> <part type="bottom-right-corner" xpos="80" ypos="79" width="30" height="28" /> - <part type="closeImage" xpos="-163" ypos="0" width="22" height="22" /> - <part type="closeImageHighlighted" xpos="-138" ypos="0" width="22" height="22" /> + <!-- Buttons --> + <part type="closeImage" xpos="-163" ypos="2" width="22" height="27" /> + <part type="closeImageHighlighted" xpos="-138" ypos="2" width="22" height="27" /> <part type="stickyImageUp" xpos="-130" ypos="51" width="19" height="22" /> <part type="stickyImageDown" xpos="-99" ypos="51" width="19" height="22" /> </widget> diff --git a/data/themes/golden-delicious/edit.xml b/data/themes/golden-delicious/edit.xml index ad36753a2..4688c7b1f 100644 --- a/data/themes/golden-delicious/edit.xml +++ b/data/themes/golden-delicious/edit.xml @@ -2,9 +2,9 @@ <skinset name="Default" image="window.png"> <widget type="Window" xpos="260" ypos="0"> <option name="captionoffsetx" value="20" /> - <option name="captionoffsety" value="7" /> + <option name="captionoffsety" value="8" /> <option name="titlebarBold" value="1" /> - <option name="titlebarHeight" value="35" /> + <option name="titlebarHeight" value="30" /> <option name="padding" value="10" /> <option name="stickySpacing" value="6" /> <option name="buttonPadding" value="8" /> @@ -24,8 +24,9 @@ <part type="bottom-edge" xpos="31" ypos="79" width="48" height="28" /> <part type="bottom-right-corner" xpos="80" ypos="79" width="30" height="28" /> - <part type="closeImage" xpos="-163" ypos="0" width="22" height="22" /> - <part type="closeImageHighlighted" xpos="-138" ypos="0" width="22" height="22" /> + <!-- Buttons --> + <part type="closeImage" xpos="-163" ypos="2" width="22" height="27" /> + <part type="closeImageHighlighted" xpos="-138" ypos="2" width="22" height="27" /> <part type="stickyImageUp" xpos="-130" ypos="51" width="19" height="22" /> <part type="stickyImageDown" xpos="-99" ypos="51" width="19" height="22" /> </widget> diff --git a/data/themes/golden-delicious/equipment.xml b/data/themes/golden-delicious/equipment.xml index 6a0dab134..da66bb8d7 100644 --- a/data/themes/golden-delicious/equipment.xml +++ b/data/themes/golden-delicious/equipment.xml @@ -2,9 +2,9 @@ <skinset name="Default" image="window.png"> <widget type="Window" xpos="260" ypos="0"> <option name="captionoffsetx" value="20" /> - <option name="captionoffsety" value="7" /> + <option name="captionoffsety" value="8" /> <option name="titlebarBold" value="1" /> - <option name="titlebarHeight" value="35" /> + <option name="titlebarHeight" value="30" /> <option name="padding" value="10" /> <option name="itemPadding" value="3" /> <option name="boxSize" value="38" /> @@ -27,8 +27,9 @@ <part type="bottom-edge" xpos="31" ypos="79" width="48" height="28" /> <part type="bottom-right-corner" xpos="80" ypos="79" width="30" height="28" /> - <part type="closeImage" xpos="-163" ypos="0" width="22" height="22" /> - <part type="closeImageHighlighted" xpos="-138" ypos="0" width="22" height="22" /> + <!-- Buttons --> + <part type="closeImage" xpos="-163" ypos="2" width="22" height="27" /> + <part type="closeImageHighlighted" xpos="-138" ypos="2" width="22" height="27" /> <part type="stickyImageUp" xpos="-130" ypos="51" width="19" height="22" /> <part type="stickyImageDown" xpos="-99" ypos="51" width="19" height="22" /> </widget> diff --git a/data/themes/golden-delicious/help.xml b/data/themes/golden-delicious/help.xml index 88c64c222..5efa4c5ee 100644 --- a/data/themes/golden-delicious/help.xml +++ b/data/themes/golden-delicious/help.xml @@ -2,8 +2,8 @@ <skinset name="Default" image="window.png"> <widget type="Window" xpos="260" ypos="0"> <option name="captionoffsetx" value="20" /> - <option name="captionoffsety" value="7" /> - <option name="titlebarHeight" value="35" /> + <option name="captionoffsety" value="8" /> + <option name="titlebarHeight" value="27" /> <option name="titlebarBold" value="1" /> <option name="padding" value="10" /> <option name="stickySpacing" value="6" /> @@ -24,8 +24,9 @@ <part type="bottom-edge" xpos="31" ypos="79" width="48" height="28" /> <part type="bottom-right-corner" xpos="80" ypos="79" width="30" height="28" /> - <part type="closeImage" xpos="-163" ypos="0" width="22" height="22" /> - <part type="closeImageHighlighted" xpos="-138" ypos="0" width="22" height="22" /> + <!-- Buttons --> + <part type="closeImage" xpos="-163" ypos="2" width="22" height="27" /> + <part type="closeImageHighlighted" xpos="-138" ypos="2" width="22" height="27" /> <part type="stickyImageUp" xpos="-130" ypos="51" width="19" height="22" /> <part type="stickyImageDown" xpos="-99" ypos="51" width="19" height="22" /> </widget> diff --git a/data/themes/golden-delicious/inventory.xml b/data/themes/golden-delicious/inventory.xml index 509498029..5aeb66e94 100644 --- a/data/themes/golden-delicious/inventory.xml +++ b/data/themes/golden-delicious/inventory.xml @@ -3,9 +3,9 @@ <widget type="Window" xpos="260" ypos="0"> <option name="showbackground" value="1" /> <option name="captionoffsetx" value="20" /> - <option name="captionoffsety" value="7" /> + <option name="captionoffsety" value="8" /> <option name="titlebarBold" value="1" /> - <option name="titlebarHeight" value="35" /> + <option name="titlebarHeight" value="28" /> <option name="padding" value="10" /> <option name="stickySpacing" value="6" /> @@ -24,8 +24,9 @@ <part type="bottom-edge" xpos="31" ypos="79" width="48" height="28" /> <part type="bottom-right-corner" xpos="80" ypos="79" width="30" height="28" /> - <part type="closeImage" xpos="-163" ypos="0" width="22" height="22" /> - <part type="closeImageHighlighted" xpos="-138" ypos="0" width="22" height="22" /> + <!-- Buttons --> + <part type="closeImage" xpos="-163" ypos="2" width="22" height="27" /> + <part type="closeImageHighlighted" xpos="-138" ypos="2" width="22" height="27" /> <part type="stickyImageUp" xpos="-130" ypos="51" width="19" height="22" /> <part type="stickyImageDown" xpos="-99" ypos="51" width="19" height="22" /> </widget> diff --git a/data/themes/golden-delicious/items.xml b/data/themes/golden-delicious/items.xml index cdbe59b84..7cc5c2e3b 100644 --- a/data/themes/golden-delicious/items.xml +++ b/data/themes/golden-delicious/items.xml @@ -2,10 +2,10 @@ <skinset name="Default" image="window.png"> <widget type="Window" xpos="260" ypos="0"> <option name="captionoffsetx" value="20" /> - <option name="captionoffsety" value="7" /> + <option name="captionoffsety" value="8" /> <option name="padding" value="8" /> <option name="titlebarBold" value="1" /> - <option name="titlePadding" value="25" /> + <option name="titlePadding" value="20" /> <!-- Top Row --> <part type="top-left-corner" xpos="0" ypos="0" width="20" height="53" /> @@ -22,7 +22,8 @@ <part type="bottom-edge" xpos="31" ypos="79" width="28" height="28" /> <part type="bottom-right-corner" xpos="80" ypos="79" width="30" height="28" /> - <part type="closeImage" xpos="-163" ypos="0" width="22" height="22" /> - <part type="closeImageHighlighted" xpos="-138" ypos="0" width="22" height="22" /> + <!-- Buttons --> + <part type="closeImage" xpos="-163" ypos="2" width="22" height="27" /> + <part type="closeImageHighlighted" xpos="-138" ypos="2" width="22" height="27" /> </widget> </skinset> diff --git a/data/themes/golden-delicious/login.xml b/data/themes/golden-delicious/login.xml index dc0f877a3..9c8a9b857 100644 --- a/data/themes/golden-delicious/login.xml +++ b/data/themes/golden-delicious/login.xml @@ -3,9 +3,9 @@ <widget type="Window" xpos="260" ypos="0"> <option name="showbackground" value="1" /> <option name="captionoffsetx" value="20" /> - <option name="captionoffsety" value="7" /> + <option name="captionoffsety" value="8" /> <option name="titlebarBold" value="1" /> - <option name="titlebarHeight" value="35" /> + <option name="titlebarHeight" value="27" /> <option name="padding" value="10" /> <!-- Top Row --> @@ -23,7 +23,8 @@ <part type="bottom-edge" xpos="31" ypos="79" width="48" height="28" /> <part type="bottom-right-corner" xpos="80" ypos="79" width="30" height="28" /> - <part type="closeImage" xpos="-163" ypos="0" width="22" height="22" /> - <part type="closeImageHighlighted" xpos="-138" ypos="0" width="22" height="22" /> + <!-- Buttons --> + <part type="closeImage" xpos="-163" ypos="2" width="22" height="27" /> + <part type="closeImageHighlighted" xpos="-138" ypos="2" width="22" height="27" /> </widget> </skinset> diff --git a/data/themes/golden-delicious/mailedit.xml b/data/themes/golden-delicious/mailedit.xml index 3a737c328..d7bd15e9e 100644 --- a/data/themes/golden-delicious/mailedit.xml +++ b/data/themes/golden-delicious/mailedit.xml @@ -2,9 +2,9 @@ <skinset name="Default" image="window.png"> <widget type="Window" xpos="260" ypos="0"> <option name="captionoffsetx" value="20" /> - <option name="captionoffsety" value="7" /> + <option name="captionoffsety" value="8" /> <option name="titlebarBold" value="1" /> - <option name="titlebarHeight" value="30" /> + <option name="titlebarHeight" value="27" /> <option name="showitemsbackground" value="1" /> <!--10--> <option name="padding" value="5" /> @@ -25,8 +25,9 @@ <part type="bottom-edge" xpos="31" ypos="79" width="48" height="28" /> <part type="bottom-right-corner" xpos="80" ypos="79" width="30" height="28" /> - <part type="closeImage" xpos="-163" ypos="0" width="22" height="22" /> - <part type="closeImageHighlighted" xpos="-138" ypos="0" width="22" height="22" /> + <!-- Buttons --> + <part type="closeImage" xpos="-163" ypos="2" width="22" height="27" /> + <part type="closeImageHighlighted" xpos="-138" ypos="2" width="22" height="27" /> <part type="stickyImageUp" xpos="-130" ypos="51" width="19" height="22" /> <part type="stickyImageDown" xpos="-99" ypos="51" width="19" height="22" /> </widget> diff --git a/data/themes/golden-delicious/npc.xml b/data/themes/golden-delicious/npc.xml index 436487edb..54de30529 100644 --- a/data/themes/golden-delicious/npc.xml +++ b/data/themes/golden-delicious/npc.xml @@ -5,9 +5,9 @@ <option name="showtextbackground" value="1" /> <option name="showitemsbackground" value="1" /> <option name="captionoffsetx" value="20" /> - <option name="captionoffsety" value="7" /> + <option name="captionoffsety" value="8" /> <option name="titlebarBold" value="1" /> - <option name="titlebarHeight" value="35" /> + <option name="titlebarHeight" value="30" /> <option name="padding" value="10" /> <!-- Top Row --> @@ -25,7 +25,8 @@ <part type="bottom-edge" xpos="31" ypos="79" width="48" height="28" /> <part type="bottom-right-corner" xpos="80" ypos="79" width="30" height="28" /> - <part type="closeImage" xpos="-163" ypos="0" width="22" height="22" /> - <part type="closeImageHighlighted" xpos="-138" ypos="0" width="22" height="22" /> + <!-- Buttons --> + <part type="closeImage" xpos="-163" ypos="2" width="22" height="27" /> + <part type="closeImageHighlighted" xpos="-138" ypos="2" width="22" height="27" /> </widget> </skinset> diff --git a/data/themes/golden-delicious/ok.xml b/data/themes/golden-delicious/ok.xml index c62df149e..ba7bc4709 100644 --- a/data/themes/golden-delicious/ok.xml +++ b/data/themes/golden-delicious/ok.xml @@ -3,9 +3,9 @@ <widget type="Window" xpos="260" ypos="0"> <option name="buttonPadding" value="8" /> <option name="captionoffsetx" value="20" /> - <option name="captionoffsety" value="7" /> + <option name="captionoffsety" value="8" /> <option name="titlebarBold" value="1" /> - <option name="titlebarHeight" value="35" /> + <option name="titlebarHeight" value="32" /> <option name="padding" value="10" /> <!-- Top Row --> @@ -23,7 +23,8 @@ <part type="bottom-edge" xpos="31" ypos="79" width="48" height="28" /> <part type="bottom-right-corner" xpos="80" ypos="79" width="30" height="28" /> - <part type="closeImage" xpos="-163" ypos="0" width="22" height="22" /> - <part type="closeImageHighlighted" xpos="-138" ypos="0" width="22" height="22" /> + <!-- Buttons --> + <part type="closeImage" xpos="-163" ypos="2" width="22" height="27" /> + <part type="closeImageHighlighted" xpos="-138" ypos="2" width="22" height="27" /> </widget> </skinset> diff --git a/data/themes/golden-delicious/outfits.xml b/data/themes/golden-delicious/outfits.xml index 09d79fa46..f4dff40f7 100644 --- a/data/themes/golden-delicious/outfits.xml +++ b/data/themes/golden-delicious/outfits.xml @@ -2,7 +2,7 @@ <skinset name="Default" image="window.png"> <widget type="Window" xpos="260" ypos="0"> <option name="captionoffsetx" value="20" /> - <option name="captionoffsety" value="7" /> + <option name="captionoffsety" value="8" /> <option name="titlebarBold" value="1" /> <option name="titlebarHeight" value="25" /> <option name="padding" value="10" /> @@ -23,8 +23,9 @@ <part type="bottom-edge" xpos="31" ypos="79" width="48" height="28" /> <part type="bottom-right-corner" xpos="80" ypos="79" width="30" height="28" /> - <part type="closeImage" xpos="-163" ypos="0" width="22" height="22" /> - <part type="closeImageHighlighted" xpos="-138" ypos="0" width="22" height="22" /> + <!-- Buttons --> + <part type="closeImage" xpos="-163" ypos="2" width="22" height="27" /> + <part type="closeImageHighlighted" xpos="-138" ypos="2" width="22" height="27" /> <part type="stickyImageUp" xpos="-130" ypos="51" width="19" height="22" /> <part type="stickyImageDown" xpos="-99" ypos="51" width="19" height="22" /> </widget> diff --git a/data/themes/golden-delicious/quests.xml b/data/themes/golden-delicious/quests.xml index 594066c87..394fd2e00 100644 --- a/data/themes/golden-delicious/quests.xml +++ b/data/themes/golden-delicious/quests.xml @@ -4,9 +4,9 @@ <option name="showlistbackground" value="1" /> <option name="showtextbackground" value="1" /> <option name="captionoffsetx" value="20" /> - <option name="captionoffsety" value="7" /> + <option name="captionoffsety" value="8" /> <option name="titlebarBold" value="1" /> - <option name="titlebarHeight" value="35" /> + <option name="titlebarHeight" value="27" /> <option name="padding" value="10" /> <option name="stickySpacing" value="6" /> @@ -25,8 +25,9 @@ <part type="bottom-edge" xpos="31" ypos="79" width="48" height="28" /> <part type="bottom-right-corner" xpos="80" ypos="79" width="30" height="28" /> - <part type="closeImage" xpos="-163" ypos="0" width="22" height="22" /> - <part type="closeImageHighlighted" xpos="-138" ypos="0" width="22" height="22" /> + <!-- Buttons --> + <part type="closeImage" xpos="-163" ypos="2" width="22" height="27" /> + <part type="closeImageHighlighted" xpos="-138" ypos="2" width="22" height="27" /> <part type="stickyImageUp" xpos="-130" ypos="51" width="19" height="22" /> <part type="stickyImageDown" xpos="-99" ypos="51" width="19" height="22" /> </widget> diff --git a/data/themes/golden-delicious/sell.xml b/data/themes/golden-delicious/sell.xml index dc0f877a3..9c8a9b857 100644 --- a/data/themes/golden-delicious/sell.xml +++ b/data/themes/golden-delicious/sell.xml @@ -3,9 +3,9 @@ <widget type="Window" xpos="260" ypos="0"> <option name="showbackground" value="1" /> <option name="captionoffsetx" value="20" /> - <option name="captionoffsety" value="7" /> + <option name="captionoffsety" value="8" /> <option name="titlebarBold" value="1" /> - <option name="titlebarHeight" value="35" /> + <option name="titlebarHeight" value="27" /> <option name="padding" value="10" /> <!-- Top Row --> @@ -23,7 +23,8 @@ <part type="bottom-edge" xpos="31" ypos="79" width="48" height="28" /> <part type="bottom-right-corner" xpos="80" ypos="79" width="30" height="28" /> - <part type="closeImage" xpos="-163" ypos="0" width="22" height="22" /> - <part type="closeImageHighlighted" xpos="-138" ypos="0" width="22" height="22" /> + <!-- Buttons --> + <part type="closeImage" xpos="-163" ypos="2" width="22" height="27" /> + <part type="closeImageHighlighted" xpos="-138" ypos="2" width="22" height="27" /> </widget> </skinset> diff --git a/data/themes/golden-delicious/server.xml b/data/themes/golden-delicious/server.xml index dc0f877a3..169eab18d 100644 --- a/data/themes/golden-delicious/server.xml +++ b/data/themes/golden-delicious/server.xml @@ -3,9 +3,9 @@ <widget type="Window" xpos="260" ypos="0"> <option name="showbackground" value="1" /> <option name="captionoffsetx" value="20" /> - <option name="captionoffsety" value="7" /> + <option name="captionoffsety" value="8" /> <option name="titlebarBold" value="1" /> - <option name="titlebarHeight" value="35" /> + <option name="titlebarHeight" value="32" /> <option name="padding" value="10" /> <!-- Top Row --> @@ -23,7 +23,8 @@ <part type="bottom-edge" xpos="31" ypos="79" width="48" height="28" /> <part type="bottom-right-corner" xpos="80" ypos="79" width="30" height="28" /> - <part type="closeImage" xpos="-163" ypos="0" width="22" height="22" /> - <part type="closeImageHighlighted" xpos="-138" ypos="0" width="22" height="22" /> + <!-- Buttons --> + <part type="closeImage" xpos="-163" ypos="2" width="22" height="27" /> + <part type="closeImageHighlighted" xpos="-138" ypos="2" width="22" height="27" /> </widget> </skinset> diff --git a/data/themes/golden-delicious/shop.xml b/data/themes/golden-delicious/shop.xml index dda68e41c..45f7fe930 100644 --- a/data/themes/golden-delicious/shop.xml +++ b/data/themes/golden-delicious/shop.xml @@ -4,9 +4,9 @@ <option name="showbuybackground" value="1" /> <option name="showsellbackground" value="1" /> <option name="captionoffsetx" value="20" /> - <option name="captionoffsety" value="7" /> + <option name="captionoffsety" value="8" /> <option name="titlebarBold" value="1" /> - <option name="titlebarHeight" value="35" /> + <option name="titlebarHeight" value="27" /> <option name="padding" value="10" /> <!-- Top Row --> @@ -24,7 +24,8 @@ <part type="bottom-edge" xpos="31" ypos="79" width="48" height="28" /> <part type="bottom-right-corner" xpos="80" ypos="79" width="30" height="28" /> - <part type="closeImage" xpos="-163" ypos="0" width="22" height="22" /> - <part type="closeImageHighlighted" xpos="-138" ypos="0" width="22" height="22" /> + <!-- Buttons --> + <part type="closeImage" xpos="-163" ypos="2" width="22" height="27" /> + <part type="closeImageHighlighted" xpos="-138" ypos="2" width="22" height="27" /> </widget> </skinset> diff --git a/data/themes/golden-delicious/social.xml b/data/themes/golden-delicious/social.xml index 6caf9db4e..5c6034126 100644 --- a/data/themes/golden-delicious/social.xml +++ b/data/themes/golden-delicious/social.xml @@ -2,9 +2,9 @@ <skinset name="Default" image="window.png"> <widget type="Window" xpos="260" ypos="0"> <option name="captionoffsetx" value="20" /> - <option name="captionoffsety" value="7" /> + <option name="captionoffsety" value="8" /> <option name="titlebarBold" value="1" /> - <option name="titlebarHeight" value="35" /> + <option name="titlebarHeight" value="27" /> <option name="padding" value="10" /> <option name="showtabbackground" value="1" /> <option name="stickySpacing" value="6" /> @@ -25,8 +25,9 @@ <part type="bottom-edge" xpos="31" ypos="79" width="48" height="28" /> <part type="bottom-right-corner" xpos="80" ypos="79" width="30" height="28" /> - <part type="closeImage" xpos="-163" ypos="0" width="22" height="22" /> - <part type="closeImageHighlighted" xpos="-138" ypos="0" width="22" height="22" /> + <!-- Buttons --> + <part type="closeImage" xpos="-163" ypos="2" width="22" height="27" /> + <part type="closeImageHighlighted" xpos="-138" ypos="2" width="22" height="27" /> <part type="stickyImageUp" xpos="-130" ypos="51" width="19" height="22" /> <part type="stickyImageDown" xpos="-99" ypos="51" width="19" height="22" /> </widget> diff --git a/data/themes/golden-delicious/spells.xml b/data/themes/golden-delicious/spells.xml index faed923eb..efe7afeb3 100644 --- a/data/themes/golden-delicious/spells.xml +++ b/data/themes/golden-delicious/spells.xml @@ -2,7 +2,7 @@ <skinset name="Default" image="window.png"> <widget type="Window" xpos="260" ypos="0"> <option name="captionoffsetx" value="20" /> - <option name="captionoffsety" value="7" /> + <option name="captionoffsety" value="8" /> <option name="padding" value="15" /> <option name="titlebarBold" value="1" /> <option name="titlePadding" value="25" /> @@ -22,7 +22,8 @@ <part type="bottom-edge" xpos="31" ypos="79" width="48" height="28" /> <part type="bottom-right-corner" xpos="80" ypos="79" width="30" height="28" /> - <part type="closeImage" xpos="-163" ypos="0" width="22" height="22" /> - <part type="closeImageHighlighted" xpos="-138" ypos="0" width="22" height="22" /> + <!-- Buttons --> + <part type="closeImage" xpos="-163" ypos="2" width="22" height="27" /> + <part type="closeImageHighlighted" xpos="-138" ypos="2" width="22" height="27" /> </widget> </skinset> diff --git a/data/themes/golden-delicious/status.xml b/data/themes/golden-delicious/status.xml index bb5ba0aa5..11cde4ab4 100644 --- a/data/themes/golden-delicious/status.xml +++ b/data/themes/golden-delicious/status.xml @@ -2,8 +2,8 @@ <skinset name="Default" image="window.png"> <widget type="Window" xpos="260" ypos="0"> <option name="captionoffsetx" value="20" /> - <option name="captionoffsety" value="7" /> - <option name="titlebarHeight" value="35" /> + <option name="captionoffsety" value="8" /> + <option name="titlebarHeight" value="27" /> <option name="titlebarBold" value="1" /> <option name="padding" value="10" /> <option name="stickySpacing" value="6" /> @@ -23,8 +23,9 @@ <part type="bottom-edge" xpos="31" ypos="79" width="48" height="28" /> <part type="bottom-right-corner" xpos="80" ypos="79" width="30" height="28" /> - <part type="closeImage" xpos="-163" ypos="0" width="22" height="22" /> - <part type="closeImageHighlighted" xpos="-138" ypos="0" width="22" height="22" /> + <!-- Buttons --> + <part type="closeImage" xpos="-163" ypos="2" width="22" height="27" /> + <part type="closeImageHighlighted" xpos="-138" ypos="2" width="22" height="27" /> <part type="stickyImageUp" xpos="-130" ypos="51" width="19" height="22" /> <part type="stickyImageDown" xpos="-99" ypos="51" width="19" height="22" /> </widget> diff --git a/data/themes/golden-delicious/window.png b/data/themes/golden-delicious/window.png Binary files differindex 1c4854755..f87cfa7ed 100644 --- a/data/themes/golden-delicious/window.png +++ b/data/themes/golden-delicious/window.png diff --git a/data/themes/golden-delicious/window.xml b/data/themes/golden-delicious/window.xml index da98ab6bd..ffa7ca89f 100644 --- a/data/themes/golden-delicious/window.xml +++ b/data/themes/golden-delicious/window.xml @@ -2,12 +2,11 @@ <skinset name="Default" image="window.png"> <widget type="Window" xpos="260" ypos="0"> <option name="captionoffsetx" value="20" /> - <option name="captionoffsety" value="7" /> + <option name="captionoffsety" value="8" /> <option name="titlebarBold" value="1" /> - <option name="titlebarHeight" value="30" /> - <!--10--> - <option name="padding" value="5" /> - <option name="stickySpacing" value="6" /> + <option name="titlebarHeight" value="29" /> + <option name="padding" value="5" /> <!--10--> + <option name="stickySpacing" value="5" /> <!-- Top Row --> <part type="top-left-corner" xpos="0" ypos="0" width="30" height="53" /> @@ -24,8 +23,9 @@ <part type="bottom-edge" xpos="31" ypos="79" width="48" height="28" /> <part type="bottom-right-corner" xpos="80" ypos="79" width="30" height="28" /> - <part type="closeImage" xpos="-163" ypos="0" width="22" height="22" /> - <part type="closeImageHighlighted" xpos="-138" ypos="0" width="22" height="22" /> + <!-- Buttons --> + <part type="closeImage" xpos="-163" ypos="2" width="22" height="27" /> + <part type="closeImageHighlighted" xpos="-138" ypos="2" width="22" height="27" /> <part type="stickyImageUp" xpos="-130" ypos="51" width="19" height="22" /> <part type="stickyImageDown" xpos="-99" ypos="51" width="19" height="22" /> </widget> diff --git a/data/themes/golden-delicious/world.xml b/data/themes/golden-delicious/world.xml index dc0f877a3..169eab18d 100644 --- a/data/themes/golden-delicious/world.xml +++ b/data/themes/golden-delicious/world.xml @@ -3,9 +3,9 @@ <widget type="Window" xpos="260" ypos="0"> <option name="showbackground" value="1" /> <option name="captionoffsetx" value="20" /> - <option name="captionoffsety" value="7" /> + <option name="captionoffsety" value="8" /> <option name="titlebarBold" value="1" /> - <option name="titlebarHeight" value="35" /> + <option name="titlebarHeight" value="32" /> <option name="padding" value="10" /> <!-- Top Row --> @@ -23,7 +23,8 @@ <part type="bottom-edge" xpos="31" ypos="79" width="48" height="28" /> <part type="bottom-right-corner" xpos="80" ypos="79" width="30" height="28" /> - <part type="closeImage" xpos="-163" ypos="0" width="22" height="22" /> - <part type="closeImageHighlighted" xpos="-138" ypos="0" width="22" height="22" /> + <!-- Buttons --> + <part type="closeImage" xpos="-163" ypos="2" width="22" height="27" /> + <part type="closeImageHighlighted" xpos="-138" ypos="2" width="22" height="27" /> </widget> </skinset> |
