Merge branch 'reorganisation' of github.com:FacialTurd/The-Powder-Toy

SConscript

@@ -258,6 +258,7 @@ if(GetOption('macosx')):
 if(GetOption('win')):
 	sources += env.RES('resources/powder-res.rc')
 sources+=Glob("src/*/*.cpp")
+sources+=Glob("src/gui/*/*.cpp")
 sources+=Glob("src/simulation/elements/*.cpp")
 sources+=Glob("src/simulation/tools/*.cpp")
 sources+=Glob("src/client/requestbroker/*.cpp")

src/Activity.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "interface/Window.h"
+#include "gui/interface/Window.h"
 
 class Activity
 {

src/PowderToyRenderer.cpp

@@ -9,7 +9,7 @@
 
 #include "Config.h"
 #include "Format.h"
-#include "interface/Engine.h"
+#include "gui/interface/Engine.h"
 #include "graphics/Graphics.h"
 #include "graphics/Renderer.h"
 

src/PowderToySDL.cpp

@@ -25,13 +25,6 @@
 #endif
 
 #include "Format.h"
-#include "Style.h"
-#include "interface/Engine.h"
-#include "interface/Button.h"
-#include "interface/Panel.h"
-#include "interface/Point.h"
-#include "interface/Label.h"
-#include "interface/Keys.h"
 
 #include "client/GameSave.h"
 #include "client/SaveFile.h"
@@ -39,10 +32,12 @@
 #include "client/Client.h"
 #include "Misc.h"
 
-#include "game/GameController.h"
-#include "game/GameView.h"
+#include "gui/game/GameController.h"
+#include "gui/game/GameView.h"
 
-#include "dialogues/ErrorMessage.h"
+#include "gui/dialogues/ErrorMessage.h"
+#include "gui/interface/Keys.h"
+#include "gui/Style.h"
 
 #include "client/HTTP.h"
 

src/cat/CommandInterface.cpp

@@ -5,8 +5,8 @@
 #include <strings.h>
 #endif
 #include "CommandInterface.h"
-#include "game/GameModel.h"
-#include "game/GameController.h"
+#include "gui/game/GameModel.h"
+#include "gui/game/GameController.h"
 
 CommandInterface::CommandInterface(GameController * c, GameModel * m) {
 	this->m = m;

src/cat/CommandInterface.h

@@ -2,7 +2,7 @@
 #define COMMANDINTERFACE_H_
 
 #include <string>
-#include "interface/Engine.h"
+#include "gui/interface/Engine.h"
 //#include "game/GameModel.h"
 
 class GameModel;

src/cat/LegacyLuaAPI.cpp

@@ -9,12 +9,12 @@
 #include "LuaScriptInterface.h"
 #include "LuaScriptHelper.h"
 
-#include "dialogues/ErrorMessage.h"
-#include "dialogues/InformationMessage.h"
-#include "dialogues/TextPrompt.h"
-#include "dialogues/ConfirmPrompt.h"
+#include "gui/dialogues/ErrorMessage.h"
+#include "gui/dialogues/InformationMessage.h"
+#include "gui/dialogues/TextPrompt.h"
+#include "gui/dialogues/ConfirmPrompt.h"
+#include "gui/game/GameModel.h"
 #include "simulation/Simulation.h"
-#include "game/GameModel.h"
 
 #include <time.h>
 

src/cat/LuaButton.cpp

@@ -8,7 +8,7 @@ extern "C"
 #include <iostream>
 #include "LuaButton.h"
 #include "LuaScriptInterface.h"
-#include "interface/Button.h"
+#include "gui/interface/Button.h"
 
 const char LuaButton::className[] = "Button";
 

src/cat/LuaCheckbox.cpp

@@ -8,7 +8,7 @@ extern "C"
 #include <iostream>
 #include "LuaCheckbox.h"
 #include "LuaScriptInterface.h"
-#include "interface/Checkbox.h"
+#include "gui/interface/Checkbox.h"
 
 const char LuaCheckbox::className[] = "Checkbox";
 

src/cat/LuaComponent.cpp

@@ -8,7 +8,7 @@ extern "C"
 #include <iostream>
 #include "LuaComponent.h"
 #include "LuaScriptInterface.h"
-#include "interface/Component.h"
+#include "gui/interface/Component.h"
 
 
 LuaComponent::LuaComponent(lua_State * l)

src/cat/LuaLabel.cpp

@@ -8,7 +8,7 @@ extern "C"
 #include <iostream>
 #include "LuaScriptInterface.h"
 #include "LuaLabel.h"
-#include "interface/Label.h"
+#include "gui/interface/Label.h"
 
 const char LuaLabel::className[] = "Label";
 

src/cat/LuaProgressBar.cpp

@@ -8,7 +8,7 @@ extern "C"
 #include <iostream>
 #include "LuaProgressBar.h"
 #include "LuaScriptInterface.h"
-#include "interface/ProgressBar.h"
+#include "gui/interface/ProgressBar.h"
 
 const char LuaProgressBar::className[] = "ProgressBar";
 

src/cat/LuaScriptInterface.cpp

@@ -9,13 +9,13 @@
 #include "LuaLuna.h"
 #include "LuaScriptInterface.h"
 #include "TPTScriptInterface.h"
-#include "dialogues/ErrorMessage.h"
-#include "dialogues/InformationMessage.h"
-#include "dialogues/TextPrompt.h"
-#include "dialogues/ConfirmPrompt.h" 
+#include "gui/dialogues/ErrorMessage.h"
+#include "gui/dialogues/InformationMessage.h"
+#include "gui/dialogues/TextPrompt.h"
+#include "gui/dialogues/ConfirmPrompt.h" 
 #include "simulation/Simulation.h"
-#include "game/GameModel.h"
-#include "game/Tool.h"
+#include "gui/game/GameModel.h"
+#include "gui/game/Tool.h"
 #include "LuaScriptHelper.h"
 #include "client/HTTP.h"
 #include "PowderToy.h"

src/cat/LuaSlider.cpp

@@ -8,7 +8,7 @@ extern "C"
 #include <iostream>
 #include "LuaSlider.h"
 #include "LuaScriptInterface.h"
-#include "interface/Slider.h"
+#include "gui/interface/Slider.h"
 
 const char LuaSlider::className[] = "Slider";
 

src/cat/LuaTextbox.cpp

@@ -8,7 +8,7 @@ extern "C"
 #include <iostream>
 #include "LuaScriptInterface.h"
 #include "LuaTextbox.h"
-#include "interface/Textbox.h"
+#include "gui/interface/Textbox.h"
 
 const char LuaTextbox::className[] = "Textbox";
 

src/cat/LuaWindow.cpp

@@ -14,9 +14,9 @@ extern "C"
 #include "LuaCheckbox.h"
 #include "LuaSlider.h"
 #include "LuaProgressBar.h"
-#include "interface/Button.h"
-#include "interface/Label.h"
-#include "interface/Window.h"
+#include "gui/interface/Button.h"
+#include "gui/interface/Label.h"
+#include "gui/interface/Window.h"
 
 const char LuaWindow::className[] = "Window";
 

src/cat/LuaWindow.h

@@ -8,7 +8,7 @@ extern "C" {
 
 #include "LuaLuna.h"
 
-#include "interface/Platform.h"
+#include "gui/interface/Platform.h"
 namespace ui
 {
 	class Window;

src/cat/TPTSTypes.h

@@ -3,7 +3,7 @@
 
 #include <string>
 #include <typeinfo>
-#include "interface/Point.h"
+#include "gui/interface/Point.h"
 
 enum ValueType { TypeNumber, TypePoint, TypeString, TypeNull, TypeFunction };
 

src/cat/TPTScriptInterface.cpp

@@ -5,7 +5,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include "TPTScriptInterface.h"
-#include "game/GameModel.h"
+#include "gui/game/GameModel.h"
 #include "simulation/Air.h"
 
 TPTScriptInterface::TPTScriptInterface(GameController * c, GameModel * m): CommandInterface(c, m)

src/client/Client.cpp

@@ -36,13 +36,13 @@
 #include "HTTP.h"
 
 #include "simulation/SaveRenderer.h"
-#include "interface/Point.h"
+#include "gui/interface/Point.h"
 #include "client/SaveInfo.h"
 #include "client/SaveFile.h"
 #include "client/GameSave.h"
 #include "client/UserInfo.h"
-#include "search/Thumbnail.h"
-#include "preview/Comment.h"
+#include "gui/search/Thumbnail.h"
+#include "gui/preview/Comment.h"
 #include "ClientListener.h"
 #include "requestbroker/RequestBroker.h"
 #include "requestbroker/APIRequest.h"

src/client/SaveFile.cpp

@@ -1,7 +1,7 @@
 #include "SaveFile.h"
 #include "GameSave.h"
 #include "Client.h"
-#include "search/Thumbnail.h"
+#include "gui/search/Thumbnail.h"
 
 SaveFile::SaveFile(SaveFile & save):
 	gameSave(NULL),

src/client/requestbroker/ThumbRenderRequest.cpp

@@ -3,7 +3,6 @@
 #include "ThumbRenderRequest.h"
 #include "client/GameSave.h"
 #include "graphics/Graphics.h"
-#include "search/Thumbnail.h"
 #include "simulation/SaveRenderer.h"
 
 ThumbRenderRequest::ThumbRenderRequest(GameSave * save, bool decorations, bool fire, int width, int height, ListenerHandle listener):

src/debug/DebugInfo.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "interface/Point.h"
+#include "gui/interface/Point.h"
 
 class DebugInfo
 {

src/debug/ElementPopulation.cpp

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "ElementPopulation.h"
-#include "interface/Engine.h"
+#include "gui/interface/Engine.h"
 #include "simulation/Simulation.h"
 #include "Format.h"
 

src/graphics/Renderer.h

@@ -9,8 +9,8 @@
 #include "Config.h"
 #include "client/Client.h"
 #include "Graphics.h"
-#include "interface/Point.h"
-#include "game/RenderPreset.h"
+#include "gui/interface/Point.h"
+#include "gui/game/RenderPreset.h"
 
 class Simulation;
 

src/gui/Style.cpp

@@ -1,7 +1,7 @@
 #include <iostream>
 
-#include "Style.h"
-#include "interface/Colour.h"
+#include "gui/Style.h"
+#include "gui/interface/Colour.h"
 
 namespace style {
 	ui::Colour Colour::InformationTitle = ui::Colour(140, 140, 255);

src/gui/colourpicker/ColourPickerActivity.cpp

@@ -1,13 +1,13 @@
 #include <algorithm>
 #include <iomanip>
 #include "ColourPickerActivity.h"
-#include "interface/Textbox.h"
-#include "interface/Label.h"
-#include "interface/Keys.h"
-#include "game/Tool.h"
-#include "Style.h"
+#include "gui/interface/Textbox.h"
+#include "gui/interface/Label.h"
+#include "gui/interface/Keys.h"
+#include "gui/game/Tool.h"
+#include "gui/Style.h"
 #include "Format.h"
-#include "game/GameModel.h"
+#include "gui/game/GameModel.h"
 
 ColourPickerActivity::ColourPickerActivity(ui::Colour initialColour, ColourPickedCallback * callback) :
 	WindowActivity(ui::Point(-1, -1), ui::Point(266, 175)),

src/gui/colourpicker/ColourPickerActivity.h

@@ -3,8 +3,8 @@
 #include <vector>
 #include <string>
 #include "Activity.h"
-#include "interface/Window.h"
-#include "interface/Textbox.h"
+#include "gui/interface/Window.h"
+#include "gui/interface/Textbox.h"
 
 class ColourPickedCallback
 {

src/gui/console/ConsoleView.cpp

@@ -1,5 +1,5 @@
 #include "ConsoleView.h"
-#include "interface/Keys.h"
+#include "gui/interface/Keys.h"
 
 ConsoleView::ConsoleView():
 	ui::Window(ui::Point(0, 0), ui::Point(XRES+BARSIZE, 150)),

src/gui/console/ConsoleView.h

@@ -3,11 +3,11 @@
 
 #include <vector>
 #include <queue>
-#include "interface/Label.h"
-#include "interface/Window.h"
+#include "gui/interface/Label.h"
+#include "gui/interface/Window.h"
 #include "ConsoleController.h"
 #include "ConsoleModel.h"
-#include "interface/Textbox.h"
+#include "gui/interface/Textbox.h"
 #include "ConsoleCommand.h"
 
 

src/gui/dialogues/ConfirmPrompt.cpp

@@ -1,7 +1,7 @@
 #include "ConfirmPrompt.h"
-#include "Style.h"
-#include "interface/Label.h"
-#include "interface/Button.h"
+#include "gui/Style.h"
+#include "gui/interface/Label.h"
+#include "gui/interface/Button.h"
 #include "PowderToy.h"
 
 ConfirmPrompt::ConfirmPrompt(std::string title, std::string message, ConfirmDialogueCallback * callback_):

src/gui/dialogues/ConfirmPrompt.h

@@ -1,7 +1,7 @@
 #ifndef CONFIRMPROMPT_H_
 #define CONFIRMPROMPT_H_
 
-#include "interface/Window.h"
+#include "gui/interface/Window.h"
 
 class ConfirmDialogueCallback;
 class ConfirmPrompt: public ui::Window {

src/gui/dialogues/ErrorMessage.cpp

@@ -1,7 +1,7 @@
-#include "Style.h"
+#include "gui/Style.h"
 #include "ErrorMessage.h"
-#include "interface/Button.h"
-#include "interface/Label.h"
+#include "gui/interface/Button.h"
+#include "gui/interface/Label.h"
 #include "PowderToy.h"
 
 ErrorMessage::ErrorMessage(std::string title, std::string message,  ErrorMessageCallback * callback_):

src/gui/dialogues/ErrorMessage.h

@@ -1,7 +1,7 @@
 #ifndef ERRORMESSAGE_H_
 #define ERRORMESSAGE_H_
 
-#include "interface/Window.h"
+#include "gui/interface/Window.h"
 
 class ErrorMessageCallback;
 class ErrorMessage: public ui::Window {

src/gui/dialogues/InformationMessage.cpp

@@ -1,8 +1,8 @@
-#include "Style.h"
+#include "gui/Style.h"
 #include "InformationMessage.h"
-#include "interface/Button.h"
-#include "interface/Label.h"
-#include "interface/ScrollPanel.h"
+#include "gui/interface/Button.h"
+#include "gui/interface/Label.h"
+#include "gui/interface/ScrollPanel.h"
 
 InformationMessage::InformationMessage(std::string title, std::string message, bool large):
 	ui::Window(ui::Point(-1, -1), ui::Point(200, 75))

src/gui/dialogues/InformationMessage.h

@@ -1,7 +1,7 @@
 #ifndef INFORMATIONMESSAGE_H_
 #define INFORMATIONMESSAGE_H_
 
-#include "interface/Window.h"
+#include "gui/interface/Window.h"
 
 class InformationMessage: public ui::Window {
 public:

src/gui/dialogues/TextPrompt.cpp

@@ -1,8 +1,8 @@
 #include <iostream>
 #include "TextPrompt.h"
-#include "interface/Label.h"
-#include "interface/Button.h"
-#include "Style.h"
+#include "gui/interface/Label.h"
+#include "gui/interface/Button.h"
+#include "gui/Style.h"
 #include "PowderToy.h"
 
 class CloseAction: public ui::ButtonAction

src/gui/dialogues/TextPrompt.h

@@ -1,8 +1,8 @@
 #ifndef TEXTPROMPT_H_
 #define TEXTPROMPT_H_
 
-#include "interface/Window.h"
-#include "interface/Textbox.h"
+#include "gui/interface/Window.h"
+#include "gui/interface/Textbox.h"
 
 class TextDialogueCallback;
 class TextPrompt: public ui::Window {

src/gui/elementsearch/ElementSearchActivity.cpp

@@ -1,11 +1,11 @@
 #include <algorithm>
 #include "ElementSearchActivity.h"
-#include "interface/Textbox.h"
-#include "interface/Label.h"
-#include "interface/Keys.h"
-#include "game/Tool.h"
-#include "Style.h"
-#include "game/GameModel.h"
+#include "gui/interface/Textbox.h"
+#include "gui/interface/Label.h"
+#include "gui/interface/Keys.h"
+#include "gui/game/Tool.h"
+#include "gui/Style.h"
+#include "gui/game/GameModel.h"
 
 class ElementSearchActivity::ToolAction: public ui::ButtonAction
 {

src/gui/elementsearch/ElementSearchActivity.h

@@ -4,9 +4,9 @@
 #include <vector>
 #include <string>
 #include "Activity.h"
-#include "interface/Window.h"
-#include "interface/Textbox.h"
-#include "game/ToolButton.h"
+#include "gui/interface/Window.h"
+#include "gui/interface/Textbox.h"
+#include "gui/game/ToolButton.h"
 
 class Tool;
 

src/gui/filebrowser/FileBrowserActivity.cpp

@@ -1,20 +1,20 @@
 #include <sstream>
 #include <iostream>
 #include "FileBrowserActivity.h"
-#include "interface/Label.h"
-#include "interface/Textbox.h"
-#include "interface/ScrollPanel.h"
-#include "interface/SaveButton.h"
-#include "interface/ProgressBar.h"
+#include "gui/interface/Label.h"
+#include "gui/interface/Textbox.h"
+#include "gui/interface/ScrollPanel.h"
+#include "gui/interface/SaveButton.h"
+#include "gui/interface/ProgressBar.h"
 #include "client/Client.h"
 #include "client/SaveFile.h"
 #include "client/GameSave.h"
-#include "Style.h"
+#include "gui/Style.h"
 #include "tasks/Task.h"
 #include "simulation/SaveRenderer.h"
-#include "dialogues/TextPrompt.h"
-#include "dialogues/ConfirmPrompt.h"
-#include "dialogues/ErrorMessage.h"
+#include "gui/dialogues/TextPrompt.h"
+#include "gui/dialogues/ConfirmPrompt.h"
+#include "gui/dialogues/ErrorMessage.h"
 
 class Thumbnail;
 

src/gui/filebrowser/FileBrowserActivity.h

@@ -3,7 +3,7 @@
 #include <vector>
 #include <string>
 #include "Activity.h"
-#include "interface/Window.h"
+#include "gui/interface/Window.h"
 #include "tasks/TaskListener.h"
 
 

src/gui/game/Brush.h

@@ -2,7 +2,7 @@
 #define BRUSH_H_
 
 #include <iostream>
-#include "interface/Point.h"
+#include "gui/interface/Point.h"
 
 class Renderer;
 class Brush

src/gui/game/GameController.cpp

@@ -7,24 +7,24 @@
 #include "GameModel.h"
 #include "client/SaveInfo.h"
 #include "client/GameSave.h"
-#include "search/SearchController.h"
-#include "render/RenderController.h"
-#include "login/LoginController.h"
-#include "interface/Point.h"
-#include "dialogues/ErrorMessage.h"
-#include "dialogues/InformationMessage.h"
-#include "dialogues/ConfirmPrompt.h"
+#include "gui/search/SearchController.h"
+#include "gui/render/RenderController.h"
+#include "gui/login/LoginController.h"
+#include "gui/interface/Point.h"
+#include "gui/dialogues/ErrorMessage.h"
+#include "gui/dialogues/InformationMessage.h"
+#include "gui/dialogues/ConfirmPrompt.h"
 #include "GameModelException.h"
 #include "simulation/Air.h"
-#include "elementsearch/ElementSearchActivity.h"
-#include "profile/ProfileActivity.h"
-#include "colourpicker/ColourPickerActivity.h"
-#include "update/UpdateActivity.h"
+#include "gui/elementsearch/ElementSearchActivity.h"
+#include "gui/profile/ProfileActivity.h"
+#include "gui/colourpicker/ColourPickerActivity.h"
+#include "gui/update/UpdateActivity.h"
 #include "Notification.h"
-#include "filebrowser/FileBrowserActivity.h"
-#include "save/LocalSaveActivity.h"
-#include "save/ServerSaveActivity.h"
-#include "interface/Keys.h"
+#include "gui/filebrowser/FileBrowserActivity.h"
+#include "gui/save/LocalSaveActivity.h"
+#include "gui/save/ServerSaveActivity.h"
+#include "gui/interface/Keys.h"
 #include "simulation/Snapshot.h"
 #include "debug/DebugInfo.h"
 //#include "debug/ElementPopulation.h"

src/gui/game/GameController.h

@@ -4,18 +4,18 @@
 #include <queue>
 #include "GameView.h"
 #include "GameModel.h"
-#include "interface/Point.h"
 #include "simulation/Simulation.h"
-#include "search/SearchController.h"
-#include "render/RenderController.h"
-#include "preview/PreviewController.h"
-#include "login/LoginController.h"
-#include "tags/TagsController.h"
-#include "console/ConsoleController.h"
-#include "localbrowser/LocalBrowserController.h"
+#include "gui/interface/Point.h"
+#include "gui/search/SearchController.h"
+#include "gui/render/RenderController.h"
+#include "gui/preview/PreviewController.h"
+#include "gui/login/LoginController.h"
+#include "gui/tags/TagsController.h"
+#include "gui/console/ConsoleController.h"
+#include "gui/localbrowser/LocalBrowserController.h"
+#include "gui/options/OptionsController.h"
 //#include "cat/TPTScriptInterface.h"
 #include "cat/LuaScriptInterface.h"
-#include "options/OptionsController.h"
 #include "client/ClientListener.h"
 #include "RenderPreset.h"
 #include "Menu.h"

src/gui/game/GameModel.cpp

@@ -1,18 +1,18 @@
-#include "interface/Engine.h"
+#include "gui/interface/Engine.h"
 #include "GameModel.h"
 #include "GameView.h"
 #include "simulation/Simulation.h"
 #include "simulation/Air.h"
 #include "simulation/Tools.h"
 #include "graphics/Renderer.h"
-#include "interface/Point.h"
+#include "gui/interface/Point.h"
 #include "Brush.h"
 #include "EllipseBrush.h"
 #include "TriangleBrush.h"
 #include "BitmapBrush.h"
 #include "client/Client.h"
 #include "client/GameSave.h"
-#include "game/DecorationTool.h"
+#include "gui/game/DecorationTool.h"
 #include "GameModelException.h"
 #include "QuickOptions.h"
 #include "Format.h"

src/gui/game/GameModel.h

@@ -5,7 +5,7 @@
 #include <deque>
 #include "client/SaveInfo.h"
 #include "simulation/Simulation.h"
-#include "interface/Colour.h"
+#include "gui/interface/Colour.h"
 #include "graphics/Renderer.h"
 #include "GameView.h"
 #include "GameController.h"

src/gui/game/GameView.cpp

@@ -2,18 +2,18 @@
 #include <iomanip>
 
 #include "Config.h"
-#include "Style.h"
+#include "gui/Style.h"
 #include "GameView.h"
 #include "graphics/Graphics.h"
-#include "interface/Window.h"
-#include "interface/Button.h"
-#include "interface/Colour.h"
-#include "interface/Keys.h"
-#include "interface/Slider.h"
-#include "search/Thumbnail.h"
+#include "gui/interface/Window.h"
+#include "gui/interface/Button.h"
+#include "gui/interface/Colour.h"
+#include "gui/interface/Keys.h"
+#include "gui/interface/Slider.h"
+#include "gui/search/Thumbnail.h"
 #include "simulation/SaveRenderer.h"
 #include "simulation/SimulationData.h"
-#include "dialogues/ConfirmPrompt.h"
+#include "gui/dialogues/ConfirmPrompt.h"
 #include "Format.h"
 #include "QuickOption.h"
 #include "IntroText.h"

src/gui/game/GameView.h

@@ -7,11 +7,11 @@
 #include <string>
 #include "GameController.h"
 #include "GameModel.h"
-#include "interface/Window.h"
-#include "interface/Point.h"
-#include "interface/Button.h"
-#include "interface/Slider.h"
-#include "interface/Textbox.h"
+#include "gui/interface/Window.h"
+#include "gui/interface/Point.h"
+#include "gui/interface/Button.h"
+#include "gui/interface/Slider.h"
+#include "gui/interface/Textbox.h"
 #include "ToolButton.h"
 #include "Brush.h"
 #include "simulation/Sample.h"

src/gui/game/PropertyTool.cpp

@@ -1,15 +1,15 @@
 #include <iostream>
 #include <sstream>
-#include "Style.h"
+#include "gui/Style.h"
 #include "simulation/Simulation.h"
 #include "Tool.h"
-#include "interface/Window.h"
-#include "interface/Button.h"
-#include "interface/Label.h"
-#include "interface/Textbox.h"
-#include "interface/DropDown.h"
-#include "interface/Keys.h"
-#include "dialogues/ErrorMessage.h"
+#include "gui/interface/Window.h"
+#include "gui/interface/Button.h"
+#include "gui/interface/Label.h"
+#include "gui/interface/Textbox.h"
+#include "gui/interface/DropDown.h"
+#include "gui/interface/Keys.h"
+#include "gui/dialogues/ErrorMessage.h"
 
 class PropertyWindow: public ui::Window
 {

src/gui/game/SampleTool.cpp

@@ -2,7 +2,7 @@
 #include "graphics/Graphics.h"
 #include "Tool.h"
 #include "GameModel.h"
-#include "interface/Colour.h"
+#include "gui/interface/Colour.h"
 
 VideoBuffer * SampleTool::GetIcon(int toolID, int width, int height)
 {

src/gui/game/SignTool.cpp

@@ -1,12 +1,12 @@
 #include <iostream>
-#include "Style.h"
+#include "gui/Style.h"
 #include "simulation/Simulation.h"
 #include "Tool.h"
-#include "interface/Window.h"
-#include "interface/Button.h"
-#include "interface/Label.h"
-#include "interface/Textbox.h"
-#include "interface/DropDown.h"
+#include "gui/interface/Window.h"
+#include "gui/interface/Button.h"
+#include "gui/interface/Label.h"
+#include "gui/interface/Textbox.h"
+#include "gui/interface/DropDown.h"
 
 class SignWindow: public ui::Window
 {

src/gui/game/Tool.cpp

@@ -1,6 +1,6 @@
 #include <string>
 #include "Tool.h"
-#include "game/Brush.h"
+#include "gui/game/Brush.h"
 
 #include "simulation/Simulation.h"
 

src/gui/game/Tool.h

@@ -5,7 +5,7 @@
 
 using namespace std;
 
-#include "interface/Point.h"
+#include "gui/interface/Point.h"
 
 class Simulation;
 class Brush;

src/gui/game/ToolButton.cpp

@@ -1,5 +1,5 @@
 #include "ToolButton.h"
-#include "interface/Keys.h"
+#include "gui/interface/Keys.h"
 
 ToolButton::ToolButton(ui::Point position, ui::Point size, std::string text_, std::string toolTip):
 	ui::Button(position, size, text_, toolTip)

src/gui/game/ToolButton.h

@@ -1,7 +1,7 @@
 #ifndef TOOLBUTTON_H_
 #define TOOLBUTTON_H_
 
-#include "interface/Button.h"
+#include "gui/interface/Button.h"
 
 class ToolButton: public ui::Button {
 	int currentSelection;

src/gui/interface/AvatarButton.h

@@ -5,7 +5,7 @@
 
 #include "Component.h"
 #include "graphics/Graphics.h"
-#include "interface/Colour.h"
+#include "gui/interface/Colour.h"
 #include "client/requestbroker/RequestListener.h"
 
 namespace ui

src/gui/interface/Button.cpp

@@ -1,5 +1,5 @@
 #include <iostream>
-#include "interface/Button.h"
+#include "gui/interface/Button.h"
 #include "graphics/Graphics.h"
 #include "Engine.h"
 #include "Misc.h"

src/gui/interface/Component.cpp

@@ -1,11 +1,11 @@
 //#include "Platform.h"
 #include <iostream>
-#include "interface/Component.h"
-#include "interface/Engine.h"
-#include "interface/Point.h"
-#include "interface/Window.h"
-#include "interface/Panel.h"
-#include "interface/ContextMenu.h"
+#include "gui/interface/Component.h"
+#include "gui/interface/Engine.h"
+#include "gui/interface/Point.h"
+#include "gui/interface/Window.h"
+#include "gui/interface/Panel.h"
+#include "gui/interface/ContextMenu.h"
 
 using namespace ui;
 

src/gui/interface/DropDown.cpp

@@ -1,5 +1,5 @@
 #include <iostream>
-#include "Style.h"
+#include "gui/Style.h"
 #include "Button.h"
 #include "DropDown.h"
 

src/gui/interface/Engine.cpp

@@ -4,9 +4,9 @@
 #include <time.h>
 
 #include "Config.h"
-#include "interface/Window.h"
-#include "interface/Platform.h"
-#include "interface/Engine.h"
+#include "gui/interface/Window.h"
+#include "gui/interface/Platform.h"
+#include "gui/interface/Engine.h"
 #include "graphics/Graphics.h"
 
 using namespace ui;

src/gui/interface/Panel.cpp

@@ -2,11 +2,11 @@
 #include <vector>
 //#include "Platform.h"
 
-#include "interface/Panel.h"
+#include "gui/interface/Panel.h"
 
-#include "interface/Point.h"
-#include "interface/Window.h"
-#include "interface/Component.h"
+#include "gui/interface/Point.h"
+#include "gui/interface/Window.h"
+#include "gui/interface/Component.h"
 #include "graphics/Graphics.h"
 
 using namespace ui;

src/gui/interface/Panel.h

@@ -2,9 +2,9 @@
 #include <vector>
 //#include "Platform.h"
 
-#include "interface/Point.h"
-#include "interface/Window.h"
-#include "interface/Component.h"
+#include "gui/interface/Point.h"
+#include "gui/interface/Window.h"
+#include "gui/interface/Component.h"
 
 #ifdef OGLI
 #include "graphics/OpenGLHeaders.h"