Changeset 7478 in orxonox.OLD

Timestamp:

May 2, 2006, 9:34:48 PM (18 years ago)

Author:

bensch

Message:

qt_gui: gui-element

Location:

branches/qt_gui/src/lib/gui

Files:

• gui_element.cc (modified) (1 diff)
• gui_element.h (modified) (2 diffs)
• gui_saveable.cc (modified) (1 diff)
• gui_saveable.h (modified) (1 diff)
• qt_gui/qt_gui.cc (modified) (3 diffs)
• qt_gui/qt_gui.h (modified) (1 diff)

branches/qt_gui/src/lib/gui/gui_element.cc

@@ -27 +27 @@
    *  standard constructor
    */
-  GuiElement::GuiElement ()
+  GuiElement::GuiElement (const std::string& name)
+  : GuiSaveableGroup(name)
   {
-    this->mainWidget = NULL;
+    //this->mainWidget = NULL;
   }
 

branches/qt_gui/src/lib/gui/gui_element.h

@@ -8 +8 @@
 #define _GUI_ELEMENT_H
 
+#include "gui_saveable.h"
+
 namespace OrxGui
 {
@@ -13 +15 @@
 
   //! A SuperClass for all the Different GuiElements
-  class GuiElement
+  class GuiElement : public GuiSaveableGroup
   {
 
   public:
-    GuiElement();
+    GuiElement(const std::string& name);
     virtual ~GuiElement();
 

branches/qt_gui/src/lib/gui/gui_saveable.cc

@@ -49 +49 @@
       : GuiSaveable(groupName)
   {
-//    this->setName(groupName);
+    //    this->setName(groupName);
   }
 

branches/qt_gui/src/lib/gui/gui_saveable.h

@@ -12 +12 @@
 
 // FORWARD DECLARATION
-  namespace OrxGui
+namespace OrxGui
+{
+  //! A class for ...
+  class GuiSaveable
   {
-    //! A class for ...
-    class GuiSaveable
-    {
-    public:
-    protected:
-      GuiSaveable(const std::string& optionName);
-      virtual ~GuiSaveable();
+  public:
+    virtual ~GuiSaveable();
 
-      void makeSaveable();
+    void makeSaveable();
 
-      virtual void load(const MultiType& value) = 0;
-      virtual const MultiType& save() = 0;
+    virtual void load(const MultiType& value) = 0;
+    virtual const MultiType& save() = 0;
 
-      MultiType&       getValue() { return this->value; };
-      const MultiType& getValue() const { return this->value; };
-      bool             isSaveable() const { return this->bSaveable; };
+    MultiType&       getValue() { return this->value; };
+    const MultiType& getValue() const { return this->value; };
+    bool             isSaveable() const { return this->bSaveable; };
 
-    protected:
-      virtual void makingElementSaveable() {};
+  protected:
+    GuiSaveable(const std::string& optionName);
+    virtual void makingElementSaveable() {};
 
-    private:
-      MultiType       value;
-      bool            bSaveable;
-    };
+  private:
+    MultiType       value;
+    bool            bSaveable;
+  };
 
 
 
-    class GuiSaveableGroup : virtual public GuiSaveable
-    {
-    public:
-      GuiSaveableGroup(const std::string& name);
-      ~GuiSaveableGroup();
+  class GuiSaveableGroup : public GuiSaveable
+  {
+  public:
+    virtual ~GuiSaveableGroup();
 
-      void addSaveable(GuiSaveable* saveable);
-      void removeSaveable(GuiSaveable* saveable);
+    void addSaveable(GuiSaveable* saveable);
+    void removeSaveable(GuiSaveable* saveable);
 
-    protected:
-      virtual void makingElementSaveable();
-    private:
-      std::vector<GuiSaveable*>              saveables;
-      static std::vector<GuiSaveableGroup*>  saveableGroups;
-    };
+  protected:
+    GuiSaveableGroup(const std::string& name);
+    virtual void makingElementSaveable();
 
-  }
+  private:
+    std::vector<GuiSaveable*>              saveables;
+    static std::vector<GuiSaveableGroup*>  saveableGroups;
+  };
+
+}
 #endif /* _GUI_SAVEABLE_H */

branches/qt_gui/src/lib/gui/qt_gui/qt_gui.cc

@@ -18 +18 @@
 #include "qt_gui.h"
 
+#include <qapplication.h>
+
+
 namespace OrxGui
 {
-  QtGui::QtGui()
+  QtGui::QtGui(int argc, char** argv)
+  : QApplication(argc, argv)
   {
 
@@ -26 +30 @@
 
   }
+
   QtGui::~QtGui()
   {
@@ -42 +47 @@
     //! Update the Gui.
   void QtGui::update()
-  {}
+  {
+    this->processEvents();
+  }
 
 }

branches/qt_gui/src/lib/gui/qt_gui/qt_gui.h

@@ -9 +9 @@
 #include "../gui.h"
 #include "gui_element.h"
+#include <qapplication.h>
+
 namespace OrxGui
 {
-  class QtGui : public OrxGui::Gui
+  class QtGui : public OrxGui::Gui, QApplication
   {
     public:
-      QtGui();
+      QtGui(int argc, char** argv);
       virtual ~QtGui();