Changeset 7480 in orxonox.OLD

Timestamp:

May 2, 2006, 10:23:52 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: renaming

Location:

branches/qt_gui/src/lib/gui

Files:

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

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

@@ -28 +28 @@
    */
   GuiElement::GuiElement (const std::string& name)
-  : GuiSaveableGroup(name)
+  : SaveableGroup(name)
   {
     //this->mainWidget = NULL;

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

@@ -15 +15 @@
 
   //! A SuperClass for all the Different GuiElements
-  class GuiElement : public GuiSaveableGroup
+  class GuiElement : public SaveableGroup
   {
 

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

@@ -24 +24 @@
    * standard constructor
   */
-  GuiSaveable::GuiSaveable (const std::string& optionName)
+  Saveable::Saveable (const std::string& optionName)
   : BaseObject(optionName)
   {
@@ -35 +35 @@
    * standard deconstructor
   */
-  GuiSaveable::~GuiSaveable ()
+  Saveable::~Saveable ()
   {
     // delete what has to be deleted here
@@ -41 +41 @@
 
 
-  void GuiSaveable::makeSaveable()
+  void Saveable::makeSaveable()
   {
     this->bSaveable = true;
@@ -48 +48 @@
 
 
-  GuiSaveableGroup::GuiSaveableGroup(const std::string& groupName)
-      : GuiSaveable(groupName)
+  SaveableGroup::SaveableGroup(const std::string& groupName)
+      : Saveable(groupName)
   {
   }
@@ -56 +56 @@
 
 
-  GuiSaveableGroup::~GuiSaveableGroup()
+  SaveableGroup::~SaveableGroup()
   {
-    std::vector<GuiSaveableGroup*>::iterator delGroup = std::find(saveableGroups.begin(), saveableGroups.end(), this);
+    std::vector<SaveableGroup*>::iterator delGroup = std::find(saveableGroups.begin(), saveableGroups.end(), this);
 
     if (delGroup != saveableGroups.end() )
@@ -64 +64 @@
   }
 
-  std::vector<GuiSaveableGroup*>  GuiSaveableGroup::saveableGroups;
+  std::vector<SaveableGroup*>  SaveableGroup::saveableGroups;
 
-  void GuiSaveableGroup::makingElementSaveable()
+  void SaveableGroup::makingElementSaveable()
   {
-    GuiSaveableGroup::saveableGroups.push_back(this);
+    SaveableGroup::saveableGroups.push_back(this);
   }
 

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

@@ -15 +15 @@
 {
   //! A class for ...
-  class GuiSaveable : public BaseObject
+  class Saveable : public BaseObject
   {
   public:
-    virtual ~GuiSaveable();
+    virtual ~Saveable();
 
     void makeSaveable();
@@ -30 +30 @@
 
   protected:
-    GuiSaveable(const std::string& optionName);
+    Saveable(const std::string& optionName);
     virtual void makingElementSaveable() {};
 
@@ -40 +40 @@
 
 
-  class GuiSaveableGroup : public GuiSaveable
+  class SaveableGroup : public Saveable
   {
   public:
-    virtual ~GuiSaveableGroup();
+    virtual ~SaveableGroup();
 
-    void addSaveable(GuiSaveable* saveable);
-    void removeSaveable(GuiSaveable* saveable);
+    void addSaveable(Saveable* saveable);
+    void removeSaveable(Saveable* saveable);
 
   protected:
-    GuiSaveableGroup(const std::string& name);
+    SaveableGroup(const std::string& name);
     virtual void makingElementSaveable();
 
   private:
-    std::vector<GuiSaveable*>              saveables;
-    static std::vector<GuiSaveableGroup*>  saveableGroups;
+    std::vector<Saveable*>              saveables;
+    static std::vector<SaveableGroup*>  saveableGroups;
   };
 

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

@@ -19 +19 @@
 
 #include <qapplication.h>
-
+#include <qgroupbox.h>
+#include <qlayout.h>
 
 namespace OrxGui
@@ -28 +29 @@
 
     this->mainWindow = new QMainWindow();
+
+
+    QGroupBox* groupBox = new QGroupBox;
+    QGridLayout* mainLayout = new QGridLayout(groupBox);
+
+
+
+
+    this->mainWindow->setCentralWidget(groupBox);
     this->mainWindow->show();
 
@@ -37 +47 @@
   QtGui::~QtGui()
   {
-
+    delete this->mainWindow;
   }