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/playerbox.xml (renamed from data/graphics/gui/playerbox_background.xml) | 0 | ||||
| -rw-r--r-- | data/themes/jewelry/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | data/themes/jewelry/Makefile.am | 2 | ||||
| -rw-r--r-- | data/themes/jewelry/playerbox.xml (renamed from data/themes/jewelry/playerbox_background.xml) | 0 | ||||
| -rw-r--r-- | src/gui/widgets/playerbox.cpp | 4 |
7 files changed, 6 insertions, 6 deletions
diff --git a/data/graphics/gui/CMakeLists.txt b/data/graphics/gui/CMakeLists.txt index b3822cbdb..01b14ce9a 100644 --- a/data/graphics/gui/CMakeLists.txt +++ b/data/graphics/gui/CMakeLists.txt @@ -31,7 +31,7 @@ SET (FILES listbox.xml mouse.png ok.xml - playerbox_background.xml + playerbox.xml popup.xml progress-indicator.png progressbar.xml diff --git a/data/graphics/gui/Makefile.am b/data/graphics/gui/Makefile.am index 3f789b401..91ace3d34 100644 --- a/data/graphics/gui/Makefile.am +++ b/data/graphics/gui/Makefile.am @@ -34,7 +34,7 @@ gui_DATA = \ listbox.xml \ mouse.png \ ok.xml \ - playerbox_background.xml \ + playerbox.xml \ popup.xml \ progress-indicator.png \ progressbar.xml \ diff --git a/data/graphics/gui/playerbox_background.xml b/data/graphics/gui/playerbox.xml index 5fc994df5..5fc994df5 100644 --- a/data/graphics/gui/playerbox_background.xml +++ b/data/graphics/gui/playerbox.xml diff --git a/data/themes/jewelry/CMakeLists.txt b/data/themes/jewelry/CMakeLists.txt index b80297e38..092cd95ae 100644 --- a/data/themes/jewelry/CMakeLists.txt +++ b/data/themes/jewelry/CMakeLists.txt @@ -29,7 +29,7 @@ SET (FILES mouse.png npc.xml ok.xml - playerbox_background.xml + playerbox.xml popup.xml progressbar.xml quests.xml diff --git a/data/themes/jewelry/Makefile.am b/data/themes/jewelry/Makefile.am index 5532b8818..fc5981c93 100644 --- a/data/themes/jewelry/Makefile.am +++ b/data/themes/jewelry/Makefile.am @@ -32,7 +32,7 @@ gui_DATA = \ mouse.png \ npc.xml \ ok.xml \ - playerbox_background.xml \ + playerbox.xml \ popup.xml \ progressbar.xml \ quests.xml \ diff --git a/data/themes/jewelry/playerbox_background.xml b/data/themes/jewelry/playerbox.xml index 1e18e42fe..1e18e42fe 100644 --- a/data/themes/jewelry/playerbox_background.xml +++ b/data/themes/jewelry/playerbox.xml diff --git a/src/gui/widgets/playerbox.cpp b/src/gui/widgets/playerbox.cpp index 4511a8544..7fbe68f7f 100644 --- a/src/gui/widgets/playerbox.cpp +++ b/src/gui/widgets/playerbox.cpp @@ -73,9 +73,9 @@ void PlayerBox::init(std::string skin) if (Theme::instance()) { if (skin.empty()) - skin = "playerbox_background.xml"; + skin = "playerbox.xml"; mSkin = Theme::instance()->loadSkinRect(mBackground, - skin, "background.xml"); + skin, "playerbox_background.xml"); if (mSkin) mDrawBackground = (mSkin->getOption("drawbackground") != 0); } |