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

Timestamp:

May 17, 2006, 11:43:19 AM (18 years ago)

Author:

bensch

Message:

qt_gui: better gui and stuff

Location:

branches/qt_gui/src

Files:

• defs/globals.h (modified) (1 diff)
• lib/gui/qt_gui/gui_video.cc (modified) (1 diff)
• lib/gui/qt_gui/qt_gui_elements.cc (modified) (1 diff)

branches/qt_gui/src/defs/globals.h

@@ -81 +81 @@
 
 #define   CONFIG_NAME_PLAYER_FIRE          "Fire"
-#define   CONFIG_NAME_PLAYER_NEXT_WEAPON   "Next"
-#define   CONFIG_NAME_PLAYER_PREV_WEAPON   "Prev"
-#define   CONFIG_NAME_PLAYER_CHANGE_SHIP   "Change_Ship"
+#define   CONFIG_NAME_PLAYER_NEXT_WEAPON   "Next-Weapon"
+#define   CONFIG_NAME_PLAYER_PREV_WEAPON   "Previous-Weapon"
+#define   CONFIG_NAME_PLAYER_CHANGE_SHIP   "Change-Ship"
 
 #define   CONFIG_NAME_QUIT                 "Quit"

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

@@ -53 +53 @@
       {
         QComboBox* resolution = new QtGuiComboBox(CONFIG_NAME_RESOLUTION, this, "640x480");
+        resolution->setEditable(true);
         layout->addWidget(resolution, 2, 0);
         std::vector<QString> resolutions;

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

@@ -87 +87 @@
   {
     Saveable::load();
-    this->setCurrentIndex(this->findText(QString().fromStdString(this->value().getString())));
+    int index = this->findText(QString().fromStdString(this->value().getString()));
+    if (index == -1)
+      index = 1;
+    this->setCurrentIndex(index);
   }