Changeset 7484 in orxonox.OLD for branches/qt_gui/src
- Timestamp:
- May 2, 2006, 11:39:54 PM (19 years ago)
- Location:
- branches/qt_gui/src/lib/gui
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/qt_gui/src/lib/gui/gui_element.cc
r7480 r7484 27 27 * standard constructor 28 28 */ 29 GuiElement::GuiElement (const std::string& name)29 Element::Element (const std::string& name) 30 30 : SaveableGroup(name) 31 31 { … … 38 38 39 39 */ 40 GuiElement::~GuiElement()40 Element::~Element() 41 41 { 42 42 // delete what has to be deleted here … … 46 46 * Every GuiElement should set this, or it could result in a SegFault. 47 47 */ 48 void GuiElement::setMainWidget(Widget* widget)48 void Element::setMainWidget(Widget* widget) 49 49 { 50 50 this->mainWidget = widget; -
branches/qt_gui/src/lib/gui/gui_element.h
r7480 r7484 15 15 16 16 //! A SuperClass for all the Different GuiElements 17 class GuiElement : public SaveableGroup17 class Element : public SaveableGroup 18 18 { 19 19 20 20 public: 21 GuiElement(const std::string& name);22 virtual ~ GuiElement();21 Element(const std::string& name); 22 virtual ~Element(); 23 23 24 24 /** @returns the main Widget of this GuiElement. */ -
branches/qt_gui/src/lib/gui/qt_gui/Makefile.am
r7481 r7484 1 1 MAINSRCDIR=../../.. 2 include $(MAINSRCDIR)/defs/include_paths.am 2 include = $(MAINSRCDIR)/lib/lang 3 include+= $(MAINSRCDIR)/defs 3 4 4 5 AM_LDFLAGS = -
branches/qt_gui/src/lib/gui/qt_gui/gui_video.cc
r7481 r7484 26 26 27 27 #include "gui_video.h" 28 29 #include <qlayout.h> 28 30 #include "sdlincl.h" 29 31 #include "debug.h" 32 33 #include <qpushbutton.h> 34 #include <qcheckbox.h> 35 #include <qcombobox.h> 30 36 31 37 namespace OrxGui … … 35 41 */ 36 42 GuiVideo::GuiVideo() 43 : Element("Video") 37 44 { 45 QGridLayout* layout = new QGridLayout(this); 46 { 47 QCheckBox* fullscreen = new QCheckBox(QString("FullScreen"), NULL); 48 //fullscreen->setName(); 49 layout->addWidget(fullscreen, 1, 1); 50 51 } 52 53 54 38 55 /* Frame* videoFrame; //!< The Frame that holds the video options. 39 56 -
branches/qt_gui/src/lib/gui/qt_gui/gui_video.h
r7481 r7484 6 6 #define _GUI_VIDEO_H 7 7 8 #include " gui_element.h"8 #include "../gui_element.h" 9 9 #include <vector> 10 10 #include <string> 11 #include <qgroupbox.h> 11 12 12 13 namespace OrxGui 13 14 { 14 15 //! Class that creates the Video-Options. 15 class GuiVideo : public GuiElement16 class GuiVideo : public OrxGui::Element, public QGroupBox 16 17 { 17 18 public: -
branches/qt_gui/src/lib/gui/qt_gui/qt_gui.cc
r7480 r7484 21 21 #include <qgroupbox.h> 22 22 #include <qlayout.h> 23 #include <qtoolbox.h> 24 25 26 #include "gui_video.h" 23 27 24 28 namespace OrxGui … … 33 37 QGroupBox* groupBox = new QGroupBox; 34 38 QGridLayout* mainLayout = new QGridLayout(groupBox); 35 36 37 39 { 40 QToolBox* toolBox = new QToolBox(); 41 { 42 // toolBox->addItem(new GuiVideo(), "Video"); 43 } 44 } 38 45 39 46 this->mainWindow->setCentralWidget(groupBox);
Note: See TracChangeset
for help on using the changeset viewer.