Changeset 7430

Timestamp:

Sep 12, 2010, 6:52:54 PM (14 years ago)

Author:

rgrieder

Message:

Added a main window to the Qt sandbox. That should be about it.

Location:

sandbox_qt/src/orxonox

Files:

• CMakeLists.txt (modified) (2 diffs)
• Main.cc (modified) (3 diffs)
• MainWindow.cc (added)
• MainWindow.h (added)
• MainWindow.ui (added)

sandbox_qt/src/orxonox/CMakeLists.txt

@@ -25 +25 @@
 SET_SOURCE_FILES(ORXONOX_SRC_FILES
   Main.cc
+  MainWindow.cc
 )
 
@@ -31 +32 @@
 ORXONOX_ADD_LIBRARY(orxonox
   FIND_HEADER_FILES
+  QT_MOC_FILES
+    MainWindow.h
+  QT_UIC_FILES
+    MainWindow.ui
   LINK_LIBRARIES
     ${QT_QTCORE_LIBRARY}

sandbox_qt/src/orxonox/Main.cc

@@ -34 +34 @@
 */
 
-#include "OrxonoxPrereqs.h"
+#include "Main.h"
 
 #include <QApplication>
@@ -42 +42 @@
 #include "core/CommandLineParser.h"
 #include "core/Core.h"
-#include "Main.h"
+#include "MainWindow.h"
 
 namespace orxonox
@@ -62 +62 @@
         Core core(arguments.join(" ").toStdString());
 
-        QCoreApplication::setOrganizationName("");
-        QCoreApplication::setOrganizationDomain("");
-        QCoreApplication::setApplicationName("");
+        QCoreApplication::setOrganizationName("Orxonox");
+        QCoreApplication::setOrganizationDomain("www.orxonox.net");
+        QCoreApplication::setApplicationName("Orxonox Sandbox");
+        QString versionString;
+        versionString += QString::number(ORXONOX_VERSION_MAJOR);
+        versionString += QString::number(ORXONOX_VERSION_MINOR);
+        versionString += QString::number(ORXONOX_VERSION_PATCH);
+        QCoreApplication::setApplicationVersion(versionString);
 
         if (CommandLineParser::getValue("generateDoc").toString().isEmpty())
+        {
+            MainWindow window;
+            window.show();
             return app.exec();
+        }
         else
             return 0;