1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-24 22:14:36 +02:00

Move settings to separate subfolder

This commit is contained in:
Dydzio 2023-02-12 17:29:23 +01:00
parent 34227a0dab
commit 7430616ada
11 changed files with 42 additions and 46 deletions

View File

@ -91,10 +91,10 @@ set(client_SRCS
windows/GUIClasses.cpp
windows/InfoWindows.cpp
windows/QuickRecruitmentWindow.cpp
windows/SystemOptionsWindow.cpp
windows/VcmiSettingsWindow.cpp
windows/SettingsMainContainer.cpp
windows/BattleOptionsWindow.cpp
windows/settings/SystemOptionsWindow.cpp
windows/settings/VcmiSettingsWindow.cpp
windows/settings/SettingsMainContainer.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/VcmiSettingsWindow.h
windows/SettingsMainContainer.h
windows/BattleOptionsWindow.h
windows/settings/SystemOptionsWindow.h
windows/settings/VcmiSettingsWindow.h
windows/settings/SettingsMainContainer.h
windows/settings/BattleOptionsWindow.h
CGameInfo.h
CMT.h

View File

@ -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"

View File

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

View File

@ -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/CGeneralTextHandler.h"
#include "../widgets/Buttons.h"
#include "../widgets/TextControls.h"
#include "CGameInfo.h"
#include "../../../lib/filesystem/ResourceID.h"
#include "../../../lib/CGeneralTextHandler.h"
#include "../../widgets/Buttons.h"
#include "../../widgets/TextControls.h"
BattleOptionsWindow::BattleOptionsWindow(BattleInterface * owner):
InterfaceObjectConfigurable()

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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