diff options
26 files changed, 80 insertions, 65 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index fb2429bec..dcc88442a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -910,8 +910,8 @@ SET(SRCS dragdrop.h effectmanager.cpp effectmanager.h - emoteshortcut.cpp - emoteshortcut.h + gui/shortcut/emoteshortcut.cpp + gui/shortcut/emoteshortcut.h const/emoteshortcut.h equipment.h eventsmanager.cpp @@ -952,14 +952,14 @@ SET(SRCS item.h itemcolormanager.cpp itemcolormanager.h - itemshortcut.cpp - itemshortcut.h + gui/shortcut/itemshortcut.cpp + gui/shortcut/itemshortcut.h itemsoundmanager.cpp itemsoundmanager.h - dropshortcut.cpp - dropshortcut.h - spellshortcut.cpp - spellshortcut.h + gui/shortcut/dropshortcut.cpp + gui/shortcut/dropshortcut.h + gui/shortcut/spellshortcut.cpp + gui/shortcut/spellshortcut.h textcommand.cpp textcommand.h enums/input/inputaction.h @@ -1119,8 +1119,8 @@ SET(SRCS settings.h shopitem.cpp shopitem.h - shortcutbase.cpp - shortcutbase.h + gui/shortcut/shortcutbase.cpp + gui/shortcut/shortcutbase.h simpleanimation.cpp simpleanimation.h const/sound.h diff --git a/src/Makefile.am b/src/Makefile.am index 0f89cf44d..f26e6332f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -716,8 +716,8 @@ manaplus_SOURCES += main.cpp \ item.h \ itemcolormanager.cpp \ itemcolormanager.h \ - itemshortcut.cpp \ - itemshortcut.h \ + gui/shortcut/itemshortcut.cpp \ + gui/shortcut/itemshortcut.h \ itemsoundmanager.cpp \ itemsoundmanager.h \ enums/commandtarget.h \ @@ -725,8 +725,8 @@ manaplus_SOURCES += main.cpp \ enums/equipslot.h \ enums/guildpositionflags.h \ enums/inventorytype.h \ - spellshortcut.cpp \ - spellshortcut.h \ + gui/shortcut/spellshortcut.cpp \ + gui/shortcut/spellshortcut.h \ statuseffect.cpp \ statuseffect.h \ units.cpp \ @@ -770,8 +770,8 @@ manaplus_SOURCES += main.cpp \ catch.hpp \ chatlogger.cpp \ chatlogger.h \ - shortcutbase.cpp \ - shortcutbase.h \ + gui/shortcut/shortcutbase.cpp \ + gui/shortcut/shortcutbase.h \ being/playerinfo.cpp \ being/playerinfo.h \ being/playerrelation.cpp \ @@ -796,12 +796,12 @@ manaplus_SOURCES += main.cpp \ enums/being/attributes.h \ enums/being/badgeindex.h \ dragdrop.h \ - dropshortcut.cpp \ - dropshortcut.h \ + gui/shortcut/dropshortcut.cpp \ + gui/shortcut/dropshortcut.h \ effectmanager.cpp \ effectmanager.h \ - emoteshortcut.cpp \ - emoteshortcut.h \ + gui/shortcut/emoteshortcut.cpp \ + gui/shortcut/emoteshortcut.h \ const/emoteshortcut.h \ equipment.h \ listeners/actorspritelistener.h \ diff --git a/src/actions/actions.cpp b/src/actions/actions.cpp index dec8539d3..1c87e1c33 100644 --- a/src/actions/actions.cpp +++ b/src/actions/actions.cpp @@ -22,13 +22,10 @@ #include "actormanager.h" #include "configuration.h" -#include "dropshortcut.h" -#include "emoteshortcut.h" #include "game.h" #ifdef USE_OPENGL #include "graphicsmanager.h" #endif -#include "itemshortcut.h" #include "spellmanager.h" #include "actions/actiondef.h" @@ -43,6 +40,10 @@ #include "gui/sdlinput.h" #include "gui/windowmanager.h" +#include "gui/shortcut/dropshortcut.h" +#include "gui/shortcut/emoteshortcut.h" +#include "gui/shortcut/itemshortcut.h" + #include "gui/popups/popupmenu.h" #include "gui/windows/buydialog.h" diff --git a/src/actions/commands.cpp b/src/actions/commands.cpp index 6f2d49b77..3511e9808 100644 --- a/src/actions/commands.cpp +++ b/src/actions/commands.cpp @@ -22,9 +22,6 @@ #include "actormanager.h" #include "configuration.h" -#ifdef EATHENA_SUPPORT -#include "emoteshortcut.h" -#endif #include "game.h" #include "inventory.h" #include "item.h" @@ -40,6 +37,10 @@ #include "gui/viewport.h" +#ifdef EATHENA_SUPPORT +#include "gui/shortcut/emoteshortcut.h" +#endif + #include "gui/windows/chatwindow.h" #include "gui/windows/skilldialog.h" #include "gui/windows/socialwindow.h" diff --git a/src/actions/pets.cpp b/src/actions/pets.cpp index 826d5ad84..3df0e64d9 100644 --- a/src/actions/pets.cpp +++ b/src/actions/pets.cpp @@ -22,7 +22,6 @@ #include "actormanager.h" #include "game.h" -#include "emoteshortcut.h" #include "actions/actiondef.h" @@ -37,6 +36,8 @@ #include "listeners/inputactionreplaylistener.h" +#include "gui/shortcut/emoteshortcut.h" + #include "net/chathandler.h" #ifdef TMWA_SUPPORT #include "net/net.h" diff --git a/src/being/crazymoves.cpp b/src/being/crazymoves.cpp index 9636e6711..65ef5f52b 100644 --- a/src/being/crazymoves.cpp +++ b/src/being/crazymoves.cpp @@ -21,13 +21,14 @@ #include "being/crazymoves.h" #include "configuration.h" -#include "dropshortcut.h" #include "settings.h" #include "being/localplayer.h" #include "enums/being/beingdirection.h" +#include "gui/shortcut/dropshortcut.h" + #include "gui/windows/outfitwindow.h" #include "net/packetlimiter.h" diff --git a/src/client.cpp b/src/client.cpp index 4f4f5279a..ec5adcfd1 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -25,17 +25,13 @@ #include "chatlogger.h" #include "configmanager.h" #include "dirs.h" -#include "dropshortcut.h" -#include "emoteshortcut.h" #include "eventsmanager.h" #include "game.h" #include "graphicsmanager.h" -#include "itemshortcut.h" #include "party.h" #include "settings.h" #include "soundmanager.h" #include "spellmanager.h" -#include "spellshortcut.h" #include "statuseffect.h" #include "units.h" #include "touchmanager.h" @@ -55,6 +51,11 @@ #include "gui/popupmanager.h" #include "gui/windowmanager.h" +#include "gui/shortcut/dropshortcut.h" +#include "gui/shortcut/emoteshortcut.h" +#include "gui/shortcut/itemshortcut.h" +#include "gui/shortcut/spellshortcut.h" + #include "gui/windows/changeemaildialog.h" #include "gui/windows/changepassworddialog.h" #include "gui/windows/charselectdialog.h" diff --git a/src/game.cpp b/src/game.cpp index a6aa8e8cb..1cec9efbd 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -25,12 +25,9 @@ #include "actormanager.h" #include "client.h" #include "configuration.h" -#include "dropshortcut.h" #include "effectmanager.h" -#include "emoteshortcut.h" #include "eventsmanager.h" #include "gamemodifiers.h" -#include "itemshortcut.h" #include "soundmanager.h" #include "settings.h" #include "touchmanager.h" @@ -60,6 +57,10 @@ #include "gui/fonts/font.h" +#include "gui/shortcut/dropshortcut.h" +#include "gui/shortcut/emoteshortcut.h" +#include "gui/shortcut/itemshortcut.h" + #include "gui/popups/popupmenu.h" #ifdef EATHENA_SUPPORT diff --git a/src/dropshortcut.cpp b/src/gui/shortcut/dropshortcut.cpp index d112b4796..e9264e9c3 100644 --- a/src/dropshortcut.cpp +++ b/src/gui/shortcut/dropshortcut.cpp @@ -20,7 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "dropshortcut.h" +#include "gui/shortcut/dropshortcut.h" #include "inventory.h" #include "item.h" diff --git a/src/dropshortcut.h b/src/gui/shortcut/dropshortcut.h index 6920ff3aa..5fc84623c 100644 --- a/src/dropshortcut.h +++ b/src/gui/shortcut/dropshortcut.h @@ -20,10 +20,10 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef DROPSHORTCUT_H -#define DROPSHORTCUT_H +#ifndef GUI_SHORTCUT_DROPSHORTCUT_H +#define GUI_SHORTCUT_DROPSHORTCUT_H -#include "shortcutbase.h" +#include "gui/shortcut/shortcutbase.h" #include "localconsts.h" @@ -66,4 +66,4 @@ class DropShortcut final : public ShortcutBase extern DropShortcut *dropShortcut; -#endif // DROPSHORTCUT_H +#endif // GUI_SHORTCUT_DROPSHORTCUT_H diff --git a/src/emoteshortcut.cpp b/src/gui/shortcut/emoteshortcut.cpp index e60c05cb0..03361f3f2 100644 --- a/src/emoteshortcut.cpp +++ b/src/gui/shortcut/emoteshortcut.cpp @@ -19,7 +19,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "emoteshortcut.h" +#include "gui/shortcut/emoteshortcut.h" #include "configuration.h" diff --git a/src/emoteshortcut.h b/src/gui/shortcut/emoteshortcut.h index 8cd3a7ded..bd4eed7f1 100644 --- a/src/emoteshortcut.h +++ b/src/gui/shortcut/emoteshortcut.h @@ -19,8 +19,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef EMOTESHORTCUT_H -#define EMOTESHORTCUT_H +#ifndef GUI_SHORTCUT_EMOTESHORTCUT_H +#define GUI_SHORTCUT_EMOTESHORTCUT_H #include "const/emoteshortcut.h" @@ -125,4 +125,4 @@ class EmoteShortcut final extern EmoteShortcut *emoteShortcut; -#endif // EMOTESHORTCUT_H +#endif // GUI_SHORTCUT_EMOTESHORTCUT_H diff --git a/src/itemshortcut.cpp b/src/gui/shortcut/itemshortcut.cpp index f1ef56993..7d6aec8f1 100644 --- a/src/itemshortcut.cpp +++ b/src/gui/shortcut/itemshortcut.cpp @@ -20,7 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "itemshortcut.h" +#include "gui/shortcut/itemshortcut.h" #include "configuration.h" #include "inventory.h" diff --git a/src/itemshortcut.h b/src/gui/shortcut/itemshortcut.h index 7dd093abd..bb2642c92 100644 --- a/src/itemshortcut.h +++ b/src/gui/shortcut/itemshortcut.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef ITEMSHORTCUT_H -#define ITEMSHORTCUT_H +#ifndef GUI_SHORTCUT_ITEMSHORTCUT_H +#define GUI_SHORTCUT_ITEMSHORTCUT_H #include "enums/simpletypes/itemcolor.h" @@ -162,4 +162,4 @@ class ItemShortcut final extern ItemShortcut *itemShortcut[SHORTCUT_TABS]; -#endif // ITEMSHORTCUT_H +#endif // GUI_SHORTCUT_ITEMSHORTCUT_H diff --git a/src/shortcutbase.cpp b/src/gui/shortcut/shortcutbase.cpp index 8bb0b3a54..99eb492f1 100644 --- a/src/shortcutbase.cpp +++ b/src/gui/shortcut/shortcutbase.cpp @@ -20,7 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "shortcutbase.h" +#include "gui/shortcut/shortcutbase.h" #include "configuration.h" #include "item.h" diff --git a/src/shortcutbase.h b/src/gui/shortcut/shortcutbase.h index 58520a8ad..6b4691811 100644 --- a/src/shortcutbase.h +++ b/src/gui/shortcut/shortcutbase.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef SHORTCUTBASE_H -#define SHORTCUTBASE_H +#ifndef GUI_SHORTCUT_SHORTCUTBASE_H +#define GUI_SHORTCUT_SHORTCUTBASE_H #include "enums/simpletypes/itemcolor.h" @@ -136,4 +136,4 @@ class ShortcutBase notfinal ItemColor mItemColorSelected; }; -#endif // SHORTCUTBASE_H +#endif // GUI_SHORTCUT_SHORTCUTBASE_H diff --git a/src/spellshortcut.cpp b/src/gui/shortcut/spellshortcut.cpp index aa4e95248..609b7e335 100644 --- a/src/spellshortcut.cpp +++ b/src/gui/shortcut/spellshortcut.cpp @@ -20,7 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "spellshortcut.h" +#include "gui/shortcut/spellshortcut.h" #include "spellmanager.h" diff --git a/src/spellshortcut.h b/src/gui/shortcut/spellshortcut.h index 88d2541ef..694bf5fac 100644 --- a/src/spellshortcut.h +++ b/src/gui/shortcut/spellshortcut.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef SPELLSHORTCUT_H -#define SPELLSHORTCUT_H +#ifndef GUI_SHORTCUT_SPELLSHORTCUT_H +#define GUI_SHORTCUT_SPELLSHORTCUT_H #include "const/spells.h" @@ -85,4 +85,4 @@ class SpellShortcut final extern SpellShortcut *spellShortcut; -#endif // SPELLSHORTCUT_H +#endif // GUI_SHORTCUT_SPELLSHORTCUT_H diff --git a/src/gui/widgets/emoteshortcutcontainer.cpp b/src/gui/widgets/emoteshortcutcontainer.cpp index e83e91bb8..455a657b5 100644 --- a/src/gui/widgets/emoteshortcutcontainer.cpp +++ b/src/gui/widgets/emoteshortcutcontainer.cpp @@ -21,7 +21,6 @@ #include "gui/widgets/emoteshortcutcontainer.h" -#include "emoteshortcut.h" #include "settings.h" #include "input/inputmanager.h" @@ -30,6 +29,8 @@ #include "gui/fonts/font.h" +#include "gui/shortcut/emoteshortcut.h" + #include "gui/popups/textpopup.h" #include "input/inputactionoperators.h" diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp index e17cb711e..8a5e6bca3 100644 --- a/src/gui/widgets/itemcontainer.cpp +++ b/src/gui/widgets/itemcontainer.cpp @@ -24,7 +24,6 @@ #include "dragdrop.h" #include "graphicsvertexes.h" -#include "itemshortcut.h" #include "being/playerinfo.h" @@ -34,6 +33,8 @@ #include "gui/fonts/font.h" +#include "gui/shortcut/itemshortcut.h" + #include "gui/popups/itempopup.h" #include "gui/windows/chatwindow.h" diff --git a/src/gui/widgets/itemshortcutcontainer.cpp b/src/gui/widgets/itemshortcutcontainer.cpp index 4659f4afd..b8fd02217 100644 --- a/src/gui/widgets/itemshortcutcontainer.cpp +++ b/src/gui/widgets/itemshortcutcontainer.cpp @@ -23,10 +23,8 @@ #include "gui/widgets/itemshortcutcontainer.h" #include "dragdrop.h" -#include "itemshortcut.h" #include "settings.h" #include "spellmanager.h" -#include "spellshortcut.h" #include "being/playerinfo.h" @@ -36,6 +34,9 @@ #include "gui/fonts/font.h" +#include "gui/shortcut/itemshortcut.h" +#include "gui/shortcut/spellshortcut.h" + #include "gui/popups/itempopup.h" #include "gui/popups/popupmenu.h" #include "gui/popups/skillpopup.h" diff --git a/src/gui/widgets/spellshortcutcontainer.cpp b/src/gui/widgets/spellshortcutcontainer.cpp index 1d1b15836..7f1ca47fa 100644 --- a/src/gui/widgets/spellshortcutcontainer.cpp +++ b/src/gui/widgets/spellshortcutcontainer.cpp @@ -23,15 +23,16 @@ #include "gui/widgets/spellshortcutcontainer.h" #include "dragdrop.h" -#include "itemshortcut.h" #include "settings.h" #include "spellmanager.h" -#include "spellshortcut.h" #include "gui/viewport.h" #include "gui/fonts/font.h" +#include "gui/shortcut/itemshortcut.h" +#include "gui/shortcut/spellshortcut.h" + #include "gui/popups/popupmenu.h" #include "gui/popups/spellpopup.h" diff --git a/src/gui/widgets/textfield.cpp b/src/gui/widgets/textfield.cpp index 497f17d2f..36315af34 100644 --- a/src/gui/widgets/textfield.cpp +++ b/src/gui/widgets/textfield.cpp @@ -287,6 +287,8 @@ int TextField::getValue() const void TextField::keyPressed(KeyEvent &event) { const int val = event.getKey().getValue(); + logger->log("TextField::keyPressed %d", val); + #ifdef USE_SDL2 if (val == Key::TEXTINPUT) { diff --git a/src/gui/widgets/virtshortcutcontainer.cpp b/src/gui/widgets/virtshortcutcontainer.cpp index 5a8a0432d..43fed340a 100644 --- a/src/gui/widgets/virtshortcutcontainer.cpp +++ b/src/gui/widgets/virtshortcutcontainer.cpp @@ -23,7 +23,6 @@ #include "gui/widgets/virtshortcutcontainer.h" #include "dragdrop.h" -#include "shortcutbase.h" #include "settings.h" #include "being/playerinfo.h" @@ -32,6 +31,8 @@ #include "gui/fonts/font.h" +#include "gui/shortcut/shortcutbase.h" + #include "gui/popups/itempopup.h" #include "gui/popups/popupmenu.h" diff --git a/src/gui/windowmanager.cpp b/src/gui/windowmanager.cpp index 1959ac4a1..49c0b859e 100644 --- a/src/gui/windowmanager.cpp +++ b/src/gui/windowmanager.cpp @@ -27,12 +27,13 @@ #include "game.h" #include "settings.h" #include "spellmanager.h" -#include "spellshortcut.h" #include "touchmanager.h" #include "gui/gui.h" #include "gui/userpalette.h" +#include "gui/shortcut/spellshortcut.h" + #include "gui/popups/textpopup.h" #ifndef DYECMD diff --git a/src/gui/windows/skilldialog.cpp b/src/gui/windows/skilldialog.cpp index 0446bc886..5db995e9d 100644 --- a/src/gui/windows/skilldialog.cpp +++ b/src/gui/windows/skilldialog.cpp @@ -24,7 +24,6 @@ #include "configuration.h" #include "effectmanager.h" -#include "itemshortcut.h" #include "spellmanager.h" #include "being/localplayer.h" @@ -32,6 +31,8 @@ #include "const/resources/spriteaction.h" +#include "gui/shortcut/itemshortcut.h" + #include "gui/windows/setupwindow.h" #include "gui/windows/shortcutwindow.h" |