diff --git a/ground/openpilotgcs/src/app/app.pro b/ground/openpilotgcs/src/app/app.pro index 8dc7d9533..16d52e292 100644 --- a/ground/openpilotgcs/src/app/app.pro +++ b/ground/openpilotgcs/src/app/app.pro @@ -1,5 +1,6 @@ include(../../openpilotgcs.pri) include(../shared/qtsingleapplication/qtsingleapplication.pri) +include(gcsversioninfo.pri) TEMPLATE = app TARGET = $$GCS_APP_TARGET diff --git a/ground/openpilotgcs/src/app/gcssplashscreen.cpp b/ground/openpilotgcs/src/app/gcssplashscreen.cpp index 2f88fdb43..371e2a687 100644 --- a/ground/openpilotgcs/src/app/gcssplashscreen.cpp +++ b/ground/openpilotgcs/src/app/gcssplashscreen.cpp @@ -33,6 +33,20 @@ const QChar CopyrightSymbol(0x00a9); GCSSplashScreen::GCSSplashScreen() : QSplashScreen(), m_pixmap(0), m_painter(0) { + QString revision; + QString year; +#ifdef GCS_REVISION + revision = GCS_REVISION; +#else + revision = tr("N/A"); +#endif + +#ifdef GCS_YEAR + year = GCS_YEAR; +#else + year = "2013"; +#endif + setWindowFlags(windowFlags() | Qt::WindowStaysOnTopHint); m_pixmap = new QPixmap(":/app/splash.png"); @@ -41,17 +55,10 @@ GCSSplashScreen::GCSSplashScreen() : QFont font("Tahoma", 8); m_painter->setFont(font); m_painter->drawText(405, 170, QString(CopyrightSymbol) + - QString(" 2010-") + QString(GCS_YEAR) + + QString(" 2010-") + year + QString(tr(" The OpenPilot Project - All Rights Reserved"))); - QString revision; -#ifdef GCS_REVISION - revision = GCS_REVISION; -#else - revision = tr("N/A"); -#endif - - m_painter->drawText(406, 175, 310, 100, Qt::TextWordWrap|Qt::AlignTop|Qt::AlignLeft, + m_painter->drawText(406, 173, 310, 100, Qt::TextWordWrap|Qt::AlignTop|Qt::AlignLeft, QString(tr("GCS Revision - ")) + revision); setPixmap(*m_pixmap); } diff --git a/ground/openpilotgcs/src/plugins/coreplugin/gcsversioninfo.pri b/ground/openpilotgcs/src/app/gcsversioninfo.pri similarity index 100% rename from ground/openpilotgcs/src/plugins/coreplugin/gcsversioninfo.pri rename to ground/openpilotgcs/src/app/gcsversioninfo.pri diff --git a/ground/openpilotgcs/src/plugins/coreplugin/coreplugin.pro b/ground/openpilotgcs/src/plugins/coreplugin/coreplugin.pro index 902241988..17cbeae2b 100644 --- a/ground/openpilotgcs/src/plugins/coreplugin/coreplugin.pro +++ b/ground/openpilotgcs/src/plugins/coreplugin/coreplugin.pro @@ -142,5 +142,3 @@ unix:!macx { INSTALLS += images } OTHER_FILES += Core.pluginspec - -include(gcsversioninfo.pri)