diff options
Diffstat (limited to 'src/gui')
36 files changed, 38 insertions, 168 deletions
diff --git a/src/gui/dialogsmanager.h b/src/gui/dialogsmanager.h index 2190819c3..9c7dc0d46 100644 --- a/src/gui/dialogsmanager.h +++ b/src/gui/dialogsmanager.h @@ -20,11 +20,13 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef DIALOGMANAGER_H -#define DIALOGMANAGER_H +#ifndef GUI_DIALOGSMANAGER_H +#define GUI_DIALOGSMANAGER_H #include <string> +#include "localconsts.h" + class Window; class DialogsManager final @@ -39,4 +41,4 @@ class DialogsManager final const bool modal); }; -#endif // DIALOGMANAGER_H +#endif // GUI_DIALOGSMANAGER_H diff --git a/src/gui/fonts/font.cpp b/src/gui/fonts/font.cpp index 68127232d..68f23d242 100644 --- a/src/gui/fonts/font.cpp +++ b/src/gui/fonts/font.cpp @@ -74,7 +74,6 @@ #include "resources/image.h" #include "resources/imagehelper.h" -#include "resources/resourcemanager.h" #include "utils/files.h" #include "utils/paths.h" diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp index 52abd30b6..1fb4cb79f 100644 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -70,13 +70,11 @@ #include "gui/sdlinput.h" #include "gui/theme.h" #include "gui/viewport.h" -#include "gui/windowmanager.h" #include "gui/fonts/font.h" #include "gui/widgets/window.h" -#include "client.h" #include "configuration.h" #include "dragdrop.h" #include "settings.h" diff --git a/src/gui/skin.cpp b/src/gui/skin.cpp index 46f790882..a1bc91dc2 100644 --- a/src/gui/skin.cpp +++ b/src/gui/skin.cpp @@ -24,7 +24,6 @@ #include "gui/skin.h" -#include "client.h" #include "settings.h" #include "resources/image.h" diff --git a/src/gui/widgets/browserbox_unittest.cc b/src/gui/widgets/browserbox_unittest.cc index 0a3e06f27..cf5c80029 100644 --- a/src/gui/widgets/browserbox_unittest.cc +++ b/src/gui/widgets/browserbox_unittest.cc @@ -46,9 +46,7 @@ TEST(browserbox, test1) { PHYSFS_init("manaplus"); dirSeparator = "/"; - Client::Options options; - client = new Client(options); - + client = new Client; logger = new Logger(); imageHelper = new SDLImageHelper(); theme = new Theme; diff --git a/src/gui/widgets/button.cpp b/src/gui/widgets/button.cpp index e67f77056..54d15391b 100644 --- a/src/gui/widgets/button.cpp +++ b/src/gui/widgets/button.cpp @@ -65,7 +65,6 @@ #include "gui/widgets/button.h" -#include "client.h" #include "graphicsvertexes.h" #include "settings.h" diff --git a/src/gui/widgets/checkbox.cpp b/src/gui/widgets/checkbox.cpp index 508bfead4..15ad7e3ec 100644 --- a/src/gui/widgets/checkbox.cpp +++ b/src/gui/widgets/checkbox.cpp @@ -65,7 +65,6 @@ #include "gui/widgets/checkbox.h" -#include "client.h" #include "settings.h" #include "input/inputaction.h" diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp index ab6b0dab0..6647a768f 100644 --- a/src/gui/widgets/dropdown.cpp +++ b/src/gui/widgets/dropdown.cpp @@ -22,7 +22,6 @@ #include "gui/widgets/dropdown.h" -#include "client.h" #include "settings.h" #include "events/keyevent.h" diff --git a/src/gui/widgets/dropshortcutcontainer.cpp b/src/gui/widgets/dropshortcutcontainer.cpp index 150c94f77..087f4b372 100644 --- a/src/gui/widgets/dropshortcutcontainer.cpp +++ b/src/gui/widgets/dropshortcutcontainer.cpp @@ -22,7 +22,6 @@ #include "gui/widgets/dropshortcutcontainer.h" -#include "client.h" #include "dragdrop.h" #include "dropshortcut.h" #include "settings.h" @@ -40,6 +39,7 @@ #include "resources/image.h" #include "utils/delete2.h" +#include "utils/stringutils.h" #include "debug.h" diff --git a/src/gui/widgets/emoteshortcutcontainer.cpp b/src/gui/widgets/emoteshortcutcontainer.cpp index 6c6c82b43..85e07e2b7 100644 --- a/src/gui/widgets/emoteshortcutcontainer.cpp +++ b/src/gui/widgets/emoteshortcutcontainer.cpp @@ -22,7 +22,6 @@ #include "gui/widgets/emoteshortcutcontainer.h" #include "animatedsprite.h" -#include "client.h" #include "emoteshortcut.h" #include "settings.h" @@ -39,6 +38,8 @@ #include "resources/db/emotedb.h" +#include "utils/stringutils.h" + #include "debug.h" static const int MAX_ITEMS = 48; diff --git a/src/gui/widgets/guitable.cpp b/src/gui/widgets/guitable.cpp index c3725b46f..7f4a18858 100644 --- a/src/gui/widgets/guitable.cpp +++ b/src/gui/widgets/guitable.cpp @@ -22,7 +22,6 @@ #include "gui/widgets/guitable.h" -#include "client.h" #include "settings.h" #include "gui/gui.h" diff --git a/src/gui/widgets/itemshortcutcontainer.cpp b/src/gui/widgets/itemshortcutcontainer.cpp index e7e2455bb..670807ed5 100644 --- a/src/gui/widgets/itemshortcutcontainer.cpp +++ b/src/gui/widgets/itemshortcutcontainer.cpp @@ -22,7 +22,6 @@ #include "gui/widgets/itemshortcutcontainer.h" -#include "client.h" #include "dragdrop.h" #include "inventory.h" #include "item.h" @@ -50,6 +49,7 @@ #include "resources/skillconsts.h" #include "utils/delete2.h" +#include "utils/stringutils.h" #include "debug.h" diff --git a/src/gui/widgets/listbox.cpp b/src/gui/widgets/listbox.cpp index 8953fc5e2..68b50c458 100644 --- a/src/gui/widgets/listbox.cpp +++ b/src/gui/widgets/listbox.cpp @@ -65,7 +65,6 @@ #include "gui/widgets/listbox.h" -#include "client.h" #include "settings.h" #include "input/inputaction.h" diff --git a/src/gui/widgets/playerbox.cpp b/src/gui/widgets/playerbox.cpp index b77b1bc42..c7a3a84b5 100644 --- a/src/gui/widgets/playerbox.cpp +++ b/src/gui/widgets/playerbox.cpp @@ -22,7 +22,6 @@ #include "gui/widgets/playerbox.h" -#include "client.h" #include "settings.h" #include "being/being.h" diff --git a/src/gui/widgets/progressbar.cpp b/src/gui/widgets/progressbar.cpp index 68db6ee1d..9a10eedb7 100644 --- a/src/gui/widgets/progressbar.cpp +++ b/src/gui/widgets/progressbar.cpp @@ -22,7 +22,6 @@ #include "gui/widgets/progressbar.h" -#include "client.h" #include "graphicsvertexes.h" #include "settings.h" diff --git a/src/gui/widgets/radiobutton.cpp b/src/gui/widgets/radiobutton.cpp index e0d031908..d4bae8273 100644 --- a/src/gui/widgets/radiobutton.cpp +++ b/src/gui/widgets/radiobutton.cpp @@ -65,7 +65,6 @@ #include "gui/widgets/radiobutton.h" -#include "client.h" #include "settings.h" #include "input/inputaction.h" diff --git a/src/gui/widgets/scrollarea.cpp b/src/gui/widgets/scrollarea.cpp index d439765af..fc7ae91d5 100644 --- a/src/gui/widgets/scrollarea.cpp +++ b/src/gui/widgets/scrollarea.cpp @@ -65,7 +65,6 @@ #include "gui/widgets/scrollarea.h" -#include "client.h" #include "graphicsvertexes.h" #include "settings.h" @@ -76,6 +75,7 @@ #include "resources/imagerect.h" #include "utils/delete2.h" +#include "utils/stringutils.h" #include "debug.h" diff --git a/src/gui/widgets/shoplistbox.cpp b/src/gui/widgets/shoplistbox.cpp index cd250d274..4c7242866 100644 --- a/src/gui/widgets/shoplistbox.cpp +++ b/src/gui/widgets/shoplistbox.cpp @@ -22,7 +22,6 @@ #include "gui/widgets/shoplistbox.h" -#include "client.h" #include "settings.h" #include "shopitem.h" diff --git a/src/gui/widgets/slider.cpp b/src/gui/widgets/slider.cpp index 444480ae1..6c2224150 100644 --- a/src/gui/widgets/slider.cpp +++ b/src/gui/widgets/slider.cpp @@ -65,7 +65,6 @@ #include "gui/widgets/slider.h" -#include "client.h" #include "graphicsvertexes.h" #include "settings.h" diff --git a/src/gui/widgets/spellshortcutcontainer.cpp b/src/gui/widgets/spellshortcutcontainer.cpp index 1b3355265..014fa4354 100644 --- a/src/gui/widgets/spellshortcutcontainer.cpp +++ b/src/gui/widgets/spellshortcutcontainer.cpp @@ -22,7 +22,6 @@ #include "gui/widgets/spellshortcutcontainer.h" -#include "client.h" #include "dragdrop.h" #include "itemshortcut.h" #include "settings.h" diff --git a/src/gui/widgets/tabs/chattab.cpp b/src/gui/widgets/tabs/chattab.cpp index 36e4b5437..684b9d4d5 100644 --- a/src/gui/widgets/tabs/chattab.cpp +++ b/src/gui/widgets/tabs/chattab.cpp @@ -23,7 +23,6 @@ #include "gui/widgets/tabs/chattab.h" #include "chatlogger.h" -#include "client.h" #include "commands.h" #include "commandhandler.h" #include "configuration.h" diff --git a/src/gui/widgets/tabs/setup_video.cpp b/src/gui/widgets/tabs/setup_video.cpp index 54b17396a..6bc8d07e9 100644 --- a/src/gui/widgets/tabs/setup_video.cpp +++ b/src/gui/widgets/tabs/setup_video.cpp @@ -22,7 +22,6 @@ #include "gui/widgets/tabs/setup_video.h" -#include "client.h" #include "configuration.h" #include "graphicsmanager.h" diff --git a/src/gui/widgets/tabs/setup_visual.cpp b/src/gui/widgets/tabs/setup_visual.cpp index e90008ac1..fff876d14 100644 --- a/src/gui/widgets/tabs/setup_visual.cpp +++ b/src/gui/widgets/tabs/setup_visual.cpp @@ -29,10 +29,9 @@ #include "gui/widgets/layouthelper.h" #include "gui/widgets/scrollarea.h" -#include "client.h" - #include "utils/delete2.h" #include "utils/gettext.h" +#include "utils/stringutils.h" #include "debug.h" diff --git a/src/gui/widgets/tabs/tab.cpp b/src/gui/widgets/tabs/tab.cpp index 73c38343b..16018e5c3 100644 --- a/src/gui/widgets/tabs/tab.cpp +++ b/src/gui/widgets/tabs/tab.cpp @@ -65,7 +65,6 @@ #include "gui/widgets/tabs/tab.h" -#include "client.h" #include "graphicsvertexes.h" #include "settings.h" diff --git a/src/gui/widgets/textfield.cpp b/src/gui/widgets/textfield.cpp index 0eb16867a..fb1bcc1db 100644 --- a/src/gui/widgets/textfield.cpp +++ b/src/gui/widgets/textfield.cpp @@ -65,7 +65,6 @@ #include "gui/widgets/textfield.h" -#include "client.h" #include "settings.h" #include "input/inputmanager.h" @@ -73,6 +72,9 @@ #include "gui/gui.h" #include "gui/skin.h" #include "gui/viewport.h" +#ifdef ANDROID +#include "gui/windowmanager.h" +#endif #include "gui/fonts/font.h" @@ -83,6 +85,7 @@ #include "utils/copynpaste.h" #include "utils/delete2.h" +#include "utils/stringutils.h" #include "utils/timer.h" #undef DELETE // Win32 compatibility hack @@ -700,7 +703,7 @@ void TextField::fontChanged() void TextField::mousePressed(MouseEvent &event) { #ifdef ANDROID - if (!client->isKeyboardVisible()) + if (!WindowManager::isKeyboardVisible()) inputManager.executeAction(InputAction::SHOW_KEYBOARD); #endif event.consume(); @@ -737,7 +740,7 @@ void TextField::mousePressed(MouseEvent &event) void TextField::focusGained(const Event &event A_UNUSED) { #ifdef ANDROID - if (!client->isKeyboardVisible()) + if (!WindowManager::isKeyboardVisible()) inputManager.executeAction(InputAction::SHOW_KEYBOARD); #endif } diff --git a/src/gui/widgets/textpreview.cpp b/src/gui/widgets/textpreview.cpp index febd1b6ba..a4bf738c9 100644 --- a/src/gui/widgets/textpreview.cpp +++ b/src/gui/widgets/textpreview.cpp @@ -22,7 +22,6 @@ #include "gui/widgets/textpreview.h" -#include "client.h" #include "settings.h" #include "gui/gui.h" diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp index 453bb125c..74c6d1cfc 100644 --- a/src/gui/widgets/window.cpp +++ b/src/gui/widgets/window.cpp @@ -76,7 +76,6 @@ #include "gui/gui.h" #include "gui/skin.h" #include "gui/viewport.h" -#include "gui/windowmanager.h" #include "gui/fonts/font.h" diff --git a/src/gui/windowmanager.cpp b/src/gui/windowmanager.cpp index eb3d244ea..9c08f385e 100644 --- a/src/gui/windowmanager.cpp +++ b/src/gui/windowmanager.cpp @@ -22,129 +22,24 @@ #include "gui/windowmanager.h" -#include "auctionmanager.h" -#include "chatlogger.h" #include "client.h" -#include "configmanager.h" #include "configuration.h" -#include "dirs.h" -#include "dropshortcut.h" -#include "emoteshortcut.h" -#include "eventsmanager.h" #include "game.h" -#include "guild.h" -#include "guildmanager.h" -#include "graphicsmanager.h" -#include "itemshortcut.h" -#include "party.h" #include "settings.h" -#include "soundconsts.h" -#include "soundmanager.h" -#include "statuseffect.h" -#include "units.h" #include "touchmanager.h" -#include "being/beingspeech.h" -#include "being/playerinfo.h" -#include "being/playerrelations.h" - -#include "input/inputmanager.h" -#include "input/joystick.h" -#include "input/keyboardconfig.h" - -#include "gui/dialogsmanager.h" #include "gui/gui.h" -#include "gui/skin.h" -#include "gui/theme.h" - -#include "gui/windows/buyselldialog.h" -#include "gui/windows/buydialog.h" -#include "gui/windows/changeemaildialog.h" -#include "gui/windows/changepassworddialog.h" -#include "gui/windows/charselectdialog.h" -#include "gui/windows/confirmdialog.h" -#include "gui/windows/connectiondialog.h" +#include "gui/userpalette.h" + #include "gui/windows/didyouknowwindow.h" #include "gui/windows/helpwindow.h" -#include "gui/windows/logindialog.h" -#include "gui/windows/npcdialog.h" -#include "gui/windows/okdialog.h" -#include "gui/windows/registerdialog.h" -#include "gui/windows/selldialog.h" -#include "gui/windows/serverdialog.h" #include "gui/windows/setupwindow.h" -#include "gui/windows/unregisterdialog.h" -#include "gui/windows/updaterwindow.h" -#include "gui/windows/quitdialog.h" -#include "gui/windows/worldselectdialog.h" -#include "gui/widgets/button.h" #include "gui/widgets/desktop.h" -#include "net/chathandler.h" -#include "net/download.h" -#include "net/gamehandler.h" -#include "net/generalhandler.h" -#include "net/guildhandler.h" -#include "net/inventoryhandler.h" -#include "net/loginhandler.h" -#include "net/net.h" -#include "net/netconsts.h" -#include "net/packetlimiter.h" -#include "net/partyhandler.h" - -#include "particle/particle.h" - -#include "resources/imagehelper.h" -#include "resources/openglimagehelper.h" -#include "resources/resourcemanager.h" -#include "resources/surfaceimagehelper.h" -#include "resources/spritereference.h" - -#include "resources/db/avatardb.h" -#include "resources/db/chardb.h" -#include "resources/db/colordb.h" -#include "resources/db/deaddb.h" -#include "resources/db/emotedb.h" -#include "resources/db/sounddb.h" -#include "resources/db/itemdb.h" -#include "resources/db/mapdb.h" -#include "resources/db/moddb.h" -#include "resources/db/monsterdb.h" -#include "resources/db/npcdb.h" -#include "resources/db/palettedb.h" -#include "resources/db/petdb.h" -#include "resources/db/weaponsdb.h" - -#include "utils/base64.h" -#include "utils/cpu.h" -#include "utils/delete2.h" #include "utils/files.h" -#include "utils/fuzzer.h" -#include "utils/gettext.h" -#include "utils/gettexthelper.h" -#include "utils/mkdir.h" -#include "utils/paths.h" -#include "utils/physfstools.h" #include "utils/sdlcheckutils.h" #include "utils/sdlhelper.h" -#include "utils/timer.h" - -#include "utils/translation/translationmanager.h" - -#include "test/testlauncher.h" -#include "test/testmain.h" - -#ifdef __APPLE__ -#include <CoreFoundation/CFBundle.h> -#endif - -#include <SDL_image.h> - -#ifdef WIN32 -#include <SDL_syswm.h> -#include "utils/specialfolder.h" -#endif #ifdef ANDROID #ifndef USE_SDL2 @@ -152,12 +47,17 @@ #endif #endif -#include <sys/stat.h> +#ifdef USE_SDL2 +#include <SDL2_framerate.h> +#else +#include <SDL_framerate.h> +#endif -#include <climits> -#include <fstream> +#include <SDL_image.h> -#include "mumblemanager.h" +#ifdef WIN32 +#include <SDL_syswm.h> +#endif #include "debug.h" @@ -166,7 +66,9 @@ FPSmanager fpsManager; namespace { SDL_Surface *mIcon(nullptr); +#ifndef USE_SDL2 int mKeyboardHeight(0); +#endif bool mIsMinimized(false); bool mNewMessageFlag(false); } // namespace @@ -206,7 +108,8 @@ void WindowManager::initTitle() SMALL_VERSION); } - SDL::SetWindowTitle(mainGraphics->getWindow(), settings.windowCaption.c_str()); + SDL::SetWindowTitle(mainGraphics->getWindow(), + settings.windowCaption.c_str()); #ifndef WIN32 setIcon(); #endif @@ -394,10 +297,12 @@ bool WindowManager::getIsMinimized() return mIsMinimized; } +#ifndef USE_SDL2 void WindowManager::updateScreenKeyboard(const int height) { mKeyboardHeight = height; } +#endif void WindowManager::deleteIcon() { diff --git a/src/gui/windowmanager.h b/src/gui/windowmanager.h index 8c3519b5c..26b07e410 100644 --- a/src/gui/windowmanager.h +++ b/src/gui/windowmanager.h @@ -23,18 +23,8 @@ #ifndef GUI_WINDOWMANAGER_H #define GUI_WINDOWMANAGER_H -#ifdef USE_SDL2 -#include <SDL2_framerate.h> -#else -#include <SDL_framerate.h> -#endif - -#include <string> - #include "localconsts.h" -class Window; - namespace WindowManager { void init(); @@ -65,7 +55,9 @@ namespace WindowManager void applyScale(); +#ifndef USE_SDL2 void updateScreenKeyboard(const int height); +#endif void reloadWallpaper(); @@ -76,6 +68,6 @@ namespace WindowManager void setIcon(); void deleteIcon(); -} +} // namespace WindowManager #endif // GUI_WINDOWMANAGER_H diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp index d92473977..c6b3d0987 100644 --- a/src/gui/windows/chatwindow.cpp +++ b/src/gui/windows/chatwindow.cpp @@ -23,7 +23,6 @@ #include "gui/windows/chatwindow.h" #include "actormanager.h" -#include "client.h" #include "commandhandler.h" #include "configuration.h" #include "game.h" @@ -77,8 +76,6 @@ #include "utils/files.h" #include "utils/gettext.h" -#include "resources/resourcemanager.h" - #include <sstream> #include <sys/stat.h> diff --git a/src/gui/windows/helpwindow.cpp b/src/gui/windows/helpwindow.cpp index 5e6b5ced2..d1083b0a9 100644 --- a/src/gui/windows/helpwindow.cpp +++ b/src/gui/windows/helpwindow.cpp @@ -35,8 +35,6 @@ #include "gui/widgets/layouttype.h" #include "gui/widgets/scrollarea.h" -#include "resources/resourcemanager.h" - #include "utils/gettext.h" #include "utils/files.h" #include "utils/paths.h" diff --git a/src/gui/windows/minimap.cpp b/src/gui/windows/minimap.cpp index f7b9a72a2..fbbb895f1 100644 --- a/src/gui/windows/minimap.cpp +++ b/src/gui/windows/minimap.cpp @@ -23,7 +23,6 @@ #include "gui/windows/minimap.h" #include "actormanager.h" -#include "client.h" #include "configuration.h" #include "party.h" #include "settings.h" diff --git a/src/gui/windows/npcdialog.cpp b/src/gui/windows/npcdialog.cpp index 11ba96933..fac7714ed 100644 --- a/src/gui/windows/npcdialog.cpp +++ b/src/gui/windows/npcdialog.cpp @@ -24,7 +24,6 @@ #include "actormanager.h" #include "configuration.h" -#include "client.h" #include "inventory.h" #include "item.h" #include "soundconsts.h" diff --git a/src/gui/windows/quitdialog.cpp b/src/gui/windows/quitdialog.cpp index 6981936e3..9635cd98f 100644 --- a/src/gui/windows/quitdialog.cpp +++ b/src/gui/windows/quitdialog.cpp @@ -24,7 +24,6 @@ #include "client.h" #include "configuration.h" -#include "game.h" #include "soundconsts.h" #include "soundmanager.h" diff --git a/src/gui/windows/serverdialog.cpp b/src/gui/windows/serverdialog.cpp index 0e249c8cb..2b1996bdb 100644 --- a/src/gui/windows/serverdialog.cpp +++ b/src/gui/windows/serverdialog.cpp @@ -35,7 +35,6 @@ #include "net/download.h" #include "gui/gui.h" -#include "gui/windowmanager.h" #include "gui/fonts/font.h" diff --git a/src/gui/windows/shopwindow.cpp b/src/gui/windows/shopwindow.cpp index 84af6355c..1a0174566 100644 --- a/src/gui/windows/shopwindow.cpp +++ b/src/gui/windows/shopwindow.cpp @@ -44,7 +44,6 @@ #include "actormanager.h" #include "auctionmanager.h" -#include "client.h" #include "configuration.h" #include "inventory.h" #include "item.h" |