Commit 90177fac authored by pixhawk's avatar pixhawk

Splashscreen fixes

parent 1b380af8
......@@ -63,8 +63,7 @@ macx {
message(Building for Mac OS X 32/64bit)
#CONFIG += x86
CONFIG += x86_64 cocoa
CONFIG += x86 cocoa #x86_64 cocoa
CONFIG -= static
DESTDIR = $$BASEDIR/bin/mac
......@@ -79,8 +78,8 @@ macx {
# Enable function-profiling with the OS X saturn tool
debug {
#QMAKE_CXXFLAGS += -finstrument-functions
#LIBS += -lSaturn
QMAKE_CXXFLAGS += -finstrument-functions
LIBS += -lSaturn
}
#ICON = $$BASEDIR/img/icons/empty.png
......
......@@ -58,9 +58,10 @@ This file is part of the PIXHAWK project
Core::Core(int &argc, char* argv[]) : QApplication(argc, argv)
{
this->setApplicationName("OpenMAV Ground Control Station");
this->setApplicationName("QGroundControl");
this->setApplicationVersion("v. 0.0.5");
this->setOrganizationName(QLatin1String("OpenMAV Association"));
this->setOrganizationName(QLatin1String("PIXHAWK Project"));
this->setOrganizationDomain("http://pixhawk.ethz.ch");
QSettings::setDefaultFormat(QSettings::IniFormat);
// Exit main application when last window is closed
connect(this, SIGNAL(lastWindowClosed()), this, SLOT(quit()));
......@@ -79,21 +80,16 @@ Core::Core(int &argc, char* argv[]) : QApplication(argc, argv)
splashScreen->show();
// Start the comm link manager
splashScreen->showMessage(tr("Starting Communication Links"));
splashScreen->showMessage(tr("QGroundControl (c) 2009-") + QString(QDate::currentDate().year()) + "PIXHAWK PROJECT", Qt::AlignLeft | Qt::AlignBottom);
startLinkManager();
// Start the UAS Manager
splashScreen->showMessage(tr("Starting UAS Manager"));
startUASManager();
// Start audio output
//GAudioOutput::instance()->say("Ground Control Station started", 1);
//tarsus = new ViconTarsusProtocol();
//tarsus->start();
// Start the user interface
splashScreen->showMessage(tr("Starting User Interface"));
startUI();
// Remove splash screen
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment