Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 7430 for sandbox_qt


Ignore:
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:
3 added
2 edited

Legend:

Unmodified
Added
Removed
  • sandbox_qt/src/orxonox/CMakeLists.txt

    r7423 r7430  
    2525SET_SOURCE_FILES(ORXONOX_SRC_FILES
    2626  Main.cc
     27  MainWindow.cc
    2728)
    2829
     
    3132ORXONOX_ADD_LIBRARY(orxonox
    3233  FIND_HEADER_FILES
     34  QT_MOC_FILES
     35    MainWindow.h
     36  QT_UIC_FILES
     37    MainWindow.ui
    3338  LINK_LIBRARIES
    3439    ${QT_QTCORE_LIBRARY}
  • sandbox_qt/src/orxonox/Main.cc

    r7425 r7430  
    3434*/
    3535
    36 #include "OrxonoxPrereqs.h"
     36#include "Main.h"
    3737
    3838#include <QApplication>
     
    4242#include "core/CommandLineParser.h"
    4343#include "core/Core.h"
    44 #include "Main.h"
     44#include "MainWindow.h"
    4545
    4646namespace orxonox
     
    6262        Core core(arguments.join(" ").toStdString());
    6363
    64         QCoreApplication::setOrganizationName("");
    65         QCoreApplication::setOrganizationDomain("");
    66         QCoreApplication::setApplicationName("");
     64        QCoreApplication::setOrganizationName("Orxonox");
     65        QCoreApplication::setOrganizationDomain("www.orxonox.net");
     66        QCoreApplication::setApplicationName("Orxonox Sandbox");
     67        QString versionString;
     68        versionString += QString::number(ORXONOX_VERSION_MAJOR);
     69        versionString += QString::number(ORXONOX_VERSION_MINOR);
     70        versionString += QString::number(ORXONOX_VERSION_PATCH);
     71        QCoreApplication::setApplicationVersion(versionString);
    6772
    6873        if (CommandLineParser::getValue("generateDoc").toString().isEmpty())
     74        {
     75            MainWindow window;
     76            window.show();
    6977            return app.exec();
     78        }
    7079        else
    7180            return 0;
Note: See TracChangeset for help on using the changeset viewer.