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/mana.cbp b/mana.cbp
index fac1c6a9..eb07c04b 100644
--- a/mana.cbp
+++ b/mana.cbp
@@ -211,16 +211,12 @@
 		<Unit filename="src\gui\debugwindow.h" />
 		<Unit filename="src\gui\emotepopup.cpp" />
 		<Unit filename="src\gui\emotepopup.h" />
-		<Unit filename="src\gui\emoteshortcutcontainer.cpp" />
-		<Unit filename="src\gui\emoteshortcutcontainer.h" />
 		<Unit filename="src\gui\equipmentwindow.cpp" />
 		<Unit filename="src\gui\equipmentwindow.h" />
 		<Unit filename="src\gui\focushandler.cpp" />
 		<Unit filename="src\gui\focushandler.h" />
 		<Unit filename="src\gui\gui.cpp" />
 		<Unit filename="src\gui\gui.h" />
-		<Unit filename="src\gui\guildlistbox.cpp" />
-		<Unit filename="src\gui\guildlistbox.h" />
 		<Unit filename="src\gui\guildwindow.cpp" />
 		<Unit filename="src\gui\guildwindow.h" />
 		<Unit filename="src\gui\help.cpp" />
@@ -229,15 +225,8 @@
 		<Unit filename="src\gui\inventorywindow.h" />
 		<Unit filename="src\gui\itemamount.cpp" />
 		<Unit filename="src\gui\itemamount.h" />
-		<Unit filename="src\gui\itemcontainer.cpp" />
-		<Unit filename="src\gui\itemcontainer.h" />
-		<Unit filename="src\gui\itemlinkhandler.cpp" />
-		<Unit filename="src\gui\itemlinkhandler.h" />
 		<Unit filename="src\gui\itempopup.cpp" />
 		<Unit filename="src\gui\itempopup.h" />
-		<Unit filename="src\gui\itemshortcutcontainer.cpp" />
-		<Unit filename="src\gui\itemshortcutcontainer.h" />
-		<Unit filename="src\gui\linkhandler.h" />
 		<Unit filename="src\gui\login.cpp" />
 		<Unit filename="src\gui\login.h" />
 		<Unit filename="src\gui\minimap.cpp" />
@@ -256,8 +245,6 @@
 		<Unit filename="src\gui\palette.h" />
 		<Unit filename="src\gui\partywindow.cpp" />
 		<Unit filename="src\gui\partywindow.h" />
-		<Unit filename="src\gui\playerbox.cpp" />
-		<Unit filename="src\gui\playerbox.h" />
 		<Unit filename="src\gui\popupmenu.cpp" />
 		<Unit filename="src\gui\popupmenu.h" />
 		<Unit filename="src\gui\quitdialog.cpp" />
@@ -286,14 +273,6 @@
 		<Unit filename="src\gui\setup_players.h" />
 		<Unit filename="src\gui\setup_video.cpp" />
 		<Unit filename="src\gui\setup_video.h" />
-		<Unit filename="src\gui\setuptab.cpp" />
-		<Unit filename="src\gui\setuptab.h" />
-		<Unit filename="src\gui\shop.cpp" />
-		<Unit filename="src\gui\shop.h" />
-		<Unit filename="src\gui\shoplistbox.cpp" />
-		<Unit filename="src\gui\shoplistbox.h" />
-		<Unit filename="src\gui\shortcutcontainer.cpp" />
-		<Unit filename="src\gui\shortcutcontainer.h" />
 		<Unit filename="src\gui\shortcutwindow.cpp" />
 		<Unit filename="src\gui\shortcutwindow.h" />
 		<Unit filename="src\gui\skilldialog.cpp" />
@@ -308,13 +287,8 @@
 		<Unit filename="src\gui\statuswindow.h" />
 		<Unit filename="src\gui\storagewindow.cpp" />
 		<Unit filename="src\gui\storagewindow.h" />
-		<Unit filename="src\gui\table.cpp" />
-		<Unit filename="src\gui\table.h" />
-		<Unit filename="src\gui\tablemodel.cpp" />
-		<Unit filename="src\gui\tablemodel.h" />
 		<Unit filename="src\gui\textdialog.cpp" />
 		<Unit filename="src\gui\textdialog.h" />
-		<Unit filename="src\gui\textrenderer.h" />
 		<Unit filename="src\gui\trade.cpp" />
 		<Unit filename="src\gui\trade.h" />
 		<Unit filename="src\gui\truetypefont.cpp" />
