Changeset 7484 in orxonox.OLD for branches

Timestamp:

May 2, 2006, 11:39:54 PM (19 years ago)

Author:

bensch

Message:

orxonox/qt_gui: more stuff

Location:

branches/qt_gui/src/lib/gui

Files:

• gui_element.cc (modified) (3 diffs)
• gui_element.h (modified) (1 diff)
• qt_gui/Makefile.am (modified) (1 diff)
• qt_gui/gui_video.cc (modified) (2 diffs)
• qt_gui/gui_video.h (modified) (1 diff)
• qt_gui/qt_gui.cc (modified) (2 diffs)

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

@@ -27 +27 @@
    *  standard constructor
    */
-  GuiElement::GuiElement (const std::string& name)
+  Element::Element (const std::string& name)
   : SaveableGroup(name)
   {
@@ -38 +38 @@
 
   */
-  GuiElement::~GuiElement ()
+  Element::~Element()
   {
     // delete what has to be deleted here
@@ -46 +46 @@
    *  Every GuiElement should set this, or it could result in a SegFault.
   */
-  void GuiElement::setMainWidget(Widget* widget)
+  void Element::setMainWidget(Widget* widget)
   {
     this->mainWidget = widget;

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

@@ -15 +15 @@
 
   //! A SuperClass for all the Different GuiElements
-  class GuiElement : public SaveableGroup
+  class Element : public SaveableGroup
   {
 
   public:
-    GuiElement(const std::string& name);
-    virtual ~GuiElement();
+    Element(const std::string& name);
+    virtual ~Element();
 
     /** @returns the main Widget of this GuiElement. */

branches/qt_gui/src/lib/gui/qt_gui/Makefile.am

@@ -1 +1 @@
 MAINSRCDIR=../../..
-include $(MAINSRCDIR)/defs/include_paths.am
+include = $(MAINSRCDIR)/lib/lang
+include+= $(MAINSRCDIR)/defs
 
 AM_LDFLAGS =

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

@@ -26 +26 @@
 
 #include "gui_video.h"
+
+#include <qlayout.h>
 #include "sdlincl.h"
 #include "debug.h"
+
+#include <qpushbutton.h>
+#include <qcheckbox.h>
+#include <qcombobox.h>
 
 namespace OrxGui
@@ -35 +41 @@
   */
   GuiVideo::GuiVideo()
+  : Element("Video")
   {
+    QGridLayout* layout = new QGridLayout(this);
+    {
+      QCheckBox* fullscreen = new QCheckBox(QString("FullScreen"), NULL);
+      //fullscreen->setName();
+      layout->addWidget(fullscreen, 1, 1);
+
+    }
+
+
+
 /*    Frame* videoFrame;        //!< The Frame that holds the video options.
 

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

@@ -6 +6 @@
 #define _GUI_VIDEO_H
 
-#include "gui_element.h"
+#include "../gui_element.h"
 #include <vector>
 #include <string>
+#include <qgroupbox.h>
 
 namespace OrxGui
 {
   //! Class that creates the Video-Options.
-  class GuiVideo : public GuiElement
+  class GuiVideo : public OrxGui::Element, public QGroupBox
   {
   public:

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

@@ -21 +21 @@
 #include <qgroupbox.h>
 #include <qlayout.h>
+#include <qtoolbox.h>
+
+
+#include "gui_video.h"
 
 namespace OrxGui
@@ -33 +37 @@
     QGroupBox* groupBox = new QGroupBox;
     QGridLayout* mainLayout = new QGridLayout(groupBox);
-
-
-
+    {
+      QToolBox* toolBox = new QToolBox();
+      {
+       // toolBox->addItem(new GuiVideo(), "Video");
+      }
+    }
 
     this->mainWindow->setCentralWidget(groupBox);