Changeset 8750 in orxonox.OLD

Timestamp:

Jun 23, 2006, 5:28:13 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: now one can also close orxonox when the datadir is not found by the user

Location:

trunk/src

Files:

• lib/gui/qt/qt_gui_datadir_fallback.cc (modified) (1 diff)
• orxonox.cc (modified) (1 diff)

trunk/src/lib/gui/qt/qt_gui_datadir_fallback.cc

@@ -49 +49 @@
       bannerWidget->setImage(bannerImage);
       mainLayout->addWidget(bannerWidget, 0,0, 3, 1);
+
+      QLabel* label = new QLabel();
+      label->setText("ORXONOX needs its DataDirectory to be configured.\n Just Select the ORXONOX-dataDirectory with the browse-button, and start the Game\n");
+
+      mainLayout->addWidget(label, 0,1);
 
       mainLayout->addWidget(new GuiGeneral(this), 1, 1, 1, 3);

trunk/src/orxonox.cc

@@ -348 +348 @@
     OrxGui::Gui* gui = new OrxGui::QtGuiDataDirFallback(argc, argv);
     gui->startGui();
+    if (gui->getState() == OrxGui::Gui::Quitting)
+      return(-1);
     delete gui;
     ResourceManager::getInstance()->setDataDir(Preferences::getInstance()->getString(CONFIG_SECTION_GENERAL, CONFIG_NAME_DATADIR, ""));