move popups into popups directory.

35 files changed, 77 insertions, 58 deletions

diff --git a/Android.mk b/Android.mk
index 5bac92b93..964b135a7 100644
--- a/Android.mk
+++ b/Android.mk
@@ -32,6 +32,7 @@ LOCAL_SRC_FILES := $(SDL_PATH)/src/main/android/SDL_android_main.c \
     $(wildcard $(LOCAL_PATH)/src/*.cpp) \
     $(wildcard $(LOCAL_PATH)/src/being/*.cpp) \
     $(wildcard $(LOCAL_PATH)/src/gui/*.cpp) \
+    $(wildcard $(LOCAL_PATH)/src/gui/popups/*.cpp) \
     $(wildcard $(LOCAL_PATH)/src/gui/widgets/*.cpp) \
     $(wildcard $(LOCAL_PATH)/src/gui/windows/*.cpp) \
     $(wildcard $(LOCAL_PATH)/src/guichan/*.cpp) \
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e2acfb4dc..968867bfb 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -251,8 +251,8 @@ SET(SRCS
     gui/widgets/window.h
     gui/widgets/windowcontainer.cpp
     gui/widgets/windowcontainer.h
-    gui/beingpopup.cpp
-    gui/beingpopup.h
+    gui/popups/beingpopup.cpp
+    gui/popups/beingpopup.h
     gui/windows/buydialog.cpp
     gui/windows/buydialog.h
     gui/windows/buyselldialog.cpp
@@ -293,12 +293,12 @@ SET(SRCS
     gui/windows/inventorywindow.h
     gui/windows/itemamountwindow.cpp
     gui/windows/itemamountwindow.h
-    gui/itempopup.cpp
-    gui/itempopup.h
-    gui/spellpopup.cpp
-    gui/spellpopup.h
-    gui/statuspopup.cpp
-    gui/statuspopup.h
+    gui/popups/itempopup.cpp
+    gui/popups/itempopup.h
+    gui/popups/spellpopup.cpp
+    gui/popups/spellpopup.h
+    gui/popups/statuspopup.cpp
+    gui/popups/statuspopup.h
     gui/windows/killstats.cpp
     gui/windows/killstats.h
     gui/windows/logindialog.cpp
@@ -321,8 +321,8 @@ SET(SRCS
     gui/windows/textcommandeditor.h
     gui/palette.cpp
     gui/palette.h
-    gui/popupmenu.cpp
-    gui/popupmenu.h
+    gui/popups/popupmenu.cpp
+    gui/popups/popupmenu.h
     gui/windows/questswindow.cpp
     gui/windows/questswindow.h
     gui/windows/quitdialog.cpp
@@ -374,14 +374,14 @@ SET(SRCS
     gui/windows/skilldialog.h
     gui/windows/socialwindow.cpp
     gui/windows/socialwindow.h
-    gui/speechbubble.cpp
-    gui/speechbubble.h
+    gui/popups/speechbubble.cpp
+    gui/popups/speechbubble.h
     gui/windows/statuswindow.cpp
     gui/windows/statuswindow.h
     gui/windows/textdialog.cpp
     gui/windows/textdialog.h
-    gui/textpopup.cpp
-    gui/textpopup.h
+    gui/popups/textpopup.cpp
+    gui/popups/textpopup.h
     gui/theme.cpp
     gui/theme.h
     gui/windows/tradewindow.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index b23baeaca..f1f0cac54 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -260,8 +260,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      gui/widgets/window.h \
 	      gui/widgets/windowcontainer.cpp \
 	      gui/widgets/windowcontainer.h \
-	      gui/beingpopup.cpp \
-	      gui/beingpopup.h \
+	      gui/popups/beingpopup.cpp \
+	      gui/popups/beingpopup.h \
 	      gui/windows/buydialog.cpp \
 	      gui/windows/buydialog.h \
 	      gui/windows/buyselldialog.cpp \
@@ -302,12 +302,12 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      gui/windows/inventorywindow.h \
 	      gui/windows/itemamountwindow.cpp \
 	      gui/windows/itemamountwindow.h \
-	      gui/itempopup.cpp \
-	      gui/itempopup.h \
-	      gui/spellpopup.cpp \
-	      gui/spellpopup.h \
-	      gui/statuspopup.cpp \
-	      gui/statuspopup.h \
+	      gui/popups/itempopup.cpp \
+	      gui/popups/itempopup.h \
+	      gui/popups/spellpopup.cpp \
+	      gui/popups/spellpopup.h \
+	      gui/popups/statuspopup.cpp \
+	      gui/popups/statuspopup.h \
 	      gui/windows/killstats.cpp \
 	      gui/windows/killstats.h \
 	      gui/windows/logindialog.cpp \
@@ -330,8 +330,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      gui/windows/textcommandeditor.h \
 	      gui/palette.cpp \
 	      gui/palette.h \
-	      gui/popupmenu.cpp \
-	      gui/popupmenu.h \
+	      gui/popups/popupmenu.cpp \
+	      gui/popups/popupmenu.h \
 	      gui/windows/questswindow.cpp \
 	      gui/windows/questswindow.h \
 	      gui/windows/quitdialog.cpp \
@@ -383,14 +383,14 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      gui/windows/skilldialog.h \
 	      gui/windows/socialwindow.cpp \
 	      gui/windows/socialwindow.h \
-	      gui/speechbubble.cpp \
-	      gui/speechbubble.h \
+	      gui/popups/speechbubble.cpp \
+	      gui/popups/speechbubble.h \
 	      gui/windows/statuswindow.cpp \
 	      gui/windows/statuswindow.h \
 	      gui/windows/textdialog.cpp \
 	      gui/windows/textdialog.h \
-	      gui/textpopup.cpp \
-	      gui/textpopup.h \
+	      gui/popups/textpopup.cpp \
+	      gui/popups/textpopup.h \
 	      gui/theme.cpp \
 	      gui/theme.h \
 	      gui/windows/tradewindow.cpp \
diff --git a/src/being/being.cpp b/src/being/being.cpp
index 07cac90c1..9ce022dd9 100644
--- a/src/being/being.cpp
+++ b/src/being/being.cpp
@@ -38,9 +38,10 @@
 
 #include "particle/particle.h"
 
-#include "gui/speechbubble.h"
 #include "gui/sdlfont.h"
 
+#include "gui/popups/speechbubble.h"
+
 #include "gui/windows/equipmentwindow.h"
 #include "gui/windows/skilldialog.h"
 #include "gui/windows/socialwindow.h"
diff --git a/src/gui/beingpopup.cpp b/src/gui/popups/beingpopup.cpp
index ec157debc..ae16d8eb2 100644
--- a/src/gui/beingpopup.cpp
+++ b/src/gui/popups/beingpopup.cpp
@@ -19,7 +19,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "gui/beingpopup.h"
+#include "gui/popups/beingpopup.h"
 
 #include "being/being.h"
 #include "being/playerrelations.h"
diff --git a/src/gui/beingpopup.h b/src/gui/popups/beingpopup.h
index 3ac46d30c..3ac46d30c 100644
--- a/src/gui/beingpopup.h
+++ b/src/gui/popups/beingpopup.h
diff --git a/src/gui/itempopup.cpp b/src/gui/popups/itempopup.cpp
index 534564d36..63fe3628c 100644
--- a/src/gui/itempopup.cpp
+++ b/src/gui/popups/itempopup.cpp
@@ -21,7 +21,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "gui/itempopup.h"
+#include "gui/popups/itempopup.h"
 
 #include "client.h"
 #include "configuration.h"
diff --git a/src/gui/itempopup.h b/src/gui/popups/itempopup.h
index d0b313e26..d0b313e26 100644
--- a/src/gui/itempopup.h
+++ b/src/gui/popups/itempopup.h
diff --git a/src/gui/popupmenu.cpp b/src/gui/popups/popupmenu.cpp
index 62f769378..6771e7e3e 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popups/popupmenu.cpp
@@ -20,7 +20,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "gui/popupmenu.h"
+#include "gui/popups/popupmenu.h"
 
 #include "actorspritemanager.h"
 #include "commandhandler.h"
diff --git a/src/gui/popupmenu.h b/src/gui/popups/popupmenu.h
index 3865c2bd3..3865c2bd3 100644
--- a/src/gui/popupmenu.h
+++ b/src/gui/popups/popupmenu.h
diff --git a/src/gui/speechbubble.cpp b/src/gui/popups/speechbubble.cpp
index cd0a08694..510bb9eae 100644
--- a/src/gui/speechbubble.cpp
+++ b/src/gui/popups/speechbubble.cpp
@@ -21,7 +21,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "gui/speechbubble.h"
+#include "gui/popups/speechbubble.h"
 
 #include "gui/gui.h"
 #include "gui/sdlfont.h"
diff --git a/src/gui/speechbubble.h b/src/gui/popups/speechbubble.h
index ca3c9668b..ca3c9668b 100644
--- a/src/gui/speechbubble.h
+++ b/src/gui/popups/speechbubble.h
diff --git a/src/gui/spellpopup.cpp b/src/gui/popups/spellpopup.cpp
index 8c1f279eb..4e06b3d87 100644
--- a/src/gui/spellpopup.cpp
+++ b/src/gui/popups/spellpopup.cpp
@@ -21,7 +21,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "gui/spellpopup.h"
+#include "gui/popups/spellpopup.h"
 
 #include "gui/gui.h"
 #include "gui/sdlfont.h"
diff --git a/src/gui/spellpopup.h b/src/gui/popups/spellpopup.h
index b7a1f83b3..b7a1f83b3 100644
--- a/src/gui/spellpopup.h
+++ b/src/gui/popups/spellpopup.h
diff --git a/src/gui/statuspopup.cpp b/src/gui/popups/statuspopup.cpp
index 34d3156d4..fb2b161c2 100644
--- a/src/gui/statuspopup.cpp
+++ b/src/gui/popups/statuspopup.cpp
@@ -21,10 +21,10 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "gui/statuspopup.h"
-
 #include "gui/viewport.h"
 
+#include "gui/popups/statuspopup.h"
+
 #include "gui/widgets/label.h"
 
 #include "being/localplayer.h"
diff --git a/src/gui/statuspopup.h b/src/gui/popups/statuspopup.h
index f7964741b..f7964741b 100644
--- a/src/gui/statuspopup.h
+++ b/src/gui/popups/statuspopup.h
diff --git a/src/gui/textpopup.cpp b/src/gui/popups/textpopup.cpp
index 4cb0d710d..2b89e388b 100644
--- a/src/gui/textpopup.cpp
+++ b/src/gui/popups/textpopup.cpp
@@ -21,7 +21,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "gui/textpopup.h"
+#include "gui/popups/textpopup.h"
 
 #include "gui/widgets/label.h"
 
diff --git a/src/gui/textpopup.h b/src/gui/popups/textpopup.h
index b165c2f25..b165c2f25 100644
--- a/src/gui/textpopup.h
+++ b/src/gui/popups/textpopup.h
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 1aa5e1d9b..5e855bea5 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -34,10 +34,11 @@
 
 #include "input/inputmanager.h"
 
-#include "gui/beingpopup.h"
 #include "gui/gui.h"
-#include "gui/popupmenu.h"
-#include "gui/textpopup.h"
+
+#include "gui/popups/beingpopup.h"
+#include "gui/popups/popupmenu.h"
+#include "gui/popups/textpopup.h"
 
 #include "gui/windows/ministatuswindow.h"
 
diff --git a/src/gui/widgets/characterdisplay.cpp b/src/gui/widgets/characterdisplay.cpp
index c8a38337f..d88334973 100644
--- a/src/gui/widgets/characterdisplay.cpp
+++ b/src/gui/widgets/characterdisplay.cpp
@@ -26,7 +26,7 @@
 
 #include "gui/windows/charselectdialog.h"
 
-#include "gui/textpopup.h"
+#include "gui/popups/textpopup.h"
 
 #include "gui/widgets/label.h"
 #include "gui/widgets/layouthelper.h"
diff --git a/src/gui/widgets/dropshortcutcontainer.cpp b/src/gui/widgets/dropshortcutcontainer.cpp
index c040d4c3a..92daf8b77 100644
--- a/src/gui/widgets/dropshortcutcontainer.cpp
+++ b/src/gui/widgets/dropshortcutcontainer.cpp
@@ -28,9 +28,10 @@
 
 #include "being/playerinfo.h"
 
-#include "gui/itempopup.h"
 #include "gui/viewport.h"
 
+#include "gui/popups/itempopup.h"
+
 #include "gui/windows/inventorywindow.h"
 
 #include "resources/image.h"
diff --git a/src/gui/widgets/emoteshortcutcontainer.cpp b/src/gui/widgets/emoteshortcutcontainer.cpp
index 50b18beb1..6afa5fae4 100644
--- a/src/gui/widgets/emoteshortcutcontainer.cpp
+++ b/src/gui/widgets/emoteshortcutcontainer.cpp
@@ -27,9 +27,10 @@
 
 #include "input/inputmanager.h"
 
-#include "gui/textpopup.h"
 #include "gui/viewport.h"
 
+#include "gui/popups/textpopup.h"
+
 #include "resources/image.h"
 
 #include <guichan/font.hpp>
diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp
index 64cafcd82..32e179226 100644
--- a/src/gui/widgets/itemcontainer.cpp
+++ b/src/gui/widgets/itemcontainer.cpp
@@ -30,9 +30,10 @@
 #include "being/playerinfo.h"
 
 #include "gui/gui.h"
-#include "gui/itempopup.h"
 #include "gui/viewport.h"
 
+#include "gui/popups/itempopup.h"
+
 #include "gui/windows/chatwindow.h"
 #include "gui/windows/shopwindow.h"
 #include "gui/windows/shortcutwindow.h"
diff --git a/src/gui/widgets/itemlinkhandler.cpp b/src/gui/widgets/itemlinkhandler.cpp
index 0dff139f6..572e4dbf2 100644
--- a/src/gui/widgets/itemlinkhandler.cpp
+++ b/src/gui/widgets/itemlinkhandler.cpp
@@ -22,9 +22,10 @@
 
 #include "gui/widgets/itemlinkhandler.h"
 
-#include "gui/itempopup.h"
 #include "gui/viewport.h"
 
+#include "gui/popups/itempopup.h"
+
 #include "gui/windows/confirmdialog.h"
 #include "gui/windows/helpwindow.h"
 
diff --git a/src/gui/widgets/itemshortcutcontainer.cpp b/src/gui/widgets/itemshortcutcontainer.cpp
index e2901c3bb..aeae7dd95 100644
--- a/src/gui/widgets/itemshortcutcontainer.cpp
+++ b/src/gui/widgets/itemshortcutcontainer.cpp
@@ -33,10 +33,11 @@
 
 #include "input/inputmanager.h"
 
-#include "gui/itempopup.h"
-#include "gui/spellpopup.h"
 #include "gui/viewport.h"
 
+#include "gui/popups/itempopup.h"
+#include "gui/popups/spellpopup.h"
+
 #include "gui/windows/inventorywindow.h"
 #include "gui/windows/skilldialog.h"
 
diff --git a/src/gui/widgets/shoplistbox.cpp b/src/gui/widgets/shoplistbox.cpp
index f719d132e..53e5f25e3 100644
--- a/src/gui/widgets/shoplistbox.cpp
+++ b/src/gui/widgets/shoplistbox.cpp
@@ -27,9 +27,10 @@
 
 #include "being/playerinfo.h"
 
-#include "gui/itempopup.h"
 #include "gui/viewport.h"
 
+#include "gui/popups/itempopup.h"
+
 #include "gui/widgets/shopitems.h"
 
 #include "resources/image.h"
diff --git a/src/gui/widgets/spellshortcutcontainer.cpp b/src/gui/widgets/spellshortcutcontainer.cpp
index 8e77d3215..648a493b1 100644
--- a/src/gui/widgets/spellshortcutcontainer.cpp
+++ b/src/gui/widgets/spellshortcutcontainer.cpp
@@ -27,9 +27,10 @@
 #include "itemshortcut.h"
 #include "spellshortcut.h"
 
-#include "gui/spellpopup.h"
 #include "gui/viewport.h"
 
+#include "gui/popups/spellpopup.h"
+
 #include "gui/windows/inventorywindow.h"
 #include "gui/windows/shortcutwindow.h"
 
diff --git a/src/gui/widgets/textfield.cpp b/src/gui/widgets/textfield.cpp
index 9390e3a24..bf5485a7b 100644
--- a/src/gui/widgets/textfield.cpp
+++ b/src/gui/widgets/textfield.cpp
@@ -31,10 +31,11 @@
 #include "input/keydata.h"
 #include "input/keyevent.h"
 
-#include "gui/popupmenu.h"
 #include "gui/sdlinput.h"
 #include "gui/viewport.h"
 
+#include "gui/popups/popupmenu.h"
+
 #include "resources/image.h"
 
 #include "utils/copynpaste.h"
diff --git a/src/gui/windowmenu.cpp b/src/gui/windowmenu.cpp
index 46b905045..99f4b4ca5 100644
--- a/src/gui/windowmenu.cpp
+++ b/src/gui/windowmenu.cpp
@@ -26,9 +26,10 @@
 
 #include "input/inputmanager.h"
 
-#include "gui/textpopup.h"
 #include "gui/viewport.h"
 
+#include "gui/popups/textpopup.h"
+
 #include "gui/windows/skilldialog.h"
 #ifdef MANASERV_SUPPORT
 #include "gui/specialswindow.h"
diff --git a/src/gui/windows/equipmentwindow.cpp b/src/gui/windows/equipmentwindow.cpp
index 0402115df..8cfb3b28e 100644
--- a/src/gui/windows/equipmentwindow.cpp
+++ b/src/gui/windows/equipmentwindow.cpp
@@ -32,9 +32,10 @@
 #include "being/localplayer.h"
 #include "being/playerinfo.h"
 
-#include "gui/itempopup.h"
 #include "gui/viewport.h"
 
+#include "gui/popups/itempopup.h"
+
 #include "gui/windows/setup.h"
 
 #include "gui/widgets/button.h"
diff --git a/src/gui/windows/inventorywindow.cpp b/src/gui/windows/inventorywindow.cpp
index b57a7ea21..5c0b71edc 100644
--- a/src/gui/windows/inventorywindow.cpp
+++ b/src/gui/windows/inventorywindow.cpp
@@ -32,9 +32,10 @@
 #include "input/keyevent.h"
 
 #include "gui/gui.h"
-#include "gui/textpopup.h"
 #include "gui/viewport.h"
 
+#include "gui/popups/textpopup.h"
+
 #include "gui/windows/equipmentwindow.h"
 #include "gui/windows/itemamountwindow.h"
 #include "gui/windows/outfitwindow.h"
diff --git a/src/gui/windows/itemamountwindow.cpp b/src/gui/windows/itemamountwindow.cpp
index 7c67fb976..1eba131c1 100644
--- a/src/gui/windows/itemamountwindow.cpp
+++ b/src/gui/windows/itemamountwindow.cpp
@@ -28,10 +28,11 @@
 #include "input/keyboardconfig.h"
 
 #include "net/inventoryhandler.h"
-#include "gui/itempopup.h"
 #include "net/net.h"
 #include "gui/viewport.h"
 
+#include "gui/popups/itempopup.h"
+
 #include "gui/windows/shopwindow.h"
 #include "gui/windows/tradewindow.h"
 
diff --git a/src/gui/windows/minimap.cpp b/src/gui/windows/minimap.cpp
index 9adadd1e0..a02e02f5d 100644
--- a/src/gui/windows/minimap.cpp
+++ b/src/gui/windows/minimap.cpp
@@ -30,7 +30,8 @@
 #include "being/localplayer.h"
 
 #include "gui/viewport.h"
-#include "gui/textpopup.h"
+
+#include "gui/popups/textpopup.h"
 
 #include "gui/windows/setup.h"
 
diff --git a/src/gui/windows/ministatuswindow.cpp b/src/gui/windows/ministatuswindow.cpp
index 21697b83f..2d64e9ffd 100644
--- a/src/gui/windows/ministatuswindow.cpp
+++ b/src/gui/windows/ministatuswindow.cpp
@@ -28,10 +28,12 @@
 #include "being/localplayer.h"
 #include "being/playerinfo.h"
 
-#include "gui/statuspopup.h"
-#include "gui/textpopup.h"
 #include "gui/viewport.h"
 
+#include "gui/popups/textpopup.h"
+
+#include "gui/popups/statuspopup.h"
+
 #include "gui/windows/statuswindow.h"
 
 #include "gui/widgets/progressbar.h"
diff --git a/src/gui/windows/skilldialog.cpp b/src/gui/windows/skilldialog.cpp
index 39cdc5d2f..29232e240 100644
--- a/src/gui/windows/skilldialog.cpp
+++ b/src/gui/windows/skilldialog.cpp
@@ -29,9 +29,10 @@
 
 #include "being/localplayer.h"
 
-#include "gui/textpopup.h"
 #include "gui/viewport.h"
 
+#include "gui/popups/textpopup.h"
+
 #include "gui/windows/setup.h"
 #include "gui/windows/shortcutwindow.h"