Merge branch 'dev-ui' into dev

Conflicts:
	src/CMakeLists.txt
	src/common/misc.cpp
	src/common/misc.h
	src/object/robotmain.cpp
	src/object/robotmain.h
	src/script/cbottoken.cpp
	src/script/cbottoken.h
	src/ui/button.cpp
	src/ui/button.h
	src/ui/check.cpp
	src/ui/check.h
	src/ui/color.cpp
	src/ui/color.h
	src/ui/compass.cpp
	src/ui/compass.h
	src/ui/control.cpp
	src/ui/control.h
	src/ui/displayinfo.cpp
	src/ui/displayinfo.h
	src/ui/displaytext.cpp
	src/ui/displaytext.h
	src/ui/edit.cpp
	src/ui/edit.h
	src/ui/gauge.cpp
	src/ui/gauge.h
	src/ui/interface.cpp
	src/ui/interface.h
	src/ui/key.cpp
	src/ui/map.h
	src/ui/shortcut.h
	src/ui/slider.h
	src/ui/target.cpp
	src/ui/target.h
	src/ui/window.cpp
	src/ui/window.h

1 files changed, 64 insertions, 66 deletions

diff --git a/src/ui/displayinfo.h b/src/ui/displayinfo.h
index 1eaa39b..2eabbf2 100644
--- a/src/ui/displayinfo.h
+++ b/src/ui/displayinfo.h
@@ -19,83 +19,81 @@
 
 #pragma once
 
+#include <string>
 
-#include "common/struct.h"
-#include "old/camera.h"
+#include "common/event.h"
 
+#include "graphics/engine/camera.h"
 
 class CInstanceManager;
-//class CD3DEngine;
-class CEvent;
 class CRobotMain;
-//class CCamera;
-
 class CObject;
-//class CLight;
+class CEventQueue;
+
+struct Event;
 
 namespace Gfx {
-class CEngine;
-class Camera;
-class Particle;
-class CLight;
+    class CEngine;
+    class CParticle;
+    class CLightManager;
 }
 
 namespace Ui {
-class CInterface;
-
-class CDisplayInfo
-{
-public:
-//    CDisplayInfo(CInstanceManager* iMan);
-    CDisplayInfo();
-    ~CDisplayInfo();
-
-    bool        EventProcess(const Event &event);
-
-    void        StartDisplayInfo(char *filename, int index, bool bSoluce);
-    void        StopDisplayInfo();
-
-    void        SetPosition(int pos);
-    int         GetPosition();
-
-protected:
-    bool        EventFrame(const Event &event);
-    void        HyperUpdate();
-    void        AdjustDisplayInfo(Math::Point wpos, Math::Point wdim);
-    void        ChangeIndexButton(int index);
-    void        UpdateIndexButton();
-    void        UpdateCopyButton();
-    void        ViewDisplayInfo();
-    CObject*    SearchToto();
-    void        CreateObjectsFile();
-
-protected:
-    CInstanceManager* m_iMan;
-    Gfx::CEngine* m_engine;
-    CEventQueue*     m_event;
-    CRobotMain* m_main;
-    Gfx::CCamera*    m_camera;
-    CInterface* m_interface;
-    Gfx::CParticle* m_particle;
-    Gfx::CLight*     m_light;
-
-    bool        m_bInfoMaximized;
-    bool        m_bInfoMinimized;
-
-    int         m_index;
-    Gfx::CameraType  m_infoCamera;
-    Math::Point     m_infoNormalPos;
-    Math::Point     m_infoNormalDim;
-    Math::Point     m_infoActualPos;
-    Math::Point     m_infoActualDim;
-    Math::Point     m_infoFinalPos;
-    Math::Point     m_infoFinalDim;
-    int         m_lightSuppl;
-    bool        m_bEditLock;
-    bool        m_bInitPause;
-    bool        m_bSoluce;
-    CObject*    m_toto;
-};
+    class CInterface;
+
+    class CDisplayInfo
+    {
+    public:
+    //    CDisplayInfo(CInstanceManager* iMan);
+        CDisplayInfo();
+        ~CDisplayInfo();
+
+        bool        EventProcess(const Event &event);
+
+        void        StartDisplayInfo(std::string filename, int index, bool bSoluce);
+        void        StopDisplayInfo();
+
+        void        SetPosition(int pos);
+        int         GetPosition();
+
+    protected:
+        bool        EventFrame(const Event &event);
+        void        HyperUpdate();
+        void        AdjustDisplayInfo(Math::Point wpos, Math::Point wdim);
+        void        ChangeIndexButton(int index);
+        void        UpdateIndexButton();
+        void        UpdateCopyButton();
+        void        ViewDisplayInfo();
+        CObject*    SearchToto();
+        void        CreateObjectsFile();
+
+    protected:
+        CInstanceManager* m_iMan;
+        Gfx::CEngine* m_engine;
+        CEventQueue*     m_event;
+        CRobotMain* m_main;
+        Gfx::CCamera*    m_camera;
+        CInterface* m_interface;
+        Gfx::CParticle* m_particle;
+        Gfx::CLightManager*     m_light;
+
+        bool        m_bInfoMaximized;
+        bool        m_bInfoMinimized;
+
+        int         m_index;
+        Gfx::CameraType  m_infoCamera;
+        Math::Point     m_infoNormalPos;
+        Math::Point     m_infoNormalDim;
+        Math::Point     m_infoActualPos;
+        Math::Point     m_infoActualDim;
+        Math::Point     m_infoFinalPos;
+        Math::Point     m_infoFinalDim;
+        int         m_lightSuppl;
+        bool        m_bEditLock;
+        bool        m_bInitPause;
+        bool        m_bSoluce;
+        CObject*    m_toto;
+    };
 
 
 }