Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 7484 in orxonox.OLD for branches/qt_gui/src


Ignore:
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:
6 edited

Legend:

Unmodified
Added
Removed
  • branches/qt_gui/src/lib/gui/gui_element.cc

    r7480 r7484  
    2727   *  standard constructor
    2828   */
    29   GuiElement::GuiElement (const std::string& name)
     29  Element::Element (const std::string& name)
    3030  : SaveableGroup(name)
    3131  {
     
    3838
    3939  */
    40   GuiElement::~GuiElement ()
     40  Element::~Element()
    4141  {
    4242    // delete what has to be deleted here
     
    4646   *  Every GuiElement should set this, or it could result in a SegFault.
    4747  */
    48   void GuiElement::setMainWidget(Widget* widget)
     48  void Element::setMainWidget(Widget* widget)
    4949  {
    5050    this->mainWidget = widget;
  • branches/qt_gui/src/lib/gui/gui_element.h

    r7480 r7484  
    1515
    1616  //! A SuperClass for all the Different GuiElements
    17   class GuiElement : public SaveableGroup
     17  class Element : public SaveableGroup
    1818  {
    1919
    2020  public:
    21     GuiElement(const std::string& name);
    22     virtual ~GuiElement();
     21    Element(const std::string& name);
     22    virtual ~Element();
    2323
    2424    /** @returns the main Widget of this GuiElement. */
  • branches/qt_gui/src/lib/gui/qt_gui/Makefile.am

    r7481 r7484  
    11MAINSRCDIR=../../..
    2 include $(MAINSRCDIR)/defs/include_paths.am
     2include = $(MAINSRCDIR)/lib/lang
     3include+= $(MAINSRCDIR)/defs
    34
    45AM_LDFLAGS =
  • branches/qt_gui/src/lib/gui/qt_gui/gui_video.cc

    r7481 r7484  
    2626
    2727#include "gui_video.h"
     28
     29#include <qlayout.h>
    2830#include "sdlincl.h"
    2931#include "debug.h"
     32
     33#include <qpushbutton.h>
     34#include <qcheckbox.h>
     35#include <qcombobox.h>
    3036
    3137namespace OrxGui
     
    3541  */
    3642  GuiVideo::GuiVideo()
     43  : Element("Video")
    3744  {
     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
    3855/*    Frame* videoFrame;        //!< The Frame that holds the video options.
    3956
  • branches/qt_gui/src/lib/gui/qt_gui/gui_video.h

    r7481 r7484  
    66#define _GUI_VIDEO_H
    77
    8 #include "gui_element.h"
     8#include "../gui_element.h"
    99#include <vector>
    1010#include <string>
     11#include <qgroupbox.h>
    1112
    1213namespace OrxGui
    1314{
    1415  //! Class that creates the Video-Options.
    15   class GuiVideo : public GuiElement
     16  class GuiVideo : public OrxGui::Element, public QGroupBox
    1617  {
    1718  public:
  • branches/qt_gui/src/lib/gui/qt_gui/qt_gui.cc

    r7480 r7484  
    2121#include <qgroupbox.h>
    2222#include <qlayout.h>
     23#include <qtoolbox.h>
     24
     25
     26#include "gui_video.h"
    2327
    2428namespace OrxGui
     
    3337    QGroupBox* groupBox = new QGroupBox;
    3438    QGridLayout* mainLayout = new QGridLayout(groupBox);
    35 
    36 
    37 
     39    {
     40      QToolBox* toolBox = new QToolBox();
     41      {
     42       // toolBox->addItem(new GuiVideo(), "Video");
     43      }
     44    }
    3845
    3946    this->mainWindow->setCentralWidget(groupBox);
Note: See TracChangeset for help on using the changeset viewer.