From e1ad4ee009e96d315f3a64c945b56b65c8560270 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Sun, 3 Apr 2016 19:51:14 -0700 Subject: [PATCH] New QGC Logo --- qgcresources.qrc | 4 +++- resources/QGCLogoBlack.png | Bin 0 -> 1445 bytes resources/QGCLogoWhite.png | Bin 0 -> 4136 bytes src/QGCPalette.cc | 10 ++++++++++ src/QGCPalette.h | 12 +++++++++++- src/ui/toolbar/MainToolBar.qml | 25 ++++++++++++++++--------- 6 files changed, 40 insertions(+), 11 deletions(-) create mode 100644 resources/QGCLogoBlack.png create mode 100644 resources/QGCLogoWhite.png diff --git a/qgcresources.qrc b/qgcresources.qrc index c3b12d2b2..eb7ff201f 100644 --- a/qgcresources.qrc +++ b/qgcresources.qrc @@ -147,12 +147,14 @@ resources/Pause.svg resources/Play.svg resources/PowerButton.svg + resources/QGCLogoWhite.png + resources/QGCLogoBlack.png resources/QGroundControlConnect.svg resources/SplashScreen.png resources/Stop.svg resources/XDelete.svg resources/XDeleteBlack.svg - + resources/firmware/px4.png resources/firmware/apm.png diff --git a/resources/QGCLogoBlack.png b/resources/QGCLogoBlack.png new file mode 100644 index 0000000000000000000000000000000000000000..31e792eeaadbfed832094c91580891bb814b4473 GIT binary patch literal 1445 zcmV;W1zP%vP)mUq`(ISEk%aT)j++xFTy#Z0GkNJu6VS&m34w8`wO%r`>-GBc zcs#zI|6Xe?8OC2$1YJt$8dL_@OMvbLn-TVw8E&RV(c)|=r2_Jzik1eOAx3YR0cXm( zw+w)@zzh?kIpQx7-D<7n_(6nrqUc$;fazS(dlo$k7m5v_=o!Gk7C_M>Dn70XSfc?uo~H9F|<4pM6HZBNAw_ZAwcOOXLDA-|5*KiGc1= zF;}uBU37__V{BHCxeVdeg&zCm0Xjv5%)Kuy4Z=fA-y%UiJK#4p(}`}{Dz{MhrUiL6 z9&;+f+Lc-WpLX5X>-9$x@~qo?-m>(RB$ZNXi~Y>A?iN=%3VFs&OTdhNoM{U5r@@ax z9xbfivxr9;0WDD_>UGuHu~vI|#67<5th*(7={ zbFAHp{sd)J$W{dpt}#;t$eB-4i|6ZfTRljox)%ca)ps*K=#Z^l`CHH&>t+rx(&bX^ zcE8`hwP2qKRqiygxcX8B zG}NpQ``K1*u88E^5{=NLle6cERBEm6)x7EnP)$`+1U0YPG$*hNMQ2pAwyH&+kH(#0 zepLNd(NJ@IRsSj)FCxjIYJ!<_cndMmE$c+YcSYcr%Vju5B0k56)wR|F*PW!%jO#^P zz;#TGYg_5WXuh0M*4WQ9H#%F+*SjITr_62AGHF|@MO$|Yp>kanCJwVP`7(K3X zU&UpMj>4qzur#sIsozZBUp zfSqW01=wwUq!o+;*a;MUguT*Qp1WVPnn5&xM^v_`qAd>(N(1)BnZhloPox zb@wu^>337E2zv&+*ZQ|B&{{7I$=Y1FZtsf70-HR|Iy5;Uk*8UQCI?%+U;@}SuuUps zfUOVPtON?!y0A@a-GHqJ+k8_4uytU&xj7K)Y}w{!n-a>FwJo{p5N`Js5s=$UU*XDm zy(D?=B-G6p3PW7u40X@vJE89DUJ3XS2IsiWlG>0LvquJg3W8xw?^Z6MZ{UvveD%kM04uDjM+_K$U6i0C%cm)`$#b!KdJwM$H}mVWpAZpydhNX9~~ ze)jeQuR{trDMuz7E~^Qat&e&XfDQzECT#ozvfQ+HZ<3=900000NkvXXu0mjf%HFtx literal 0 HcmV?d00001 diff --git a/resources/QGCLogoWhite.png b/resources/QGCLogoWhite.png new file mode 100644 index 0000000000000000000000000000000000000000..cb52e4ef5822d782ecd629e9e40bf2b38e2a901e GIT binary patch literal 4136 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 literal 0 HcmV?d00001 diff --git a/src/QGCPalette.cc b/src/QGCPalette.cc index 6372e8183..d55f1fcc6 100644 --- a/src/QGCPalette.cc +++ b/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) diff --git a/src/QGCPalette.h b/src/QGCPalette.h index 2b105aaca..a58f34265 100644 --- a/src/QGCPalette.h +++ b/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 _paletteObjects; ///< List of all active QGCPalette objects diff --git a/src/ui/toolbar/MainToolBar.qml b/src/ui/toolbar/MainToolBar.qml index be07f6c76..316bd99cb 100644 --- a/src/ui/toolbar/MainToolBar.qml +++ b/src/ui/toolbar/MainToolBar.qml @@ -419,15 +419,22 @@ Rectangle { ExclusiveGroup { id: mainActionGroup } - QGCToolBarButton { - id: preferencesButton - width: mainWindow.tbButtonWidth - anchors.top: parent.top - anchors.bottom: parent.bottom - source: "/qmlimages/Hamburger.svg" - onClicked: { - mainWindow.showLeftMenu(); - preferencesButton.checked = false; + Image { + id: preferencesButton + width: mainWindow.tbButtonWidth + anchors.topMargin: _topBottomMargins + anchors.bottomMargin: _topBottomMargins + anchors.top: parent.top + anchors.bottom: parent.bottom + source: qgcPal.globalTheme == QGCPalette.Light ? "/res/QGCLogoBlack" : "/res/QGCLogoWhite" + fillMode: Image.PreserveAspectFit + + readonly property real _topBottomMargins: ScreenTools.defaultFontPixelHeight / 2 + + MouseArea { + anchors.fill: parent + + onClicked: mainWindow.showLeftMenu() } } -- 2.22.0