From 6ba0f42f22a170625f15879e01b4653a4ac153a1 Mon Sep 17 00:00:00 2001
From: erihel <erihel@gmail.com>
Date: Fri, 31 Aug 2012 22:28:07 +0200
Subject: latest changes; few more classes should compile now

---
 src/ui/studio.h | 165 ++++++++++++++++++++++++++++++++------------------------
 1 file changed, 94 insertions(+), 71 deletions(-)

(limited to 'src/ui/studio.h')

diff --git a/src/ui/studio.h b/src/ui/studio.h
index 687ab22..6af69ee 100644
--- a/src/ui/studio.h
+++ b/src/ui/studio.h
@@ -1,5 +1,6 @@
 // * This file is part of the COLOBOT source code
 // * Copyright (C) 2001-2008, Daniel ROUX & EPSITEC SA, www.epsitec.ch
+// * Copyright (C) 2012 Polish Portal of Colobot (PPC)
 // *
 // * This program is free software: you can redistribute it and/or modify
 // * it under the terms of the GNU General Public License as published by
@@ -19,22 +20,42 @@
 #pragma once
 
 
-#include "object/object.h"
-#include "script/script.h"
+#include <object/object.h>
 
+#include <script/script.h>
 
-class CInstanceManager;
-class CD3DEngine;
-class CEvent;
-class CRobotMain;
-class CCamera;
-class CSound;
-class CInterface;
-class CScript;
-class CList;
-class CEdit;
+#include <graphics/engine/engine.h>
+#include <graphics/engine/camera.h>
 
+#include <common/event.h>
+#include <common/struct.h>
+#include <common/misc.h>
+#include <common/iman.h>
 
+#include <sound/sound.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/interface.h>
+
+
+namespace Ui {
 
 enum StudioDialog
 {
@@ -49,67 +70,69 @@ enum StudioDialog
 
 class CStudio
 {
-public:
-    CStudio(CInstanceManager* iMan);
-    ~CStudio();
-
-    bool        EventProcess(const Event &event);
-
-    void        StartEditScript(CScript *script, char* name, int rank);
-    bool        StopEditScript(bool bCancel);
-
-protected:
-    bool        EventFrame(const Event &event);
-    void        SearchToken(CEdit* edit);
-    void        ColorizeScript(CEdit* edit);
-    void        AdjustEditScript();
-    void        SetInfoText(char *text, bool bClickable);
-    void        ViewEditScript();
-    void        UpdateFlux();
-    void        UpdateButtons();
-
-    void        StartDialog(StudioDialog type);
-    void        StopDialog();
-    void        AdjustDialog();
-    bool        EventDialog(const Event &event);
-    void        UpdateChangeList();
-    void        UpdateChangeEdit();
-    void        UpdateDialogAction();
-    void        UpdateDialogPublic();
-    void        UpdateDialogList();
-    void        SearchDirectory(char *dir, bool bCreate);
-    bool        ReadProgram();
-    bool        WriteProgram();
-
-protected:
-    CInstanceManager* m_iMan;
-    CD3DEngine* m_engine;
-    CEvent*     m_event;
-    CRobotMain* m_main;
-    CCamera*    m_camera;
-    CSound*     m_sound;
-    CInterface* m_interface;
-
-    int         m_rank;
-    CScript*    m_script;
-
-    bool        m_bEditMaximized;
-    bool        m_bEditMinimized;
-
-    CameraType  m_editCamera;
-    Math::Point     m_editActualPos;
-    Math::Point     m_editActualDim;
-    Math::Point     m_editFinalPos;
-    Math::Point     m_editFinalDim;
-
-    float       m_time;
-    float       m_fixInfoTextTime;
-    bool        m_bRunning;
-    bool        m_bRealTime;
-    bool        m_bInitPause;
-    char        m_helpFilename[100];
+    public:
+        CStudio();
+        ~CStudio();
+
+        bool        EventProcess(const Event &event);
+
+        void        StartEditScript(CScript *script, char* name, int rank);
+        bool        StopEditScript(bool bCancel);
+
+    protected:
+        bool        EventFrame(const Event &event);
+        void        SearchToken(CEdit* edit);
+        void        ColorizeScript(CEdit* edit);
+        void        AdjustEditScript();
+        void        SetInfoText(char *text, bool bClickable);
+        void        ViewEditScript();
+        void        UpdateFlux();
+        void        UpdateButtons();
+
+        void        StartDialog(StudioDialog type);
+        void        StopDialog();
+        void        AdjustDialog();
+        bool        EventDialog(const Event &event);
+        void        UpdateChangeList();
+        void        UpdateChangeEdit();
+        void        UpdateDialogAction();
+        void        UpdateDialogPublic();
+        void        UpdateDialogList();
+        void        SearchDirectory(char *dir, bool bCreate);
+        bool        ReadProgram();
+        bool        WriteProgram();
+
+    protected:
+        CInstanceManager* m_iMan;
+        Gfx::CEngine* m_engine;
+        CEventQueue*     m_event;
+        CRobotMain* m_main;
+        CCamera*    m_camera;
+        CSoundInterface* m_sound;
+        CInterface* m_interface;
+
+        int         m_rank;
+        CScript*    m_script;
+
+        bool        m_bEditMaximized;
+        bool        m_bEditMinimized;
+
+        CameraType  m_editCamera;
+        Math::Point     m_editActualPos;
+        Math::Point     m_editActualDim;
+        Math::Point     m_editFinalPos;
+        Math::Point     m_editFinalDim;
+
+        float       m_time;
+        float       m_fixInfoTextTime;
+        bool        m_bRunning;
+        bool        m_bRealTime;
+        bool        m_bInitPause;
+        char        m_helpFilename[100];
 
     StudioDialog m_dialog;
 };
 
 
+}
+
-- 
cgit v1.2.3-1-g7c22


From 01cc0fbc49696a19a56dfdd8359d4bb77e868925 Mon Sep 17 00:00:00 2001
From: erihel <erihel@gmail.com>
Date: Tue, 11 Sep 2012 12:49:41 +0200
Subject: * latest changes * all files except studio, map and maindialog should
 compile * did some code cleanup

---
 src/ui/studio.h | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'src/ui/studio.h')

