diff options
| -rw-r--r-- | data/themes/golden-delicious/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | data/themes/golden-delicious/Makefile.am | 1 | ||||
| -rw-r--r-- | data/themes/golden-delicious/skillpopup.xml | 22 | ||||
| -rw-r--r-- | data/themes/jewelry/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | data/themes/jewelry/Makefile.am | 1 | ||||
| -rw-r--r-- | data/themes/jewelry/skillpopup.xml | 22 | ||||
| -rw-r--r-- | src/gui/popups/skillpopup.cpp | 2 |
7 files changed, 49 insertions, 1 deletions
diff --git a/data/themes/golden-delicious/CMakeLists.txt b/data/themes/golden-delicious/CMakeLists.txt index 1ba7e4df1..c85ce997b 100644 --- a/data/themes/golden-delicious/CMakeLists.txt +++ b/data/themes/golden-delicious/CMakeLists.txt @@ -94,6 +94,7 @@ SET (FILES shoplistbox.xml shop.xml skilllistbox.xml + skillpopup.xml slider_highlighted.xml slider.xml social.xml diff --git a/data/themes/golden-delicious/Makefile.am b/data/themes/golden-delicious/Makefile.am index 08cd45dc4..3e45b950a 100644 --- a/data/themes/golden-delicious/Makefile.am +++ b/data/themes/golden-delicious/Makefile.am @@ -96,6 +96,7 @@ gui_DATA = \ shop.xml \ shoplistbox.xml \ skilllistbox.xml \ + skillpopup.xml \ slider.xml \ slider_highlighted.xml \ social.xml \ diff --git a/data/themes/golden-delicious/skillpopup.xml b/data/themes/golden-delicious/skillpopup.xml new file mode 100644 index 000000000..b333d40e4 --- /dev/null +++ b/data/themes/golden-delicious/skillpopup.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<skinset name="Default" image="window.png"> + <widget type="Window" xpos="260" ypos="109"> + <option name="padding" value="10" /> + <option name="palette" value="1" /> + + <!-- Top Row --> + <part type="top-left-corner" width="30" height="15" /> + <part type="top-edge" xpos="31" ypos="0" width="48" height="15" /> + <part type="top-right-corner" xpos="80" ypos="0" width="30" height="15" /> + + <!-- Middle Row --> + <part type="left-edge" xpos="0" ypos="16" width="30" height="10" /> + <part type="bg-quad" xpos="31" ypos="16" width="48" height="10" /> + <part type="right-edge" xpos="80" ypos="16" width="30" height="10" /> + + <!-- Bottom Row --> + <part type="bottom-left-corner" xpos="0" ypos="27" width="30" height="14" /> + <part type="bottom-edge" xpos="31" ypos="27" width="48" height="14" /> + <part type="bottom-right-corner" xpos="80" ypos="27" width="30" height="14" /> + </widget> +</skinset> diff --git a/data/themes/jewelry/CMakeLists.txt b/data/themes/jewelry/CMakeLists.txt index b84dfa7bd..c7646e49d 100644 --- a/data/themes/jewelry/CMakeLists.txt +++ b/data/themes/jewelry/CMakeLists.txt @@ -93,6 +93,7 @@ SET (FILES shop.xml shoplistbox.xml skilllistbox.xml + skillpopup.xml slider.xml slider_highlighted.xml social.xml diff --git a/data/themes/jewelry/Makefile.am b/data/themes/jewelry/Makefile.am index c2f4db4af..bbe4277c7 100644 --- a/data/themes/jewelry/Makefile.am +++ b/data/themes/jewelry/Makefile.am @@ -96,6 +96,7 @@ gui_DATA = \ shop.xml \ shoplistbox.xml \ skilllistbox.xml \ + skillpopup.xml \ slider.xml \ slider_highlighted.xml \ social.xml \ diff --git a/data/themes/jewelry/skillpopup.xml b/data/themes/jewelry/skillpopup.xml new file mode 100644 index 000000000..b333d40e4 --- /dev/null +++ b/data/themes/jewelry/skillpopup.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<skinset name="Default" image="window.png"> + <widget type="Window" xpos="260" ypos="109"> + <option name="padding" value="10" /> + <option name="palette" value="1" /> + + <!-- Top Row --> + <part type="top-left-corner" width="30" height="15" /> + <part type="top-edge" xpos="31" ypos="0" width="48" height="15" /> + <part type="top-right-corner" xpos="80" ypos="0" width="30" height="15" /> + + <!-- Middle Row --> + <part type="left-edge" xpos="0" ypos="16" width="30" height="10" /> + <part type="bg-quad" xpos="31" ypos="16" width="48" height="10" /> + <part type="right-edge" xpos="80" ypos="16" width="30" height="10" /> + + <!-- Bottom Row --> + <part type="bottom-left-corner" xpos="0" ypos="27" width="30" height="14" /> + <part type="bottom-edge" xpos="31" ypos="27" width="48" height="14" /> + <part type="bottom-right-corner" xpos="80" ypos="27" width="30" height="14" /> + </widget> +</skinset> diff --git a/src/gui/popups/skillpopup.cpp b/src/gui/popups/skillpopup.cpp index 58383ef75..a7b30a20c 100644 --- a/src/gui/popups/skillpopup.cpp +++ b/src/gui/popups/skillpopup.cpp @@ -39,7 +39,7 @@ extern int serverVersion; SkillPopup *skillPopup = nullptr; SkillPopup::SkillPopup() : - Popup("SkillPopup", "itempopup.xml"), + Popup("SkillPopup", "skillpopup.xml"), mSkillName(new Label(this)), mSkillDesc(new TextBox(this)), mSkillEffect(new TextBox(this)), |