Changeset 7603 in orxonox.OLD for branches

Timestamp:

May 12, 2006, 9:14:47 AM (19 years ago)

Author:

bensch

Message:

DataDirectory-selection works

Location:

branches/qt_gui/src

Files:

• defs/globals.h (modified) (1 diff)
• lib/gui/qt_gui/gui_general.cc (modified) (2 diffs)
• lib/gui/qt_gui/gui_general.h (modified) (2 diffs)
• lib/gui/qt_gui/qt_gui_elements.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_GENERAL           "data"
+#define   CONFIG_SECTION_GENERAL           "general"
 
 /*

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

@@ -47 +47 @@
       QLabel* dataDirLabel = new QLabel("DataDirectory");
       layout->addWidget(dataDirLabel, 0,0);
-      QtGuiInputLine* dataDir = new QtGuiInputLine(CONFIG_NAME_DATADIR, this);
+      this->dataDir = new QtGuiInputLine(CONFIG_NAME_DATADIR, this);
       layout->addWidget(dataDir, 0, 1, 1, 2);
       QPushButton* dataFileDialogButton = new QPushButton("browse");
       layout->addWidget(dataFileDialogButton, 0, 3, 1, 1);
       connect(dataFileDialogButton, SIGNAL(released()), this, SLOT(openDataFileDialog()));
-
 
 
@@ -83 +82 @@
     "Choose the ORXONOX DATA DIRECTORY",
     ".",
-    "ORXONOX DATA INDEX (data.oxd)");
+    "ORXONOX DATA INDEX (" DEFAULT_DATA_DIR_CHECKFILE ")" );
+
+    s.remove("data.oxd");
+    if (!s.isNull())
+      this->dataDir->setText(s);
   }
 

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

@@ -11 +11 @@
 #include <QtGui/QGroupBox>
 
+
 namespace OrxGui
 {
+  class QtGuiInputLine;
+
   //! Class that creates the Audio-Options.
   class GuiGeneral : public QGroupBox, public OrxGui::Element
@@ -22 +25 @@
     virtual ~GuiGeneral();
 
-    public slots:
-      void openDataFileDialog();
+  public slots:
+    void openDataFileDialog();
 
+  private:
+    QtGuiInputLine* dataDir;
   };
 }

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

@@ -107 +107 @@
   void QtGuiInputLine::load()
   {
-    this->setText(this->value().getString().c_str());
+    Saveable::load();
+    this->setText(QString().fromStdString(this->value().getString()));
   }
 
@@ -114 +115 @@
   void QtGuiInputLine::save()
   {
+    this->value() = this->text().toStdString();
+    Saveable::save();
   }