Fixed includes in ui.

28 files changed, 149 insertions, 149 deletions

diff --git a/src/app/app.cpp b/src/app/app.cpp
index ab02b11..5567e42 100644
--- a/src/app/app.cpp
+++ b/src/app/app.cpp
@@ -261,6 +261,7 @@ bool CApplication::Create()
 
     /* Gettext initialization */
 
+    m_locale = "LANGUAGE=";
     std::string locale = "C";
     switch (m_language)
     {
@@ -281,7 +282,8 @@ bool CApplication::Create()
             break;
     }
 
-    setenv("LANGUAGE", locale.c_str(), 1);
+    m_locale += locale;
+    putenv(m_locale.c_str());
     setlocale(LC_ALL, locale.c_str());
 
     std::string trPath = m_dataPath + std::string("/i18n");
diff --git a/src/app/app.h b/src/app/app.h
index 8848be1..d3fa647 100644
--- a/src/app/app.h
+++ b/src/app/app.h
@@ -452,5 +452,9 @@ protected:
 
     //! Application language
     Language        m_language;
+
+private:
+    //! Set locale, needed for putenv/setenv
+    std::string m_locale;
 };
 
diff --git a/src/ui/control.cpp b/src/ui/control.cpp
index c4bf6ea..81893d5 100644
--- a/src/ui/control.cpp
+++ b/src/ui/control.cpp
@@ -16,7 +16,7 @@
 // * along with this program. If not, see  http://www.gnu.org/licenses/.
 
 
