From dc85aa21388b122723b4d50fb7112a39fe8acd6e Mon Sep 17 00:00:00 2001 From: krzys-h Date: Thu, 6 Aug 2015 13:25:24 +0200 Subject: [PATCH] Moved all UI controls to a subdirectory --- src/CMakeLists.txt | 42 ++++++++++++------------- src/graphics/engine/engine.cpp | 2 +- src/object/auto/auto.cpp | 6 ++-- src/object/auto/autobase.cpp | 4 +-- src/object/auto/autoconvert.cpp | 4 +-- src/object/auto/autoderrick.cpp | 4 +-- src/object/auto/autodestroyer.cpp | 4 +-- src/object/auto/autofactory.cpp | 4 +-- src/object/auto/autohouston.cpp | 4 +-- src/object/auto/autolabo.cpp | 4 +-- src/object/auto/autonuclearplant.cpp | 4 +-- src/object/auto/autopowercaptor.cpp | 4 +-- src/object/auto/autopowerplant.cpp | 6 ++-- src/object/auto/autopowerstation.cpp | 6 ++-- src/object/auto/autoradar.cpp | 6 ++-- src/object/auto/autorepair.cpp | 4 +-- src/object/auto/autoresearch.cpp | 6 ++-- src/object/auto/autotower.cpp | 6 ++-- src/object/auto/autovault.cpp | 4 +-- src/object/brain.cpp | 6 ++-- src/object/robotmain.cpp | 16 +++++----- src/object/subclass/exchange_post.cpp | 6 ++-- src/script/script.cpp | 6 ++-- src/ui/{ => controls}/button.cpp | 2 +- src/ui/{ => controls}/button.h | 2 +- src/ui/{ => controls}/check.cpp | 2 +- src/ui/{ => controls}/check.h | 2 +- src/ui/{ => controls}/color.cpp | 2 +- src/ui/{ => controls}/color.h | 2 +- src/ui/{ => controls}/compass.cpp | 2 +- src/ui/{ => controls}/compass.h | 2 +- src/ui/{ => controls}/control.cpp | 2 +- src/ui/{ => controls}/control.h | 0 src/ui/{ => controls}/edit.cpp | 4 +-- src/ui/{ => controls}/edit.h | 2 +- src/ui/{ => controls}/editvalue.cpp | 8 ++--- src/ui/{ => controls}/editvalue.h | 2 +- src/ui/{ => controls}/enumslider.cpp | 2 +- src/ui/{ => controls}/enumslider.h | 2 +- src/ui/{ => controls}/gauge.cpp | 2 +- src/ui/{ => controls}/gauge.h | 2 +- src/ui/{ => controls}/group.cpp | 2 +- src/ui/{ => controls}/group.h | 2 +- src/ui/{ => controls}/image.cpp | 2 +- src/ui/{ => controls}/image.h | 2 +- src/ui/{ => controls}/interface.cpp | 2 +- src/ui/{ => controls}/interface.h | 38 +++++++++++----------- src/ui/{ => controls}/key.cpp | 2 +- src/ui/{ => controls}/key.h | 2 +- src/ui/{ => controls}/label.cpp | 2 +- src/ui/{ => controls}/label.h | 2 +- src/ui/{ => controls}/list.cpp | 2 +- src/ui/{ => controls}/list.h | 6 ++-- src/ui/{ => controls}/map.cpp | 2 +- src/ui/{ => controls}/map.h | 2 +- src/ui/{ => controls}/scroll.cpp | 4 +-- src/ui/{ => controls}/scroll.h | 2 +- src/ui/{ => controls}/shortcut.cpp | 2 +- src/ui/{ => controls}/shortcut.h | 2 +- src/ui/{ => controls}/slider.cpp | 4 +-- src/ui/{ => controls}/slider.h | 2 +- src/ui/{ => controls}/target.cpp | 3 +- src/ui/{ => controls}/target.h | 2 +- src/ui/{ => controls}/window.cpp | 2 +- src/ui/{ => controls}/window.h | 40 +++++++++++------------ src/ui/displayinfo.cpp | 12 +++---- src/ui/displaytext.cpp | 10 +++--- src/ui/maindialog.cpp | 6 ++-- src/ui/mainmap.h | 3 +- src/ui/mainshort.h | 2 +- src/ui/mainui.cpp | 6 ++-- src/ui/screen/screen_apperance.cpp | 12 +++---- src/ui/screen/screen_io.cpp | 10 +++--- src/ui/screen/screen_io_read.cpp | 10 +++--- src/ui/screen/screen_io_write.cpp | 14 ++++----- src/ui/screen/screen_level_list.cpp | 14 ++++----- src/ui/screen/screen_loading.cpp | 10 +++--- src/ui/screen/screen_main_menu.cpp | 10 +++--- src/ui/screen/screen_player_select.cpp | 12 +++---- src/ui/screen/screen_quit.cpp | 10 +++--- src/ui/screen/screen_setup.cpp | 6 ++-- src/ui/screen/screen_setup_controls.cpp | 14 ++++----- src/ui/screen/screen_setup_display.cpp | 12 +++---- src/ui/screen/screen_setup_game.cpp | 12 +++---- src/ui/screen/screen_setup_graphics.cpp | 14 ++++----- src/ui/screen/screen_setup_sound.cpp | 10 +++--- src/ui/screen/screen_welcome.cpp | 4 +-- src/ui/studio.cpp | 30 +++++++++--------- 88 files changed, 286 insertions(+), 288 deletions(-) rename src/ui/{ => controls}/button.cpp (99%) rename src/ui/{ => controls}/button.h (97%) rename src/ui/{ => controls}/check.cpp (99%) rename src/ui/{ => controls}/check.h (97%) rename src/ui/{ => controls}/color.cpp (99%) rename src/ui/{ => controls}/color.h (97%) rename src/ui/{ => controls}/compass.cpp (99%) rename src/ui/{ => controls}/compass.h (97%) rename src/ui/{ => controls}/control.cpp (99%) rename src/ui/{ => controls}/control.h (100%) rename src/ui/{ => controls}/edit.cpp (99%) rename src/ui/{ => controls}/edit.h (99%) rename src/ui/{ => controls}/editvalue.cpp (98%) rename src/ui/{ => controls}/editvalue.h (98%) rename src/ui/{ => controls}/enumslider.cpp (98%) rename src/ui/{ => controls}/enumslider.h (97%) rename src/ui/{ => controls}/gauge.cpp (99%) rename src/ui/{ => controls}/gauge.h (97%) rename src/ui/{ => controls}/group.cpp (99%) rename src/ui/{ => controls}/group.h (97%) rename src/ui/{ => controls}/image.cpp (99%) rename src/ui/{ => controls}/image.h (97%) rename src/ui/{ => controls}/interface.cpp (99%) rename src/ui/{ => controls}/interface.h (85%) rename src/ui/{ => controls}/key.cpp (99%) rename src/ui/{ => controls}/key.h (98%) rename src/ui/{ => controls}/label.cpp (98%) rename src/ui/{ => controls}/label.h (97%) rename src/ui/{ => controls}/list.cpp (99%) rename src/ui/{ => controls}/list.h (97%) rename src/ui/{ => controls}/map.cpp (99%) rename src/ui/{ => controls}/map.h (99%) rename src/ui/{ => controls}/scroll.cpp (99%) rename src/ui/{ => controls}/scroll.h (98%) rename src/ui/{ => controls}/shortcut.cpp (99%) rename src/ui/{ => controls}/shortcut.h (97%) rename src/ui/{ => controls}/slider.cpp (99%) rename src/ui/{ => controls}/slider.h (98%) rename src/ui/{ => controls}/target.cpp (99%) rename src/ui/{ => controls}/target.h (97%) rename src/ui/{ => controls}/window.cpp (99%) rename src/ui/{ => controls}/window.h (88%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 50118224..a98606e6 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -223,34 +223,34 @@ set(BASE_SOURCES ui/screen/screen_setup_graphics.cpp ui/screen/screen_setup_sound.cpp ui/screen/screen_welcome.cpp - ui/button.cpp - ui/check.cpp - ui/color.cpp - ui/compass.cpp - ui/control.cpp ui/displayinfo.cpp ui/displaytext.cpp - ui/edit.cpp - ui/editvalue.cpp - ui/enumslider.cpp - ui/gauge.cpp - ui/group.cpp - ui/image.cpp - ui/interface.cpp - ui/key.cpp - ui/label.cpp - ui/list.cpp ui/maindialog.cpp ui/mainmap.cpp ui/mainshort.cpp ui/mainui.cpp - ui/map.cpp - ui/scroll.cpp - ui/shortcut.cpp - ui/slider.cpp ui/studio.cpp - ui/target.cpp - ui/window.cpp + ui/controls/button.cpp + ui/controls/check.cpp + ui/controls/color.cpp + ui/controls/compass.cpp + ui/controls/control.cpp + ui/controls/edit.cpp + ui/controls/editvalue.cpp + ui/controls/enumslider.cpp + ui/controls/gauge.cpp + ui/controls/group.cpp + ui/controls/image.cpp + ui/controls/interface.cpp + ui/controls/key.cpp + ui/controls/label.cpp + ui/controls/list.cpp + ui/controls/map.cpp + ui/controls/scroll.cpp + ui/controls/shortcut.cpp + ui/controls/slider.cpp + ui/controls/target.cpp + ui/controls/window.cpp ${OPENAL_SRC} ) diff --git a/src/graphics/engine/engine.cpp b/src/graphics/engine/engine.cpp index 85af6ff9..53bfea7d 100644 --- a/src/graphics/engine/engine.cpp +++ b/src/graphics/engine/engine.cpp @@ -51,7 +51,7 @@ #include "sound/sound.h" -#include "ui/interface.h" +#include "ui/controls/interface.h" #include #include diff --git a/src/object/auto/auto.cpp b/src/object/auto/auto.cpp index 22803117..e3a76389 100644 --- a/src/object/auto/auto.cpp +++ b/src/object/auto/auto.cpp @@ -30,9 +30,9 @@ #include "object/level/parserline.h" #include "object/level/parserparam.h" -#include "ui/gauge.h" -#include "ui/interface.h" -#include "ui/window.h" +#include "ui/controls/gauge.h" +#include "ui/controls/interface.h" +#include "ui/controls/window.h" // Object's constructor. diff --git a/src/object/auto/autobase.cpp b/src/object/auto/autobase.cpp index a36c0dbf..a7cee73a 100644 --- a/src/object/auto/autobase.cpp +++ b/src/object/auto/autobase.cpp @@ -35,8 +35,8 @@ #include "physics/physics.h" -#include "ui/interface.h" -#include "ui/window.h" +#include "ui/controls/interface.h" +#include "ui/controls/window.h" diff --git a/src/object/auto/autoconvert.cpp b/src/object/auto/autoconvert.cpp index cf299226..559940c6 100644 --- a/src/object/auto/autoconvert.cpp +++ b/src/object/auto/autoconvert.cpp @@ -32,8 +32,8 @@ #include "object/level/parserline.h" #include "object/level/parserparam.h" -#include "ui/interface.h" -#include "ui/window.h" +#include "ui/controls/interface.h" +#include "ui/controls/window.h" // Object's constructor. diff --git a/src/object/auto/autoderrick.cpp b/src/object/auto/autoderrick.cpp index 3742a1e3..2bdc7398 100644 --- a/src/object/auto/autoderrick.cpp +++ b/src/object/auto/autoderrick.cpp @@ -32,8 +32,8 @@ #include "object/level/parserline.h" #include "object/level/parserparam.h" -#include "ui/interface.h" -#include "ui/window.h" +#include "ui/controls/interface.h" +#include "ui/controls/window.h" diff --git a/src/object/auto/autodestroyer.cpp b/src/object/auto/autodestroyer.cpp index b2a059f8..de6469ad 100644 --- a/src/object/auto/autodestroyer.cpp +++ b/src/object/auto/autodestroyer.cpp @@ -30,8 +30,8 @@ #include "object/level/parserline.h" #include "object/level/parserparam.h" -#include "ui/interface.h" -#include "ui/window.h" +#include "ui/controls/interface.h" +#include "ui/controls/window.h" #include diff --git a/src/object/auto/autofactory.cpp b/src/object/auto/autofactory.cpp index 1fc921ed..d753f2b3 100644 --- a/src/object/auto/autofactory.cpp +++ b/src/object/auto/autofactory.cpp @@ -41,8 +41,8 @@ #include "script/script.h" -#include "ui/interface.h" -#include "ui/window.h" +#include "ui/controls/interface.h" +#include "ui/controls/window.h" #include diff --git a/src/object/auto/autohouston.cpp b/src/object/auto/autohouston.cpp index de1eb2f5..d8b452f2 100644 --- a/src/object/auto/autohouston.cpp +++ b/src/object/auto/autohouston.cpp @@ -22,8 +22,8 @@ #include "object/old_object.h" -#include "ui/interface.h" -#include "ui/window.h" +#include "ui/controls/interface.h" +#include "ui/controls/window.h" // Object's constructor. diff --git a/src/object/auto/autolabo.cpp b/src/object/auto/autolabo.cpp index 3c95cb9c..64d2f19b 100644 --- a/src/object/auto/autolabo.cpp +++ b/src/object/auto/autolabo.cpp @@ -35,8 +35,8 @@ #include "object/level/parserline.h" #include "object/level/parserparam.h" -#include "ui/interface.h" -#include "ui/window.h" +#include "ui/controls/interface.h" +#include "ui/controls/window.h" diff --git a/src/object/auto/autonuclearplant.cpp b/src/object/auto/autonuclearplant.cpp index 8e420e54..82eaee26 100644 --- a/src/object/auto/autonuclearplant.cpp +++ b/src/object/auto/autonuclearplant.cpp @@ -33,8 +33,8 @@ #include "object/level/parserline.h" #include "object/level/parserparam.h" -#include "ui/interface.h" -#include "ui/window.h" +#include "ui/controls/interface.h" +#include "ui/controls/window.h" const float NUCLEARPLANT_DELAY = 30.0f; // duration of the generation diff --git a/src/object/auto/autopowercaptor.cpp b/src/object/auto/autopowercaptor.cpp index dfd9b496..7f52978d 100644 --- a/src/object/auto/autopowercaptor.cpp +++ b/src/object/auto/autopowercaptor.cpp @@ -34,8 +34,8 @@ #include "object/level/parserline.h" #include "object/level/parserparam.h" -#include "ui/interface.h" -#include "ui/window.h" +#include "ui/controls/interface.h" +#include "ui/controls/window.h" diff --git a/src/object/auto/autopowerplant.cpp b/src/object/auto/autopowerplant.cpp index be3cf5d8..b8941ef8 100644 --- a/src/object/auto/autopowerplant.cpp +++ b/src/object/auto/autopowerplant.cpp @@ -35,9 +35,9 @@ #include "object/level/parserline.h" #include "object/level/parserparam.h" -#include "ui/gauge.h" -#include "ui/interface.h" -#include "ui/window.h" +#include "ui/controls/gauge.h" +#include "ui/controls/interface.h" +#include "ui/controls/window.h" const float POWERPLANT_POWER = 0.4f; // Necessary energy for a battery diff --git a/src/object/auto/autopowerstation.cpp b/src/object/auto/autopowerstation.cpp index 44aef7c2..bfd298a3 100644 --- a/src/object/auto/autopowerstation.cpp +++ b/src/object/auto/autopowerstation.cpp @@ -31,9 +31,9 @@ #include "object/interface/carrier_object.h" #include "object/interface/powered_object.h" -#include "ui/gauge.h" -#include "ui/interface.h" -#include "ui/window.h" +#include "ui/controls/gauge.h" +#include "ui/controls/interface.h" +#include "ui/controls/window.h" diff --git a/src/object/auto/autoradar.cpp b/src/object/auto/autoradar.cpp index 6014e386..0b75c371 100644 --- a/src/object/auto/autoradar.cpp +++ b/src/object/auto/autoradar.cpp @@ -25,9 +25,9 @@ #include "object/object_manager.h" #include "object/old_object.h" -#include "ui/gauge.h" -#include "ui/interface.h" -#include "ui/window.h" +#include "ui/controls/gauge.h" +#include "ui/controls/interface.h" +#include "ui/controls/window.h" diff --git a/src/object/auto/autorepair.cpp b/src/object/auto/autorepair.cpp index 74e6d9cb..9164015c 100644 --- a/src/object/auto/autorepair.cpp +++ b/src/object/auto/autorepair.cpp @@ -30,8 +30,8 @@ #include "physics/physics.h" -#include "ui/interface.h" -#include "ui/window.h" +#include "ui/controls/interface.h" +#include "ui/controls/window.h" diff --git a/src/object/auto/autoresearch.cpp b/src/object/auto/autoresearch.cpp index 5ce2c015..bce1c160 100644 --- a/src/object/auto/autoresearch.cpp +++ b/src/object/auto/autoresearch.cpp @@ -33,9 +33,9 @@ #include "object/level/parserline.h" #include "object/level/parserparam.h" -#include "ui/gauge.h" -#include "ui/interface.h" -#include "ui/window.h" +#include "ui/controls/gauge.h" +#include "ui/controls/interface.h" +#include "ui/controls/window.h" const float SEARCH_TIME = 30.0f; // duration of a research diff --git a/src/object/auto/autotower.cpp b/src/object/auto/autotower.cpp index 36e20951..a06769d8 100644 --- a/src/object/auto/autotower.cpp +++ b/src/object/auto/autotower.cpp @@ -34,9 +34,9 @@ #include "physics/physics.h" -#include "ui/gauge.h" -#include "ui/interface.h" -#include "ui/window.h" +#include "ui/controls/gauge.h" +#include "ui/controls/interface.h" +#include "ui/controls/window.h" const float TOWER_SCOPE = 200.0f; // range of beam diff --git a/src/object/auto/autovault.cpp b/src/object/auto/autovault.cpp index 36b72cde..e0614013 100644 --- a/src/object/auto/autovault.cpp +++ b/src/object/auto/autovault.cpp @@ -33,8 +33,8 @@ #include "object/level/parserline.h" #include "object/level/parserparam.h" -#include "ui/interface.h" -#include "ui/window.h" +#include "ui/controls/interface.h" +#include "ui/controls/window.h" const float OPEN_DELAY = 8.0f; // duration of opening diff --git a/src/object/brain.cpp b/src/object/brain.cpp index 4c03e329..ff8090d8 100644 --- a/src/object/brain.cpp +++ b/src/object/brain.cpp @@ -51,10 +51,10 @@ #include "sound/sound.h" -#include "ui/interface.h" -#include "ui/slider.h" +#include "ui/controls/interface.h" +#include "ui/controls/slider.h" #include "ui/studio.h" -#include "ui/window.h" +#include "ui/controls/window.h" #include diff --git a/src/object/robotmain.cpp b/src/object/robotmain.cpp index 55fe9fd2..5ae5ea2e 100644 --- a/src/object/robotmain.cpp +++ b/src/object/robotmain.cpp @@ -87,20 +87,20 @@ #include "sound/sound.h" -#include "ui/button.h" +#include "ui/controls/button.h" #include "ui/displayinfo.h" #include "ui/displaytext.h" -#include "ui/edit.h" -#include "ui/interface.h" -#include "ui/label.h" +#include "ui/controls/edit.h" +#include "ui/controls/interface.h" +#include "ui/controls/label.h" #include "ui/maindialog.h" #include "ui/mainmap.h" #include "ui/mainshort.h" #include "ui/mainui.h" -#include "ui/map.h" -#include "ui/shortcut.h" -#include "ui/slider.h" -#include "ui/window.h" +#include "ui/controls/map.h" +#include "ui/controls/shortcut.h" +#include "ui/controls/slider.h" +#include "ui/controls/window.h" #include diff --git a/src/object/subclass/exchange_post.cpp b/src/object/subclass/exchange_post.cpp index d1d7074e..8cd67667 100644 --- a/src/object/subclass/exchange_post.cpp +++ b/src/object/subclass/exchange_post.cpp @@ -30,9 +30,9 @@ #include "object/level/parserline.h" #include "object/level/parserparam.h" -#include "ui/interface.h" -#include "ui/list.h" -#include "ui/window.h" +#include "ui/controls/interface.h" +#include "ui/controls/list.h" +#include "ui/controls/window.h" #include diff --git a/src/script/script.cpp b/src/script/script.cpp index 3bd130d8..ef4a9bd0 100644 --- a/src/script/script.cpp +++ b/src/script/script.cpp @@ -40,9 +40,9 @@ #include "script/cbottoken.h" #include "ui/displaytext.h" -#include "ui/edit.h" -#include "ui/interface.h" -#include "ui/list.h" +#include "ui/controls/edit.h" +#include "ui/controls/interface.h" +#include "ui/controls/list.h" diff --git a/src/ui/button.cpp b/src/ui/controls/button.cpp similarity index 99% rename from src/ui/button.cpp rename to src/ui/controls/button.cpp index 4d06e897..46b182fb 100644 --- a/src/ui/button.cpp +++ b/src/ui/controls/button.cpp @@ -18,7 +18,7 @@ */ -#include "ui/button.h" +#include "ui/controls/button.h" #include "common/event.h" #include "common/misc.h" diff --git a/src/ui/button.h b/src/ui/controls/button.h similarity index 97% rename from src/ui/button.h rename to src/ui/controls/button.h index 88565888..a5ab09cd 100644 --- a/src/ui/button.h +++ b/src/ui/controls/button.h @@ -21,7 +21,7 @@ #pragma once -#include "ui/control.h" +#include "ui/controls/control.h" namespace Ui diff --git a/src/ui/check.cpp b/src/ui/controls/check.cpp similarity index 99% rename from src/ui/check.cpp rename to src/ui/controls/check.cpp index 0fcf90b8..b674f7c1 100644 --- a/src/ui/check.cpp +++ b/src/ui/controls/check.cpp @@ -18,7 +18,7 @@ */ -#include "ui/check.h" +#include "ui/controls/check.h" #include "common/event.h" #include "common/misc.h" diff --git a/src/ui/check.h b/src/ui/controls/check.h similarity index 97% rename from src/ui/check.h rename to src/ui/controls/check.h index 4ab0a0e4..dca652ac 100644 --- a/src/ui/check.h +++ b/src/ui/controls/check.h @@ -21,7 +21,7 @@ #pragma once -#include "ui/control.h" +#include "ui/controls/control.h" namespace Gfx diff --git a/src/ui/color.cpp b/src/ui/controls/color.cpp similarity index 99% rename from src/ui/color.cpp rename to src/ui/controls/color.cpp index b5ab86b7..c3b5af87 100644 --- a/src/ui/color.cpp +++ b/src/ui/controls/color.cpp @@ -18,7 +18,7 @@ */ -#include "ui/color.h" +#include "ui/controls/color.h" #include "common/event.h" #include "common/misc.h" diff --git a/src/ui/color.h b/src/ui/controls/color.h similarity index 97% rename from src/ui/color.h rename to src/ui/controls/color.h index d2be408d..9588e88e 100644 --- a/src/ui/color.h +++ b/src/ui/controls/color.h @@ -21,7 +21,7 @@ #pragma once -#include "ui/control.h" +#include "ui/controls/control.h" namespace Gfx diff --git a/src/ui/compass.cpp b/src/ui/controls/compass.cpp similarity index 99% rename from src/ui/compass.cpp rename to src/ui/controls/compass.cpp index a3c7676b..3c0acbeb 100644 --- a/src/ui/compass.cpp +++ b/src/ui/controls/compass.cpp @@ -18,7 +18,7 @@ */ -#include "ui/compass.h" +#include "ui/controls/compass.h" #include "common/event.h" #include "common/misc.h" diff --git a/src/ui/compass.h b/src/ui/controls/compass.h similarity index 97% rename from src/ui/compass.h rename to src/ui/controls/compass.h index 1d1883d7..5fd30f0c 100644 --- a/src/ui/compass.h +++ b/src/ui/controls/compass.h @@ -21,7 +21,7 @@ #pragma once -#include "ui/control.h" +#include "ui/controls/control.h" namespace Gfx diff --git a/src/ui/control.cpp b/src/ui/controls/control.cpp similarity index 99% rename from src/ui/control.cpp rename to src/ui/controls/control.cpp index 8ffc51c9..e601c518 100644 --- a/src/ui/control.cpp +++ b/src/ui/controls/control.cpp @@ -18,7 +18,7 @@ */ -#include "ui/control.h" +#include "ui/controls/control.h" #include "app/app.h" diff --git a/src/ui/control.h b/src/ui/controls/control.h similarity index 100% rename from src/ui/control.h rename to src/ui/controls/control.h diff --git a/src/ui/edit.cpp b/src/ui/controls/edit.cpp similarity index 99% rename from src/ui/edit.cpp rename to src/ui/controls/edit.cpp index c302b8da..981142dc 100644 --- a/src/ui/edit.cpp +++ b/src/ui/controls/edit.cpp @@ -18,7 +18,7 @@ */ -#include "ui/edit.h" +#include "ui/controls/edit.h" #include "common/config.h" @@ -35,7 +35,7 @@ #include "object/robotmain.h" -#include "ui/scroll.h" +#include "ui/controls/scroll.h" #include diff --git a/src/ui/edit.h b/src/ui/controls/edit.h similarity index 99% rename from src/ui/edit.h rename to src/ui/controls/edit.h index d42d6db7..44e34383 100644 --- a/src/ui/edit.h +++ b/src/ui/controls/edit.h @@ -25,7 +25,7 @@ #pragma once -#include "ui/control.h" +#include "ui/controls/control.h" namespace Ui diff --git a/src/ui/editvalue.cpp b/src/ui/controls/editvalue.cpp similarity index 98% rename from src/ui/editvalue.cpp rename to src/ui/controls/editvalue.cpp index 3a2fa2f1..78b3661e 100644 --- a/src/ui/editvalue.cpp +++ b/src/ui/controls/editvalue.cpp @@ -18,16 +18,16 @@ */ -#include "ui/editvalue.h" +#include "ui/controls/editvalue.h" #include "common/event.h" #include "common/misc.h" #include "object/robotmain.h" -#include "ui/button.h" -#include "ui/edit.h" -#include "ui/interface.h" +#include "ui/controls/button.h" +#include "ui/controls/edit.h" +#include "ui/controls/interface.h" #include diff --git a/src/ui/editvalue.h b/src/ui/controls/editvalue.h similarity index 98% rename from src/ui/editvalue.h rename to src/ui/controls/editvalue.h index 4c94aaf9..2e81b914 100644 --- a/src/ui/editvalue.h +++ b/src/ui/controls/editvalue.h @@ -22,7 +22,7 @@ #pragma once -#include "ui/control.h" +#include "ui/controls/control.h" namespace Gfx diff --git a/src/ui/enumslider.cpp b/src/ui/controls/enumslider.cpp similarity index 98% rename from src/ui/enumslider.cpp rename to src/ui/controls/enumslider.cpp index 8536efe7..afa75400 100644 --- a/src/ui/enumslider.cpp +++ b/src/ui/controls/enumslider.cpp @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see http://gnu.org/licenses */ -#include "ui/enumslider.h" +#include "ui/controls/enumslider.h" #include "common/stringutils.h" diff --git a/src/ui/enumslider.h b/src/ui/controls/enumslider.h similarity index 97% rename from src/ui/enumslider.h rename to src/ui/controls/enumslider.h index 4a353393..a46b0c7c 100644 --- a/src/ui/enumslider.h +++ b/src/ui/controls/enumslider.h @@ -18,7 +18,7 @@ */ #pragma once -#include "ui/slider.h" +#include "ui/controls/slider.h" #include #include diff --git a/src/ui/gauge.cpp b/src/ui/controls/gauge.cpp similarity index 99% rename from src/ui/gauge.cpp rename to src/ui/controls/gauge.cpp index 89b6fc8c..4b3f5529 100644 --- a/src/ui/gauge.cpp +++ b/src/ui/controls/gauge.cpp @@ -18,7 +18,7 @@ */ -#include "ui/gauge.h" +#include "ui/controls/gauge.h" #include "graphics/engine/engine.h" diff --git a/src/ui/gauge.h b/src/ui/controls/gauge.h similarity index 97% rename from src/ui/gauge.h rename to src/ui/controls/gauge.h index a709958f..ebe85d08 100644 --- a/src/ui/gauge.h +++ b/src/ui/controls/gauge.h @@ -21,7 +21,7 @@ #pragma once -#include "ui/control.h" +#include "ui/controls/control.h" namespace Ui { diff --git a/src/ui/group.cpp b/src/ui/controls/group.cpp similarity index 99% rename from src/ui/group.cpp rename to src/ui/controls/group.cpp index ae15e7e2..c44aa098 100644 --- a/src/ui/group.cpp +++ b/src/ui/controls/group.cpp @@ -18,7 +18,7 @@ */ -#include "ui/group.h" +#include "ui/controls/group.h" #include "common/event.h" #include "common/misc.h" diff --git a/src/ui/group.h b/src/ui/controls/group.h similarity index 97% rename from src/ui/group.h rename to src/ui/controls/group.h index 69eefc31..11e47627 100644 --- a/src/ui/group.h +++ b/src/ui/controls/group.h @@ -22,7 +22,7 @@ #pragma once -#include "ui/control.h" +#include "ui/controls/control.h" namespace Gfx { diff --git a/src/ui/image.cpp b/src/ui/controls/image.cpp similarity index 99% rename from src/ui/image.cpp rename to src/ui/controls/image.cpp index 357e581f..53d93e0e 100644 --- a/src/ui/image.cpp +++ b/src/ui/controls/image.cpp @@ -18,7 +18,7 @@ */ -#include "ui/image.h" +#include "ui/controls/image.h" #include "common/event.h" #include "common/misc.h" diff --git a/src/ui/image.h b/src/ui/controls/image.h similarity index 97% rename from src/ui/image.h rename to src/ui/controls/image.h index 0f180add..abc2e1a0 100644 --- a/src/ui/image.h +++ b/src/ui/controls/image.h @@ -22,7 +22,7 @@ #pragma once -#include "ui/control.h" +#include "ui/controls/control.h" namespace Gfx { diff --git a/src/ui/interface.cpp b/src/ui/controls/interface.cpp similarity index 99% rename from src/ui/interface.cpp rename to src/ui/controls/interface.cpp index 4e26eb55..07651806 100644 --- a/src/ui/interface.cpp +++ b/src/ui/controls/interface.cpp @@ -18,7 +18,7 @@ */ -#include "ui/interface.h" +#include "ui/controls/interface.h" #include "app/app.h" diff --git a/src/ui/interface.h b/src/ui/controls/interface.h similarity index 85% rename from src/ui/interface.h rename to src/ui/controls/interface.h index d284748a..dd3179bd 100644 --- a/src/ui/interface.h +++ b/src/ui/controls/interface.h @@ -29,25 +29,25 @@ #include "math/point.h" -#include "ui/button.h" -#include "ui/check.h" -#include "ui/color.h" -#include "ui/compass.h" -#include "ui/control.h" -#include "ui/edit.h" -#include "ui/editvalue.h" -#include "ui/enumslider.h" -#include "ui/group.h" -#include "ui/image.h" -#include "ui/key.h" -#include "ui/label.h" -#include "ui/list.h" -#include "ui/map.h" -#include "ui/scroll.h" -#include "ui/shortcut.h" -#include "ui/slider.h" -#include "ui/target.h" -#include "ui/window.h" +#include "ui/controls/button.h" +#include "ui/controls/check.h" +#include "ui/controls/color.h" +#include "ui/controls/compass.h" +#include "ui/controls/control.h" +#include "ui/controls/edit.h" +#include "ui/controls/editvalue.h" +#include "ui/controls/enumslider.h" +#include "ui/controls/group.h" +#include "ui/controls/image.h" +#include "ui/controls/key.h" +#include "ui/controls/label.h" +#include "ui/controls/list.h" +#include "ui/controls/map.h" +#include "ui/controls/scroll.h" +#include "ui/controls/shortcut.h" +#include "ui/controls/slider.h" +#include "ui/controls/target.h" +#include "ui/controls/window.h" #include diff --git a/src/ui/key.cpp b/src/ui/controls/key.cpp similarity index 99% rename from src/ui/key.cpp rename to src/ui/controls/key.cpp index a79cc8d6..f760c6d6 100644 --- a/src/ui/key.cpp +++ b/src/ui/controls/key.cpp @@ -18,7 +18,7 @@ */ -#include "ui/key.h" +#include "ui/controls/key.h" #include "common/global.h" #include "common/stringutils.h" diff --git a/src/ui/key.h b/src/ui/controls/key.h similarity index 98% rename from src/ui/key.h rename to src/ui/controls/key.h index 00bdfe19..d90137b6 100644 --- a/src/ui/key.h +++ b/src/ui/controls/key.h @@ -24,7 +24,7 @@ #pragma once -#include "ui/control.h" +#include "ui/controls/control.h" #include "app/input.h" diff --git a/src/ui/label.cpp b/src/ui/controls/label.cpp similarity index 98% rename from src/ui/label.cpp rename to src/ui/controls/label.cpp index b0ff1e67..2b99ce33 100644 --- a/src/ui/label.cpp +++ b/src/ui/controls/label.cpp @@ -18,7 +18,7 @@ */ -#include "ui/label.h" +#include "ui/controls/label.h" #include "graphics/engine/engine.h" diff --git a/src/ui/label.h b/src/ui/controls/label.h similarity index 97% rename from src/ui/label.h rename to src/ui/controls/label.h index 293f2867..d6507599 100644 --- a/src/ui/label.h +++ b/src/ui/controls/label.h @@ -22,7 +22,7 @@ #pragma once -#include "ui/control.h" +#include "ui/controls/control.h" #include "common/event.h" #include "common/misc.h" diff --git a/src/ui/list.cpp b/src/ui/controls/list.cpp similarity index 99% rename from src/ui/list.cpp rename to src/ui/controls/list.cpp index f29e1dda..56ed23e6 100644 --- a/src/ui/list.cpp +++ b/src/ui/controls/list.cpp @@ -18,7 +18,7 @@ */ -#include "ui/list.h" +#include "ui/controls/list.h" #include "graphics/engine/engine.h" diff --git a/src/ui/list.h b/src/ui/controls/list.h similarity index 97% rename from src/ui/list.h rename to src/ui/controls/list.h index 45f6303e..17e52705 100644 --- a/src/ui/list.h +++ b/src/ui/controls/list.h @@ -22,15 +22,15 @@ #pragma once -#include "ui/control.h" +#include "ui/controls/control.h" #include "common/event.h" #include "common/misc.h" #include "graphics/engine/text.h" -#include "ui/button.h" -#include "ui/scroll.h" +#include "ui/controls/button.h" +#include "ui/controls/scroll.h" namespace Ui diff --git a/src/ui/map.cpp b/src/ui/controls/map.cpp similarity index 99% rename from src/ui/map.cpp rename to src/ui/controls/map.cpp index 7a7a4ef0..f79c2cd2 100644 --- a/src/ui/map.cpp +++ b/src/ui/controls/map.cpp @@ -18,7 +18,7 @@ */ -#include "ui/map.h" +#include "ui/controls/map.h" #include "common/image.h" diff --git a/src/ui/map.h b/src/ui/controls/map.h similarity index 99% rename from src/ui/map.h rename to src/ui/controls/map.h index ff6fc549..2bcf4bbc 100644 --- a/src/ui/map.h +++ b/src/ui/controls/map.h @@ -21,7 +21,7 @@ #pragma once -#include "ui/control.h" +#include "ui/controls/control.h" #include "common/event.h" diff --git a/src/ui/scroll.cpp b/src/ui/controls/scroll.cpp similarity index 99% rename from src/ui/scroll.cpp rename to src/ui/controls/scroll.cpp index e94d3402..b81fd56b 100644 --- a/src/ui/scroll.cpp +++ b/src/ui/controls/scroll.cpp @@ -18,14 +18,14 @@ */ -#include "ui/scroll.h" +#include "ui/controls/scroll.h" #include "common/event.h" #include "common/misc.h" #include "graphics/engine/engine.h" -#include "ui/button.h" +#include "ui/controls/button.h" diff --git a/src/ui/scroll.h b/src/ui/controls/scroll.h similarity index 98% rename from src/ui/scroll.h rename to src/ui/controls/scroll.h index 8c0b24a1..ccb02d24 100644 --- a/src/ui/scroll.h +++ b/src/ui/controls/scroll.h @@ -24,7 +24,7 @@ #include "common/event.h" -#include "ui/control.h" +#include "ui/controls/control.h" namespace Ui { diff --git a/src/ui/shortcut.cpp b/src/ui/controls/shortcut.cpp similarity index 99% rename from src/ui/shortcut.cpp rename to src/ui/controls/shortcut.cpp index d29dd293..39570498 100644 --- a/src/ui/shortcut.cpp +++ b/src/ui/controls/shortcut.cpp @@ -18,7 +18,7 @@ */ -#include "ui/shortcut.h" +#include "ui/controls/shortcut.h" #include "common/event.h" #include "common/misc.h" diff --git a/src/ui/shortcut.h b/src/ui/controls/shortcut.h similarity index 97% rename from src/ui/shortcut.h rename to src/ui/controls/shortcut.h index f835ebef..b860b6a6 100644 --- a/src/ui/shortcut.h +++ b/src/ui/controls/shortcut.h @@ -21,7 +21,7 @@ #pragma once -#include "ui/control.h" +#include "ui/controls/control.h" #include "common/event.h" diff --git a/src/ui/slider.cpp b/src/ui/controls/slider.cpp similarity index 99% rename from src/ui/slider.cpp rename to src/ui/controls/slider.cpp index 6abec531..22bb85af 100644 --- a/src/ui/slider.cpp +++ b/src/ui/controls/slider.cpp @@ -18,7 +18,7 @@ */ -#include "ui/slider.h" +#include "ui/controls/slider.h" #include "common/event.h" #include "common/misc.h" @@ -27,7 +27,7 @@ #include "graphics/engine/engine.h" #include "graphics/engine/text.h" -#include "ui/button.h" +#include "ui/controls/button.h" #include diff --git a/src/ui/slider.h b/src/ui/controls/slider.h similarity index 98% rename from src/ui/slider.h rename to src/ui/controls/slider.h index 64edbc55..c168190f 100644 --- a/src/ui/slider.h +++ b/src/ui/controls/slider.h @@ -21,7 +21,7 @@ #pragma once -#include "ui/control.h" +#include "ui/controls/control.h" namespace Ui { diff --git a/src/ui/target.cpp b/src/ui/controls/target.cpp similarity index 99% rename from src/ui/target.cpp rename to src/ui/controls/target.cpp index e0005268..48a01079 100644 --- a/src/ui/target.cpp +++ b/src/ui/controls/target.cpp @@ -18,7 +18,7 @@ */ -#include "ui/target.h" +#include "ui/controls/target.h" #include "object/object_manager.h" #include "object/old_object.h" @@ -269,4 +269,3 @@ CObject* CTarget::DetectFriendObject(Math::Point pos) } } - diff --git a/src/ui/target.h b/src/ui/controls/target.h similarity index 97% rename from src/ui/target.h rename to src/ui/controls/target.h index f5e97729..e4b57172 100644 --- a/src/ui/target.h +++ b/src/ui/controls/target.h @@ -29,7 +29,7 @@ #include "object/robotmain.h" -#include "ui/control.h" +#include "ui/controls/control.h" #include diff --git a/src/ui/window.cpp b/src/ui/controls/window.cpp similarity index 99% rename from src/ui/window.cpp rename to src/ui/controls/window.cpp index 91edf51f..ff3125c5 100644 --- a/src/ui/window.cpp +++ b/src/ui/controls/window.cpp @@ -18,7 +18,7 @@ */ -#include "ui/window.h" +#include "ui/controls/window.h" diff --git a/src/ui/window.h b/src/ui/controls/window.h similarity index 88% rename from src/ui/window.h rename to src/ui/controls/window.h index 20d0a58f..9327c67f 100644 --- a/src/ui/window.h +++ b/src/ui/controls/window.h @@ -21,27 +21,27 @@ #pragma once -#include "ui/control.h" +#include "ui/controls/control.h" -#include "ui/button.h" -#include "ui/check.h" -#include "ui/color.h" -#include "ui/compass.h" -#include "ui/control.h" -#include "ui/edit.h" -#include "ui/editvalue.h" -#include "ui/enumslider.h" -#include "ui/gauge.h" -#include "ui/group.h" -#include "ui/image.h" -#include "ui/key.h" -#include "ui/label.h" -#include "ui/list.h" -#include "ui/map.h" -#include "ui/scroll.h" -#include "ui/shortcut.h" -#include "ui/slider.h" -#include "ui/target.h" +#include "ui/controls/button.h" +#include "ui/controls/check.h" +#include "ui/controls/color.h" +#include "ui/controls/compass.h" +#include "ui/controls/control.h" +#include "ui/controls/edit.h" +#include "ui/controls/editvalue.h" +#include "ui/controls/enumslider.h" +#include "ui/controls/gauge.h" +#include "ui/controls/group.h" +#include "ui/controls/image.h" +#include "ui/controls/key.h" +#include "ui/controls/label.h" +#include "ui/controls/list.h" +#include "ui/controls/map.h" +#include "ui/controls/scroll.h" +#include "ui/controls/shortcut.h" +#include "ui/controls/slider.h" +#include "ui/controls/target.h" #include diff --git a/src/ui/displayinfo.cpp b/src/ui/displayinfo.cpp index abab5140..35f2030a 100644 --- a/src/ui/displayinfo.cpp +++ b/src/ui/displayinfo.cpp @@ -42,12 +42,12 @@ #include "script/cbottoken.h" -#include "ui/button.h" -#include "ui/edit.h" -#include "ui/group.h" -#include "ui/interface.h" -#include "ui/slider.h" -#include "ui/window.h" +#include "ui/controls/button.h" +#include "ui/controls/edit.h" +#include "ui/controls/group.h" +#include "ui/controls/interface.h" +#include "ui/controls/slider.h" +#include "ui/controls/window.h" #include diff --git a/src/ui/displaytext.cpp b/src/ui/displaytext.cpp index 96ba7249..54d38923 100644 --- a/src/ui/displaytext.cpp +++ b/src/ui/displaytext.cpp @@ -33,11 +33,11 @@ #include "object/motion/motion.h" #include "object/motion/motiontoto.h" -#include "ui/button.h" -#include "ui/group.h" -#include "ui/interface.h" -#include "ui/label.h" -#include "ui/window.h" +#include "ui/controls/button.h" +#include "ui/controls/group.h" +#include "ui/controls/interface.h" +#include "ui/controls/label.h" +#include "ui/controls/window.h" diff --git a/src/ui/maindialog.cpp b/src/ui/maindialog.cpp index 0c59a9f3..99048673 100644 --- a/src/ui/maindialog.cpp +++ b/src/ui/maindialog.cpp @@ -35,10 +35,10 @@ #include "sound/sound.h" -#include "ui/button.h" -#include "ui/interface.h" +#include "ui/controls/button.h" +#include "ui/controls/interface.h" #include "ui/mainui.h" -#include "ui/window.h" +#include "ui/controls/window.h" #include "ui/screen/screen_setup.h" diff --git a/src/ui/mainmap.h b/src/ui/mainmap.h index 95b768da..e5767289 100644 --- a/src/ui/mainmap.h +++ b/src/ui/mainmap.h @@ -27,7 +27,7 @@ #include "math/point.h" -#include "ui/interface.h" +#include "ui/controls/interface.h" namespace Ui @@ -69,4 +69,3 @@ protected: }; } - diff --git a/src/ui/mainshort.h b/src/ui/mainshort.h index dfc90de7..24fa4b84 100644 --- a/src/ui/mainshort.h +++ b/src/ui/mainshort.h @@ -29,7 +29,7 @@ #include "object/object_type.h" -#include "ui/interface.h" +#include "ui/controls/interface.h" namespace Ui { diff --git a/src/ui/mainui.cpp b/src/ui/mainui.cpp index 18511328..42e900a6 100644 --- a/src/ui/mainui.cpp +++ b/src/ui/mainui.cpp @@ -51,10 +51,10 @@ #include "ui/screen/screen_quit.h" #include "ui/screen/screen_welcome.h" -#include "ui/interface.h" -#include "ui/label.h" +#include "ui/controls/interface.h" +#include "ui/controls/label.h" #include "ui/maindialog.h" -#include "ui/window.h" +#include "ui/controls/window.h" namespace Ui { diff --git a/src/ui/screen/screen_apperance.cpp b/src/ui/screen/screen_apperance.cpp index b35ec262..400f2216 100644 --- a/src/ui/screen/screen_apperance.cpp +++ b/src/ui/screen/screen_apperance.cpp @@ -26,12 +26,12 @@ #include "graphics/engine/camera.h" -#include "ui/button.h" -#include "ui/color.h" -#include "ui/interface.h" -#include "ui/label.h" -#include "ui/slider.h" -#include "ui/window.h" +#include "ui/controls/button.h" +#include "ui/controls/color.h" +#include "ui/controls/interface.h" +#include "ui/controls/label.h" +#include "ui/controls/slider.h" +#include "ui/controls/window.h" namespace Ui { diff --git a/src/ui/screen/screen_io.cpp b/src/ui/screen/screen_io.cpp index c518e426..de7e79e9 100644 --- a/src/ui/screen/screen_io.cpp +++ b/src/ui/screen/screen_io.cpp @@ -29,11 +29,11 @@ #include "ui/screen/screen_level_list.h" -#include "ui/button.h" -#include "ui/edit.h" -#include "ui/interface.h" -#include "ui/image.h" -#include "ui/window.h" +#include "ui/controls/button.h" +#include "ui/controls/edit.h" +#include "ui/controls/interface.h" +#include "ui/controls/image.h" +#include "ui/controls/window.h" #include #include diff --git a/src/ui/screen/screen_io_read.cpp b/src/ui/screen/screen_io_read.cpp index ac44c740..79a68ab7 100644 --- a/src/ui/screen/screen_io_read.cpp +++ b/src/ui/screen/screen_io_read.cpp @@ -21,11 +21,11 @@ #include "app/app.h" -#include "ui/button.h" -#include "ui/interface.h" -#include "ui/image.h" -#include "ui/list.h" -#include "ui/window.h" +#include "ui/controls/button.h" +#include "ui/controls/interface.h" +#include "ui/controls/image.h" +#include "ui/controls/list.h" +#include "ui/controls/window.h" namespace Ui { diff --git a/src/ui/screen/screen_io_write.cpp b/src/ui/screen/screen_io_write.cpp index 8b9f8a05..7aeda22f 100644 --- a/src/ui/screen/screen_io_write.cpp +++ b/src/ui/screen/screen_io_write.cpp @@ -21,13 +21,13 @@ #include "app/app.h" -#include "ui/button.h" -#include "ui/edit.h" -#include "ui/interface.h" -#include "ui/image.h" -#include "ui/label.h" -#include "ui/list.h" -#include "ui/window.h" +#include "ui/controls/button.h" +#include "ui/controls/edit.h" +#include "ui/controls/interface.h" +#include "ui/controls/image.h" +#include "ui/controls/label.h" +#include "ui/controls/list.h" +#include "ui/controls/window.h" namespace Ui { diff --git a/src/ui/screen/screen_level_list.cpp b/src/ui/screen/screen_level_list.cpp index b1f14201..64822884 100644 --- a/src/ui/screen/screen_level_list.cpp +++ b/src/ui/screen/screen_level_list.cpp @@ -29,13 +29,13 @@ #include "object/level/parser.h" -#include "ui/button.h" -#include "ui/check.h" -#include "ui/edit.h" -#include "ui/interface.h" -#include "ui/label.h" -#include "ui/list.h" -#include "ui/window.h" +#include "ui/controls/button.h" +#include "ui/controls/check.h" +#include "ui/controls/edit.h" +#include "ui/controls/interface.h" +#include "ui/controls/label.h" +#include "ui/controls/list.h" +#include "ui/controls/window.h" namespace Ui { diff --git a/src/ui/screen/screen_loading.cpp b/src/ui/screen/screen_loading.cpp index 8f67f6f9..f578e73f 100644 --- a/src/ui/screen/screen_loading.cpp +++ b/src/ui/screen/screen_loading.cpp @@ -21,11 +21,11 @@ #include "app/app.h" -#include "ui/button.h" -#include "ui/edit.h" -#include "ui/interface.h" -#include "ui/label.h" -#include "ui/window.h" +#include "ui/controls/button.h" +#include "ui/controls/edit.h" +#include "ui/controls/interface.h" +#include "ui/controls/label.h" +#include "ui/controls/window.h" namespace Ui { diff --git a/src/ui/screen/screen_main_menu.cpp b/src/ui/screen/screen_main_menu.cpp index c3f22b23..ccdc83ad 100644 --- a/src/ui/screen/screen_main_menu.cpp +++ b/src/ui/screen/screen_main_menu.cpp @@ -25,11 +25,11 @@ #include "object/level/parser.h" -#include "ui/button.h" -#include "ui/group.h" -#include "ui/interface.h" -#include "ui/label.h" -#include "ui/window.h" +#include "ui/controls/button.h" +#include "ui/controls/group.h" +#include "ui/controls/interface.h" +#include "ui/controls/label.h" +#include "ui/controls/window.h" #include "ui/screen/screen_setup.h" diff --git a/src/ui/screen/screen_player_select.cpp b/src/ui/screen/screen_player_select.cpp index fc5b6f63..987207f5 100644 --- a/src/ui/screen/screen_player_select.cpp +++ b/src/ui/screen/screen_player_select.cpp @@ -25,13 +25,13 @@ #include "object/player_profile.h" -#include "ui/button.h" -#include "ui/edit.h" -#include "ui/interface.h" -#include "ui/label.h" -#include "ui/list.h" +#include "ui/controls/button.h" +#include "ui/controls/edit.h" +#include "ui/controls/interface.h" +#include "ui/controls/label.h" +#include "ui/controls/list.h" #include "ui/maindialog.h" -#include "ui/window.h" +#include "ui/controls/window.h" namespace Ui { diff --git a/src/ui/screen/screen_quit.cpp b/src/ui/screen/screen_quit.cpp index ab9ea1d8..a28f1d91 100644 --- a/src/ui/screen/screen_quit.cpp +++ b/src/ui/screen/screen_quit.cpp @@ -21,11 +21,11 @@ #include "app/app.h" -#include "ui/button.h" -#include "ui/edit.h" -#include "ui/interface.h" -#include "ui/label.h" -#include "ui/window.h" +#include "ui/controls/button.h" +#include "ui/controls/edit.h" +#include "ui/controls/interface.h" +#include "ui/controls/label.h" +#include "ui/controls/window.h" namespace Ui { diff --git a/src/ui/screen/screen_setup.cpp b/src/ui/screen/screen_setup.cpp index d5c74240..201abd89 100644 --- a/src/ui/screen/screen_setup.cpp +++ b/src/ui/screen/screen_setup.cpp @@ -28,9 +28,9 @@ #include "graphics/engine/camera.h" -#include "ui/button.h" -#include "ui/interface.h" -#include "ui/window.h" +#include "ui/controls/button.h" +#include "ui/controls/interface.h" +#include "ui/controls/window.h" namespace Ui { diff --git a/src/ui/screen/screen_setup_controls.cpp b/src/ui/screen/screen_setup_controls.cpp index d79f95b2..fcff31ce 100644 --- a/src/ui/screen/screen_setup_controls.cpp +++ b/src/ui/screen/screen_setup_controls.cpp @@ -28,13 +28,13 @@ #include "graphics/engine/camera.h" -#include "ui/button.h" -#include "ui/group.h" -#include "ui/interface.h" -#include "ui/key.h" -#include "ui/label.h" -#include "ui/scroll.h" -#include "ui/window.h" +#include "ui/controls/button.h" +#include "ui/controls/group.h" +#include "ui/controls/interface.h" +#include "ui/controls/key.h" +#include "ui/controls/label.h" +#include "ui/controls/scroll.h" +#include "ui/controls/window.h" namespace Ui { diff --git a/src/ui/screen/screen_setup_display.cpp b/src/ui/screen/screen_setup_display.cpp index a24e3851..5ddcc4e0 100644 --- a/src/ui/screen/screen_setup_display.cpp +++ b/src/ui/screen/screen_setup_display.cpp @@ -28,12 +28,12 @@ #include "graphics/engine/camera.h" -#include "ui/button.h" -#include "ui/check.h" -#include "ui/interface.h" -#include "ui/label.h" -#include "ui/list.h" -#include "ui/window.h" +#include "ui/controls/button.h" +#include "ui/controls/check.h" +#include "ui/controls/interface.h" +#include "ui/controls/label.h" +#include "ui/controls/list.h" +#include "ui/controls/window.h" namespace Ui { diff --git a/src/ui/screen/screen_setup_game.cpp b/src/ui/screen/screen_setup_game.cpp index 90d30eb2..dcf69edc 100644 --- a/src/ui/screen/screen_setup_game.cpp +++ b/src/ui/screen/screen_setup_game.cpp @@ -28,12 +28,12 @@ #include "graphics/engine/camera.h" -#include "ui/button.h" -#include "ui/check.h" -#include "ui/interface.h" -#include "ui/label.h" -#include "ui/slider.h" -#include "ui/window.h" +#include "ui/controls/button.h" +#include "ui/controls/check.h" +#include "ui/controls/interface.h" +#include "ui/controls/label.h" +#include "ui/controls/slider.h" +#include "ui/controls/window.h" namespace Ui { diff --git a/src/ui/screen/screen_setup_graphics.cpp b/src/ui/screen/screen_setup_graphics.cpp index 734d5c60..a8d71dcb 100644 --- a/src/ui/screen/screen_setup_graphics.cpp +++ b/src/ui/screen/screen_setup_graphics.cpp @@ -28,13 +28,13 @@ #include "graphics/engine/camera.h" -#include "ui/button.h" -#include "ui/check.h" -#include "ui/editvalue.h" -#include "ui/enumslider.h" -#include "ui/interface.h" -#include "ui/label.h" -#include "ui/window.h" +#include "ui/controls/button.h" +#include "ui/controls/check.h" +#include "ui/controls/editvalue.h" +#include "ui/controls/enumslider.h" +#include "ui/controls/interface.h" +#include "ui/controls/label.h" +#include "ui/controls/window.h" namespace Ui { diff --git a/src/ui/screen/screen_setup_sound.cpp b/src/ui/screen/screen_setup_sound.cpp index 86d2899d..3782930c 100644 --- a/src/ui/screen/screen_setup_sound.cpp +++ b/src/ui/screen/screen_setup_sound.cpp @@ -28,11 +28,11 @@ #include "graphics/engine/camera.h" -#include "ui/button.h" -#include "ui/interface.h" -#include "ui/label.h" -#include "ui/slider.h" -#include "ui/window.h" +#include "ui/controls/button.h" +#include "ui/controls/interface.h" +#include "ui/controls/label.h" +#include "ui/controls/slider.h" +#include "ui/controls/window.h" namespace Ui { diff --git a/src/ui/screen/screen_welcome.cpp b/src/ui/screen/screen_welcome.cpp index ae2f7ca8..d853b1ea 100644 --- a/src/ui/screen/screen_welcome.cpp +++ b/src/ui/screen/screen_welcome.cpp @@ -25,8 +25,8 @@ #include "graphics/engine/engine.h" -#include "ui/interface.h" -#include "ui/window.h" +#include "ui/controls/interface.h" +#include "ui/controls/window.h" namespace Ui { diff --git a/src/ui/studio.cpp b/src/ui/studio.cpp index e2aca32b..7b620dcc 100644 --- a/src/ui/studio.cpp +++ b/src/ui/studio.cpp @@ -43,21 +43,21 @@ #include "sound/sound.h" -#include "ui/check.h" -#include "ui/color.h" -#include "ui/compass.h" -#include "ui/control.h" -#include "ui/edit.h" -#include "ui/group.h" -#include "ui/image.h" -#include "ui/interface.h" -#include "ui/key.h" -#include "ui/label.h" -#include "ui/list.h" -#include "ui/map.h" -#include "ui/shortcut.h" -#include "ui/target.h" -#include "ui/window.h" +#include "ui/controls/check.h" +#include "ui/controls/color.h" +#include "ui/controls/compass.h" +#include "ui/controls/control.h" +#include "ui/controls/edit.h" +#include "ui/controls/group.h" +#include "ui/controls/image.h" +#include "ui/controls/interface.h" +#include "ui/controls/key.h" +#include "ui/controls/label.h" +#include "ui/controls/list.h" +#include "ui/controls/map.h" +#include "ui/controls/shortcut.h" +#include "ui/controls/target.h" +#include "ui/controls/window.h" #include