LP-03 Artwork rebranding : updated Logos, wizard and config shapes

ground/openpilotgcs/share/openpilotgcs/default_configurations/OpenPilotGCS.xml

@@ -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>

ground/openpilotgcs/src/app/appresources.qrc

@@ -1,5 +1,5 @@
 <RCC>
     <qresource prefix="/app">
-        <file>splash.png</file>
+        <file>librepilot_splash.png</file>
     </qresource>
 </RCC>

ground/openpilotgcs/src/app/gcssplashscreen.cpp

@@ -35,7 +35,7 @@ GCSSplashScreen::GCSSplashScreen() :
     QSplashScreen(), m_pixmap(0), m_painter(0)
 {
     setWindowFlags(windowFlags());
-    m_pixmap  = new QPixmap(":/app/splash.png");
+    m_pixmap  = new QPixmap(":/app/librepilot_splash.png");
 
     m_painter = new QPainter(m_pixmap);
     m_painter->setPen(Qt::lightGray);
@@ -43,7 +43,7 @@ GCSSplashScreen::GCSSplashScreen() :
     m_painter->setFont(font);
     m_painter->drawText(405, 170, QString(CopyrightSymbol) +
                         QString(" 2010-") + VersionInfo::year() +
-                        QString(tr(" The OpenPilot Project - All Rights Reserved")));
+                        QString(tr(" The LibrePilot Project - All Rights Reserved")));
 
     m_painter->drawText(406, 173, 310, 100, Qt::TextWordWrap | Qt::AlignTop | Qt::AlignLeft,
                         QString(tr("GCS Revision - ")) + VersionInfo::revision());

ground/openpilotgcs/src/app/librepilotgcs.rc

@@ -0,0 +1 @@
+ IDI_ICON1               ICON    DISCARDABLE     "librepilotgcs.ico"

ground/openpilotgcs/src/app/openpilotgcs.rc

@@ -1 +0,0 @@
- IDI_ICON1               ICON    DISCARDABLE     "openpilotgcs.ico"

ground/openpilotgcs/src/plugins/coreplugin/aboutdialog.cpp

@@ -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,7 @@ AboutDialog::AboutDialog(QWidget *parent) :
         "Built on %4 at %5<br/>"
         "Based on Qt %6 (%7 bit)<br/>"
         "<br/>"
-        "&copy; %8, 2010-%9. All rights reserved.<br/>"
+        "&copy; %8, %9. All rights reserved.<br/>"
         ).arg(
         VersionInfo::revision().left(60), // %1
         VersionInfo::uavoHash().left(8), // %2

ground/openpilotgcs/src/plugins/coreplugin/core.qrc

@@ -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>

ground/openpilotgcs/src/plugins/coreplugin/coreconstants.h

@@ -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

ground/openpilotgcs/src/plugins/coreplugin/coreplugin.pro

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

ground/openpilotgcs/src/plugins/coreplugin/mainwindow.cpp

@@ -134,9 +134,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
     QCoreApplication::setApplicationName(QLatin1String("OpenPilotGCS"));
     QCoreApplication::setApplicationVersion(QLatin1String(Core::Constants::GCS_VERSION_LONG));

ground/openpilotgcs/src/plugins/coreplugin/qml/AboutDialog.qml

@@ -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

ground/openpilotgcs/src/plugins/coreplugin/workspacesettings.cpp

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

ground/openpilotgcs/src/plugins/flightlog/flightlogplugin.cpp

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

ground/openpilotgcs/src/plugins/opmap/opmap_edit_waypoint_dialog.ui

@@ -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>

ground/openpilotgcs/src/plugins/opmap/pathplanner.ui

@@ -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>

ground/openpilotgcs/src/plugins/pathactioneditor/pathactioneditortreemodel.cpp

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

ground/openpilotgcs/src/plugins/setupwizard/vehicletemplateselectorwidget.cpp

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

ground/openpilotgcs/src/plugins/welcome/qml/SitesPanel.qml

@@ -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 = [

ground/openpilotgcs/src/plugins/welcome/qml/main.qml

@@ -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

ground/openpilotgcs/src/plugins/welcome/welcome.qrc

@@ -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>

ground/openpilotgcs/src/plugins/welcome/welcomemode.cpp

@@ -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

ground/openpilotgcs/src/plugins/welcome/welcomemode.h

@@ -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
     {