Cleanup GUI classes

Moved remaining widgets into widgets folder, standardized include order, moved TextRenderer out.

1 files changed, 26 insertions, 26 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index ec84f273..f84e7227 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,22 +23,35 @@ mana_SOURCES = gui/widgets/avatar.cpp \
 	      gui/widgets/desktop.h \
 	      gui/widgets/dropdown.cpp \
 	      gui/widgets/dropdown.h \
+	      gui/widgets/emoteshortcutcontainer.cpp \
+	      gui/widgets/emoteshortcutcontainer.h \
 	      gui/widgets/flowcontainer.cpp \
 	      gui/widgets/flowcontainer.h \
+	      gui/widgets/guildlistbox.cpp \
+	      gui/widgets/guildlistbox.h \
 	      gui/widgets/icon.cpp \
 	      gui/widgets/icon.h \
 	      gui/widgets/inttextfield.cpp \
 	      gui/widgets/inttextfield.h \
+	      gui/widgets/itemcontainer.cpp \
+	      gui/widgets/itemcontainer.h \
+	      gui/widgets/itemlinkhandler.cpp \
+	      gui/widgets/itemlinkhandler.h \
+	      gui/widgets/itemshortcutcontainer.cpp \
+	      gui/widgets/itemshortcutcontainer.h \
 	      gui/widgets/label.cpp \
 	      gui/widgets/label.h \
 	      gui/widgets/layout.cpp \
 	      gui/widgets/layout.h \
 	      gui/widgets/layouthelper.cpp \
 	      gui/widgets/layouthelper.h \
+	      gui/widgets/linkhandler.h \
 	      gui/widgets/listbox.cpp \
 	      gui/widgets/listbox.h \
 	      gui/widgets/passwordfield.cpp \
 	      gui/widgets/passwordfield.h \
+	      gui/widgets/playerbox.cpp \
+	      gui/widgets/playerbox.h \
 	      gui/widgets/popup.cpp \
 	      gui/widgets/popup.h \
 	      gui/widgets/progressbar.cpp \
@@ -49,12 +62,24 @@ mana_SOURCES = gui/widgets/avatar.cpp \
 	      gui/widgets/resizegrip.h \
 	      gui/widgets/scrollarea.cpp \
 	      gui/widgets/scrollarea.h \
+	      gui/widgets/setuptab.cpp \
+	      gui/widgets/setuptab.h \
+	      gui/widgets/shopitems.cpp \
+	      gui/widgets/shopitems.h \
+	      gui/widgets/shoplistbox.cpp \
+	      gui/widgets/shoplistbox.h \
+	      gui/widgets/shortcutcontainer.cpp \
+	      gui/widgets/shortcutcontainer.h \
 	      gui/widgets/slider.cpp \
 	      gui/widgets/slider.h \
 	      gui/widgets/tab.cpp \
 	      gui/widgets/tab.h \
 	      gui/widgets/tabbedarea.cpp \
 	      gui/widgets/tabbedarea.h \
+	      gui/widgets/table.cpp \
+	      gui/widgets/table.h \
+	      gui/widgets/tablemodel.cpp \
+	      gui/widgets/tablemodel.h \
 	      gui/widgets/textbox.cpp \
 	      gui/widgets/textbox.h \
 	      gui/widgets/textfield.cpp \
@@ -91,16 +116,12 @@ mana_SOURCES = gui/widgets/avatar.cpp \
 	      gui/debugwindow.h \
 	      gui/emotepopup.cpp \
 	      gui/emotepopup.h \
-	      gui/emoteshortcutcontainer.cpp \
-	      gui/emoteshortcutcontainer.h \
 	      gui/equipmentwindow.cpp \
 	      gui/equipmentwindow.h \
 	      gui/focushandler.cpp \
 	      gui/focushandler.h \
 	      gui/gui.cpp \
 	      gui/gui.h \
-	      gui/guildlistbox.cpp \
-	      gui/guildlistbox.h \
 	      gui/guildwindow.cpp \
 	      gui/guildwindow.h \
 	      gui/help.cpp \
@@ -109,15 +130,8 @@ mana_SOURCES = gui/widgets/avatar.cpp \
 	      gui/inventorywindow.h \
 	      gui/itemamount.cpp \
 	      gui/itemamount.h \
-	      gui/itemcontainer.cpp \
-	      gui/itemcontainer.h \
-	      gui/itemlinkhandler.cpp \
-	      gui/itemlinkhandler.h \
 	      gui/itempopup.cpp \
 	      gui/itempopup.h \
-	      gui/itemshortcutcontainer.cpp \
-	      gui/itemshortcutcontainer.h \
-	      gui/linkhandler.h \
 	      gui/login.cpp \
 	      gui/login.h \
 	      gui/minimap.cpp \
@@ -136,8 +150,6 @@ mana_SOURCES = gui/widgets/avatar.cpp \
 	      gui/palette.h \
 	      gui/partywindow.cpp \
 	      gui/partywindow.h \
-	      gui/playerbox.cpp \
-	      gui/playerbox.h \
 	      gui/popupmenu.cpp \
 	      gui/popupmenu.h \
 	      gui/quitdialog.cpp \
@@ -166,14 +178,6 @@ mana_SOURCES = gui/widgets/avatar.cpp \
 	      gui/setup_players.h \
 	      gui/setup_video.cpp \
 	      gui/setup_video.h \
-	      gui/setuptab.cpp \
-	      gui/setuptab.h \
-	      gui/shop.cpp \
-	      gui/shop.h \
-	      gui/shoplistbox.cpp \
-	      gui/shoplistbox.h \
-	      gui/shortcutcontainer.cpp \
-	      gui/shortcutcontainer.h \
 	      gui/shortcutwindow.cpp \
 	      gui/shortcutwindow.h \
 	      gui/skilldialog.cpp \
@@ -188,13 +192,8 @@ mana_SOURCES = gui/widgets/avatar.cpp \
 	      gui/statuswindow.h \
 	      gui/storagewindow.cpp \
 	      gui/storagewindow.h \
-	      gui/table.cpp \
-	      gui/table.h \
-	      gui/tablemodel.cpp \
-	      gui/tablemodel.h \
 	      gui/textdialog.cpp \
 	      gui/textdialog.h \
-	      gui/textrenderer.h \
 	      gui/trade.cpp \
 	      gui/trade.h \
 	      gui/truetypefont.cpp \
@@ -387,6 +386,7 @@ mana_SOURCES = gui/widgets/avatar.cpp \
 	      textmanager.h \
 	      textparticle.cpp \
 	      textparticle.h \
+	      textrenderer.h \
 	      tileset.h \
 	      units.cpp \
 	      units.h \