Changeset 7534 in orxonox.OLD for branches/qt_gui/src/lib
- Timestamp:
- May 4, 2006, 3:14:25 PM (19 years ago)
- Location:
- branches/qt_gui/src/lib/gui/qt_gui
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/qt_gui/src/lib/gui/qt_gui/gui_audio.cc
r7495 r7534 27 27 #include "gui_audio.h" 28 28 29 #include < qlayout.h>29 #include <QtGui/QLayout> 30 30 #include "sdlincl.h" 31 31 #include "debug.h" 32 32 33 #include < qpushbutton.h>34 #include < qcheckbox.h>35 #include < qcombobox.h>33 #include <QtGui/QPushButton> 34 #include <QtGui/QCheckBox> 35 #include <QtGui/QComboBox> 36 36 37 37 namespace OrxGui … … 46 46 47 47 { 48 QCheckBox* fullscreen = new QCheckBox(QString("Enabled") , this);48 QCheckBox* fullscreen = new QCheckBox(QString("Enabled")); 49 49 //fullscreen->setName(); 50 50 layout->addWidget(fullscreen, 0, 0); 51 51 52 QCheckBox* wireframe = new QCheckBox("Test" , this);52 QCheckBox* wireframe = new QCheckBox("Test"); 53 53 layout->addWidget(wireframe, 1, 0); 54 54 55 QComboBox* resolution = new QComboBox( "SecondTest", this);55 QComboBox* resolution = new QComboBox(); 56 56 layout->addWidget(resolution, 2, 0); 57 57 -
branches/qt_gui/src/lib/gui/qt_gui/gui_audio.h
r7495 r7534 9 9 #include <vector> 10 10 #include <string> 11 #include < qgroupbox.h>11 #include <QtGui/QGroupBox> 12 12 13 13 namespace OrxGui -
branches/qt_gui/src/lib/gui/qt_gui/gui_video.cc
r7531 r7534 27 27 #include "gui_video.h" 28 28 29 #include < qlayout.h>29 #include <QtGui/QLayout> 30 30 #include "sdlincl.h" 31 31 #include "debug.h" 32 32 33 #include <qpushbutton.h> 34 #include <qcheckbox.h> 35 #include <qcombobox.h> 33 34 #include <QtGui/QPushButton> 35 #include <QtGui/QCheckBox> 36 #include <QtGui/QComboBox> 36 37 37 38 namespace OrxGui … … 54 55 55 56 { 56 QComboBox* resolution = new QComboBox( "Resolution", this);57 QComboBox* resolution = new QComboBox(); 57 58 layout->addWidget(resolution, 2, 0); 58 59 std::vector<QString> resolutions; 59 60 this->getResolutions(resolutions); 60 61 for (unsigned int i = 0; i < resolutions.size(); ++i) 61 resolution-> insertItem(resolutions[i]);62 resolution->addItem(resolutions[i]); 62 63 } 63 64 … … 148 149 PRINTF(5)(" %d x %d\n", modes[i]->w, modes[i]->h); 149 150 sprintf(tmpChar, "%dx%d", modes[i]->w, modes[i]->h); 150 resolutionList.push_back( std::string(tmpChar));151 resolutionList.push_back(QString(tmpChar)); 151 152 x = modes[i]->w; y = modes[i]->h; 152 153 } -
branches/qt_gui/src/lib/gui/qt_gui/gui_video.h
r7531 r7534 9 9 #include <vector> 10 10 #include <string> 11 #include < qgroupbox.h>11 #include <QtGui/QGroupBox> 12 12 13 13 namespace OrxGui -
branches/qt_gui/src/lib/gui/qt_gui/qt_gui.cc
r7531 r7534 18 18 #include "qt_gui.h" 19 19 20 #include <qapplication.h> 21 #include <qgroupbox.h> 22 #include <qlayout.h> 23 #include <qtoolbox.h> 20 #include <QtGui/QApplication> 21 #include <QtGui/QToolBox> 22 #include <QtGui/QGridLayout> 24 23 25 #include <qpushbutton.h>26 #include <qcombobox.h>27 24 28 25 #include "gui_video.h" -
branches/qt_gui/src/lib/gui/qt_gui/qt_gui.h
r7493 r7534 9 9 #include "../gui.h" 10 10 #include "../gui_element.h" 11 #include < qapplication.h>12 #include < qmainwindow.h>11 #include <QtGui/QApplication> 12 #include <QtGui/QMainWindow> 13 13 14 14 namespace OrxGui
Note: See TracChangeset
for help on using the changeset viewer.