Fixed includes in ui.

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");

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

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 {

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"
 
 
 

src/ui/displayinfo.cpp

@@ -18,14 +18,14 @@
 // displayinfo.cpp
 
 
-#include "displayinfo.h"
+#include "ui/displayinfo.h"
 
-#include "interface.h"
-#include "button.h"
-#include "slider.h"
-#include "edit.h"
-#include "group.h"
-#include "window.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"

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"

src/ui/edit.cpp

@@ -18,7 +18,7 @@
 // edit.cpp
 
 
-#include "edit.h"
+#include "ui/edit.h"
 
 #include <string.h>
 

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>
 

src/ui/gauge.cpp

@@ -18,7 +18,7 @@
 // gauge.cpp
 
 
-#include <ui/gauge.h>
+#include "ui/gauge.h"
 
 
 namespace Ui {

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 {

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 {

src/ui/interface.cpp

@@ -18,7 +18,7 @@
 // interface.cpp
 
 
-#include <ui/interface.h>
+#include "ui/interface.h"
 
 namespace Ui {
 

src/ui/interface.h

@@ -21,33 +21,33 @@
 
 #include <string>
 
-#include <common/event.h>
-#include <common/misc.h>
-#include <common/iman.h>
+#include "common/event.h"
+#include "common/misc.h"
+#include "common/iman.h"
 
-#include <math/point.h>
+#include "math/point.h"
 
-#include <graphics/engine/camera.h>
-#include <graphics/engine/engine.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 "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 {
 

src/ui/key.cpp

@@ -18,7 +18,7 @@
 // key.cpp
 
 
-#include <ui/key.h>
+#include "ui/key.h"
 
 #include <string.h>
 

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 {
 

src/ui/label.cpp

@@ -18,7 +18,7 @@
 // label.cpp
 
 
-#include <ui/label.h>
+#include "ui/label.h"
 
 namespace Ui {
 

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 {
 

src/ui/list.cpp

@@ -18,7 +18,7 @@
 // list.cpp
 
 
-#include <ui/list.h>
+#include "ui/list.h"
 
 #include <string.h>
 

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 {

src/ui/mainshort.cpp

@@ -18,7 +18,7 @@
 // mainshort.cpp
 
 
-#include <ui/mainshort.h>
+#include "ui/mainshort.h"
 
 namespace Ui {
 

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 {
 

src/ui/map.cpp

@@ -18,7 +18,7 @@
 // map.cpp
 
 
-#include "map.h"
+#include "ui/map.h"
 
 #include <string.h>
 

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 {

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 {
 

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 {
 

src/ui/target.cpp

@@ -17,7 +17,7 @@
 // target.cpp
 
 
-#include <ui/target.h>
+#include "ui/target.h"
 
 
 

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 {

src/ui/window.h

@@ -21,30 +21,30 @@
 
 #include <string>
 
-#include <common/event.h>
-#include <common/misc.h>
-#include <common/restext.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 "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 "graphics/engine/text.h"
 
 namespace Ui {