Move settings to separate subfolder

client/CMakeLists.txt

@@ -91,10 +91,10 @@ set(client_SRCS
 	windows/GUIClasses.cpp
 	windows/InfoWindows.cpp
 	windows/QuickRecruitmentWindow.cpp
-	windows/SystemOptionsWindow.cpp
+	windows/settings/SystemOptionsWindow.cpp
-	windows/VcmiSettingsWindow.cpp
+	windows/settings/VcmiSettingsWindow.cpp
-	windows/SettingsMainContainer.cpp
+	windows/settings/SettingsMainContainer.cpp
-	windows/BattleOptionsWindow.cpp
+	windows/settings/BattleOptionsWindow.cpp
 
 	CGameInfo.cpp
 	CMT.cpp
@@ -207,10 +207,10 @@ set(client_HEADERS
 	windows/GUIClasses.h
 	windows/InfoWindows.h
 	windows/QuickRecruitmentWindow.h
-	windows/SystemOptionsWindow.h
+	windows/settings/SystemOptionsWindow.h
-	windows/VcmiSettingsWindow.h
+	windows/settings/VcmiSettingsWindow.h
-	windows/SettingsMainContainer.h
+	windows/settings/SettingsMainContainer.h
-	windows/BattleOptionsWindow.h
+	windows/settings/BattleOptionsWindow.h
 
 	CGameInfo.h
 	CMT.h

client/adventureMap/CAdvMapInt.cpp

@@ -30,7 +30,7 @@
 #include "../gui/CGuiHandler.h"
 #include "../widgets/TextControls.h"
 #include "../widgets/Buttons.h"
-#include "../windows/SettingsMainContainer.h"
+#include "../windows/settings/SettingsMainContainer.h"
 #include "../CMT.h"
 
 #include "../../CCallback.h"

client/battle/BattleWindow.cpp

@@ -35,8 +35,7 @@
 #include "../../lib/CStack.h"
 #include "../../lib/CConfigHandler.h"
 #include "../../lib/filesystem/ResourceID.h"
-#include "windows/BattleOptionsWindow.h"
+#include "../windows/settings/SettingsMainContainer.h"
-#include "windows/SettingsMainContainer.h"
 
 BattleWindow::BattleWindow(BattleInterface & owner):
 	owner(owner)

client/windows/settings/BattleOptionsWindow.cpp

@@ -11,13 +11,12 @@
 
 #include "BattleOptionsWindow.h"
 #include "CConfigHandler.h"
-#include "gui/CGuiHandler.h"
+#include "../../gui/CGuiHandler.h"
 
-#include "../../lib/filesystem/ResourceID.h"
+#include "../../../lib/filesystem/ResourceID.h"
-#include "../../lib/CGeneralTextHandler.h"
+#include "../../../lib/CGeneralTextHandler.h"
-#include "../widgets/Buttons.h"
+#include "../../widgets/Buttons.h"
-#include "../widgets/TextControls.h"
+#include "../../widgets/TextControls.h"
-#include "CGameInfo.h"
 
 BattleOptionsWindow::BattleOptionsWindow(BattleInterface * owner):
 		InterfaceObjectConfigurable()

client/windows/settings/BattleOptionsWindow.h

@@ -9,8 +9,8 @@
  */
 #pragma once
 
-#include "gui/InterfaceObjectConfigurable.h"
+#include "../../gui/InterfaceObjectConfigurable.h"
-#include "battle/BattleInterface.h"
+#include "../../battle/BattleInterface.h"
 
 class BattleOptionsWindow : public InterfaceObjectConfigurable
 {

client/windows/settings/SettingsMainContainer.cpp

@@ -17,14 +17,14 @@
 #include "VcmiSettingsWindow.h"
 #include "BattleOptionsWindow.h"
 
-#include "../../lib/filesystem/ResourceID.h"
+#include "filesystem/ResourceID.h"
-#include "../../lib/CGeneralTextHandler.h"
+#include "CGeneralTextHandler.h"
-#include "../gui/CGuiHandler.h"
+#include "gui/CGuiHandler.h"
-#include "../lobby/CSavingScreen.h"
+#include "lobby/CSavingScreen.h"
-#include "../widgets/Images.h"
+#include "widgets/Images.h"
-#include "../CGameInfo.h"
+#include "CGameInfo.h"
-#include "../CPlayerInterface.h"
+#include "CPlayerInterface.h"
-#include "../CServerHandler.h"
+#include "CServerHandler.h"
 
 
 SettingsMainContainer::SettingsMainContainer(BattleInterface * parentBattleUi) : InterfaceObjectConfigurable()

client/windows/settings/SettingsMainContainer.h

@@ -10,8 +10,8 @@
 
 #pragma once
 
-#include "../widgets/ObjectLists.h"
+#include "widgets/ObjectLists.h"
-#include "../widgets/Buttons.h"
+#include "widgets/Buttons.h"
 #include "gui/InterfaceObjectConfigurable.h"
 #include "gui/CGuiHandler.h"
 #include "battle/BattleInterface.h"

client/windows/settings/SystemOptionsWindow.cpp

@@ -13,19 +13,17 @@
 
 #include <SDL_surface.h>
 #include <SDL_rect.h>
-#include <SDL_video.h>
 
-#include "../lib/CGeneralTextHandler.h"
+#include "../../../lib/CGeneralTextHandler.h"
-#include "../lib/filesystem/ResourceID.h"
+#include "../../../lib/filesystem/ResourceID.h"
-#include "../gui/CGuiHandler.h"
+#include "../../gui/CGuiHandler.h"
-#include "../widgets/Buttons.h"
+#include "../../widgets/Buttons.h"
-#include "../widgets/TextControls.h"
+#include "../../widgets/TextControls.h"
-#include "../widgets/Images.h"
+#include "../../widgets/Images.h"
-#include "../CGameInfo.h"
+#include "CGameInfo.h"
-#include "../CMusicHandler.h"
+#include "CMusicHandler.h"
-#include "../CPlayerInterface.h"
+#include "CPlayerInterface.h"
-#include "VcmiSettingsWindow.h"
+#include "windows/GUIClasses.h"
-#include "GUIClasses.h"
 #include "CServerHandler.h"
 #include "renderSDL/SDL_Extensions.h"
 #include "CMT.h"

client/windows/settings/SystemOptionsWindow.h

@@ -9,8 +9,8 @@
  */
 #pragma once
 
-#include "../lib/CConfigHandler.h"
+#include "../../../lib/CConfigHandler.h"
-#include "gui/InterfaceObjectConfigurable.h"
+#include "../../gui/InterfaceObjectConfigurable.h"
 
 class SystemOptionsWindow : public InterfaceObjectConfigurable
 {

client/windows/settings/VcmiSettingsWindow.cpp

@@ -11,8 +11,8 @@
 
 #include "VcmiSettingsWindow.h"
 
-#include "../../lib/filesystem/ResourceID.h"
+#include "../../../lib/filesystem/ResourceID.h"
-#include "gui/CGuiHandler.h"
+#include "../../gui/CGuiHandler.h"
 
 VcmiSettingsWindow::VcmiSettingsWindow() : InterfaceObjectConfigurable()
 {

client/windows/settings/VcmiSettingsWindow.h

@@ -9,7 +9,7 @@
  */
 #pragma once
 
-#include "gui/InterfaceObjectConfigurable.h"
+#include "../../gui/InterfaceObjectConfigurable.h"
 
 class VcmiSettingsWindow : public InterfaceObjectConfigurable
 {