Changeset 8749 in orxonox.OLD for trunk/src

Timestamp:

Jun 23, 2006, 5:08:04 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: fallback test for ORXONOX-data-directory

Location:

trunk/src

Files:

• lib/gui/qt/Makefile.am (modified) (2 diffs)
• lib/gui/qt/qt_gui_datadir_fallback.cc (copied) (copied from trunk/src/lib/gui/qt/qt_gui.cc) (6 diffs)
• lib/gui/qt/qt_gui_datadir_fallback.h (copied) (copied from trunk/src/lib/gui/qt/qt_gui.h) (3 diffs)
• orxonox.cc (modified) (6 diffs)

trunk/src/lib/gui/qt/Makefile.am

@@ -25 +25 @@
                 gui_general_moc.cc \
                 gui_control.cc \
-                gui_control_moc.cc
+                gui_control_moc.cc \
+                \
+                qt_gui_datadir_fallback.cc \
+                qt_gui_datadir_fallback_moc.cc
+
 
 
@@ -36 +40 @@
                 gui_audio.h \
                 gui_general.h \
-                gui_control.h
+                gui_control.h \
+                \
+                qt_gui_datadir_fallback.cc
 
 

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

@@ -16 +16 @@
 //#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_
 
-#include "qt_gui.h"
+#include "qt_gui_datadir_fallback.h"
 
 #include <QtGui/QApplication>
@@ -34 +34 @@
 namespace OrxGui
 {
-  QtGui::QtGui(int argc, char** argv)
+  QtGuiDataDirFallback::QtGuiDataDirFallback(int argc, char** argv)
   : QApplication(argc, argv)
   {
@@ -50 +50 @@
       mainLayout->addWidget(bannerWidget, 0,0, 3, 1);
 
-
-      QToolBox* toolBox = new QToolBox(groupBox);
-      {
-        toolBox->addItem(new GuiGeneral(this), "General");
-        toolBox->addItem(new GuiVideo(this), "Video");
-        toolBox->addItem(new GuiAudio(this), "Audio");
-        toolBox->addItem(new GuiControl(this), "Control");
-      }
-      mainLayout->addWidget(toolBox,1,1, 1, 3);
-
+      mainLayout->addWidget(new GuiGeneral(this), 1, 1, 1, 3);
 
       QPushButton* start = new QPushButton("start");
@@ -81 +72 @@
   }
 
-  QtGui::~QtGui()
+  QtGuiDataDirFallback::~QtGuiDataDirFallback()
   {
     delete this->mainWindow;
   }
 
-  void QtGui::startGui()
+  void QtGuiDataDirFallback::startGui()
   {
   }
 
-  void QtGui::stopGui()
+  void QtGuiDataDirFallback::stopGui()
   {}
 
-  void QtGui::suspend()
+  void QtGuiDataDirFallback::suspend()
   {}
 
     //! Update the Gui.
-  void QtGui::update()
+  void QtGuiDataDirFallback::update()
   {
     this->processEvents();
@@ -103 +94 @@
 
 
-  void QtGui::quitApp()
+  void QtGuiDataDirFallback::quitApp()
   {
     Gui::quitEvent();
@@ -109 +100 @@
   }
 
-  void QtGui::startApp()
+  void QtGuiDataDirFallback::startApp()
   {
     Gui::startEvent();

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

@@ -1 +1 @@
 /*!
- * @file qt_gui.h
+ * @file qt_gui_datadir_fallback.h
  * @brief Definition of ...
 */
 
-#ifndef __QT_GUI_H
-#define __QT_GUI_H
+#ifndef __QT_GUI_DATADIR_FALLBACK_H
+#define __QT_GUI_DATADIR_FALLBACK_H
 
 #include "../gui.h"
@@ -14 +14 @@
 namespace OrxGui
 {
-  class QtGui : public QApplication, public OrxGui::Gui
+  class QtGuiDataDirFallback : public QApplication, public OrxGui::Gui
   {
     Q_OBJECT
     public:
-      QtGui(int argc, char** argv);
-      virtual ~QtGui();
+      QtGuiDataDirFallback(int argc, char** argv);
+      virtual ~QtGuiDataDirFallback();
 
     //! Start the Gui
@@ -40 +40 @@
 }
 
-#endif /* __QT_GUI_H */
+#endif /* __QT_GUI_DATADIR_FALLBACK_H */

trunk/src/orxonox.cc

@@ -31 +31 @@
 
 #include "gui/qt/qt_gui.h"
+#include "gui/qt/qt_gui_datadir_fallback.h"
 
 #include "parser/ini_parser/ini_parser.h"
@@ -227 +228 @@
   // initialize everything
   SDL_Init(0);
+  if( initVideo() == -1)
+    return -1;
   if( initResources () == -1)
-    return -1;
-  if( initVideo() == -1)
     return -1;
   if( initSound() == -1)
@@ -286 +287 @@
   PRINT(3)("> Initializing input\n");
 
-  EventHandler::getInstance()->
   EventHandler::getInstance()->init();
   EventHandler::getInstance()->subscribe(GraphicsEngine::getInstance(), ES_ALL, EV_VIDEO_RESIZE);
@@ -336 +336 @@
   }
 
-  if (!ResourceManager::getInstance()->verifyDataDir(DEFAULT_DATA_DIR_CHECKFILE))
-  {
+
+  while (!ResourceManager::getInstance()->verifyDataDir(DEFAULT_DATA_DIR_CHECKFILE))
+  {
+
     PRINTF(1)("The DataDirectory %s could not be verified\n\nh" \
               "!!!  Please Change in File %s Section %s Entry %s to a suitable value !!!\n",
@@ -344 +346 @@
               CONFIG_SECTION_GENERAL,
               CONFIG_NAME_DATADIR );
-    OrxGui::Gui* gui = new OrxGui::QtGui(argc, argv);
+    OrxGui::Gui* gui = new OrxGui::QtGuiDataDirFallback(argc, argv);
     gui->startGui();
     delete gui;
-    exit(-1);
-  }
+    ResourceManager::getInstance()->setDataDir(Preferences::getInstance()->getString(CONFIG_SECTION_GENERAL, CONFIG_NAME_DATADIR, ""));
+
+  }
+
+
   //! @todo this is a hack and should be loadable
   std::string imageDir = ResourceManager::getInstance()->getFullName("maps");
@@ -356 +361 @@
 
   //  DynamicLoader::loadDyLib("libtest.so");
+  return 0;
+}
+
+/**
+ * initializes miscelaneous features
+ * @return -1 on failure
+ */
+int Orxonox::initMisc()
+{
+  OrxShell::ShellBuffer::getInstance();
 
   // start the collision detection engine
   CDEngine::getInstance();
-  return 0;
-}
-
-/**
- * initializes miscelaneous features
- * @return -1 on failure
- */
-int Orxonox::initMisc()
-{
-  OrxShell::ShellBuffer::getInstance();
+
   return 0;
 }