Merge branch 'laurent/LP-03_Artwork_rebranding' of git://github.com/f5soh/LibrePilot into f5soh-laurent/LP-03_Artwork_rebranding
Conflicts: package/winx86/openpilotgcs.nsi
1
LICENSE.txt
Normal file
@ -0,0 +1 @@
|
||||
To be rewrited
|
@ -24,7 +24,7 @@ DEFINES += PLUGIN_REL_PATH=$$shell_quote(\"$$relative_path($$GCS_PLUGIN_PATH, $$
|
||||
DEFINES += GCS_NAME=$$shell_quote(\"$$GCS_BIG_NAME\")
|
||||
|
||||
win32 {
|
||||
RC_FILE = openpilotgcs.rc
|
||||
RC_FILE = librepilotgcs.rc
|
||||
target.path = /bin
|
||||
INSTALLS += target
|
||||
} else:macx {
|
||||
@ -47,7 +47,7 @@ win32 {
|
||||
}
|
||||
}
|
||||
|
||||
OTHER_FILES += openpilotgcs.rc
|
||||
OTHER_FILES += librepilotgcs.rc
|
||||
|
||||
RESOURCES += \
|
||||
appresources.qrc
|
||||
|
@ -41,11 +41,15 @@ GCSSplashScreen::GCSSplashScreen() :
|
||||
m_painter->setPen(Qt::lightGray);
|
||||
QFont font("Tahoma", 8);
|
||||
m_painter->setFont(font);
|
||||
m_painter->drawText(405, 170, QString(CopyrightSymbol) +
|
||||
QString(" 2010-") + VersionInfo::year() +
|
||||
QString(tr(" The OpenPilot Project - All Rights Reserved")));
|
||||
|
||||
m_painter->drawText(406, 173, 310, 100, Qt::TextWordWrap | Qt::AlignTop | Qt::AlignLeft,
|
||||
m_painter->drawText(405, 170, QString(CopyrightSymbol) +
|
||||
QString(" ") + VersionInfo::year() +
|
||||
QString(tr(" The LibrePilot Project - All Rights Reserved")));
|
||||
|
||||
m_painter->drawText(405, 180, 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,
|
||||
QString(tr("GCS Revision - ")) + VersionInfo::revision());
|
||||
setPixmap(*m_pixmap);
|
||||
}
|
||||
@ -58,10 +62,10 @@ void GCSSplashScreen::drawMessageText(const QString &message)
|
||||
QPixmap pix(*m_pixmap);
|
||||
QPainter progressPainter(&pix);
|
||||
|
||||
progressPainter.setPen(Qt::lightGray);
|
||||
progressPainter.setPen(Qt::yellow);
|
||||
QFont font("Tahoma", 13);
|
||||
progressPainter.setFont(font);
|
||||
progressPainter.drawText(170, 385, message);
|
||||
progressPainter.drawText(300, 385, message);
|
||||
setPixmap(pix);
|
||||
}
|
||||
|
||||
|
BIN
ground/openpilotgcs/src/app/librepilotgcs.ico
Normal file
After Width: | Height: | Size: 73 KiB |
1
ground/openpilotgcs/src/app/librepilotgcs.rc
Normal file
@ -0,0 +1 @@
|
||||
IDI_ICON1 ICON DISCARDABLE "librepilotgcs.ico"
|
Before Width: | Height: | Size: 33 KiB |
@ -1 +0,0 @@
|
||||
IDI_ICON1 ICON DISCARDABLE "openpilotgcs.ico"
|
Before Width: | Height: | Size: 274 KiB After Width: | Height: | Size: 68 KiB |
Before Width: | Height: | Size: 425 KiB After Width: | Height: | Size: 424 KiB |
Before Width: | Height: | Size: 165 KiB After Width: | Height: | Size: 204 KiB |
Before Width: | Height: | Size: 329 KiB After Width: | Height: | Size: 360 KiB |
Before Width: | Height: | Size: 1.1 MiB After Width: | Height: | Size: 1.4 MiB |
@ -44,8 +44,8 @@ using namespace Core::Constants;
|
||||
AboutDialog::AboutDialog(QWidget *parent) :
|
||||
QDialog(parent)
|
||||
{
|
||||
setWindowIcon(QIcon(":/core/images/openpilot_logo_32.png"));
|
||||
setWindowTitle(tr("About OpenPilot"));
|
||||
setWindowIcon(QIcon(":/core/images/librepilot_logo_32.png"));
|
||||
setWindowTitle(tr("About LibrePilot"));
|
||||
setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
|
||||
setMinimumSize(600, 400);
|
||||
setMaximumSize(800, 600);
|
||||
@ -58,7 +58,8 @@ AboutDialog::AboutDialog(QWidget *parent) :
|
||||
"Built on %4 at %5<br/>"
|
||||
"Based on Qt %6 (%7 bit)<br/>"
|
||||
"<br/>"
|
||||
"© %8, 2010-%9. All rights reserved.<br/>"
|
||||
"© %8, %9. All rights reserved.<br/>"
|
||||
"© The OpenPilot Project 2010-2015. All rights reserved.<br/>"
|
||||
).arg(
|
||||
VersionInfo::revision().left(60), // %1
|
||||
VersionInfo::uavoHash().left(8), // %2
|
||||
|
@ -1,10 +1,10 @@
|
||||
<RCC>
|
||||
<qresource prefix="/core">
|
||||
<file>images/openpilot_logo_500.png</file>
|
||||
<file>images/openpilot_logo_256.png</file>
|
||||
<file>images/openpilot_logo_128.png</file>
|
||||
<file>images/openpilot_logo_64.png</file>
|
||||
<file>images/openpilot_logo_32.png</file>
|
||||
<file>images/librepilot_logo_500.png</file>
|
||||
<file>images/librepilot_logo_256.png</file>
|
||||
<file>images/librepilot_logo_128.png</file>
|
||||
<file>images/librepilot_logo_64.png</file>
|
||||
<file>images/librepilot_logo_32.png</file>
|
||||
<file>images/clean_pane_small.png</file>
|
||||
<file>images/clear.png</file>
|
||||
<file>images/closebutton.png</file>
|
||||
@ -50,7 +50,7 @@
|
||||
<file>images/exiticon.png</file>
|
||||
<file>images/optionsicon.png</file>
|
||||
<file>images/helpicon.png</file>
|
||||
<file>images/openpiloticon.png</file>
|
||||
<file>images/librepiloticon.png</file>
|
||||
<file>images/ah.png</file>
|
||||
<file>images/config.png</file>
|
||||
<file>images/flight.png</file>
|
||||
|
@ -44,7 +44,7 @@ namespace Constants {
|
||||
"." STRINGIFY(GCS_VERSION_RELEASE)
|
||||
|
||||
const char *const GCS_VERSION_LONG = GCS_VERSION;
|
||||
const char *const GCS_AUTHOR = "The OpenPilot Project";
|
||||
const char *const GCS_AUTHOR = "The LibrePilot Project";
|
||||
const char *const GCS_HELP = "http://wiki.openpilot.org";
|
||||
|
||||
#undef GCS_VERSION
|
||||
@ -129,7 +129,7 @@ const char *const GO_FORWARD = "GCS.GoForward";
|
||||
const char *const GOTOPREVIOUSGROUP = "GCS.GotoPreviousTabGroup";
|
||||
const char *const GOTONEXTGROUP = "GCS.GotoNextTabGroup";
|
||||
const char *const WINDOWSLIST = "GCS.WindowsList";
|
||||
const char *const ABOUT_OPENPILOTGCS = "GCS.AboutOpenPilotGCS";
|
||||
const char *const ABOUT_LIBREPILOTGCS = "GCS.AboutLibrePilotGCS";
|
||||
const char *const ABOUT_PLUGINS = "GCS.AboutPlugins";
|
||||
const char *const ABOUT_AUTHORS = "GCS.AboutAuthors";
|
||||
const char *const ABOUT_QT = "GCS.AboutQt";
|
||||
@ -212,7 +212,7 @@ const char *const ICON_PLUGIN = ":/core/images/pluginicon.png";
|
||||
const char *const ICON_EXIT = ":/core/images/exiticon.png";
|
||||
const char *const ICON_OPTIONS = ":/core/images/optionsicon.png";
|
||||
const char *const ICON_HELP = ":/core/images/helpicon.png";
|
||||
const char *const ICON_OPENPILOT = ":/core/images/openpiloticon.png";
|
||||
const char *const ICON_LIBREPILOT = ":/core/images/librepiloticon.png";
|
||||
|
||||
|
||||
// wizard kind
|
||||
|
@ -142,7 +142,7 @@ RESOURCES += core.qrc \
|
||||
fancyactionbar.qrc
|
||||
|
||||
unix:!macx {
|
||||
images.files = images/openpilot_logo_*.png
|
||||
images.files = images/librepilot_logo_*.png
|
||||
images.path = /share/pixmaps
|
||||
INSTALLS += images
|
||||
}
|
||||
|
After Width: | Height: | Size: 4.5 KiB |
After Width: | Height: | Size: 8.8 KiB |
After Width: | Height: | Size: 921 B |
After Width: | Height: | Size: 18 KiB |
After Width: | Height: | Size: 2.3 KiB |
After Width: | Height: | Size: 562 B |
Before Width: | Height: | Size: 7.2 KiB |
Before Width: | Height: | Size: 15 KiB |
Before Width: | Height: | Size: 553 B |
Before Width: | Height: | Size: 21 KiB |
Before Width: | Height: | Size: 3.4 KiB |
Before Width: | Height: | Size: 510 B |
@ -133,9 +133,9 @@ MainWindow::MainWindow() :
|
||||
#endif
|
||||
m_toggleFullScreenAction(0)
|
||||
{
|
||||
setWindowTitle(tr("OpenPilot GCS ") + VersionInfo::label());
|
||||
setWindowTitle(tr("LibrePilot GCS ") + VersionInfo::label());
|
||||
#ifndef Q_WS_MAC
|
||||
qApp->setWindowIcon(QIcon(":/core/images/openpilot_logo_128.png"));
|
||||
qApp->setWindowIcon(QIcon(":/core/images/librepilot_logo_128.png"));
|
||||
#endif
|
||||
qApp->setStyle(QStyleFactory::create("Fusion"));
|
||||
|
||||
|
@ -44,7 +44,7 @@ Rectangle {
|
||||
anchors.leftMargin: 10
|
||||
anchors.top: parent.top
|
||||
anchors.topMargin: 10
|
||||
source: "../images/openpilot_logo_128.png"
|
||||
source: "../images/librepilot_logo_128.png"
|
||||
z: 100
|
||||
fillMode: Image.PreserveAspectFit
|
||||
MouseArea {
|
||||
@ -53,7 +53,7 @@ Rectangle {
|
||||
hoverEnabled: true
|
||||
cursorShape: Qt.PointingHandCursor
|
||||
onClicked: {
|
||||
dialog.openUrl("http://www.openpilot.org")
|
||||
dialog.openUrl("http://www.librepilot.org")
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -83,7 +83,7 @@ Rectangle {
|
||||
anchors.fill: parent
|
||||
Text {
|
||||
id: headerLabel
|
||||
text: qsTr("OpenPilot Ground Control Station")
|
||||
text: qsTr("LibrePilot Ground Control Station")
|
||||
Layout.fillWidth: true
|
||||
font.pixelSize: 14
|
||||
font.bold: true
|
||||
|
@ -114,7 +114,7 @@ void WorkspaceSettings::readSettings(QSettings *qs)
|
||||
QString defaultName = "Workspace" + numberString;
|
||||
QString defaultIconName = "Icon" + numberString;
|
||||
QString name = qs->value(defaultName, defaultName).toString();
|
||||
QString iconName = qs->value(defaultIconName, ":/core/images/openpilot_logo_64.png").toString();
|
||||
QString iconName = qs->value(defaultIconName, ":/core/images/librepilot_logo_64.png").toString();
|
||||
m_names.append(name);
|
||||
m_iconNames.append(iconName);
|
||||
m_modeNames.append(QString("Mode") + QString::number(i));
|
||||
|
@ -77,7 +77,7 @@ void FlightLogPlugin::ShowLogManagementDialog()
|
||||
qmlRegisterType<UAVOLogSettingsWrapper>("org.openpilot", 1, 0, "UAVOLogSettingsWrapper");
|
||||
FlightLogManager *flightLogManager = new FlightLogManager();
|
||||
m_logDialog = new QQuickView();
|
||||
m_logDialog->setIcon(QIcon(":/core/images/openpilot_logo_32.png"));
|
||||
m_logDialog->setIcon(QIcon(":/core/images/librepilot_logo_32.png"));
|
||||
m_logDialog->setTitle(tr("Manage flight side logs"));
|
||||
m_logDialog->rootContext()->setContextProperty("logStatus", flightLogManager->flightLogStatus());
|
||||
m_logDialog->rootContext()->setContextProperty("logControl", flightLogManager->flightLogControl());
|
||||
|
@ -23,11 +23,11 @@
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
<string>OpenPilot GCS Edit Waypoint</string>
|
||||
<string>LibrePilot GCS Edit Waypoint</string>
|
||||
</property>
|
||||
<property name="windowIcon">
|
||||
<iconset resource="../coreplugin/core.qrc">
|
||||
<normaloff>:/core/images/openpilot_logo_128.png</normaloff>:/core/images/openpilot_logo_128.png</iconset>
|
||||
<normaloff>:/core/images/librepilot_logo_128.png</normaloff>:/core/images/librepilot_logo_128.png</iconset>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout">
|
||||
<item>
|
||||
|
@ -15,7 +15,7 @@
|
||||
</property>
|
||||
<property name="windowIcon">
|
||||
<iconset resource="../coreplugin/core.qrc">
|
||||
<normaloff>:/core/images/openpilot_logo_64.png</normaloff>:/core/images/openpilot_logo_64.png</iconset>
|
||||
<normaloff>:/core/images/librepilot_logo_64.png</normaloff>:/core/images/librepilot_logo_64.png</iconset>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout">
|
||||
<item>
|
||||
|
@ -289,7 +289,7 @@ QVariant PathActionEditorTreeModel::data(const QModelIndex &index, int role) con
|
||||
return item->data(index.column());
|
||||
}
|
||||
// if (role == Qt::DecorationRole)
|
||||
// return QIcon(":/core/images/openpilot_logo_128.png");
|
||||
// return QIcon(":/core/images/librepilot_logo_128.png");
|
||||
|
||||
if (role == Qt::ToolTipRole) {
|
||||
TreeItem *item = static_cast<TreeItem *>(index.internalPointer());
|
||||
|
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 16 KiB |
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 18 KiB |
Before Width: | Height: | Size: 2.5 MiB After Width: | Height: | Size: 2.7 MiB |
Before Width: | Height: | Size: 288 KiB After Width: | Height: | Size: 330 KiB |
Before Width: | Height: | Size: 526 KiB After Width: | Height: | Size: 569 KiB |
Before Width: | Height: | Size: 216 KiB After Width: | Height: | Size: 252 KiB |
Before Width: | Height: | Size: 591 KiB After Width: | Height: | Size: 723 KiB |
Before Width: | Height: | Size: 417 KiB After Width: | Height: | Size: 424 KiB |
@ -86,7 +86,7 @@ void VehicleTemplateSelectorWidget::updatePhoto(QJsonObject *templ)
|
||||
QByteArray imageData = QByteArray::fromBase64(templ->value("photo").toString().toLatin1());
|
||||
photo.loadFromData(imageData, "PNG");
|
||||
} else {
|
||||
photo.load(":/core/images/openpilot_logo_500.png");
|
||||
photo.load(":/core/images/librepilot_logo_500.png");
|
||||
}
|
||||
m_photoItem = ui->templateImage->scene()->addPixmap(photo);
|
||||
ui->templateImage->setSceneRect(ui->templateImage->scene()->itemsBoundingRect());
|
||||
|
@ -21,12 +21,12 @@ Item {
|
||||
|
||||
ListModel {
|
||||
id: sitesModel
|
||||
ListElement { link: "http://www.openpilot.org" }
|
||||
ListElement { link: "http://www.librepilot.org" }
|
||||
ListElement { link: "http://wiki.openpilot.org" }
|
||||
ListElement { link: "http://www.openpilot.org/hardware/get-hardware/" }
|
||||
ListElement { link: "http://forums.openpilot.org" }
|
||||
ListElement { link: "http://git.openpilot.org" }
|
||||
ListElement { link: "http://progress.openpilot.org" }
|
||||
ListElement { link: "http://forum.librepilot.org" }
|
||||
ListElement { link: "http://github.com/librepilot" }
|
||||
ListElement { link: "http://github.com/librepilot/LibrePilot/issues" }
|
||||
function title(index){
|
||||
if (title["text"] === undefined) {
|
||||
title.text = [
|
||||
|
After Width: | Height: | Size: 17 KiB |
After Width: | Height: | Size: 17 KiB |
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 16 KiB |
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 18 KiB |
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 18 KiB |
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 18 KiB |
Before Width: | Height: | Size: 1.3 KiB |
After Width: | Height: | Size: 22 KiB |
After Width: | Height: | Size: 16 KiB |
Before Width: | Height: | Size: 144 KiB |
Before Width: | Height: | Size: 13 KiB |
Before Width: | Height: | Size: 22 KiB After Width: | Height: | Size: 29 KiB |
Before Width: | Height: | Size: 22 KiB After Width: | Height: | Size: 31 KiB |
@ -5,11 +5,11 @@ Rectangle {
|
||||
width: 1024
|
||||
height: 768
|
||||
|
||||
color: "#272727"
|
||||
color: "#fefefe"
|
||||
|
||||
Image {
|
||||
id: bg
|
||||
source: "images/welcome-op-bg.png"
|
||||
source: "images/welcome-lp-bg.png"
|
||||
anchors.bottom: parent.bottom
|
||||
anchors.right: parent.right
|
||||
|
||||
@ -43,7 +43,7 @@ Rectangle {
|
||||
spacing: 16
|
||||
|
||||
Image {
|
||||
source: "images/welcome-op-logo.png"
|
||||
source: "images/welcome-lp-logo.png"
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
anchors.verticalCenterOffset: -2 //it looks better aligned to icons grid
|
||||
|
||||
@ -128,7 +128,7 @@ Rectangle {
|
||||
}
|
||||
Text {
|
||||
id: textOpVersionAvailable
|
||||
color: "#5fcf07"
|
||||
color: "#feb103"
|
||||
text: welcomePlugin.newVersionText
|
||||
font.bold: true
|
||||
font.underline: true
|
||||
|
@ -7,11 +7,10 @@
|
||||
<file>qml/NewsPanel.qml</file>
|
||||
<file>qml/ScrollDecorator.qml</file>
|
||||
<file>qml/images/welcome-news-bg.png</file>
|
||||
<file>qml/images/welcome-op-logo.png</file>
|
||||
<file>qml/images/welcome-lp-logo.png</file>
|
||||
<file>qml/images/button-label.png</file>
|
||||
<file>qml/images/button-label-bottom.png</file>
|
||||
<file>qml/images/welcome-op-bg.png</file>
|
||||
<file>qml/images/welcome-bg.png</file>
|
||||
<file>qml/images/welcome-lp-bg.png</file>
|
||||
<file>qml/images/flightdata-on.png</file>
|
||||
<file>qml/images/flightdata-off.png</file>
|
||||
<file>qml/images/config-on.png</file>
|
||||
|
@ -89,7 +89,7 @@ WelcomeMode::WelcomeMode() :
|
||||
// This will delete the network access manager instance when we're done
|
||||
connect(networkAccessManager, SIGNAL(finished(QNetworkReply *)), networkAccessManager, SLOT(deleteLater()));
|
||||
|
||||
networkAccessManager->get(QNetworkRequest(QUrl("http://www.openpilot.org/opver")));
|
||||
networkAccessManager->get(QNetworkRequest(QUrl("http://www.librepilot.org/opver")));
|
||||
} else {
|
||||
// No network, can delete this now as we don't need it.
|
||||
delete networkAccessManager;
|
||||
@ -109,7 +109,7 @@ QString WelcomeMode::name() const
|
||||
|
||||
QIcon WelcomeMode::icon() const
|
||||
{
|
||||
return QIcon(QLatin1String(":/core/images/openpiloticon.png"));
|
||||
return QIcon(QLatin1String(":/core/images/librepiloticon.png"));
|
||||
}
|
||||
|
||||
int WelcomeMode::priority() const
|
||||
|
@ -62,7 +62,7 @@ public:
|
||||
void activated();
|
||||
QString contextHelpId() const
|
||||
{
|
||||
return QLatin1String("OpenPilot GCS");
|
||||
return QLatin1String("LibrePilot GCS");
|
||||
}
|
||||
void setPriority(int priority)
|
||||
{
|
||||
@ -70,7 +70,7 @@ public:
|
||||
}
|
||||
QString versionString() const
|
||||
{
|
||||
return tr("OpenPilot GCS Version: %1 ").arg(VersionInfo::tagOrHash8());
|
||||
return tr("LibrePilot GCS Version: %1 ").arg(VersionInfo::tagOrHash8());
|
||||
}
|
||||
QString newVersionText() const
|
||||
{
|
||||
|
@ -2830,15 +2830,15 @@
|
||||
<Workspace>
|
||||
<AllowTabBarMovement>false</AllowTabBarMovement>
|
||||
<Icon1>:/core/images/ah.png</Icon1>
|
||||
<Icon10>:/core/images/openpilot_logo_64.png</Icon10>
|
||||
<Icon10>:/core/images/librepilot_logo_64.png</Icon10>
|
||||
<Icon2>:/core/images/config.png</Icon2>
|
||||
<Icon3>:/core/images/cog.png</Icon3>
|
||||
<Icon4>:/core/images/scopes.png</Icon4>
|
||||
<Icon5>:/core/images/joystick.png</Icon5>
|
||||
<Icon6>:/core/images/cpu.png</Icon6>
|
||||
<Icon7>:/core/images/openpilot_logo_64.png</Icon7>
|
||||
<Icon8>:/core/images/openpilot_logo_64.png</Icon8>
|
||||
<Icon9>:/core/images/openpilot_logo_64.png</Icon9>
|
||||
<Icon7>:/core/images/librepilot_logo_64.png</Icon7>
|
||||
<Icon8>:/core/images/librepilot_logo_64.png</Icon8>
|
||||
<Icon9>:/core/images/librepilot_logo_64.png</Icon9>
|
||||
<NumberOfWorkspaces>6</NumberOfWorkspaces>
|
||||
<TabBarPlacementIndex>1</TabBarPlacementIndex>
|
||||
<Workspace1>Flight data</Workspace1>
|
||||
|
@ -61,9 +61,9 @@
|
||||
VIAddVersionKey "ProductName" "${INSTALLER_NAME}"
|
||||
VIAddVersionKey "FileVersion" "${FILE_VERSION}"
|
||||
VIAddVersionKey "Comments" "${INSTALLER_NAME}. ${BUILD_DESCRIPTION}"
|
||||
VIAddVersionKey "CompanyName" "The OpenPilot Team, http://www.openpilot.org"
|
||||
VIAddVersionKey "LegalTrademarks" "${PRODUCT_NAME} is a trademark of The OpenPilot Team"
|
||||
VIAddVersionKey "LegalCopyright" "© 2010-2015 The OpenPilot Team"
|
||||
VIAddVersionKey "CompanyName" "The LibrePilot Team, http://www.librepilot.org"
|
||||
VIAddVersionKey "LegalTrademarks" "${PRODUCT_NAME} is a trademark of The LibrePilot Team"
|
||||
VIAddVersionKey "LegalCopyright" "© 2015 The LibrePilot Team"
|
||||
VIAddVersionKey "FileDescription" "${INSTALLER_NAME}"
|
||||
|
||||
;--------------------------------
|
||||
@ -84,9 +84,9 @@
|
||||
;--------------------------------
|
||||
; Branding
|
||||
|
||||
BrandingText "© 2010-2015 The OpenPilot Team, http://www.openpilot.org"
|
||||
BrandingText "© 2015 The LibrePilot Team, http://www.librepilot.org"
|
||||
|
||||
!define MUI_ICON "${NSIS_DATA_TREE}\resources\openpilot.ico"
|
||||
!define MUI_ICON "${NSIS_DATA_TREE}\resources\installer_icon.ico"
|
||||
!define MUI_HEADERIMAGE
|
||||
!define MUI_HEADERIMAGE_BITMAP "${NSIS_DATA_TREE}\resources\header.bmp"
|
||||
!define MUI_WELCOMEFINISHPAGE_BITMAP "${NSIS_DATA_TREE}\resources\welcome.bmp"
|
||||
@ -268,11 +268,11 @@ Section "Shortcuts" InSecShortcuts
|
||||
"" "$INSTDIR\bin\${GCS_SMALL_NAME}.exe" 0
|
||||
CreateShortCut "$SMPROGRAMS\${OP_BIG_NAME}\OpenPilot Milestones.lnk" "$INSTDIR\MILESTONES.txt" \
|
||||
"" "$INSTDIR\bin\${GCS_SMALL_NAME}.exe" 0
|
||||
CreateShortCut "$SMPROGRAMS\${OP_BIG_NAME}\OpenPilot Website.lnk" "http://www.openpilot.org" \
|
||||
CreateShortCut "$SMPROGRAMS\${OP_BIG_NAME}\OpenPilot Website.lnk" "http://www.librepilot.org" \
|
||||
"" "$INSTDIR\bin\${GCS_SMALL_NAME}.exe" 0
|
||||
CreateShortCut "$SMPROGRAMS\${OP_BIG_NAME}\OpenPilot Wiki.lnk" "http://wiki.openpilot.org" \
|
||||
"" "$INSTDIR\bin\${GCS_SMALL_NAME}.exe" 0
|
||||
CreateShortCut "$SMPROGRAMS\${OP_BIG_NAME}\OpenPilot Forums.lnk" "http://forums.openpilot.org" \
|
||||
CreateShortCut "$SMPROGRAMS\${OP_BIG_NAME}\OpenPilot Forums.lnk" "http://forums.librepilot.org" \
|
||||
"" "$INSTDIR\bin\${GCS_SMALL_NAME}.exe" 0
|
||||
CreateShortCut "$DESKTOP\${GCS_BIG_NAME}.lnk" "$INSTDIR\bin\${GCS_SMALL_NAME}.exe" \
|
||||
"" "$INSTDIR\bin\${GCS_SMALL_NAME}.exe" 0 "" "" "${PRODUCT_NAME} ${PRODUCT_VERSION}. ${BUILD_DESCRIPTION}"
|
||||
@ -281,14 +281,14 @@ SectionEnd
|
||||
|
||||
Section ; create uninstall info
|
||||
; Write the installation path into the registry
|
||||
WriteRegStr HKCU "Software\${OP_BIG_NAME}" "Install Location" $INSTDIR
|
||||
WriteRegStr HKCU "Software\OpenPilot" "Install Location" $INSTDIR
|
||||
|
||||
; Write the uninstall keys for Windows
|
||||
WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${OP_BIG_NAME}" "DisplayName" "${GCS_BIG_NAME}"
|
||||
WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${OP_BIG_NAME}" "UninstallString" '"$INSTDIR\Uninstall.exe"'
|
||||
WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${OP_BIG_NAME}" "DisplayIcon" '"$INSTDIR\bin\${GCS_SMALL_NAME}.exe"'
|
||||
WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${OP_BIG_NAME}" "Publisher" "OpenPilot Team"
|
||||
WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${OP_BIG_NAME}" "URLInfoAbout" "http://www.openpilot.org"
|
||||
WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${OP_BIG_NAME}" "Publisher" "LibrePilot Team"
|
||||
WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${OP_BIG_NAME}" "URLInfoAbout" "http://www.librepilot.org"
|
||||
WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${OP_BIG_NAME}" "HelpLink" "http://wiki.openpilot.org"
|
||||
WriteRegDWORD HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${OP_BIG_NAME}" "EstimatedSize" 100600
|
||||
WriteRegDWORD HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${OP_BIG_NAME}" "NoModify" 1
|
||||
|
Before Width: | Height: | Size: 25 KiB After Width: | Height: | Size: 9.5 KiB |
BIN
package/winx86/resources/installer_icon.ico
Normal file
After Width: | Height: | Size: 73 KiB |
Before Width: | Height: | Size: 33 KiB |
Before Width: | Height: | Size: 151 KiB After Width: | Height: | Size: 51 KiB |