Changeset 7531 in orxonox.OLD for branches/qt_gui/src/lib
- Timestamp:
- May 4, 2006, 9:52:36 AM (19 years ago)
- Location:
- branches/qt_gui/src/lib/gui/qt_gui
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/qt_gui/src/lib/gui/qt_gui/gui_video.cc
r7529 r7531 56 56 QComboBox* resolution = new QComboBox("Resolution", this); 57 57 layout->addWidget(resolution, 2, 0); 58 std::vector< std::string> resolutions;58 std::vector<QString> resolutions; 59 59 this->getResolutions(resolutions); 60 60 for (unsigned int i = 0; i < resolutions.size(); ++i) … … 115 115 * @param menu the Menu to set The resolutions to. 116 116 */ 117 void GuiVideo::getResolutions(std::vector< std::string>& resolutionList)117 void GuiVideo::getResolutions(std::vector<QString>& resolutionList) 118 118 { 119 119 SDL_Init(SDL_INIT_VIDEO); -
branches/qt_gui/src/lib/gui/qt_gui/gui_video.h
r7493 r7531 21 21 22 22 private: 23 void getResolutions(std::vector< std::string>& resolutionList);23 void getResolutions(std::vector<QString>& resolutionList); 24 24 }; 25 25 } -
branches/qt_gui/src/lib/gui/qt_gui/qt_gui.cc
r7495 r7531 24 24 25 25 #include <qpushbutton.h> 26 #include <qcombobox.h> 26 27 27 28 #include "gui_video.h" -
branches/qt_gui/src/lib/gui/qt_gui/qt_gui_elements.cc
r7472 r7531 23 23 24 24 25 26 27 QtGuiComboBox::QtGuiComboBox(QWidget* parent, const std::string& name) 28 : QComboBox(parent), Saveable(name) 29 { 30 31 32 } 33 34 35 25 36 } -
branches/qt_gui/src/lib/gui/qt_gui/qt_gui_elements.h
r7472 r7531 115 115 }; 116 116 117 118 class QtGuiComboBox : public QComboBox, public OrxGui::Saveable 119 { 120 QtGuiComboBox(QWidget* parent, const std::string& name); 121 } 122 123 124 117 125 class QtGuiTextLine : public QLineEdit, public QtGuiWidget, public GuiSaveable 118 126 {
Note: See TracChangeset
for help on using the changeset viewer.