Merged

mavground.pri

@@ -1,145 +1,155 @@
-#-------------------------------------------------
-#
-# MAVGround - Micro Air Vehicle Groundstation
-# 
-# Please see our website at <http://pixhawk.ethz.ch>
-#
-# Original Author:
-# Lorenz Meier <mavteam@student.ethz.ch>
-#
-# Contributing Authors (in alphabetical order):
-# 
-# (c) 2009 PIXHAWK Team
-#
-# This file is part of the mav groundstation project
-# MAVGround is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-# MAVGround is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-# You should have received a copy of the GNU General Public License
-# along with MAVGround. If not, see <http://www.gnu.org/licenses/>.
-#
-#-------------------------------------------------
-
-QT       += network opengl svg xml phonon
-
-TEMPLATE = app
-TARGET = qgroundcontrol
-
-BASEDIR = .
-BUILDDIR = build
-LANGUAGE = C++
-
-#CONFIG += static debug
-#CONFIG += static release console
-CONFIG += static debug_and_release console
-
-OBJECTS_DIR = $$BUILDDIR/obj
-MOC_DIR = $$BUILDDIR/moc
-UI_HEADERS_DIR = src/ui/generated
-
-
-# Add external libraries
-INCLUDEPATH += $$BASEDIR/lib/flite/include \
-               $$BASEDIR/lib/flite/lang
-
-#$$BASEDIR/lib/qextserialport/include
-#               $$BASEDIR/lib/openjaus/libjaus/include \
-#               $$BASEDIR/lib/openjaus/libopenJaus/include
-
-message(Qt version $$[QT_VERSION])
-
-
-
-# MAC OS X
-macx { 
-
-    message(Building for Mac OS X 64bit)
-
-    CONFIG += x86_64
-    CONFIG -= x86 static phonon
-
-    QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.5
-
-    DESTDIR = $$BASEDIR/bin/mac
-    INCLUDEPATH += -framework SDL \
-        $$BASEDIR/../mavlink/src
-
-    LIBS += -framework IOKit \
-        -framework SDL \
-        -framework CoreFoundation \
-        -framework ApplicationServices \
-        -lm
-
-    # Enable function-profiling with the OS X saturn tool
-    debug {
-        #QMAKE_CXXFLAGS += -finstrument-functions
-        #LIBS += -lSaturn
-    }
-    
-    ICON = $$BASEDIR/images/icons/macx.icns
-}
-
-# GNU/Linux
-linux-g++ { 
-
-    message(Building for GNU/Linux)
-    
-    debug {
-        DESTDIR = $$BASEDIR
-    }
-
-    release {
-        DESTDIR = $$BASEDIR
-    }
-    INCLUDEPATH += /usr/include
-
-    HARDWARE_PLATFORM = $$system(uname -a)
-    contains( HARDWARE_PLATFORM, x86_64 ) {
-        # 64-bit Linux
-        LIBS += \
-            -L$$BASEDIR/lib/flite/linux64
-    } else {
-        # 32-bit Linux
-        LIBS += \
-           -L$$BASEDIR/lib/flite/linux32
-    }
-    LIBS += -lm \
-        -lflite_cmu_us_awb \
-        -lflite_cmu_us_rms \
-        -lflite_cmu_us_slt \
-        -lflite_usenglish \
-        -lflite_cmulex \
-        -lflite \
-        -lSDL \
-        -lSDLmain
-}
-
-
-# Windows (32bit/64bit)
-win32 { 
-
-    message(Building for Windows Platform (32/64bit))
-    
-    # Special settings for debug
-    #CONFIG += CONSOLE
-    LIBS += -L$$BASEDIR\lib\sdl\win32 \
-        -lmingw32 -lSDLmain -lSDL -mwindows
-    
-    INCLUDEPATH += $$BASEDIR/lib/sdl/include
-
-    debug {
-        DESTDIR = $$BASEDIR/bin
-    }
-
-    release {
-        DESTDIR = $$BASEDIR/bin
-    }
-        
-}
-
-
+#-------------------------------------------------
+#
+# QGroundControl - Micro Air Vehicle Groundstation
+# 
+# Please see our website at <http://qgroundcontrol.org>
+#
+# Original Author:
+# Lorenz Meier <mavteam@student.ethz.ch>
+#
+# Contributing Authors (in alphabetical order):
+# 
+# (c) 2009 PIXHAWK Team
+#
+# This file is part of the mav groundstation project
+# MAVGround is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+# MAVGround is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+# You should have received a copy of the GNU General Public License
+# along with MAVGround. If not, see <http://www.gnu.org/licenses/>.
+#
+#-------------------------------------------------
+
+QT       += network opengl svg xml phonon
+
+TEMPLATE = app
+TARGET = qgroundcontrol
+
+BASEDIR = .
+BUILDDIR = build
+LANGUAGE = C++
+
+#CONFIG += static debug
+#CONFIG += static release console
+CONFIG += static debug_and_release console
+
+OBJECTS_DIR = $$BUILDDIR/obj
+MOC_DIR = $$BUILDDIR/moc
+UI_HEADERS_DIR = src/ui/generated
+
+
+# Add external libraries
+INCLUDEPATH += $$BASEDIR/lib/flite/include \
+               $$BASEDIR/lib/flite/lang
+
+#$$BASEDIR/lib/qextserialport/include
+#               $$BASEDIR/lib/openjaus/libjaus/include \
+#               $$BASEDIR/lib/openjaus/libopenJaus/include
+
+message(Qt version $$[QT_VERSION])
+
+
+
+# MAC OS X
+macx { 
+
+    CONFIG += x86 #x86_64
+    CONFIG -= static phonon
+
+    HARDWARE_PLATFORM = $$system(uname -a)
+    contains( HARDWARE_PLATFORM, x86_64 ) {
+        # x64 Mac OS X Snow Leopard 10.6 and later
+        CONFIG += x86_64
+        CONFIG -= x86 static phonon
+        message(Building for Mac OS X 64bit/Snow Leopard 10.6 and later)
+    } else {
+        # x86 Mac OS X Leopard 10.5 and earlier
+        CONFIG += x86 static phonon
+        message(Building for Mac OS X 32bit/Leopard 10.5 and earlier)
+    }
+
+    QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.5
+
+    DESTDIR = $$BASEDIR/bin/mac
+    INCLUDEPATH += -framework SDL \
+        $$BASEDIR/../mavlink/src
+
+    LIBS += -framework IOKit \
+        -framework SDL \
+        -framework CoreFoundation \
+        -framework ApplicationServices \
+        -lm
+
+    # Enable function-profiling with the OS X saturn tool
+    debug {
+        #QMAKE_CXXFLAGS += -finstrument-functions
+        #LIBS += -lSaturn
+    }
+    
+    ICON = $$BASEDIR/images/icons/macx.icns
+}
+
+# GNU/Linux
+linux-g++ { 
+    
+    debug {
+        DESTDIR = $$BASEDIR
+    }
+
+    release {
+        DESTDIR = $$BASEDIR
+    }
+    INCLUDEPATH += /usr/include
+
+    HARDWARE_PLATFORM = $$system(uname -a)
+    contains( HARDWARE_PLATFORM, x86_64 ) {
+        # 64-bit Linux
+        LIBS += \
+            -L$$BASEDIR/lib/flite/linux64
+        message(Building for GNU/Linux 64bit/x64)
+    } else {
+        # 32-bit Linux
+        LIBS += \
+           -L$$BASEDIR/lib/flite/linux32
+        message(Building for GNU/Linux 32bit/i386)
+    }
+    LIBS += -lm \
+        -lflite_cmu_us_awb \
+        -lflite_cmu_us_rms \
+        -lflite_cmu_us_slt \
+        -lflite_usenglish \
+        -lflite_cmulex \
+        -lflite \
+        -lSDL \
+        -lSDLmain
+}
+
+
+# Windows (32bit/64bit)
+win32 { 
+
+    message(Building for Windows Platform (32/64bit))
+    
+    # Special settings for debug
+    #CONFIG += CONSOLE
+    LIBS += -L$$BASEDIR\lib\sdl\win32 \
+        -lmingw32 -lSDLmain -lSDL -mwindows
+    
+    INCLUDEPATH += $$BASEDIR/lib/sdl/include
+
+    debug {
+        DESTDIR = $$BASEDIR/bin
+    }
+
+    release {
+        DESTDIR = $$BASEDIR/bin
+    }
+        
+}
+
+

