diff options
30 files changed, 380 insertions, 5 deletions
diff --git a/data/graphics/gui/CMakeLists.txt b/data/graphics/gui/CMakeLists.txt index aca2b43cd..552d65e50 100644 --- a/data/graphics/gui/CMakeLists.txt +++ b/data/graphics/gui/CMakeLists.txt @@ -6,6 +6,10 @@ SET (FILES button_disabled.xml button_highlighted.xml button_pressed.xml + buttonpin.xml + buttonpin_disabled.xml + buttonpin_highlighted.xml + buttonpin_pressed.xml buttonplay.png buy.xml charcreate_playerbox.xml diff --git a/data/graphics/gui/Makefile.am b/data/graphics/gui/Makefile.am index 049d80d95..9b167ba48 100644 --- a/data/graphics/gui/Makefile.am +++ b/data/graphics/gui/Makefile.am @@ -9,6 +9,10 @@ gui_DATA = \ button_disabled.xml \ button_highlighted.xml \ button_pressed.xml \ + buttonpin.xml \ + buttonpin_disabled.xml \ + buttonpin_highlighted.xml \ + buttonpin_pressed.xml \ buttonplay.png \ buy.xml \ charcreate_playerbox.xml \ diff --git a/data/graphics/gui/buttonpin.xml b/data/graphics/gui/buttonpin.xml new file mode 100644 index 000000000..33d24e80a --- /dev/null +++ b/data/graphics/gui/buttonpin.xml @@ -0,0 +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="8" /> + <option name="spacing" value="2" /> + + <!-- Top Row --> + <part type="top-left-corner" xpos="0" ypos="0" width="10" height="5" /> + <part type="top-edge" xpos="9" ypos="0" width="8" height="5" /> + <part type="top-right-corner" xpos="16" ypos="0" width="10" height="5" /> + + <!-- Middle Row --> + <part type="left-edge" xpos="0" ypos="4" width="10" height="16" /> + <part type="bg-quad" xpos="9" ypos="4" width="8" height="16" /> + <part type="right-edge" xpos="16" ypos="4" width="10" height="16" /> + + <!-- Bottom Row --> + <part type="bottom-left-corner" xpos="0" ypos="19" width="10" height="5" /> + <part type="bottom-edge" xpos="9" ypos="19" width="8" height="5" /> + <part type="bottom-right-corner" xpos="16" ypos="19" width="10" height="5" /> + </widget> +</skinset> diff --git a/data/graphics/gui/buttonpin_disabled.xml b/data/graphics/gui/buttonpin_disabled.xml new file mode 100644 index 000000000..2f5c91400 --- /dev/null +++ b/data/graphics/gui/buttonpin_disabled.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<skinset name="Default" image="window.png"> + <widget type="Window" xpos="41" ypos="75"> + <option name="padding" value="8" /> + <option name="spacing" value="2" /> + + <!-- Top Row --> + <part type="top-left-corner" xpos="0" ypos="0" width="10" height="5" /> + <part type="top-edge" xpos="9" ypos="0" width="8" height="5" /> + <part type="top-right-corner" xpos="16" ypos="0" width="10" height="5" /> + + <!-- Middle Row --> + <part type="left-edge" xpos="0" ypos="4" width="10" height="16" /> + <part type="bg-quad" xpos="9" ypos="4" width="8" height="16" /> + <part type="right-edge" xpos="16" ypos="4" width="10" height="16" /> + + <!-- Bottom Row --> + <part type="bottom-left-corner" xpos="0" ypos="19" width="10" height="5" /> + <part type="bottom-edge" xpos="9" ypos="19" width="8" height="5" /> + <part type="bottom-right-corner" xpos="16" ypos="19" width="10" height="5" /> + </widget> +</skinset> diff --git a/data/graphics/gui/buttonpin_highlighted.xml b/data/graphics/gui/buttonpin_highlighted.xml new file mode 100644 index 000000000..fd715445c --- /dev/null +++ b/data/graphics/gui/buttonpin_highlighted.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<skinset name="Default" image="window.png"> + <widget type="Window" xpos="41" ypos="25"> + <option name="padding" value="8" /> + <option name="spacing" value="2" /> + + <!-- Top Row --> + <part type="top-left-corner" xpos="0" ypos="0" width="10" height="5" /> + <part type="top-edge" xpos="9" ypos="0" width="8" height="5" /> + <part type="top-right-corner" xpos="16" ypos="0" width="10" height="5" /> + + <!-- Middle Row --> + <part type="left-edge" xpos="0" ypos="4" width="10" height="16" /> + <part type="bg-quad" xpos="9" ypos="4" width="8" height="16" /> + <part type="right-edge" xpos="16" ypos="4" width="10" height="16" /> + + <!-- Bottom Row --> + <part type="bottom-left-corner" xpos="0" ypos="19" width="10" height="5" /> + <part type="bottom-edge" xpos="9" ypos="19" width="8" height="5" /> + <part type="bottom-right-corner" xpos="16" ypos="19" width="10" height="5" /> + </widget> +</skinset> diff --git a/data/graphics/gui/buttonpin_pressed.xml b/data/graphics/gui/buttonpin_pressed.xml new file mode 100644 index 000000000..3b4c71e97 --- /dev/null +++ b/data/graphics/gui/buttonpin_pressed.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<skinset name="Default" image="window.png"> + <widget type="Window" xpos="41" ypos="50"> + <option name="padding" value="8" /> + <option name="spacing" value="2" /> + + <!-- Top Row --> + <part type="top-left-corner" xpos="0" ypos="0" width="10" height="5" /> + <part type="top-edge" xpos="9" ypos="0" width="8" height="5" /> + <part type="top-right-corner" xpos="16" ypos="0" width="10" height="5" /> + + <!-- Middle Row --> + <part type="left-edge" xpos="0" ypos="4" width="10" height="16" /> + <part type="bg-quad" xpos="9" ypos="4" width="8" height="16" /> + <part type="right-edge" xpos="16" ypos="4" width="10" height="16" /> + + <!-- Bottom Row --> + <part type="bottom-left-corner" xpos="0" ypos="19" width="10" height="5" /> + <part type="bottom-edge" xpos="9" ypos="19" width="8" height="5" /> + <part type="bottom-right-corner" xpos="16" ypos="19" width="10" height="5" /> + </widget> +</skinset> diff --git a/data/themes/golden-delicious/CMakeLists.txt b/data/themes/golden-delicious/CMakeLists.txt index 2fc2b80f4..4d4f28328 100644 --- a/data/themes/golden-delicious/CMakeLists.txt +++ b/data/themes/golden-delicious/CMakeLists.txt @@ -6,6 +6,10 @@ SET (FILES button_highlighted.xml button_pressed.xml button.xml + buttonpin_disabled.xml + buttonpin_highlighted.xml + buttonpin_pressed.xml + buttonpin.xml buy.xml charcreate.xml CHANGELOG.txt diff --git a/data/themes/golden-delicious/Makefile.am b/data/themes/golden-delicious/Makefile.am index 0dcfcb358..c16ff1246 100644 --- a/data/themes/golden-delicious/Makefile.am +++ b/data/themes/golden-delicious/Makefile.am @@ -9,6 +9,10 @@ gui_DATA = \ button_disabled.xml \ button_highlighted.xml \ button_pressed.xml \ + buttonpin.xml \ + buttonpin_disabled.xml \ + buttonpin_highlighted.xml \ + buttonpin_pressed.xml \ buy.xml \ charcreate.xml \ CHANGELOG.txt \ diff --git a/data/themes/golden-delicious/buttonpin.xml b/data/themes/golden-delicious/buttonpin.xml new file mode 100644 index 000000000..f7b063f07 --- /dev/null +++ b/data/themes/golden-delicious/buttonpin.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<skinset name="Default" image="window.png"> + <widget type="Window" xpos="41" ypos="0"> + <option name="padding" value="10" /> + + <!-- 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" /> + + <!-- 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" /> + + <!-- 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" /> + </widget> +</skinset> diff --git a/data/themes/golden-delicious/buttonpin_disabled.xml b/data/themes/golden-delicious/buttonpin_disabled.xml new file mode 100644 index 000000000..1322f462b --- /dev/null +++ b/data/themes/golden-delicious/buttonpin_disabled.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<skinset name="Default" image="window.png"> + <widget type="Window" xpos="41" ypos="75"> + <option name="padding" value="9" /> + + <!-- 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" /> + + <!-- 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" /> + + <!-- 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" /> + </widget> +</skinset> diff --git a/data/themes/golden-delicious/buttonpin_highlighted.xml b/data/themes/golden-delicious/buttonpin_highlighted.xml new file mode 100644 index 000000000..b82ed4b55 --- /dev/null +++ b/data/themes/golden-delicious/buttonpin_highlighted.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<skinset name="Default" image="window.png"> + <widget type="Window" xpos="41" ypos="25"> + <option name="padding" value="9" /> + + <!-- 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" /> + + <!-- 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" /> + + <!-- 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" /> + </widget> +</skinset> diff --git a/data/themes/golden-delicious/buttonpin_pressed.xml b/data/themes/golden-delicious/buttonpin_pressed.xml new file mode 100644 index 000000000..5f3b06a03 --- /dev/null +++ b/data/themes/golden-delicious/buttonpin_pressed.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<skinset name="Default" image="window.png"> + <widget type="Window" xpos="41" ypos="50"> + <option name="padding" value="9" /> + + <!-- 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" /> + + <!-- 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" /> + + <!-- 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" /> + </widget> +</skinset> diff --git a/data/themes/golden-delicious/pin.xml b/data/themes/golden-delicious/pin.xml index b6b922852..52894b0da 100644 --- a/data/themes/golden-delicious/pin.xml +++ b/data/themes/golden-delicious/pin.xml @@ -2,6 +2,6 @@ <skinset name="Default" image="window.png"> <widget type="Window"> <option name="padding" value="8" /> - <option name="spacing" value="8" /> + <option name="spacing" value="4" /> </widget> </skinset> diff --git a/data/themes/jewelry-simple/CMakeLists.txt b/data/themes/jewelry-simple/CMakeLists.txt index 104b95ba9..b48228017 100644 --- a/data/themes/jewelry-simple/CMakeLists.txt +++ b/data/themes/jewelry-simple/CMakeLists.txt @@ -6,6 +6,10 @@ SET (FILES button_disabled.xml button_highlighted.xml button_pressed.xml + buttonpin.xml + buttonpin_disabled.xml + buttonpin_highlighted.xml + buttonpin_pressed.xml buy.xml charcreate.xml CHANGELOG.txt diff --git a/data/themes/jewelry-simple/Makefile.am b/data/themes/jewelry-simple/Makefile.am index f3c050ac6..a76021a1e 100644 --- a/data/themes/jewelry-simple/Makefile.am +++ b/data/themes/jewelry-simple/Makefile.am @@ -9,6 +9,10 @@ gui_DATA = \ button_disabled.xml \ button_highlighted.xml \ button_pressed.xml \ + buttonpin.xml \ + buttonpin_disabled.xml \ + buttonpin_highlighted.xml \ + buttonpin_pressed.xml \ buy.xml \ charcreate.xml \ CHANGELOG.txt \ diff --git a/data/themes/jewelry-simple/buttonpin.xml b/data/themes/jewelry-simple/buttonpin.xml new file mode 100644 index 000000000..9e99447a9 --- /dev/null +++ b/data/themes/jewelry-simple/buttonpin.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<skinset name="Default" image="window.png"> + <widget type="Window" xpos="41" ypos="0"> + <option name="padding" value="11" /> + + <!-- 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" /> + + <!-- 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" /> + + <!-- 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" /> + </widget> +</skinset> diff --git a/data/themes/jewelry-simple/buttonpin_disabled.xml b/data/themes/jewelry-simple/buttonpin_disabled.xml new file mode 100644 index 000000000..1322f462b --- /dev/null +++ b/data/themes/jewelry-simple/buttonpin_disabled.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<skinset name="Default" image="window.png"> + <widget type="Window" xpos="41" ypos="75"> + <option name="padding" value="9" /> + + <!-- 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" /> + + <!-- 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" /> + + <!-- 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" /> + </widget> +</skinset> diff --git a/data/themes/jewelry-simple/buttonpin_highlighted.xml b/data/themes/jewelry-simple/buttonpin_highlighted.xml new file mode 100644 index 000000000..b82ed4b55 --- /dev/null +++ b/data/themes/jewelry-simple/buttonpin_highlighted.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<skinset name="Default" image="window.png"> + <widget type="Window" xpos="41" ypos="25"> + <option name="padding" value="9" /> + + <!-- 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" /> + + <!-- 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" /> + + <!-- 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" /> + </widget> +</skinset> diff --git a/data/themes/jewelry-simple/buttonpin_pressed.xml b/data/themes/jewelry-simple/buttonpin_pressed.xml new file mode 100644 index 000000000..5f3b06a03 --- /dev/null +++ b/data/themes/jewelry-simple/buttonpin_pressed.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<skinset name="Default" image="window.png"> + <widget type="Window" xpos="41" ypos="50"> + <option name="padding" value="9" /> + + <!-- 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" /> + + <!-- 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" /> + + <!-- 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" /> + </widget> +</skinset> diff --git a/data/themes/jewelry-simple/pin.xml b/data/themes/jewelry-simple/pin.xml index 267b16969..bbc6674e6 100644 --- a/data/themes/jewelry-simple/pin.xml +++ b/data/themes/jewelry-simple/pin.xml @@ -2,6 +2,6 @@ <skinset name="Default" image="window.png"> <widget type="Window"> <option name="padding" value="4" /> - <option name="spacing" value="8" /> + <option name="spacing" value="4" /> </widget> </skinset> diff --git a/data/themes/jewelry/CMakeLists.txt b/data/themes/jewelry/CMakeLists.txt index afd0cc128..33a693367 100644 --- a/data/themes/jewelry/CMakeLists.txt +++ b/data/themes/jewelry/CMakeLists.txt @@ -6,6 +6,10 @@ SET (FILES button_disabled.xml button_highlighted.xml button_pressed.xml + buttonpin.xml + buttonpin_disabled.xml + buttonpin_highlighted.xml + buttonpin_pressed.xml buy.xml charcreate.xml CHANGELOG.txt diff --git a/data/themes/jewelry/Makefile.am b/data/themes/jewelry/Makefile.am index 4a7f5caa2..7f7ab8ab4 100644 --- a/data/themes/jewelry/Makefile.am +++ b/data/themes/jewelry/Makefile.am @@ -9,6 +9,10 @@ gui_DATA = \ button_disabled.xml \ button_highlighted.xml \ button_pressed.xml \ + buttonpin.xml \ + buttonpin_disabled.xml \ + buttonpin_highlighted.xml \ + buttonpin_pressed.xml \ buy.xml \ charcreate.xml \ CHANGELOG.txt \ diff --git a/data/themes/jewelry/buttonpin.xml b/data/themes/jewelry/buttonpin.xml new file mode 100644 index 000000000..9e99447a9 --- /dev/null +++ b/data/themes/jewelry/buttonpin.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<skinset name="Default" image="window.png"> + <widget type="Window" xpos="41" ypos="0"> + <option name="padding" value="11" /> + + <!-- 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" /> + + <!-- 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" /> + + <!-- 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" /> + </widget> +</skinset> diff --git a/data/themes/jewelry/buttonpin_disabled.xml b/data/themes/jewelry/buttonpin_disabled.xml new file mode 100644 index 000000000..1322f462b --- /dev/null +++ b/data/themes/jewelry/buttonpin_disabled.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<skinset name="Default" image="window.png"> + <widget type="Window" xpos="41" ypos="75"> + <option name="padding" value="9" /> + + <!-- 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" /> + + <!-- 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" /> + + <!-- 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" /> + </widget> +</skinset> diff --git a/data/themes/jewelry/buttonpin_highlighted.xml b/data/themes/jewelry/buttonpin_highlighted.xml new file mode 100644 index 000000000..b82ed4b55 --- /dev/null +++ b/data/themes/jewelry/buttonpin_highlighted.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<skinset name="Default" image="window.png"> + <widget type="Window" xpos="41" ypos="25"> + <option name="padding" value="9" /> + + <!-- 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" /> + + <!-- 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" /> + + <!-- 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" /> + </widget> +</skinset> diff --git a/data/themes/jewelry/buttonpin_pressed.xml b/data/themes/jewelry/buttonpin_pressed.xml new file mode 100644 index 000000000..5f3b06a03 --- /dev/null +++ b/data/themes/jewelry/buttonpin_pressed.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<skinset name="Default" image="window.png"> + <widget type="Window" xpos="41" ypos="50"> + <option name="padding" value="9" /> + + <!-- 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" /> + + <!-- 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" /> + + <!-- 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" /> + </widget> +</skinset> diff --git a/data/themes/jewelry/pin.xml b/data/themes/jewelry/pin.xml index d417b3c52..b3b45cebf 100644 --- a/data/themes/jewelry/pin.xml +++ b/data/themes/jewelry/pin.xml @@ -2,6 +2,6 @@ <skinset name="Default" image="window.png"> <widget type="Window"> <option name="padding" value="4" /> - <option name="spacing" value="10" /> + <option name="spacing" value="6" /> </widget> </skinset> diff --git a/src/gui/widgets/button.h b/src/gui/widgets/button.h index 447ef8192..a14a1a5a1 100644 --- a/src/gui/widgets/button.h +++ b/src/gui/widgets/button.h @@ -86,6 +86,7 @@ class Skin; const std::string BUTTON_PLAY = "buttonplay.png"; const std::string BUTTON_SKIN = "button"; +const std::string BUTTON_PIN_SKIN = "buttonpin"; /** * Button widget. Same as the Guichan button but with custom look. diff --git a/src/gui/widgets/pincode.cpp b/src/gui/widgets/pincode.cpp index e0f0ce3d8..6d826e3e2 100644 --- a/src/gui/widgets/pincode.cpp +++ b/src/gui/widgets/pincode.cpp @@ -97,7 +97,7 @@ void Pincode::addButtons() mButtons[f] = new Button(this, str, str, - BUTTON_SKIN, + BUTTON_PIN_SKIN, this); mButtons[f]->adjustSize(); const Rect &rect = mButtons[f]->getDimension(); @@ -126,7 +126,7 @@ void Pincode::addButtons() // TRANSLATORS: clear pin code button _("Clear"), "clear", - BUTTON_SKIN, + BUTTON_PIN_SKIN, this); mButtons[10]->adjustSize(); add(mButtons[10]); diff --git a/src/gui/windows/pincodedialog.cpp b/src/gui/windows/pincodedialog.cpp index 223ad69c0..0e79774ac 100644 --- a/src/gui/windows/pincodedialog.cpp +++ b/src/gui/windows/pincodedialog.cpp @@ -75,6 +75,8 @@ PincodeDialog::PincodeDialog(const std::string &restrict title, int width = getFont()->getWidth(title); if (width < textLabel->getWidth()) width = textLabel->getWidth(); + if (width < mPincode->getWidth()) + width = mPincode->getWidth(); reflowLayout(CAST_S32(width + 20), 0); updateButtons(); } |