Merge pull request #3137 from DonLakeFlyer/QGCLogo

New QGC Logo

qgcresources.qrc

@@ -147,12 +147,14 @@
         <file alias="Pause">resources/Pause.svg</file>
         <file alias="Play">resources/Play.svg</file>
         <file alias="PowerButton">resources/PowerButton.svg</file>
+        <file alias="QGCLogoWhite">resources/QGCLogoWhite.png</file>
+        <file alias="QGCLogoBlack">resources/QGCLogoBlack.png</file>
         <file alias="QGroundControlConnect">resources/QGroundControlConnect.svg</file>
         <file alias="SplashScreen">resources/SplashScreen.png</file>
         <file alias="Stop">resources/Stop.svg</file>
         <file alias="XDelete.svg">resources/XDelete.svg</file>
         <file alias="XDeleteBlack.svg">resources/XDeleteBlack.svg</file>
-    </qresource>
+</qresource>
     <qresource prefix="/res/firmware">
         <file alias="px4.png">resources/firmware/px4.png</file>
         <file alias="apm.png">resources/firmware/apm.png</file>

src/QGCPalette.cc

@@ -119,6 +119,16 @@ QColor QGCPalette::_mapWidgetBorderDark[QGCPalette::_cThemes][QGCPalette::_cColo
     { QColor(0, 0, 0), QColor(0, 0, 0) },
 };
 
+QColor QGCPalette::_brandingPurple[QGCPalette::_cThemes][QGCPalette::_cColorGroups] = {
+    { QColor("#4A2C6D"), QColor("#4A2C6D") },
+    { QColor("#4A2C6D"), QColor("#4A2C6D") },
+};
+
+QColor QGCPalette::_brandingBlue[QGCPalette::_cThemes][QGCPalette::_cColorGroups] = {
+    { QColor("#48D6FF"), QColor("#48D6FF") },
+    { QColor("#48D6FF"), QColor("#48D6FF") },
+};
+
 QGCPalette::QGCPalette(QObject* parent) :
     QObject(parent),
     _colorGroupEnabled(true)

src/QGCPalette.h

@@ -64,6 +64,10 @@ class QGCPalette : public QObject
     //      textFieldText -         Text color for TextFields
     //      mapButton -             Background color for map buttons
     //      mapButtonHighlight -    Background color for map button in selected or hover state
+    //      mapWidgetBorderLight -  Widget border color which will stand out against light map tiles
+    //      mapWidgetBorderDark -   Widget border color which will stand out against dark map tiles
+    //      brandingPurple -        Purple color from branding guidelines
+    //      brandingBlue -          Blue color from branding guidelines
 
     Q_PROPERTY(QColor window                READ window                 WRITE setWindow                 NOTIFY paletteChanged)
     Q_PROPERTY(QColor windowShade           READ windowShade            WRITE setWindowShade            NOTIFY paletteChanged)
@@ -82,6 +86,8 @@ class QGCPalette : public QObject
     Q_PROPERTY(QColor mapButtonHighlight    READ mapButtonHighlight     WRITE setMapButtonHighlight     NOTIFY paletteChanged)
     Q_PROPERTY(QColor mapWidgetBorderLight  READ mapWidgetBorderLight   WRITE setMapWidgetBorderLight   NOTIFY paletteChanged)
     Q_PROPERTY(QColor mapWidgetBorderDark   READ mapWidgetBorderDark    WRITE setMapWidgetBorderDark    NOTIFY paletteChanged)
+    Q_PROPERTY(QColor brandingPurple        READ brandingPurple                                         NOTIFY paletteChanged)
+    Q_PROPERTY(QColor brandingBlue          READ brandingBlue                                           NOTIFY paletteChanged)
 
 public:
     enum ColorGroup {
@@ -117,6 +123,8 @@ public:
     QColor mapButtonHighlight(void)     const { return _mapButtonHighlight[_theme][_colorGroupEnabled ? 1 : 0]; }
     QColor mapWidgetBorderLight(void)   const { return _mapWidgetBorderLight[_theme][_colorGroupEnabled ? 1 : 0]; }
     QColor mapWidgetBorderDark(void)    const { return _mapWidgetBorderDark[_theme][_colorGroupEnabled ? 1 : 0]; }
+    QColor brandingPurple(void)         const { return _brandingPurple[_theme][_colorGroupEnabled ? 1 : 0]; }
+    QColor brandingBlue(void)           const { return _brandingBlue[_theme][_colorGroupEnabled ? 1 : 0]; }
 
     void setWindow(QColor& color)               { _window[_theme][_colorGroupEnabled ? 1 : 0] = color; _signalPaletteChangeToAll(); }
     void setWindowShade(QColor& color)          { _windowShade[_theme][_colorGroupEnabled ? 1 : 0] = color; _signalPaletteChangeToAll(); }
@@ -174,10 +182,12 @@ private:
     
     static QColor _mapButton[_cThemes][_cColorGroups];
     static QColor _mapButtonHighlight[_cThemes][_cColorGroups];
-
     static QColor _mapWidgetBorderLight[_cThemes][_cColorGroups];
     static QColor _mapWidgetBorderDark[_cThemes][_cColorGroups];
 
+    static QColor _brandingPurple[_cThemes][_cColorGroups];
+    static QColor _brandingBlue[_cThemes][_cColorGroups];
+
     void _themeChanged(void);
     
     static QList<QGCPalette*>   _paletteObjects;    ///< List of all active QGCPalette objects

src/ui/toolbar/MainToolBar.qml

@@ -419,15 +419,22 @@ Rectangle {
 
         ExclusiveGroup { id: mainActionGroup }
 
-        QGCToolBarButton {
+        Image {
-            id:                 preferencesButton
+            id:                     preferencesButton
-            width:              mainWindow.tbButtonWidth
+            width:                  mainWindow.tbButtonWidth
-            anchors.top:        parent.top
+            anchors.topMargin:      _topBottomMargins
-            anchors.bottom:     parent.bottom
+            anchors.bottomMargin:   _topBottomMargins
-            source:             "/qmlimages/Hamburger.svg"
+            anchors.top:            parent.top
-            onClicked: {
+            anchors.bottom:         parent.bottom
-                mainWindow.showLeftMenu();
+            source:                 qgcPal.globalTheme == QGCPalette.Light ? "/res/QGCLogoBlack" : "/res/QGCLogoWhite"
-                preferencesButton.checked = false;
+            fillMode:               Image.PreserveAspectFit
+
+            readonly property real _topBottomMargins: ScreenTools.defaultFontPixelHeight / 2
+
+            MouseArea {
+                anchors.fill: parent
+
+                onClicked: mainWindow.showLeftMenu()
             }
         }