src/Core.cc

@@ -61,6 +61,14 @@ Core::Core(int &argc, char* argv[]) : QApplication(argc, argv)
     this->setApplicationName("OpenMAV Ground Control Station");
     this->setApplicationVersion("v. 0.0.5");
     this->setOrganizationName(QLatin1String("OpenMAV Association"));
+    this->setOrganizationDomain("http://qgroundcontrol.org");
+
+    // Show splash screen
+    QPixmap splashImage(":images/splash.png");
+    QSplashScreen* splashScreen = new QSplashScreen(splashImage, Qt::WindowStaysOnTopHint);
+    splashScreen->show();
+    splashScreen->showMessage(tr("Loading application fonts"), Qt::AlignLeft | Qt::AlignBottom, QColor(62, 93, 141));
+
     QSettings::setDefaultFormat(QSettings::IniFormat);
     // Exit main application when last window is closed
     connect(this, SIGNAL(lastWindowClosed()), this, SLOT(quit()));
@@ -73,17 +81,12 @@ Core::Core(int &argc, char* argv[]) : QApplication(argc, argv)
     fontDatabase.addApplicationFont(fontFileName);
     setFont(fontDatabase.font(fontFamilyName, "Roman", 12));
 
-    // Show splash screen
-    QPixmap splashImage(":images/splash.png");
-    QSplashScreen* splashScreen = new QSplashScreen(splashImage, Qt::WindowStaysOnTopHint);
-    splashScreen->show();
-
     // Start the comm link manager
