Moved all UI controls to a subdirectory

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}
 )
 

src/graphics/engine/engine.cpp

@@ -51,7 +51,7 @@
 
 #include "sound/sound.h"
 
-#include "ui/interface.h"
+#include "ui/controls/interface.h"
 
 #include <iomanip>
 #include <SDL_thread.h>

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.

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"
 
 
 

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.

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"
 
 
 

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 <limits>
 

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 <boost/regex.hpp>

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.

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"
 
 
 

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

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"
 
 
 

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

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"
 
 
 

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"
 
 
 

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"
 
 
 

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

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

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

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 <iomanip>

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 <iomanip>
 

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 <boost/lexical_cast.hpp>
 

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"
 
 
 

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"

src/ui/controls/button.h

@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include "ui/control.h"
+#include "ui/controls/control.h"
 
 
 namespace Ui

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"

src/ui/controls/check.h

@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include "ui/control.h"
+#include "ui/controls/control.h"
 
 
 namespace Gfx

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"

src/ui/controls/color.h

@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include "ui/control.h"
+#include "ui/controls/control.h"
 
 
 namespace Gfx

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"

src/ui/controls/compass.h

@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include "ui/control.h"
+#include "ui/controls/control.h"
 
 
 namespace Gfx

src/ui/controls/control.cpp

@@ -18,7 +18,7 @@
  */
 
 
-#include "ui/control.h"
+#include "ui/controls/control.h"
 
 #include "app/app.h"
 

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 <clipboard/clipboard.h>
 

src/ui/controls/edit.h

@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include "ui/control.h"
+#include "ui/controls/control.h"
 
 
 namespace Ui

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 <cstdio>
 

src/ui/controls/editvalue.h

@@ -22,7 +22,7 @@
 #pragma once
 
 
-#include "ui/control.h"
+#include "ui/controls/control.h"
 
 
 namespace Gfx

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"
 

src/ui/controls/enumslider.h

@@ -18,7 +18,7 @@
  */
 #pragma once
 
-#include "ui/slider.h"
+#include "ui/controls/slider.h"
 
 #include <vector>
 #include <map>

src/ui/controls/gauge.cpp

@@ -18,7 +18,7 @@
  */
 
 
-#include "ui/gauge.h"
+#include "ui/controls/gauge.h"
 
 #include "graphics/engine/engine.h"
 

src/ui/controls/gauge.h

@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include "ui/control.h"
+#include "ui/controls/control.h"
 
 namespace Ui
 {

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"

src/ui/controls/group.h

@@ -22,7 +22,7 @@
 #pragma once
 
 
-#include "ui/control.h"
+#include "ui/controls/control.h"
 
 namespace Gfx
 {

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"

src/ui/controls/image.h

@@ -22,7 +22,7 @@
 #pragma once
 
 
-#include "ui/control.h"
+#include "ui/controls/control.h"
 
 namespace Gfx
 {

src/ui/controls/interface.cpp

@@ -18,7 +18,7 @@
  */
 
 
-#include "ui/interface.h"
+#include "ui/controls/interface.h"
 
 #include "app/app.h"
 

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 <string>
 

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"

src/ui/controls/key.h

@@ -24,7 +24,7 @@
 
 #pragma once
 
-#include "ui/control.h"
+#include "ui/controls/control.h"
 
 #include "app/input.h"
 

src/ui/controls/label.cpp

@@ -18,7 +18,7 @@
  */
 
 
-#include "ui/label.h"
+#include "ui/controls/label.h"
 
 #include "graphics/engine/engine.h"
 

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"

src/ui/controls/list.cpp

@@ -18,7 +18,7 @@
  */
 
 
-#include "ui/list.h"
+#include "ui/controls/list.h"
 
 #include "graphics/engine/engine.h"
 

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

src/ui/controls/map.cpp

@@ -18,7 +18,7 @@
  */
 
 
-#include "ui/map.h"
+#include "ui/controls/map.h"
 
 #include "common/image.h"
 

src/ui/controls/map.h

@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include "ui/control.h"
+#include "ui/controls/control.h"
 
 #include "common/event.h"
 

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"
 
 
 

src/ui/controls/scroll.h

@@ -24,7 +24,7 @@
 
 #include "common/event.h"
 
-#include "ui/control.h"
+#include "ui/controls/control.h"
 
 namespace Ui
 {

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"

src/ui/controls/shortcut.h

@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include "ui/control.h"
+#include "ui/controls/control.h"
 
 #include "common/event.h"
 

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 <stdio.h>
 

src/ui/controls/slider.h

@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include "ui/control.h"
+#include "ui/controls/control.h"
 
 namespace Ui
 {

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)
 }
 
 }
-

src/ui/controls/target.h

@@ -29,7 +29,7 @@
 
 #include "object/robotmain.h"
 
-#include "ui/control.h"
+#include "ui/controls/control.h"
 
 #include <string>
 

src/ui/controls/window.cpp

@@ -18,7 +18,7 @@
  */
 
 
-#include "ui/window.h"
+#include "ui/controls/window.h"
 
 
 

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 <string>
 

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 <string.h>
 

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"
 
 
 

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"
 

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:
 };
 
 }
-

src/ui/mainshort.h

@@ -29,7 +29,7 @@
 
 #include "object/object_type.h"
 
-#include "ui/interface.h"
+#include "ui/controls/interface.h"
 
 namespace Ui
 {

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
 {

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
 {

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 <ctime>
 #include <cstring>

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
 {

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
 {

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
 {

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
 {

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"
 

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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 <stdio.h>