From 90177facc2992ccd896c12a738837c3d440262d6 Mon Sep 17 00:00:00 2001
From: pixhawk <pixhawk@student.ethz.ch>
Date: Sun, 11 Apr 2010 11:16:07 +0200
Subject: [PATCH] Splashscreen fixes

---
 mavground.pri |  7 +++----
 src/Core.cc   | 12 ++++--------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/mavground.pri b/mavground.pri
index fd432999b..f804ef771 100644
--- a/mavground.pri
+++ b/mavground.pri
@@ -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
diff --git a/src/Core.cc b/src/Core.cc
index 4e45c6464..27f69a93f 100644
--- a/src/Core.cc
+++ b/src/Core.cc
@@ -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
-- 
2.22.0