1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-03-15 07:29:15 +01:00

Merge pull request #17 from f5soh/laurent/LP-03_Artwork_icons_splashscreen

Laurent/lp 03 artwork icons splashscreen
This commit is contained in:
a*morale 2015-07-16 11:18:29 +02:00
commit 01a56796c3
8 changed files with 6 additions and 6 deletions

View File

@ -30,7 +30,7 @@ win32 {
INSTALLS += target
} else:macx {
LIBS += -framework CoreFoundation
ICON = openpilotgcs.icns
ICON = librepilotgcs.icns
QMAKE_INFO_PLIST = Info.plist
FILETYPES.files = profile.icns prifile.icns
FILETYPES.path = Contents/Resources

View File

@ -38,7 +38,7 @@ GCSSplashScreen::GCSSplashScreen() :
m_pixmap = new QPixmap(":/app/splash.png");
m_painter = new QPainter(m_pixmap);
m_painter->setPen(Qt::lightGray);
m_painter->setPen(Qt::darkGray);
QFont font("Tahoma", 8);
m_painter->setFont(font);
@ -46,10 +46,10 @@ GCSSplashScreen::GCSSplashScreen() :
QString(" ") + VersionInfo::year() +
QString(tr(" The LibrePilot Project - All Rights Reserved")));
m_painter->drawText(405, 180, QString(CopyrightSymbol) +
m_painter->drawText(405, 182, QString(CopyrightSymbol) +
QString(tr(" 2010-2015 The OpenPilot Project - All Rights Reserved")));
m_painter->drawText(406, 183, 310, 100, Qt::TextWordWrap | Qt::AlignTop | Qt::AlignLeft,
m_painter->drawText(406, 186, 310, 100, Qt::TextWordWrap | Qt::AlignTop | Qt::AlignLeft,
QString(tr("GCS Revision - ")) + VersionInfo::revision());
setPixmap(*m_pixmap);
}
@ -65,7 +65,7 @@ void GCSSplashScreen::drawMessageText(const QString &message)
progressPainter.setPen(Qt::yellow);
QFont font("Tahoma", 13);
progressPainter.setFont(font);
progressPainter.drawText(300, 385, message);
progressPainter.drawText(300, 380, message);
setPixmap(pix);
}

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 73 KiB

After

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 55 KiB

After

Width:  |  Height:  |  Size: 50 KiB

View File

@ -39,7 +39,7 @@ cp "${ROOT_DIR}/GPLv3.txt" "${SRC_DIR}/Docs/"
--background "${ROOT_DIR}/package/osx/background.png" \
--window-size 600 500 \
--icon-size 60 \
--icon "Getting Started.webloc" 100 380 \
--icon "Getting Started.webloc" 110 380 \
--hide-extension "Getting Started.webloc" \
--icon "Docs" 250 380 \
--icon "WHATSNEW.txt" 400 380 \

Binary file not shown.

Before

Width:  |  Height:  |  Size: 73 KiB

After

Width:  |  Height:  |  Size: 26 KiB