Changeset 7601 in orxonox.OLD

Timestamp:

May 12, 2006, 8:58:20 AM (18 years ago)

Author:

bensch

Message:

orxonox/qt_gui: QtGuiComboBox saveable

Location:

branches/qt_gui/src

Files:

• defs/globals.h (modified) (2 diffs)
• lib/gui/gtk_gui/gui_update.cc (modified) (1 diff)
• lib/gui/qt_gui/gui_general.cc (modified) (4 diffs)
• lib/gui/qt_gui/gui_video.cc (modified) (1 diff)
• lib/gui/qt_gui/qt_gui_elements.cc (modified) (1 diff)
• orxonox.cc (modified) (2 diffs)

branches/qt_gui/src/defs/globals.h

@@ -38 +38 @@
 #define   CONFIG_SECTION_VIDEO_ADVANCED    "video_advanced"
 #define   CONFIG_SECTION_AUDIO             "audio"
-#define   CONFIG_SECTION_EXEC              "exec"
-#define   CONFIG_SECTION_DATA              "data"
+#define   CONFIG_SECTION_GENERAL           "data"
 
 /*
@@ -70 +69 @@
 #define   CONFIG_NAME_VERBOSE_MODE         "Verbose-Mode"
 #define   CONFIG_NAME_ALWAYS_SHOW_GUI      "Always-Show-The-Gui"
+#define   CONFIG_NAME_DEBUG_LEVEL          "Debug-Level"
+
 // evenets
 #define   CONFIG_NAME_PLAYER_FORWARD       "Forward"

branches/qt_gui/src/lib/gui/gtk_gui/gui_update.cc

@@ -51 +51 @@
 
   this->updateFrame = new Frame("Update-Options:");
-  this->updateFrame->setGroupName(CONFIG_SECTION_DATA);
+  this->updateFrame->setGroupName(CONFIG_SECTION_GENERAL);
   this->updateBox = new Box('v');
 

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

@@ -31 +31 @@
 
 #include "debug.h"
+#include "globals.h"
 
 #include "qt_gui_elements.h"
@@ -40 +41 @@
   */
   GuiGeneral::GuiGeneral(OrxGui::Gui* gui)
-  : Element("General", gui), QGroupBox()
+  : Element(CONFIG_SECTION_GENERAL, gui), QGroupBox()
   {
     QGridLayout* layout = new QGridLayout(this);
@@ -46 +47 @@
       QLabel* dataDirLabel = new QLabel("DataDirectory");
       layout->addWidget(dataDirLabel, 0,0);
-      QtGuiInputLine* dataDir = new QtGuiInputLine("Data-Directory", this);
+      QtGuiInputLine* dataDir = new QtGuiInputLine(CONFIG_NAME_DATADIR, this);
       layout->addWidget(dataDir, 0, 1, 1, 2);
       QPushButton* dataFileDialogButton = new QPushButton("browse");
@@ -56 +57 @@
       QLabel* debugLabel = new QLabel("debug-mode");
       layout->addWidget(debugLabel, 1,0);
-      QtGuiComboBox* debug = new QtGuiComboBox("debug", this);
+      QtGuiComboBox* debug = new QtGuiComboBox(CONFIG_NAME_DEBUG_LEVEL, this);
       layout->addWidget(debug, 1, 1, 1, 2);
 

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

@@ -52 +52 @@
 
       {
-        QComboBox* resolution = new QComboBox();
+        QComboBox* resolution = new QtGuiComboBox(CONFIG_NAME_RESOLUTION, this);
         layout->addWidget(resolution, 2, 0);
         std::vector<QString> resolutions;

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

@@ -86 +86 @@
   void QtGuiComboBox::load()
   {
-    //TODO
+    Saveable::load();
+    this->setCurrentIndex(this->findText(QString().fromStdString(this->value().getString())));
   }
 
   void QtGuiComboBox::save()
   {
+    this->value() = this->currentText().toStdString();
+    Saveable::save();
   }
 

branches/qt_gui/src/orxonox.cc

@@ -314 +314 @@
   // init the resource manager
   std::string dataPath;
-  if ((dataPath = Preferences::getInstance()->getString(CONFIG_SECTION_DATA, CONFIG_NAME_DATADIR, ""))!= "")
+  if ((dataPath = Preferences::getInstance()->getString(CONFIG_SECTION_GENERAL, CONFIG_NAME_DATADIR, ""))!= "")
   {
     if (!ResourceManager::getInstance()->setDataDir(dataPath) &&
@@ -329 +329 @@
     ResourceManager::getInstance()->getDataDir().c_str(),
     this->configFileName.c_str(),
-              CONFIG_SECTION_DATA,
+              CONFIG_SECTION_GENERAL,
               CONFIG_NAME_DATADIR );
     OrxGui::Gui* gui = new OrxGui::QtGui(argc, argv);