diff options
| -rw-r--r-- | data/graphics/gui/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | data/graphics/gui/Makefile.am | 3 | ||||
| -rw-r--r-- | data/graphics/gui/emote_selection.xml | 5 | ||||
| -rw-r--r-- | data/graphics/gui/item_selection.xml | 5 | ||||
| -rw-r--r-- | data/graphics/gui/selection.png | bin | 740 -> 0 bytes | |||
| -rw-r--r-- | data/graphics/gui/window.png | bin | 15435 -> 16084 bytes | |||
| -rw-r--r-- | src/gui/emotepopup.cpp | 2 | ||||
| -rw-r--r-- | src/gui/widgets/itemcontainer.cpp | 2 |
8 files changed, 16 insertions, 4 deletions
diff --git a/data/graphics/gui/CMakeLists.txt b/data/graphics/gui/CMakeLists.txt index f9c73c6fe..6cd7c3698 100644 --- a/data/graphics/gui/CMakeLists.txt +++ b/data/graphics/gui/CMakeLists.txt @@ -12,7 +12,9 @@ SET (FILES dropdown.xml dropdown_background.xml dropdown_pressed.xml + emote_selection.xml equipmentbox.png + item_selection.xml item_shortcut_background.xml mouse.png playerbox_background.xml @@ -28,7 +30,6 @@ SET (FILES scroll_highlighted.xml scrollbuttons.xml scrollbuttons_pressed.xml - selection.png slider.xml slider_highlighted.xml speechbubble.xml diff --git a/data/graphics/gui/Makefile.am b/data/graphics/gui/Makefile.am index 2224bb467..f43d75e38 100644 --- a/data/graphics/gui/Makefile.am +++ b/data/graphics/gui/Makefile.am @@ -15,7 +15,9 @@ gui_DATA = \ dropdown.xml \ dropdown_background.xml \ dropdown_pressed.xml \ + emote_selection.xml \ equipmentbox.png \ + item_selection.xml \ item_shortcut_background.xml \ mouse.png \ playerbox_background.xml \ @@ -31,7 +33,6 @@ gui_DATA = \ scroll_highlighted.xml \ scrollbuttons.xml \ scrollbuttons_pressed.xml\ - selection.png \ slider.xml \ slider_highlighted.xml \ speechbubble.xml \ diff --git a/data/graphics/gui/emote_selection.xml b/data/graphics/gui/emote_selection.xml new file mode 100644 index 000000000..ffdf5026e --- /dev/null +++ b/data/graphics/gui/emote_selection.xml @@ -0,0 +1,5 @@ +<skinset name="Default" image="window.png"> + <widget type="Window"> + <part type="standart" xpos="138" ypos="75" width="32" height="32" /> + </widget> +</skinset> diff --git a/data/graphics/gui/item_selection.xml b/data/graphics/gui/item_selection.xml new file mode 100644 index 000000000..ffdf5026e --- /dev/null +++ b/data/graphics/gui/item_selection.xml @@ -0,0 +1,5 @@ +<skinset name="Default" image="window.png"> + <widget type="Window"> + <part type="standart" xpos="138" ypos="75" width="32" height="32" /> + </widget> +</skinset> diff --git a/data/graphics/gui/selection.png b/data/graphics/gui/selection.png Binary files differdeleted file mode 100644 index 78827dafa..000000000 --- a/data/graphics/gui/selection.png +++ /dev/null diff --git a/data/graphics/gui/window.png b/data/graphics/gui/window.png Binary files differindex 3c6cbbdb9..c0840e7ae 100644 --- a/data/graphics/gui/window.png +++ b/data/graphics/gui/window.png diff --git a/src/gui/emotepopup.cpp b/src/gui/emotepopup.cpp index 0b1d72808..33ecc037f 100644 --- a/src/gui/emotepopup.cpp +++ b/src/gui/emotepopup.cpp @@ -63,7 +63,7 @@ EmotePopup::EmotePopup() : mEmotes.push_back(sprite); } - mSelectionImage = Theme::getImageFromTheme("selection.png"); + mSelectionImage = Theme::getImageFromThemeXml("emote_selection.xml"); if (!mSelectionImage) logger->log1("Error: Unable to load selection.png"); diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp index 70f2c47fb..c5118ce44 100644 --- a/src/gui/widgets/itemcontainer.cpp +++ b/src/gui/widgets/itemcontainer.cpp @@ -174,7 +174,7 @@ ItemContainer::ItemContainer(Inventory *inventory, bool forceQuantity): { setFocusable(true); - mSelImg = Theme::getImageFromTheme("selection.png"); + mSelImg = Theme::getImageFromThemeXml("item_selection.xml"); if (!mSelImg) logger->log1("Error: Unable to load selection.png"); |
