diff options
| -rw-r--r-- | data/graphics/gui/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | data/graphics/gui/Makefile.am | 2 | ||||
| -rw-r--r-- | data/graphics/gui/item_shortcut_background.xml | 5 | ||||
| -rw-r--r-- | data/graphics/gui/item_shortcut_bgr.png | bin | 284 -> 0 bytes | |||
| -rw-r--r-- | data/graphics/gui/window.png | bin | 15332 -> 15435 bytes | |||
| -rw-r--r-- | src/gui/widgets/dropshortcutcontainer.cpp | 3 | ||||
| -rw-r--r-- | src/gui/widgets/emoteshortcutcontainer.cpp | 3 | ||||
| -rw-r--r-- | src/gui/widgets/itemshortcutcontainer.cpp | 3 | ||||
| -rw-r--r-- | src/gui/widgets/spellshortcutcontainer.cpp | 3 |
9 files changed, 15 insertions, 6 deletions
diff --git a/data/graphics/gui/CMakeLists.txt b/data/graphics/gui/CMakeLists.txt index a8be383b2..f9c73c6fe 100644 --- a/data/graphics/gui/CMakeLists.txt +++ b/data/graphics/gui/CMakeLists.txt @@ -13,7 +13,7 @@ SET (FILES dropdown_background.xml dropdown_pressed.xml equipmentbox.png - item_shortcut_bgr.png + item_shortcut_background.xml mouse.png playerbox_background.xml progress-indicator.png diff --git a/data/graphics/gui/Makefile.am b/data/graphics/gui/Makefile.am index 7cd231eae..2224bb467 100644 --- a/data/graphics/gui/Makefile.am +++ b/data/graphics/gui/Makefile.am @@ -16,7 +16,7 @@ gui_DATA = \ dropdown_background.xml \ dropdown_pressed.xml \ equipmentbox.png \ - item_shortcut_bgr.png \ + item_shortcut_background.xml \ mouse.png \ playerbox_background.xml \ progress-indicator.png \ diff --git a/data/graphics/gui/item_shortcut_background.xml b/data/graphics/gui/item_shortcut_background.xml new file mode 100644 index 000000000..2d9f2a9be --- /dev/null +++ b/data/graphics/gui/item_shortcut_background.xml @@ -0,0 +1,5 @@ +<skinset name="Default" image="window.png"> + <widget type="Window"> + <part type="standart" xpos="98" ypos="75" width="36" height="42" /> + </widget> +</skinset> diff --git a/data/graphics/gui/item_shortcut_bgr.png b/data/graphics/gui/item_shortcut_bgr.png Binary files differdeleted file mode 100644 index 0543e38ac..000000000 --- a/data/graphics/gui/item_shortcut_bgr.png +++ /dev/null diff --git a/data/graphics/gui/window.png b/data/graphics/gui/window.png Binary files differindex 477602fa6..3c6cbbdb9 100644 --- a/data/graphics/gui/window.png +++ b/data/graphics/gui/window.png diff --git a/src/gui/widgets/dropshortcutcontainer.cpp b/src/gui/widgets/dropshortcutcontainer.cpp index af3b78a31..d6d31871b 100644 --- a/src/gui/widgets/dropshortcutcontainer.cpp +++ b/src/gui/widgets/dropshortcutcontainer.cpp @@ -55,7 +55,8 @@ DropShortcutContainer::DropShortcutContainer(): mItemPopup = new ItemPopup; - mBackgroundImg = Theme::getImageFromTheme("item_shortcut_bgr.png"); + mBackgroundImg = Theme::getImageFromThemeXml( + "item_shortcut_background.xml"); if (dropShortcut) mMaxItems = dropShortcut->getItemCount(); else diff --git a/src/gui/widgets/emoteshortcutcontainer.cpp b/src/gui/widgets/emoteshortcutcontainer.cpp index aaf22c066..79a50bf40 100644 --- a/src/gui/widgets/emoteshortcutcontainer.cpp +++ b/src/gui/widgets/emoteshortcutcontainer.cpp @@ -56,7 +56,8 @@ EmoteShortcutContainer::EmoteShortcutContainer(): addMouseListener(this); addWidgetListener(this); - mBackgroundImg = Theme::getImageFromTheme("item_shortcut_bgr.png"); + mBackgroundImg = Theme::getImageFromThemeXml( + "item_shortcut_background.xml"); if (mBackgroundImg) mBackgroundImg->setAlpha(Client::getGuiAlpha()); diff --git a/src/gui/widgets/itemshortcutcontainer.cpp b/src/gui/widgets/itemshortcutcontainer.cpp index 0585f59cd..714435d21 100644 --- a/src/gui/widgets/itemshortcutcontainer.cpp +++ b/src/gui/widgets/itemshortcutcontainer.cpp @@ -62,7 +62,8 @@ ItemShortcutContainer::ItemShortcutContainer(unsigned number): mItemPopup = new ItemPopup; mSpellPopup = new SpellPopup; - mBackgroundImg = Theme::getImageFromTheme("item_shortcut_bgr.png"); + mBackgroundImg = Theme::getImageFromThemeXml( + "item_shortcut_background.xml"); if (itemShortcut[mNumber]) mMaxItems = itemShortcut[mNumber]->getItemCount(); else diff --git a/src/gui/widgets/spellshortcutcontainer.cpp b/src/gui/widgets/spellshortcutcontainer.cpp index 7818dc8dc..c3e3b1495 100644 --- a/src/gui/widgets/spellshortcutcontainer.cpp +++ b/src/gui/widgets/spellshortcutcontainer.cpp @@ -63,7 +63,8 @@ SpellShortcutContainer::SpellShortcutContainer(unsigned number): mSpellPopup = new SpellPopup; - mBackgroundImg = Theme::getImageFromTheme("item_shortcut_bgr.png"); + mBackgroundImg = Theme::getImageFromThemeXml( + "item_shortcut_background.xml"); if (spellShortcut) mMaxItems = spellShortcut->getSpellsCount(); else |