-#include "control.h"
+#include "ui/control.h"
 
 
 namespace Ui {
diff --git a/src/ui/control.h b/src/ui/control.h
index e100002..e08c34d 100644
--- a/src/ui/control.h
+++ b/src/ui/control.h
@@ -21,19 +21,19 @@
 
 #include <string>
 
-#include <common/event.h>
-#include <common/iman.h>
-#include <common/misc.h>
-#include <common/restext.h>
+#include "common/event.h"
+#include "common/iman.h"
+#include "common/misc.h"
+#include "common/restext.h"
 
-#include <graphics/core/device.h>
-#include <graphics/engine/engine.h>
-#include <graphics/engine/particle.h>
-#include <graphics/engine/text.h>
+#include "graphics/core/device.h"
+#include "graphics/engine/engine.h"
+#include "graphics/engine/particle.h"
+#include "graphics/engine/text.h"
 
-#include <object/robotmain.h>
+#include "object/robotmain.h"
 
-#include <sound/sound.h>
+#include "sound/sound.h"
 
 
 
diff --git a/src/ui/displayinfo.cpp b/src/ui/displayinfo.cpp
index e6e95a2..c58f2f8 100644
--- a/src/ui/displayinfo.cpp
+++ b/src/ui/displayinfo.cpp
@@ -18,14 +18,14 @@
 // displayinfo.cpp
 
 
-#include "displayinfo.h"
-
-#include "interface.h"
-#include "button.h"
-#include "slider.h"
-#include "edit.h"
-#include "group.h"
-#include "window.h"
+#include "ui/displayinfo.h"
+
+#include "ui/interface.h"
+#include "ui/button.h"
+#include "ui/slider.h"
+#include "ui/edit.h"
+#include "ui/group.h"
+#include "ui/window.h"
 
 #include "common/iman.h"
 #include "common/misc.h"
diff --git a/src/ui/displaytext.cpp b/src/ui/displaytext.cpp
index 8578655..7c60f8b 100644
--- a/src/ui/displaytext.cpp
+++ b/src/ui/displaytext.cpp
@@ -18,13 +18,13 @@
 // displaytext.cpp
 
 
-#include "displaytext.h"
+#include "ui/displaytext.h"
 
-#include "interface.h"
-#include "button.h"
-#include "label.h"
-#include "window.h"
-#include "group.h"
+#include "ui/interface.h"
+#include "ui/button.h"
+#include "ui/label.h"
+#include "ui/window.h"
+#include "ui/group.h"
 
 #include "common/event.h"
 #include "common/iman.h"
diff --git a/src/ui/edit.cpp b/src/ui/edit.cpp
index 8c875b6..4c558f4 100644
--- a/src/ui/edit.cpp
+++ b/src/ui/edit.cpp
@@ -18,7 +18,7 @@
 // edit.cpp
 
 
-#include "edit.h"
+#include "ui/edit.h"
 
 #include <string.h>
 
diff --git a/src/ui/edit.h b/src/ui/edit.h
index 2de3028..b6766f8 100644
--- a/src/ui/edit.h
+++ b/src/ui/edit.h
@@ -24,18 +24,18 @@
 #pragma once
 
 
-#include <ui/control.h>
-#include <ui/scroll.h>
+#include "ui/control.h"
+#include "ui/scroll.h"
 
-#include <graphics/engine/engine.h>
-#include <graphics/engine/text.h>
+#include "graphics/engine/engine.h"
+#include "graphics/engine/text.h"
 
-#include <common/event.h>
-#include <common/misc.h>
-#include <common/iman.h>
-#include <common/restext.h>
+#include "common/event.h"
+#include "common/misc.h"
+#include "common/iman.h"
+#include "common/restext.h"
 
-#include <app/app.h>
+#include "app/app.h"
 
 #include <vector>
 
diff --git a/src/ui/gauge.cpp b/src/ui/gauge.cpp
index 3e93166..1cbe84b 100644
--- a/src/ui/gauge.cpp
+++ b/src/ui/gauge.cpp
@@ -18,7 +18,7 @@
 // gauge.cpp
 
 
-#include <ui/gauge.h>
+#include "ui/gauge.h"
 
 
 namespace Ui {
diff --git a/src/ui/gauge.h b/src/ui/gauge.h
index 8b7ef66..f4a008f 100644
--- a/src/ui/gauge.h
+++ b/src/ui/gauge.h
@@ -19,12 +19,12 @@
 
 #pragma once
 
-#include <graphics/engine/engine.h>
+#include "graphics/engine/engine.h"
 
-#include <common/event.h>
-#include <common/misc.h>
+#include "common/event.h"
+#include "common/misc.h"
 
-#include <ui/control.h>
+#include "ui/control.h"
 
 
 namespace Ui {
diff --git a/src/ui/image.cpp b/src/ui/image.cpp
index 3c52d86..ad838fa 100644
--- a/src/ui/image.cpp
+++ b/src/ui/image.cpp
@@ -18,7 +18,6 @@
 // image.cpp
 
 
-#include <stdio.h>
 
 #include "graphics/engine/engine.h"
 #include "common/event.h"
@@ -28,6 +27,7 @@
 #include "ui/image.h"
 
 #include <string.h>
+#include <stdio.h>
 
 
 namespace Ui {
diff --git a/src/ui/interface.cpp b/src/ui/interface.cpp
index 1c62456..465f142 100644
--- a/src/ui/interface.cpp
+++ b/src/ui/interface.cpp
@@ -18,7 +18,7 @@
 // interface.cpp
 
 
-#include <ui/interface.h>
+#include "ui/interface.h"
 
 namespace Ui {
 
diff --git a/src/ui/interface.h b/src/ui/interface.h
index aa0bd98..1496541 100644
--- a/src/ui/interface.h
+++ b/src/ui/interface.h
@@ -21,33 +21,33 @@
 
 #include <string>
 
-#include <common/event.h>
-#include <common/misc.h>
-#include <common/iman.h>
-
-#include <math/point.h>
-
-#include <graphics/engine/camera.h>
-#include <graphics/engine/engine.h>
-
-#include <ui/control.h>
-#include <ui/button.h>
-#include <ui/color.h>
-#include <ui/check.h>
-#include <ui/key.h>
-#include <ui/group.h>
-#include <ui/image.h>
-#include <ui/label.h>
-#include <ui/edit.h>
-#include <ui/editvalue.h>
-#include <ui/scroll.h>
-#include <ui/slider.h>
-#include <ui/list.h>
-#include <ui/shortcut.h>
-#include <ui/compass.h>
-#include <ui/target.h>
-#include <ui/map.h>
-#include <ui/window.h>
+#include "common/event.h"
+#include "common/misc.h"
+#include "common/iman.h"
+
+#include "math/point.h"
+
+#include "graphics/engine/camera.h"
+#include "graphics/engine/engine.h"
+
+#include "ui/control.h"
+#include "ui/button.h"
+#include "ui/color.h"
+#include "ui/check.h"
+#include "ui/key.h"
+#include "ui/group.h"
+#include "ui/image.h"
+#include "ui/label.h"
+#include "ui/edit.h"
+#include "ui/editvalue.h"
+#include "ui/scroll.h"
+#include "ui/slider.h"
+#include "ui/list.h"
+#include "ui/shortcut.h"
+#include "ui/compass.h"
+#include "ui/target.h"
+#include "ui/map.h"
+#include "ui/window.h"
 
 namespace Ui {
 
diff --git a/src/ui/key.cpp b/src/ui/key.cpp
index ea1b964..0ba3a6f 100644
--- a/src/ui/key.cpp
+++ b/src/ui/key.cpp
@@ -18,7 +18,7 @@
 // key.cpp
 
 
-#include <ui/key.h>
+#include "ui/key.h"
 
 #include <string.h>
 
diff --git a/src/ui/key.h b/src/ui/key.h
index 5ca71b0..be28b6e 100644
--- a/src/ui/key.h
+++ b/src/ui/key.h
@@ -22,14 +22,14 @@
 #include <cctype>
 #include <string>
 
-#include <ui/control.h>
+#include "ui/control.h"
 
-#include <common/iman.h>
-#include <common/event.h>
-#include <common/restext.h>
-#include <common/key.h>
+#include "common/iman.h"
+#include "common/event.h"
+#include "common/restext.h"
+#include "common/key.h"
 
-#include <app/app.h>
+#include "app/app.h"
 
 namespace Ui {
 
diff --git a/src/ui/label.cpp b/src/ui/label.cpp
index d7b9cbe..af65ab2 100644
--- a/src/ui/label.cpp
+++ b/src/ui/label.cpp
@@ -18,7 +18,7 @@
 // label.cpp
 
 
-#include <ui/label.h>
+#include "ui/label.h"
 
 namespace Ui {
 
diff --git a/src/ui/label.h b/src/ui/label.h
index 6fe2e31..c9e1050 100644
--- a/src/ui/label.h
+++ b/src/ui/label.h
@@ -20,10 +20,10 @@
 #pragma once
 
 
-#include <ui/control.h>
+#include "ui/control.h"
 
-#include <common/event.h>
-#include <common/misc.h>
+#include "common/event.h"
+#include "common/misc.h"
 
 namespace Ui {
 
diff --git a/src/ui/list.cpp b/src/ui/list.cpp
index 5ecebf3..4e6ca38 100644
--- a/src/ui/list.cpp
+++ b/src/ui/list.cpp
@@ -18,7 +18,7 @@
 // list.cpp
 
 
-#include <ui/list.h>
+#include "ui/list.h"
 
 #include <string.h>
 
diff --git a/src/ui/list.h b/src/ui/list.h
index 2408111..97bd48c 100644
--- a/src/ui/list.h
+++ b/src/ui/list.h
@@ -20,14 +20,14 @@
 #pragma once
 
 
-#include <ui/control.h>
-#include <ui/button.h>
-#include <ui/scroll.h>
+#include "ui/control.h"
+#include "ui/button.h"
+#include "ui/scroll.h"
 
-#include <common/event.h>
-#include <common/misc.h>
+#include "common/event.h"
+#include "common/misc.h"
 
-#include <graphics/engine/text.h>
+#include "graphics/engine/text.h"
 
 
 namespace Ui {
diff --git a/src/ui/mainshort.cpp b/src/ui/mainshort.cpp
index 5b1271f..ac6d7fc 100644
--- a/src/ui/mainshort.cpp
+++ b/src/ui/mainshort.cpp
@@ -18,7 +18,7 @@
 // mainshort.cpp
 
 
-#include <ui/mainshort.h>
+#include "ui/mainshort.h"
 
 namespace Ui {
 
diff --git a/src/ui/mainshort.h b/src/ui/mainshort.h
index d570484..e97bdcc 100644
--- a/src/ui/mainshort.h
+++ b/src/ui/mainshort.h
@@ -19,15 +19,11 @@
 
 #pragma once
 
-#include <ui/interface.h>
-
-#include <common/event.h>
-
-#include <math/point.h>
-
-#include <object/object.h>
-
-#include <graphics/engine/engine.h>
+#include "ui/interface.h"
+#include "common/event.h"
+#include "math/point.h"
+#include "object/object.h"
+#include "graphics/engine/engine.h"
 
 namespace Ui {
 
diff --git a/src/ui/map.cpp b/src/ui/map.cpp
index 1b3dd70..23ec9fb 100644
--- a/src/ui/map.cpp
+++ b/src/ui/map.cpp
@@ -18,7 +18,7 @@
 // map.cpp
 
 
-#include "map.h"
+#include "ui/map.h"
 
 #include <string.h>
 
diff --git a/src/ui/map.h b/src/ui/map.h
index 18020af..9e1767c 100644
--- a/src/ui/map.h
+++ b/src/ui/map.h
@@ -20,21 +20,21 @@
 #pragma once
 
 
-#include <ui/control.h>
+#include "ui/control.h"
 
-#include <object/object.h>
-#include <object/robotmain.h>
+#include "object/object.h"
+#include "object/robotmain.h"
 
-#include <common/event.h>
-#include <common/iman.h>
+#include "common/event.h"
+#include "common/iman.h"
 
-#include <graphics/engine/terrain.h>
-#include <graphics/engine/water.h>
-#include <graphics/engine/engine.h>
-#include <graphics/core/device.h>
-#include <graphics/core/vertex.h>
+#include "graphics/engine/terrain.h"
+#include "graphics/engine/water.h"
+#include "graphics/engine/engine.h"
+#include "graphics/core/device.h"
+#include "graphics/core/vertex.h"
 
-#include <math/geometry.h>
+#include "math/geometry.h"
 
 
 namespace Ui {
diff --git a/src/ui/scroll.h b/src/ui/scroll.h
index 9dbd8a4..52b60bc 100644
--- a/src/ui/scroll.h
+++ b/src/ui/scroll.h
@@ -20,9 +20,8 @@
 #pragma once
 
 
-#include <ui/control.h>
-
-#include <common/event.h>
+#include "ui/control.h"
+#include "common/event.h"
 
 namespace Ui {
 
diff --git a/src/ui/slider.h b/src/ui/slider.h
index b0de011..4912453 100644
--- a/src/ui/slider.h
+++ b/src/ui/slider.h
@@ -20,9 +20,8 @@
 #pragma once
 
 
-#include <ui/control.h>
-
-#include <common/event.h>
+#include "ui/control.h"
+#include "common/event.h"
 
 namespace Ui {
 
diff --git a/src/ui/target.cpp b/src/ui/target.cpp
index f0ae70e..a2166e4 100644
--- a/src/ui/target.cpp
+++ b/src/ui/target.cpp
@@ -17,7 +17,7 @@
 // target.cpp
 
 
-#include <ui/target.h>
+#include "ui/target.h"
 
 
 
diff --git a/src/ui/target.h b/src/ui/target.h
index 1f7f256..05a3651 100644
--- a/src/ui/target.h
+++ b/src/ui/target.h
@@ -20,17 +20,17 @@
 
 #include <string>
 
-#include <ui/control.h>
+#include "ui/control.h"
 
-#include <common/misc.h>
-#include <common/iman.h>
-#include <common/restext.h>
-#include <common/event.h>
+#include "common/misc.h"
+#include "common/iman.h"
+#include "common/restext.h"
+#include "common/event.h"
 
-#include <graphics/engine/engine.h>
+#include "graphics/engine/engine.h"
 
-#include <object/robotmain.h>
-#include <object/object.h>
+#include "object/robotmain.h"
+#include "object/object.h"
 
 
 namespace Ui {
diff --git a/src/ui/window.h b/src/ui/window.h
index 5fa6331..8d7090c 100644
--- a/src/ui/window.h
+++ b/src/ui/window.h
@@ -21,30 +21,30 @@
 
 #include <string>
 
-#include <common/event.h>
-#include <common/misc.h>
-#include <common/restext.h>
-
-#include <ui/button.h>
-#include <ui/color.h>
-#include <ui/check.h>
-#include <ui/key.h>
-#include <ui/group.h>
-#include <ui/image.h>
-#include <ui/label.h>
-#include <ui/edit.h>
-#include <ui/editvalue.h>
-#include <ui/scroll.h>
-#include <ui/slider.h>
-#include <ui/list.h>
-#include <ui/shortcut.h>
-#include <ui/map.h>
-#include <ui/gauge.h>
-#include <ui/compass.h>
-#include <ui/target.h>
-#include <ui/control.h>
-
-#include <graphics/engine/text.h>
+#include "common/event.h"
+#include "common/misc.h"
+#include "common/restext.h"
+
+#include "ui/button.h"
+#include "ui/color.h"
+#include "ui/check.h"
+#include "ui/key.h"
+#include "ui/group.h"
+#include "ui/image.h"
+#include "ui/label.h"
+#include "ui/edit.h"
+#include "ui/editvalue.h"
+#include "ui/scroll.h"
+#include "ui/slider.h"
+#include "ui/list.h"
+#include "ui/shortcut.h"
+#include "ui/map.h"
+#include "ui/gauge.h"
+#include "ui/compass.h"
+#include "ui/target.h"
+#include "ui/control.h"
+
+#include "graphics/engine/text.h"
 
 namespace Ui {