Changeset 7608 in orxonox.OLD for branches/qt_gui/src/orxonox.cc

Timestamp:

May 12, 2006, 10:43:53 AM (18 years ago)

Author:

bensch

Message:

merged the old qt-gui back with
svn merge -r7438:HEAD ​https://svn.orxonox.net/orxonox/branches/qt_gui_old .
minor conflict in BuildLibs.am

File:

• branches/qt_gui/src/orxonox.cc (modified) (6 diffs)

branches/qt_gui/src/orxonox.cc

@@ -30 +30 @@
 #include "globals.h"
 
-#include "gui.h"
+#include "gui/qt_gui/qt_gui.h"
 
 #include "parser/ini_parser/ini_parser.h"
@@ -280 +280 @@
   PRINT(3)("> Initializing input\n");
 
+  EventHandler::getInstance()->
   EventHandler::getInstance()->init();
   EventHandler::getInstance()->subscribe(GraphicsEngine::getInstance(), ES_ALL, EV_VIDEO_RESIZE);
@@ -319 +320 @@
   // 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) &&
@@ -334 +335 @@
     ResourceManager::getInstance()->getDataDir().c_str(),
     this->configFileName.c_str(),
-              CONFIG_SECTION_DATA,
+              CONFIG_SECTION_GENERAL,
               CONFIG_NAME_DATADIR );
-    Gui* gui = new Gui(argc, argv);
+    OrxGui::Gui* gui = new OrxGui::QtGui(argc, argv);
     gui->startGui();
     delete gui;
@@ -426 +427 @@
 
   IniFilePrefsReader ini(ResourceManager::homeDirCheck(DEFAULT_CONFIG_FILE));
+  Preferences::getInstance()->setUserIni(ResourceManager::homeDirCheck(DEFAULT_CONFIG_FILE));
 
   prefs.parse(argc, argv);
@@ -512 +514 @@
 
     // starting the GUI
-    Gui* gui = new Gui(argc, argv);
-    gui->startGui();
-
-    if (! gui->startOrxonox)
+    OrxGui::QtGui gui(argc, argv);
+    gui.startGui();
+
+    if (gui.getState() & OrxGui::Gui::Quitting)
       return 0;
 
-    delete gui;
   }