1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-29 14:52:12 +01:00

OP-786 Moved the actual file and the dependency to gcsversioninfo.pri to the /app sub project from the /plugins/coreplugin project. This was necessary since the new splash screen depends on defines in the generated gcsversioninfo.h header file.

Changed position of the revision text to make it look nicer.
This commit is contained in:
Fredrik Arvidsson 2013-01-22 21:09:35 +01:00
parent 38820f5d7d
commit 6b683665b6
4 changed files with 17 additions and 11 deletions

View File

@ -1,5 +1,6 @@
include(../../openpilotgcs.pri)
include(../shared/qtsingleapplication/qtsingleapplication.pri)
include(gcsversioninfo.pri)
TEMPLATE = app
TARGET = $$GCS_APP_TARGET

View File

@ -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);
}

View File

@ -142,5 +142,3 @@ unix:!macx {
INSTALLS += images
}
OTHER_FILES += Core.pluginspec
include(gcsversioninfo.pri)