Changeset 7493 in orxonox.OLD for branches

Timestamp:

May 3, 2006, 12:45:13 AM (19 years ago)

Author:

bensch

Message:

some Widgets work

Location:

branches/qt_gui/src/lib/gui

Files:

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

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

@@ -64 +64 @@
   }
 
+  void SaveableGroup::load(const MultiType& value)
+  {}
+
+  const MultiType& SaveableGroup::save()
+  {}
+
+
+
   std::vector<SaveableGroup*>  SaveableGroup::saveableGroups;
 
@@ -72 +80 @@
 
 
+
 }

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

@@ -48 +48 @@
     void removeSaveable(Saveable* saveable);
 
+    virtual void load(const MultiType& value);
+    virtual const MultiType& save();
+
   protected:
     SaveableGroup(const std::string& name);

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

@@ -40 +40 @@
    *  Creates the Video-Option-Frame
   */
-  GuiVideo::GuiVideo()
-  : Element("Video")
+  GuiVideo::GuiVideo(QWidget* parent)
+  : Element("Video"), QGroupBox(parent)
   {
     QGridLayout* layout = new QGridLayout(this);
+
     {
-      QCheckBox* fullscreen = new QCheckBox(QString("FullScreen"), NULL);
+      QCheckBox* fullscreen = new QCheckBox(QString("FullScreen"), this);
       //fullscreen->setName();
-      layout->addWidget(fullscreen, 1, 1);
+      layout->addWidget(fullscreen, 0, 0);
+
+      QCheckBox* wireframe = new QCheckBox("Wireframe mode", this);
+      layout->addWidget(wireframe, 1, 0);
+
+      QComboBox* resolution = new QComboBox("Resolution", this);
+      layout->addWidget(resolution, 2, 0);
+
 
     }

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

@@ -17 +17 @@
   {
   public:
-    GuiVideo();
+    GuiVideo(QWidget* parent = NULL);
     virtual ~GuiVideo();
 

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

@@ -23 +23 @@
 #include <qtoolbox.h>
 
+#include <qpushbutton.h>
 
 #include "gui_video.h"
@@ -35 +36 @@
 
 
-    QGroupBox* groupBox = new QGroupBox;
+    QGroupBox* groupBox = new QGroupBox(this->mainWindow);
     QGridLayout* mainLayout = new QGridLayout(groupBox);
     {
-      QToolBox* toolBox = new QToolBox();
+      QToolBox* toolBox = new QToolBox(groupBox);
       {
-       // toolBox->addItem(new GuiVideo(), "Video");
+
+        toolBox->addItem(new GuiVideo(toolBox), "Video");
       }
+      mainLayout->addWidget(toolBox,1,1);
     }
 

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

@@ -32 +32 @@
     private:
       QMainWindow*              mainWindow;
-      std::list<Element*>       elements;   //!< A List of Elements within the QTGui
+      std::list<Element*>       elements;       //!< A List of Elements within the QTGui
   };
 }