Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 7549 in orxonox.OLD for branches/qt_gui/src/lib/gui/qt_gui


Ignore:
Timestamp:
May 6, 2006, 10:52:49 AM (18 years ago)
Author:
bensch
Message:

Saveable integration. Step 1

Location:
branches/qt_gui/src/lib/gui/qt_gui
Files:
7 edited

Legend:

Unmodified
Added
Removed

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

    r7539 r7549  
    3737   *  Creates the Audio-Option-Frame
    3838  */
    39   GuiAudio::GuiAudio(QWidget* parent)
    40   : Element("Audio"), QGroupBox(parent)
     39  GuiAudio::GuiAudio(OrxGui::Gui* gui)
     40  : Element("Audio", gui), QGroupBox()
    4141  {
    4242    QGridLayout* layout = new QGridLayout(this);
    … …  
    4444    {
    4545      QtGuiCheckBox* fullscreen = new QtGuiCheckBox("Enabled", true);
    46       //fullscreen->setName();
    4746      layout->addWidget(fullscreen, 0, 0);
    4847
    … …  
    5049      layout->addWidget(wireframe, 1, 0);
    5150
    52       QtGuiComboBox* resolution = new QtGuiComboBox("SoundCard");
    53       layout->addWidget(resolution, 2, 0);
     51      QtGuiComboBox* soundCard = new QtGuiComboBox("SoundCard");
     52      layout->addWidget(soundCard, 2, 0);
    5453
     54      QtGuiSlider* channels = new QtGuiSlider("Channels");
     55      layout->addWidget(channels, 3, 0);
    5556
     57      QtGuiSlider* musicVolume = new QtGuiSlider("Music-Volume");
     58      layout->addWidget(musicVolume,0, 1);
     59      QtGuiSlider* effectVolume = new QtGuiSlider("Effects-Volume");
     60      layout->addWidget(effectVolume, 0, 2);
    5661    }
    5762

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

    r7534 r7549  
    1717  {
    1818  public:
    19     GuiAudio(QWidget* parent = NULL);
     19    GuiAudio(OrxGui::Gui* gui);
    2020    virtual ~GuiAudio();
    2121

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

    r7547 r7549  
    3838   *  Creates the Video-Option-Frame
    3939  */
    40   GuiVideo::GuiVideo(QWidget* parent)
    41       : Element("Video"), QGroupBox(parent)
     40  GuiVideo::GuiVideo(OrxGui::Gui* gui)
     41      : Element("Video", gui), QGroupBox()
    4242  {
    4343    QGridLayout* layout = new QGridLayout(this);

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

    r7534 r7549  
    1717  {
    1818  public:
    19     GuiVideo(QWidget* parent = NULL);
     19    GuiVideo(OrxGui::Gui* gui);
    2020    virtual ~GuiVideo();
    2121

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

    r7548 r7549  
    4141      {
    4242
    43         toolBox->addItem(new GuiVideo(toolBox), "Video");
    44         toolBox->addItem(new GuiAudio(toolBox), "Audio");
     43        toolBox->addItem(new GuiVideo(this), "Video");
     44        toolBox->addItem(new GuiAudio(this), "Audio");
    4545      }
    4646      mainLayout->addWidget(toolBox,1,1, 1, 3);
    … …  
    6161
    6262    this->exec();
    63 
    64 
    6563  }
    6664
    … …  
    9189    this->quit();
    9290  }
     91
    9392  void QtGui::startApp()
    9493  {

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

    r7539 r7549  
    4343  }
    4444
     45
     46
     47
     48
     49  QtGuiSlider::QtGuiSlider(const std::string& name)
     50  : QSlider(), Saveable(name)
     51  {
     52
     53  }
     54  QtGuiSlider::~QtGuiSlider()
     55  {}
     56
     57
     58
     59
     60
     61
     62
     63
    4564  QtGuiComboBox::QtGuiComboBox(const std::string& name)
    4665  : QComboBox(), Saveable(name)

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

    r7543 r7549  
    4848
    4949  public:
    50     QtGuiSlider();
    51     virtual ~QtGuiSlider() {};
     50    QtGuiSlider(const std::string& name);
     51    virtual ~QtGuiSlider();
    5252
    5353  public slots:
Note: See TracChangeset for help on using the changeset viewer.