Changeset 7603 in orxonox.OLD for branches/qt_gui/src/lib/gui/qt_gui/gui_general.cc

Timestamp:

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

Author:

bensch

Message:

DataDirectory-selection works

File:

• branches/qt_gui/src/lib/gui/qt_gui/gui_general.cc (modified) (2 diffs)

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);
   }