-    splashScreen->showMessage(tr("Starting Communication Links"));
+    splashScreen->showMessage(tr("Starting Communication Links"), Qt::AlignLeft | Qt::AlignBottom, QColor(62, 93, 141));
     startLinkManager();
 
     // Start the UAS Manager
-    splashScreen->showMessage(tr("Starting UAS Manager"));
+    splashScreen->showMessage(tr("Starting UAS Manager"), Qt::AlignLeft | Qt::AlignBottom, QColor(62, 93, 141));
     startUASManager();
 
     // Start audio output
@@ -93,7 +96,7 @@ Core::Core(int &argc, char* argv[]) : QApplication(argc, argv)
     //tarsus->start();
 
     // Start the user interface
-    splashScreen->showMessage(tr("Starting User Interface"));
+    splashScreen->showMessage(tr("Starting User Interface"), Qt::AlignLeft | Qt::AlignBottom, QColor(62, 93, 141));
     startUI();
 
     // Remove splash screen
@@ -140,7 +143,5 @@ void Core::startUI()
 {
     // Start UI
     mainWindow = new MainWindow();
-    // Make UI visible
-    mainWindow->show();
 }
 

src/ui/MainWindow.cc

@@ -60,6 +60,9 @@ This file is part of the PIXHAWK project
 MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
 {
 
+    this->hide();
+    this->setVisible(false);
+
     // Quick hack
     //comp = new LogCompressor("/home/pixhawk/Desktop/test.txt");
 
@@ -142,10 +145,6 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
 
     // Add status bar
     setStatusBar(createStatusBar());
-    // Load widgets
-    loadWidgets();
-    // Adjust the size
-    adjustSize();
 
     // Create actions
     connectActions();
@@ -173,6 +172,12 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
     //CommConfigurationWindow* simulationWidget = new CommConfigurationWindow(simulationLink, mavlink, this);
     //ui.menuNetwork->addAction(commWidget->getAction());
     simulationLink->connect();
+
+    // Load widgets and show application window
+    loadWidgets();
+
+    // Adjust the size
+    adjustSize();
 }
 
 MainWindow::~MainWindow()