diff --git a/src/ui/studio.h b/src/ui/studio.h
index 6af69ee..e9fb69c 100644
--- a/src/ui/studio.h
+++ b/src/ui/studio.h
@@ -19,6 +19,7 @@
 
 #pragma once
 
+#include <string>
 
 #include <object/object.h>
 
@@ -54,6 +55,8 @@
 #include <ui/window.h>
 #include <ui/interface.h>
 
+#include <app/app.h>
+
 
 namespace Ui {
 
@@ -76,7 +79,7 @@ class CStudio
 
         bool        EventProcess(const Event &event);
 
-        void        StartEditScript(CScript *script, char* name, int rank);
+        void        StartEditScript(CScript *script, std::string name, int rank);
         bool        StopEditScript(bool bCancel);
 
     protected:
@@ -84,7 +87,7 @@ class CStudio
         void        SearchToken(CEdit* edit);
         void        ColorizeScript(CEdit* edit);
         void        AdjustEditScript();
-        void        SetInfoText(char *text, bool bClickable);
+        void        SetInfoText(std::string text, bool bClickable);
         void        ViewEditScript();
         void        UpdateFlux();
         void        UpdateButtons();
@@ -98,7 +101,7 @@ class CStudio
         void        UpdateDialogAction();
         void        UpdateDialogPublic();
         void        UpdateDialogList();
-        void        SearchDirectory(char *dir, bool bCreate);
+        void        SearchDirectory(std::string dir, bool bCreate);
         bool        ReadProgram();
         bool        WriteProgram();
 
@@ -110,9 +113,11 @@ class CStudio
         CCamera*    m_camera;
         CSoundInterface* m_sound;
         CInterface* m_interface;
+        CApplication *m_app;
 
         int         m_rank;
         CScript*    m_script;
+        Gfx::CameraType m_editCamera;
 
         bool        m_bEditMaximized;
         bool        m_bEditMinimized;
@@ -128,7 +133,7 @@ class CStudio
         bool        m_bRunning;
         bool        m_bRealTime;
         bool        m_bInitPause;
-        char        m_helpFilename[100];
+        std::string  m_helpFilename;
 
     StudioDialog m_dialog;
 };
-- 
cgit v1.2.3-1-g7c22


From c439964d281f55ce66e4efa6e51239ebb112c65e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Konopacki?= <konopacki.m@gmail.com>
Date: Sat, 15 Sep 2012 22:06:10 +0200
Subject: [src/ui] CStudio compiles

---
 src/ui/studio.h | 50 ++++++++++++++++----------------------------------
 1 file changed, 16 insertions(+), 34 deletions(-)

(limited to 'src/ui/studio.h')

diff --git a/src/ui/studio.h b/src/ui/studio.h
index 8b7355c..905baa6 100644
--- a/src/ui/studio.h
+++ b/src/ui/studio.h
@@ -18,47 +18,29 @@
 // studio.h
 
 #pragma once
+#include "common/event.h"
 
-#include <string>
-
-#include <object/object.h>
-
-#include <script/script.h>
-
-#include <graphics/engine/engine.h>
-#include <graphics/engine/camera.h>
+#include "graphics/engine/camera.h"
 
-#include <common/event.h>
-#include <common/misc.h>
-#include <common/iman.h>
 
-#include <sound/sound.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/interface.h>
+#include <string>
 
-#include <app/app.h>
+class CEventQueue;
+class CInstanceManager;
+class CRobotMain;
+class CScript;
+class CSoundInterface;
 
+namespace Gfx {
+class CEngine;
+class CCamera;
+};
 
 namespace Ui {
 
+class CEdit;
+class CInterface;
+
 enum StudioDialog
 {
     SD_NULL,
@@ -100,7 +82,7 @@ class CStudio
         void        UpdateDialogAction();
         void        UpdateDialogPublic();
         void        UpdateDialogList();
-        void        SearchDirectory(std::string dir, bool bCreate);
+        void        SearchDirectory(char* dir, bool bCreate);
         bool        ReadProgram();
         bool        WriteProgram();
 
-- 
cgit v1.2.3-1-g7c22