diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2010-08-02 23:54:57 -0600 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2010-08-03 16:42:17 -0600 |
| commit | 7773f04b4beb1a24214fe1a367b645a689d2c852 (patch) | |
| tree | 6711fc8402944eddaf78d46101f0d07687bb7356 | |
| parent | 94f91a5fd9f3f609e93224fe71d2a3bcce1c0866 (diff) | |
| download | mana-7773f04b4beb1a24214fe1a367b645a689d2c852.tar.gz mana-7773f04b4beb1a24214fe1a367b645a689d2c852.tar.bz2 mana-7773f04b4beb1a24214fe1a367b645a689d2c852.tar.xz mana-7773f04b4beb1a24214fe1a367b645a689d2c852.zip | |
Move Theme and UserPalette to the resources folder
Reviewed-by: Yohann Ferreira
58 files changed, 86 insertions, 87 deletions
@@ -240,8 +240,6 @@ <Unit filename="src\gui\textdialog.h" /> <Unit filename="src\gui\textpopup.cpp" /> <Unit filename="src\gui\textpopup.h" /> - <Unit filename="src\gui\theme.cpp" /> - <Unit filename="src\gui\theme.h" /> <Unit filename="src\gui\trade.cpp" /> <Unit filename="src\gui\trade.h" /> <Unit filename="src\gui\truetypefont.cpp" /> @@ -250,8 +248,6 @@ <Unit filename="src\gui\unregisterdialog.h" /> <Unit filename="src\gui\updatewindow.cpp" /> <Unit filename="src\gui\updatewindow.h" /> - <Unit filename="src\gui\userpalette.cpp" /> - <Unit filename="src\gui\userpalette.h" /> <Unit filename="src\gui\viewport.cpp" /> <Unit filename="src\gui\viewport.h" /> <Unit filename="src\gui\widgets\avatarlistbox.cpp" /> @@ -566,6 +562,10 @@ <Unit filename="src\resources\specialdb.h" /> <Unit filename="src\resources\spritedef.cpp" /> <Unit filename="src\resources\spritedef.h" /> + <Unit filename="src\resources\theme.cpp" /> + <Unit filename="src\resources\theme.h" /> + <Unit filename="src\resources\userpalette.cpp" /> + <Unit filename="src\resources\userpalette.h" /> <Unit filename="src\resources\wallpaper.cpp" /> <Unit filename="src\resources\wallpaper.h" /> <Unit filename="src\rotationalparticle.cpp" /> @@ -72,6 +72,8 @@ ./src/configlistener.h ./src/configuration.cpp ./src/configuration.h +./src/defaults.cpp +./src/defaults.h ./src/effectmanager.cpp ./src/effectmanager.h ./src/emoteshortcut.cpp @@ -188,8 +190,6 @@ ./src/gui/textdialog.h ./src/gui/textpopup.cpp ./src/gui/textpopup.h -./src/gui/theme.cpp -./src/gui/theme.h ./src/gui/trade.cpp ./src/gui/trade.h ./src/gui/truetypefont.cpp @@ -198,8 +198,6 @@ ./src/gui/unregisterdialog.h ./src/gui/updatewindow.cpp ./src/gui/updatewindow.h -./src/gui/userpalette.cpp -./src/gui/userpalette.h ./src/gui/viewport.cpp ./src/gui/viewport.h ./src/gui/widgets/avatarlistbox.cpp @@ -506,6 +504,10 @@ ./src/resources/specialdb.h ./src/resources/spritedef.cpp ./src/resources/spritedef.h +./src/resources/theme.cpp +./src/resources/theme.h +./src/resources/userpalette.cpp +./src/resources/userpalette.h ./src/resources/wallpaper.cpp ./src/resources/wallpaper.h ./src/rotationalparticle.cpp diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9e4d43e3..ba929208 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -296,8 +296,6 @@ SET(SRCS gui/textdialog.h gui/textpopup.cpp gui/textpopup.h - gui/theme.cpp - gui/theme.h gui/trade.cpp gui/trade.h gui/truetypefont.cpp @@ -306,8 +304,6 @@ SET(SRCS gui/unregisterdialog.h gui/updatewindow.cpp gui/updatewindow.h - gui/userpalette.cpp - gui/userpalette.h gui/viewport.cpp gui/viewport.h gui/windowmenu.cpp @@ -386,6 +382,10 @@ SET(SRCS resources/specialdb.h resources/spritedef.h resources/spritedef.cpp + resources/theme.cpp + resources/theme.h + resources/userpalette.cpp + resources/userpalette.h resources/wallpaper.cpp resources/wallpaper.h utils/base64.cpp diff --git a/src/Makefile.am b/src/Makefile.am index fdec70be..6de1e6dd 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -193,8 +193,6 @@ mana_SOURCES = gui/widgets/avatarlistbox.cpp \ gui/textdialog.h \ gui/textpopup.cpp \ gui/textpopup.h \ - gui/theme.cpp \ - gui/theme.h \ gui/trade.cpp \ gui/trade.h \ gui/truetypefont.cpp \ @@ -203,8 +201,6 @@ mana_SOURCES = gui/widgets/avatarlistbox.cpp \ gui/unregisterdialog.h \ gui/updatewindow.cpp \ gui/updatewindow.h \ - gui/userpalette.cpp \ - gui/userpalette.h \ gui/viewport.cpp \ gui/viewport.h \ gui/windowmenu.cpp \ @@ -283,6 +279,10 @@ mana_SOURCES = gui/widgets/avatarlistbox.cpp \ resources/specialdb.cpp \ resources/spritedef.h \ resources/spritedef.cpp \ + resources/theme.cpp \ + resources/theme.h \ + resources/userpalette.cpp \ + resources/userpalette.h \ resources/wallpaper.cpp \ resources/wallpaper.h \ utils/base64.cpp \ diff --git a/src/actorsprite.cpp b/src/actorsprite.cpp index 3d0e7d54..535708f0 100644 --- a/src/actorsprite.cpp +++ b/src/actorsprite.cpp @@ -31,13 +31,12 @@ #include "sound.h" #include "statuseffect.h" -#include "gui/theme.h" - #include "net/net.h" #include "resources/image.h" #include "resources/imageset.h" #include "resources/resourcemanager.h" +#include "resources/theme.h" #include <cassert> diff --git a/src/being.cpp b/src/being.cpp index 280a5a1b..344636a5 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -42,8 +42,6 @@ #include "gui/gui.h" #include "gui/socialwindow.h" #include "gui/speechbubble.h" -#include "gui/theme.h" -#include "gui/userpalette.h" #include "net/charhandler.h" #include "net/gamehandler.h" @@ -60,6 +58,8 @@ #include "resources/monsterdb.h" #include "resources/npcdb.h" #include "resources/resourcemanager.h" +#include "resources/theme.h" +#include "resources/userpalette.h" #include "utils/dtor.h" #include "utils/stringutils.h" diff --git a/src/client.cpp b/src/client.cpp index 23f7a76d..4209e2fa 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -49,10 +49,8 @@ #include "gui/sdlinput.h" #include "gui/serverdialog.h" #include "gui/setup.h" -#include "gui/theme.h" #include "gui/unregisterdialog.h" #include "gui/updatewindow.h" -#include "gui/userpalette.h" #include "gui/worldselectdialog.h" #include "gui/widgets/button.h" @@ -74,6 +72,8 @@ #include "resources/specialdb.h" #include "resources/npcdb.h" #include "resources/resourcemanager.h" +#include "resources/theme.h" +#include "resources/userpalette.h" #include "utils/gettext.h" #include "utils/mkdir.h" diff --git a/src/gui/emotepopup.cpp b/src/gui/emotepopup.cpp index 3e06fdcf..f9dc8e0f 100644 --- a/src/gui/emotepopup.cpp +++ b/src/gui/emotepopup.cpp @@ -29,11 +29,10 @@ #include "localplayer.h" #include "log.h" -#include "gui/theme.h" - #include "resources/emotedb.h" #include "resources/image.h" #include "resources/iteminfo.h" +#include "resources/theme.h" #include "utils/dtor.h" diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp index 43e330f4..dcc372cd 100644 --- a/src/gui/equipmentwindow.cpp +++ b/src/gui/equipmentwindow.cpp @@ -29,7 +29,6 @@ #include "gui/equipmentwindow.h" #include "gui/itempopup.h" -#include "gui/theme.h" #include "gui/setup.h" #include "gui/viewport.h" @@ -41,6 +40,7 @@ #include "resources/image.h" #include "resources/iteminfo.h" #include "resources/resourcemanager.h" +#include "resources/theme.h" #include "utils/gettext.h" #include "utils/stringutils.h" diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp index 0fff3496..f8dc3e82 100644 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -24,7 +24,6 @@ #include "gui/focushandler.h" #include "gui/palette.h" #include "gui/sdlinput.h" -#include "gui/theme.h" #include "gui/truetypefont.h" #include "gui/widgets/window.h" @@ -39,6 +38,7 @@ #include "resources/imageset.h" #include "resources/imageloader.h" #include "resources/resourcemanager.h" +#include "resources/theme.h" #include <guichan/exception.hpp> #include <guichan/image.hpp> diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp index 3bb84ab8..41ac96b4 100644 --- a/src/gui/inventorywindow.cpp +++ b/src/gui/inventorywindow.cpp @@ -30,7 +30,6 @@ #include "gui/itemamount.h" #include "gui/setup.h" #include "gui/sdlinput.h" -#include "gui/theme.h" #include "gui/viewport.h" #include "gui/widgets/button.h" @@ -44,6 +43,7 @@ #include "net/net.h" #include "resources/iteminfo.h" +#include "resources/theme.h" #include "utils/gettext.h" #include "utils/stringutils.h" diff --git a/src/gui/itempopup.cpp b/src/gui/itempopup.cpp index 5e7271ea..ce4d1126 100644 --- a/src/gui/itempopup.cpp +++ b/src/gui/itempopup.cpp @@ -26,7 +26,6 @@ #include "units.h" #include "gui/gui.h" -#include "gui/theme.h" #include "gui/widgets/icon.h" #include "gui/widgets/textbox.h" @@ -36,6 +35,7 @@ #include "resources/image.h" #include "resources/resourcemanager.h" +#include "resources/theme.h" #include <guichan/font.hpp> diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp index 1d01f48c..dd447f95 100644 --- a/src/gui/minimap.cpp +++ b/src/gui/minimap.cpp @@ -30,10 +30,10 @@ #include "map.h" #include "gui/setup.h" -#include "gui/userpalette.h" #include "resources/image.h" #include "resources/resourcemanager.h" +#include "resources/userpalette.h" #include "utils/gettext.h" diff --git a/src/gui/ministatus.cpp b/src/gui/ministatus.cpp index 620754ef..1642d1b0 100644 --- a/src/gui/ministatus.cpp +++ b/src/gui/ministatus.cpp @@ -30,7 +30,6 @@ #include "gui/gui.h" #include "gui/statuswindow.h" #include "gui/textpopup.h" -#include "gui/theme.h" #include "gui/widgets/progressbar.h" @@ -38,6 +37,8 @@ #include "net/playerhandler.h" #include "net/gamehandler.h" +#include "resources/theme.h" + #include "utils/gettext.h" #include "utils/stringutils.h" diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp index b1375ad0..115b582c 100644 --- a/src/gui/serverdialog.cpp +++ b/src/gui/serverdialog.cpp @@ -30,7 +30,6 @@ #include "gui/okdialog.h" #include "gui/sdlinput.h" -#include "gui/theme.h" #include "gui/widgets/button.h" #include "gui/widgets/dropdown.h" @@ -42,10 +41,11 @@ #include "net/net.h" +#include "resources/theme.h" + #include "utils/gettext.h" #include "utils/stringutils.h" #include "utils/xml.h" -#include "widgets/dropdown.h" #include <guichan/font.hpp> diff --git a/src/gui/setup_colors.cpp b/src/gui/setup_colors.cpp index 12dba82a..6b3b3fec 100644 --- a/src/gui/setup_colors.cpp +++ b/src/gui/setup_colors.cpp @@ -23,8 +23,6 @@ #include "configuration.h" #include "gui/gui.h" -#include "gui/theme.h" -#include "gui/userpalette.h" #include "gui/widgets/browserbox.h" #include "gui/widgets/itemlinkhandler.h" @@ -36,6 +34,9 @@ #include "gui/widgets/textfield.h" #include "gui/widgets/textpreview.h" +#include "resources/theme.h" +#include "resources/userpalette.h" + #include "utils/gettext.h" #include "utils/stringutils.h" diff --git a/src/gui/skilldialog.cpp b/src/gui/skilldialog.cpp index c990274a..168553f6 100644 --- a/src/gui/skilldialog.cpp +++ b/src/gui/skilldialog.cpp @@ -26,7 +26,6 @@ #include "configuration.h" #include "gui/setup.h" -#include "gui/theme.h" #include "gui/widgets/button.h" #include "gui/widgets/container.h" @@ -44,6 +43,7 @@ #include "resources/image.h" #include "resources/resourcemanager.h" +#include "resources/theme.h" #include "utils/dtor.h" #include "utils/gettext.h" diff --git a/src/gui/socialwindow.cpp b/src/gui/socialwindow.cpp index cd9471aa..8911c8fd 100644 --- a/src/gui/socialwindow.cpp +++ b/src/gui/socialwindow.cpp @@ -29,7 +29,6 @@ #include "gui/okdialog.h" #include "gui/setup.h" #include "gui/textdialog.h" -#include "gui/theme.h" #include "gui/widgets/avatarlistbox.h" #include "gui/widgets/browserbox.h" @@ -47,6 +46,8 @@ #include "net/guildhandler.h" #include "net/partyhandler.h" +#include "resources/theme.h" + #include "utils/dtor.h" #include "utils/gettext.h" #include "utils/stringutils.h" diff --git a/src/gui/specialswindow.cpp b/src/gui/specialswindow.cpp index c751d6cb..b511e4a3 100644 --- a/src/gui/specialswindow.cpp +++ b/src/gui/specialswindow.cpp @@ -23,7 +23,6 @@ #include "log.h" #include "gui/setup.h" -#include "gui/theme.h" #include "gui/widgets/button.h" #include "gui/widgets/container.h" @@ -42,6 +41,7 @@ #include "net/specialhandler.h" #include "resources/specialdb.h" +#include "resources/theme.h" #include "utils/dtor.h" #include "utils/gettext.h" diff --git a/src/gui/speechbubble.cpp b/src/gui/speechbubble.cpp index 08d00038..af42feb7 100644 --- a/src/gui/speechbubble.cpp +++ b/src/gui/speechbubble.cpp @@ -25,10 +25,11 @@ #include "graphics.h" #include "gui/gui.h" -#include "gui/theme.h" #include "gui/widgets/textbox.h" +#include "resources/theme.h" + #include <guichan/font.hpp> #include <guichan/widgets/label.hpp> diff --git a/src/gui/speechbubble.h b/src/gui/speechbubble.h index 8682ab7e..6017398a 100644 --- a/src/gui/speechbubble.h +++ b/src/gui/speechbubble.h @@ -23,10 +23,10 @@ #ifndef SPEECHBUBBLE_H #define SPEECHBUBBLE_H -#include "gui/theme.h" - #include "gui/widgets/popup.h" +#include "resources/theme.h" + class TextBox; class SpeechBubble : public Popup diff --git a/src/gui/statuswindow.cpp b/src/gui/statuswindow.cpp index 3dd50232..493f5ee6 100644 --- a/src/gui/statuswindow.cpp +++ b/src/gui/statuswindow.cpp @@ -26,7 +26,6 @@ #include "units.h" #include "gui/setup.h" -#include "gui/theme.h" #include "gui/widgets/button.h" #include "gui/widgets/label.h" @@ -40,6 +39,8 @@ #include "net/playerhandler.h" #include "net/gamehandler.h" +#include "resources/theme.h" + #include "utils/gettext.h" #include "utils/mathutils.h" #include "utils/stringutils.h" diff --git a/src/gui/widgets/avatarlistbox.cpp b/src/gui/widgets/avatarlistbox.cpp index 6ec4d1e8..6551aa04 100644 --- a/src/gui/widgets/avatarlistbox.cpp +++ b/src/gui/widgets/avatarlistbox.cpp @@ -25,10 +25,10 @@ #include "gui/chat.h" #include "gui/gui.h" #include "gui/palette.h" -#include "gui/theme.h" #include "resources/image.h" #include "resources/resourcemanager.h" +#include "resources/theme.h" #include "utils/stringutils.h" diff --git a/src/gui/widgets/browserbox.cpp b/src/gui/widgets/browserbox.cpp index d43afed7..d890f138 100644 --- a/src/gui/widgets/browserbox.cpp +++ b/src/gui/widgets/browserbox.cpp @@ -21,10 +21,10 @@ #include "gui/widgets/browserbox.h" -#include "gui/theme.h" - #include "gui/widgets/linkhandler.h" +#include "resources/theme.h" + #include <guichan/graphics.hpp> #include <guichan/font.hpp> #include <guichan/cliprectangle.hpp> diff --git a/src/gui/widgets/button.cpp b/src/gui/widgets/button.cpp index dbaa357c..3d3a07c2 100644 --- a/src/gui/widgets/button.cpp +++ b/src/gui/widgets/button.cpp @@ -25,9 +25,9 @@ #include "graphics.h" #include "gui/palette.h" -#include "gui/theme.h" #include "resources/image.h" +#include "resources/theme.h" #include "utils/dtor.h" diff --git a/src/gui/widgets/checkbox.cpp b/src/gui/widgets/checkbox.cpp index 64594940..6a44132d 100644 --- a/src/gui/widgets/checkbox.cpp +++ b/src/gui/widgets/checkbox.cpp @@ -25,9 +25,9 @@ #include "graphics.h" #include "gui/palette.h" -#include "gui/theme.h" #include "resources/image.h" +#include "resources/theme.h" int CheckBox::instances = 0; float CheckBox::mAlpha = 1.0; diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp index e694137d..ced9c38b 100644 --- a/src/gui/widgets/dropdown.cpp +++ b/src/gui/widgets/dropdown.cpp @@ -26,12 +26,12 @@ #include "gui/palette.h" #include "gui/sdlinput.h" -#include "gui/theme.h" #include "gui/widgets/listbox.h" #include "gui/widgets/scrollarea.h" #include "resources/image.h" +#include "resources/theme.h" #include "utils/dtor.h" diff --git a/src/gui/widgets/emoteshortcutcontainer.cpp b/src/gui/widgets/emoteshortcutcontainer.cpp index 28727429..7a24c464 100644 --- a/src/gui/widgets/emoteshortcutcontainer.cpp +++ b/src/gui/widgets/emoteshortcutcontainer.cpp @@ -32,10 +32,10 @@ #include "log.h" #include "gui/palette.h" -#include "gui/theme.h" #include "resources/emotedb.h" #include "resources/image.h" +#include "resources/theme.h" #include "utils/dtor.h" diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp index 7648eb24..b98cac66 100644 --- a/src/gui/widgets/itemcontainer.cpp +++ b/src/gui/widgets/itemcontainer.cpp @@ -32,7 +32,6 @@ #include "gui/outfitwindow.h" #include "gui/palette.h" #include "gui/sdlinput.h" -#include "gui/theme.h" #include "gui/viewport.h" #include "net/net.h" @@ -40,6 +39,7 @@ #include "resources/image.h" #include "resources/iteminfo.h" +#include "resources/theme.h" #include "utils/stringutils.h" diff --git a/src/gui/widgets/itemshortcutcontainer.cpp b/src/gui/widgets/itemshortcutcontainer.cpp index 869264f7..f2982de9 100644 --- a/src/gui/widgets/itemshortcutcontainer.cpp +++ b/src/gui/widgets/itemshortcutcontainer.cpp @@ -32,11 +32,11 @@ #include "gui/inventorywindow.h" #include "gui/itempopup.h" #include "gui/palette.h" -#include "gui/theme.h" #include "gui/viewport.h" #include "resources/image.h" #include "resources/iteminfo.h" +#include "resources/theme.h" #include "utils/stringutils.h" diff --git a/src/gui/widgets/label.cpp b/src/gui/widgets/label.cpp index 4c607edf..cefddae0 100644 --- a/src/gui/widgets/label.cpp +++ b/src/gui/widgets/label.cpp @@ -20,7 +20,7 @@ #include "gui/widgets/label.h" -#include "gui/theme.h" +#include "resources/theme.h" Label::Label() { diff --git a/src/gui/widgets/listbox.cpp b/src/gui/widgets/listbox.cpp index 2193b888..d79d8d0c 100644 --- a/src/gui/widgets/listbox.cpp +++ b/src/gui/widgets/listbox.cpp @@ -25,7 +25,8 @@ #include "gui/palette.h" #include "gui/sdlinput.h" -#include "gui/theme.h" + +#include "resources/theme.h" #include <guichan/font.hpp> #include <guichan/graphics.hpp> diff --git a/src/gui/widgets/playerbox.cpp b/src/gui/widgets/playerbox.cpp index cc9e963e..559ac5a6 100644 --- a/src/gui/widgets/playerbox.cpp +++ b/src/gui/widgets/playerbox.cpp @@ -26,9 +26,8 @@ #include "configuration.h" #include "graphics.h" -#include "gui/theme.h" - #include "resources/image.h" +#include "resources/theme.h" #include "utils/dtor.h" diff --git a/src/gui/widgets/popup.cpp b/src/gui/widgets/popup.cpp index 4dc58f72..e242bcf4 100644 --- a/src/gui/widgets/popup.cpp +++ b/src/gui/widgets/popup.cpp @@ -26,12 +26,12 @@ #include "graphics.h" #include "log.h" -#include "gui/theme.h" #include "gui/viewport.h" #include "gui/widgets/windowcontainer.h" #include "resources/image.h" +#include "resources/theme.h" #include <guichan/exception.hpp> diff --git a/src/gui/widgets/progressbar.cpp b/src/gui/widgets/progressbar.cpp index 60c44fe2..15838952 100644 --- a/src/gui/widgets/progressbar.cpp +++ b/src/gui/widgets/progressbar.cpp @@ -27,9 +27,9 @@ #include "gui/gui.h" #include "gui/palette.h" -#include "gui/theme.h" #include "resources/image.h" +#include "resources/theme.h" #include "utils/dtor.h" diff --git a/src/gui/widgets/progressindicator.cpp b/src/gui/widgets/progressindicator.cpp index 6bda617f..91b40751 100644 --- a/src/gui/widgets/progressindicator.cpp +++ b/src/gui/widgets/progressindicator.cpp @@ -23,11 +23,10 @@ #include "graphics.h" #include "simpleanimation.h" -#include "gui/theme.h" - #include "resources/animation.h" #include "resources/imageset.h" #include "resources/resourcemanager.h" +#include "resources/theme.h" #include <guichan/widgets/label.hpp> diff --git a/src/gui/widgets/radiobutton.cpp b/src/gui/widgets/radiobutton.cpp index 4cbc22e7..1296feb6 100644 --- a/src/gui/widgets/radiobutton.cpp +++ b/src/gui/widgets/radiobutton.cpp @@ -24,9 +24,8 @@ #include "configuration.h" #include "graphics.h" -#include "gui/theme.h" - #include "resources/image.h" +#include "resources/theme.h" int RadioButton::instances = 0; float RadioButton::mAlpha = 1.0; diff --git a/src/gui/widgets/resizegrip.cpp b/src/gui/widgets/resizegrip.cpp index 496e3727..7850643f 100644 --- a/src/gui/widgets/resizegrip.cpp +++ b/src/gui/widgets/resizegrip.cpp @@ -24,9 +24,8 @@ #include "configuration.h" #include "graphics.h" -#include "gui/theme.h" - #include "resources/image.h" +#include "resources/theme.h" #include <guichan/graphics.hpp> diff --git a/src/gui/widgets/scrollarea.cpp b/src/gui/widgets/scrollarea.cpp index d8ffe5ab..7d42883a 100644 --- a/src/gui/widgets/scrollarea.cpp +++ b/src/gui/widgets/scrollarea.cpp @@ -24,9 +24,8 @@ #include "configuration.h" #include "graphics.h" -#include "gui/theme.h" - #include "resources/image.h" +#include "resources/theme.h" #include "utils/dtor.h" diff --git a/src/gui/widgets/shoplistbox.cpp b/src/gui/widgets/shoplistbox.cpp index b92ec6cb..c0a79500 100644 --- a/src/gui/widgets/shoplistbox.cpp +++ b/src/gui/widgets/shoplistbox.cpp @@ -26,12 +26,12 @@ #include "shopitem.h" #include "gui/itempopup.h" -#include "gui/theme.h" #include "gui/viewport.h" #include "gui/widgets/shopitems.h" #include "resources/image.h" +#include "resources/theme.h" #include <guichan/font.hpp> #include <guichan/listmodel.hpp> diff --git a/src/gui/widgets/slider.cpp b/src/gui/widgets/slider.cpp index 00a8e86f..c044d55d 100644 --- a/src/gui/widgets/slider.cpp +++ b/src/gui/widgets/slider.cpp @@ -24,9 +24,8 @@ #include "configuration.h" #include "graphics.h" -#include "gui/theme.h" - #include "resources/image.h" +#include "resources/theme.h" Image *Slider::hStart, *Slider::hMid, *Slider::hEnd, *Slider::hGrip; Image *Slider::vStart, *Slider::vMid, *Slider::vEnd, *Slider::vGrip; diff --git a/src/gui/widgets/tab.cpp b/src/gui/widgets/tab.cpp index 503a8e55..10a51afe 100644 --- a/src/gui/widgets/tab.cpp +++ b/src/gui/widgets/tab.cpp @@ -25,11 +25,11 @@ #include "graphics.h" #include "gui/palette.h" -#include "gui/theme.h" #include "gui/widgets/tabbedarea.h" #include "resources/image.h" +#include "resources/theme.h" #include "utils/dtor.h" diff --git a/src/gui/widgets/table.cpp b/src/gui/widgets/table.cpp index 663d6d02..3d8680ce 100644 --- a/src/gui/widgets/table.cpp +++ b/src/gui/widgets/table.cpp @@ -24,7 +24,8 @@ #include "configuration.h" #include "gui/sdlinput.h" -#include "gui/theme.h" + +#include "resources/theme.h" #include "utils/dtor.h" diff --git a/src/gui/widgets/textbox.cpp b/src/gui/widgets/textbox.cpp index f248f35d..5b112e54 100644 --- a/src/gui/widgets/textbox.cpp +++ b/src/gui/widgets/textbox.cpp @@ -21,7 +21,7 @@ #include "gui/widgets/textbox.h" -#include "gui/theme.h" +#include "resources/theme.h" #include <guichan/font.hpp> diff --git a/src/gui/widgets/textfield.cpp b/src/gui/widgets/textfield.cpp index f89f6239..9696cd59 100644 --- a/src/gui/widgets/textfield.cpp +++ b/src/gui/widgets/textfield.cpp @@ -26,9 +26,9 @@ #include "gui/palette.h" #include "gui/sdlinput.h" -#include "gui/theme.h" #include "resources/image.h" +#include "resources/theme.h" #include "utils/copynpaste.h" #include "utils/dtor.h" diff --git a/src/gui/widgets/whispertab.cpp b/src/gui/widgets/whispertab.cpp index 685d28ab..864f1f51 100644 --- a/src/gui/widgets/whispertab.cpp +++ b/src/gui/widgets/whispertab.cpp @@ -25,11 +25,11 @@ #include "commandhandler.h" #include "localplayer.h" -#include "gui/theme.h" - #include "net/chathandler.h" #include "net/net.h" +#include "resources/theme.h" + #include "utils/gettext.h" #include "utils/stringutils.h" diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp index dafaaeed..aa8e6df3 100644 --- a/src/gui/widgets/window.cpp +++ b/src/gui/widgets/window.cpp @@ -26,7 +26,6 @@ #include "gui/gui.h" #include "gui/palette.h" -#include "gui/theme.h" #include "gui/viewport.h" #include "gui/widgets/layout.h" @@ -34,6 +33,7 @@ #include "gui/widgets/windowcontainer.h" #include "resources/image.h" +#include "resources/theme.h" #include <guichan/exception.hpp> #include <guichan/focushandler.hpp> diff --git a/src/item.cpp b/src/item.cpp index 83e12cef..6b13dd1b 100644 --- a/src/item.cpp +++ b/src/item.cpp @@ -21,12 +21,12 @@ #include "item.h" -#include "gui/theme.h" +#include "configuration.h" #include "resources/image.h" #include "resources/iteminfo.h" #include "resources/resourcemanager.h" -#include "configuration.h" +#include "resources/theme.h" Item::Item(int id, int quantity, bool equipment, bool equipped): mImage(0), diff --git a/src/localplayer.cpp b/src/localplayer.cpp index 2d17cf90..7034cf31 100644 --- a/src/localplayer.cpp +++ b/src/localplayer.cpp @@ -39,8 +39,6 @@ #include "gui/gui.h" #include "gui/okdialog.h" -#include "gui/theme.h" -#include "gui/userpalette.h" #include "gui/widgets/chattab.h" @@ -57,6 +55,8 @@ #include "resources/imageset.h" #include "resources/iteminfo.h" #include "resources/resourcemanager.h" +#include "resources/theme.h" +#include "resources/userpalette.h" #include "utils/gettext.h" #include "utils/stringutils.h" diff --git a/src/localplayer.h b/src/localplayer.h index 64ff6e30..14ab5482 100644 --- a/src/localplayer.h +++ b/src/localplayer.h @@ -26,7 +26,7 @@ #include "being.h" #include "listener.h" -#include "gui/userpalette.h" +#include "resources/userpalette.h" #include <guichan/actionlistener.hpp> diff --git a/src/net/tmwa/gui/guildtab.cpp b/src/net/tmwa/gui/guildtab.cpp index 8b788bad..ca922e55 100644 --- a/src/net/tmwa/gui/guildtab.cpp +++ b/src/net/tmwa/gui/guildtab.cpp @@ -26,13 +26,12 @@ #include "guild.h" #include "localplayer.h" -#include "gui/theme.h" - #include "net/net.h" #include "net/guildhandler.h" #include "resources/iteminfo.h" #include "resources/itemdb.h" +#include "resources/theme.h" #include "utils/dtor.h" #include "utils/gettext.h" diff --git a/src/net/tmwa/gui/partytab.cpp b/src/net/tmwa/gui/partytab.cpp index 0f3e8e24..d5781971 100644 --- a/src/net/tmwa/gui/partytab.cpp +++ b/src/net/tmwa/gui/partytab.cpp @@ -26,13 +26,12 @@ #include "localplayer.h" #include "party.h" -#include "gui/theme.h" - #include "net/net.h" #include "net/partyhandler.h" #include "resources/iteminfo.h" #include "resources/itemdb.h" +#include "resources/theme.h" #include "utils/dtor.h" #include "utils/gettext.h" diff --git a/src/gui/theme.cpp b/src/resources/theme.cpp index 152bf773..6633f1e0 100644 --- a/src/gui/theme.cpp +++ b/src/resources/theme.cpp @@ -21,7 +21,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "gui/theme.h" +#include "resources/theme.h" #include "client.h" #include "configuration.h" diff --git a/src/gui/theme.h b/src/resources/theme.h index 6798bed5..6798bed5 100644 --- a/src/gui/theme.h +++ b/src/resources/theme.h diff --git a/src/gui/userpalette.cpp b/src/resources/userpalette.cpp index 0f30b752..5067c794 100644 --- a/src/gui/userpalette.cpp +++ b/src/resources/userpalette.cpp @@ -20,7 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "userpalette.h" +#include "resources/userpalette.h" #include "configuration.h" #include "client.h" diff --git a/src/gui/userpalette.h b/src/resources/userpalette.h index 82bcea1c..82bcea1c 100644 --- a/src/gui/userpalette.h +++ b/src/resources/userpalette.h diff --git a/src/text.cpp b/src/text.cpp index 5e84392e..216b02e2 100644 --- a/src/text.cpp +++ b/src/text.cpp @@ -28,10 +28,10 @@ #include "gui/gui.h" #include "gui/palette.h" -#include "gui/theme.h" #include "resources/resourcemanager.h" #include "resources/image.h" +#include "resources/theme.h" #include <guichan/font.hpp> diff --git a/src/textrenderer.h b/src/textrenderer.h index 4da868f1..fccdd3c7 100644 --- a/src/textrenderer.h +++ b/src/textrenderer.h @@ -24,7 +24,7 @@ #include "graphics.h" -#include "gui/theme.h" +#include "resources/theme.h" /** * Class for text rendering. Used by the TextParticle, the Text and FlashText |