@@ -343,22 +317,35 @@
 		<Unit filename="src\gui\widgets\desktop.h" />
 		<Unit filename="src\gui\widgets\dropdown.cpp" />
 		<Unit filename="src\gui\widgets\dropdown.h" />
+		<Unit filename="src\gui\widgets\emoteshortcutcontainer.cpp" />
+		<Unit filename="src\gui\widgets\emoteshortcutcontainer.h" />
 		<Unit filename="src\gui\widgets\flowcontainer.cpp" />
 		<Unit filename="src\gui\widgets\flowcontainer.h" />
+		<Unit filename="src\gui\widgets\guildlistbox.cpp" />
+		<Unit filename="src\gui\widgets\guildlistbox.h" />
 		<Unit filename="src\gui\widgets\icon.cpp" />
 		<Unit filename="src\gui\widgets\icon.h" />
 		<Unit filename="src\gui\widgets\inttextfield.cpp" />
 		<Unit filename="src\gui\widgets\inttextfield.h" />
+		<Unit filename="src\gui\widgets\itemcontainer.cpp" />
+		<Unit filename="src\gui\widgets\itemcontainer.h" />
+		<Unit filename="src\gui\widgets\itemlinkhandler.cpp" />
+		<Unit filename="src\gui\widgets\itemlinkhandler.h" />
+		<Unit filename="src\gui\widgets\itemshortcutcontainer.cpp" />
+		<Unit filename="src\gui\widgets\itemshortcutcontainer.h" />
 		<Unit filename="src\gui\widgets\label.cpp" />
 		<Unit filename="src\gui\widgets\label.h" />
 		<Unit filename="src\gui\widgets\layout.cpp" />
 		<Unit filename="src\gui\widgets\layout.h" />
 		<Unit filename="src\gui\widgets\layouthelper.cpp" />
 		<Unit filename="src\gui\widgets\layouthelper.h" />
+		<Unit filename="src\gui\widgets\linkhandler.h" />
 		<Unit filename="src\gui\widgets\listbox.cpp" />
 		<Unit filename="src\gui\widgets\listbox.h" />
 		<Unit filename="src\gui\widgets\passwordfield.cpp" />
 		<Unit filename="src\gui\widgets\passwordfield.h" />
+		<Unit filename="src\gui\widgets\playerbox.cpp" />
+		<Unit filename="src\gui\widgets\playerbox.h" />
 		<Unit filename="src\gui\widgets\popup.cpp" />
 		<Unit filename="src\gui\widgets\popup.h" />
 		<Unit filename="src\gui\widgets\progressbar.cpp" />
@@ -369,12 +356,24 @@
 		<Unit filename="src\gui\widgets\resizegrip.h" />
 		<Unit filename="src\gui\widgets\scrollarea.cpp" />
 		<Unit filename="src\gui\widgets\scrollarea.h" />
+		<Unit filename="src\gui\widgets\setuptab.cpp" />
+		<Unit filename="src\gui\widgets\setuptab.h" />
+		<Unit filename="src\gui\widgets\shopitems.cpp" />
+		<Unit filename="src\gui\widgets\shopitems.h" />
+		<Unit filename="src\gui\widgets\shoplistbox.cpp" />
+		<Unit filename="src\gui\widgets\shoplistbox.h" />
+		<Unit filename="src\gui\widgets\shortcutcontainer.cpp" />
+		<Unit filename="src\gui\widgets\shortcutcontainer.h" />
 		<Unit filename="src\gui\widgets\slider.cpp" />
 		<Unit filename="src\gui\widgets\slider.h" />
 		<Unit filename="src\gui\widgets\tab.cpp" />
 		<Unit filename="src\gui\widgets\tab.h" />
 		<Unit filename="src\gui\widgets\tabbedarea.cpp" />
 		<Unit filename="src\gui\widgets\tabbedarea.h" />
+		<Unit filename="src\gui\widgets\table.cpp" />
+		<Unit filename="src\gui\widgets\table.h" />
+		<Unit filename="src\gui\widgets\tablemodel.cpp" />
+		<Unit filename="src\gui\widgets\tablemodel.h" />
 		<Unit filename="src\gui\widgets\textbox.cpp" />
 		<Unit filename="src\gui\widgets\textbox.h" />
 		<Unit filename="src\gui\widgets\textfield.cpp" />
@@ -884,6 +883,7 @@
 		<Unit filename="src\textmanager.h" />
 		<Unit filename="src\textparticle.cpp" />
 		<Unit filename="src\textparticle.h" />
+		<Unit filename="src\textrenderer.h" />
 		<Unit filename="src\tileset.h" />
 		<Unit filename="src\units.cpp" />
 		<Unit filename="src\units.h" />