Changeset 7661 in orxonox.OLD for trunk/src/orxonox.cc

Timestamp:

May 18, 2006, 12:55:34 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the QT_GUI back to the trunk
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/qt_gui . -r7607:HEAD

absolutely no conflicts

File:

• trunk/src/orxonox.cc (modified) (9 diffs)

trunk/src/orxonox.cc

@@ -30 +30 @@
 #include "globals.h"
 
-#include "gui.h"
-
+#include "gui/qt_gui/qt_gui.h"
+
+#include "file.h"
 #include "parser/ini_parser/ini_parser.h"
 #include "util/loading/game_loader.h"
@@ -189 +190 @@
 const std::string& Orxonox::getConfigFile ()
 {
-  if (ResourceManager::isFile("orxonox.conf"))
+  File orxConfFile("orxonox.conf");
+  if (orxConfFile.isFile())
   {
     this->configFileName =  "orxonox.conf";
   }
   else
-    this->configFileName = ResourceManager::homeDirCheck(DEFAULT_CONFIG_FILE);
+    this->configFileName = File(DEFAULT_CONFIG_FILE).name();
 
   PRINTF(3)("Parsed Config File: '%s'\n", this->configFileName);
@@ -280 +282 @@
   PRINT(3)("> Initializing input\n");
 
+  EventHandler::getInstance()->
   EventHandler::getInstance()->init();
   EventHandler::getInstance()->subscribe(GraphicsEngine::getInstance(), ES_ALL, EV_VIDEO_RESIZE);
@@ -319 +322 @@
   // 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 +337 @@
     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;
@@ -425 +428 @@
   CmdLinePrefsReader prefs;
 
-  IniFilePrefsReader ini(ResourceManager::homeDirCheck(DEFAULT_CONFIG_FILE));
+  IniFilePrefsReader ini(File(DEFAULT_CONFIG_FILE).name());
+  Preferences::getInstance()->setUserIni(File(DEFAULT_CONFIG_FILE).name());
 
   prefs.parse(argc, argv);
@@ -501 +505 @@
 {
   // checking for existence of the configuration-files, or if the lock file is still used
-  if (showGui || (!ResourceManager::isFile("./orxonox.conf") &&
-                  !ResourceManager::isFile(DEFAULT_CONFIG_FILE))
+  if (showGui || (!File("./orxonox.conf").isFile() &&
+      !File(DEFAULT_CONFIG_FILE).isFile())
 #if DEBUG < 3 // developers do not need to see the GUI, when orxonox fails
       || ResourceManager::isFile(DEFAULT_LOCK_FILE)
@@ -508 +512 @@
      )
   {
-    if (ResourceManager::isFile(DEFAULT_LOCK_FILE))
-      ResourceManager::deleteFile(DEFAULT_LOCK_FILE);
+    File lockFile(DEFAULT_LOCK_FILE);
+    if (lockFile.isFile())
+      lockFile.remove();
 
     // 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;
   }
 
   PRINT(0)(">>> Starting Orxonox <<<\n");
 
-  ResourceManager::touchFile(DEFAULT_LOCK_FILE);
+  File(DEFAULT_LOCK_FILE).touch();
 
   Orxonox *orx = Orxonox::getInstance();
@@ -537 +541 @@
 
   delete orx;
-  ResourceManager::deleteFile("~/.orxonox/orxonox.lock");
-}
+  File("~/.orxonox/orxonox.lock").remove();
+}