diff --git a/android/res/drawable-hdpi/icon.png b/android/res/drawable-hdpi/icon.png index 0cc381c8d040aa2f1442c2140c241563405d9841..dcfe2f156dfda0c865a71e2f8acab79cb866e0d9 100644 Binary files a/android/res/drawable-hdpi/icon.png and b/android/res/drawable-hdpi/icon.png differ diff --git a/android/res/drawable-ldpi/icon.png b/android/res/drawable-ldpi/icon.png index f487d95c0fb9f40af5ecd2d2feea9473bcd30a0a..d2d940a38598e7b32a8012020578c652930d27f2 100644 Binary files a/android/res/drawable-ldpi/icon.png and b/android/res/drawable-ldpi/icon.png differ diff --git a/android/res/drawable-mdpi/icon.png b/android/res/drawable-mdpi/icon.png index 07399ed5bc008593ee43b238e58e8a0c3adfbbb7..add26523f3c013be39129b6453b8c322d632793a 100644 Binary files a/android/res/drawable-mdpi/icon.png and b/android/res/drawable-mdpi/icon.png differ diff --git a/android/res/drawable-xhdpi/icon.png b/android/res/drawable-xhdpi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..d02d9c7b0c0f05858548923098d46d6800771660 Binary files /dev/null and b/android/res/drawable-xhdpi/icon.png differ diff --git a/android/res/drawable-xxhdpi/icon.png b/android/res/drawable-xxhdpi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..139f14d48f7715f5b67e401bda92baa6486784c0 Binary files /dev/null and b/android/res/drawable-xxhdpi/icon.png differ diff --git a/android/res/drawable-xxxhdpi/icon.png b/android/res/drawable-xxxhdpi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..b08f1ce792cf737130ee6e3e113a27b9a00add01 Binary files /dev/null and b/android/res/drawable-xxxhdpi/icon.png differ diff --git a/ios/AppIcon29x29.png b/ios/AppIcon29x29.png index 22b02b2c44904b5a30990489a5d75aab9216c2d1..fa01256f1bcdd0d3cb0be404fc1a5184c4e6a71d 100644 Binary files a/ios/AppIcon29x29.png and b/ios/AppIcon29x29.png differ diff --git a/ios/AppIcon29x29@2x.png b/ios/AppIcon29x29@2x.png index 8bccfc00730d5b8d4564e6fb3c1989c326d25edc..dac46423a75a1952251e9dd3b5f6164720a8eba1 100644 Binary files a/ios/AppIcon29x29@2x.png and b/ios/AppIcon29x29@2x.png differ diff --git a/ios/AppIcon29x29@2x~ipad.png b/ios/AppIcon29x29@2x~ipad.png index 7d993b049638973dd874d0c6d72884a6eef23caf..8363ab2a8bf41a550d27c443f8ac32377e762291 100644 Binary files a/ios/AppIcon29x29@2x~ipad.png and b/ios/AppIcon29x29@2x~ipad.png differ diff --git a/ios/AppIcon29x29~ipad.png b/ios/AppIcon29x29~ipad.png index 9f4d3566bbe997b5745753575c2fde6a69df9179..bc250364ef616610e7e4430c840cbcdc46e13432 100644 Binary files a/ios/AppIcon29x29~ipad.png and b/ios/AppIcon29x29~ipad.png differ diff --git a/ios/AppIcon40x40@2x.png b/ios/AppIcon40x40@2x.png index 85b0f543d39c7943ae61eda226dc402dcbb28891..03d3ea423092cd0ebf4334054c5fcd0f49f9ee0b 100644 Binary files a/ios/AppIcon40x40@2x.png and b/ios/AppIcon40x40@2x.png differ diff --git a/ios/AppIcon40x40@2x~ipad.png b/ios/AppIcon40x40@2x~ipad.png index b38d96a20bec772bb05e2839dc0c1d8b47f4ae20..be29cf209af5134ee56618cbfc4c0c140773809c 100644 Binary files a/ios/AppIcon40x40@2x~ipad.png and b/ios/AppIcon40x40@2x~ipad.png differ diff --git a/ios/AppIcon40x40~ipad.png b/ios/AppIcon40x40~ipad.png index ed4de9e8e5835dd2c925a5da3ef80b4ed3753cb7..0a4da93a472939457c48d45182b7da20921c7ee7 100644 Binary files a/ios/AppIcon40x40~ipad.png and b/ios/AppIcon40x40~ipad.png differ diff --git a/ios/AppIcon50x50@2x~ipad.png b/ios/AppIcon50x50@2x~ipad.png index c11f619763e9ce460c0a6376c3a2aeb091fb9a02..428ddd5397bbbeeb84dff4eada270c1d60344c78 100644 Binary files a/ios/AppIcon50x50@2x~ipad.png and b/ios/AppIcon50x50@2x~ipad.png differ diff --git a/ios/AppIcon50x50~ipad.png b/ios/AppIcon50x50~ipad.png index cd3b929a54d1e702eb2f198a538b40011eb5f4ee..35710568b1979cc9c4f6b3505a9e84a8742b1d56 100644 Binary files a/ios/AppIcon50x50~ipad.png and b/ios/AppIcon50x50~ipad.png differ diff --git a/ios/AppIcon57x57.png b/ios/AppIcon57x57.png index 73db1a53429872e097bb82df2d06b727f619c84d..60879a4768ca50962957be7b4b75c8682edb17c5 100644 Binary files a/ios/AppIcon57x57.png and b/ios/AppIcon57x57.png differ diff --git a/ios/AppIcon57x57@2x.png b/ios/AppIcon57x57@2x.png index 17cfb33ab553c7ac7e121997990b0a653df45bfa..a2eb2e8f92e42db991be69d1e8038920896bf346 100644 Binary files a/ios/AppIcon57x57@2x.png and b/ios/AppIcon57x57@2x.png differ diff --git a/ios/AppIcon60x60@2x.png b/ios/AppIcon60x60@2x.png index 5fee5f54efcc9757b1953d94b6ec0aab9feaba4c..0be42c95fbf0aeb14088a50b0d2b614e24b3750e 100644 Binary files a/ios/AppIcon60x60@2x.png and b/ios/AppIcon60x60@2x.png differ diff --git a/ios/AppIcon72x72@2x~ipad.png b/ios/AppIcon72x72@2x~ipad.png index 3701cc606c08c784b8f614a091b412606ce09229..d5553b20791102422687dcce5e6271963ffc647e 100644 Binary files a/ios/AppIcon72x72@2x~ipad.png and b/ios/AppIcon72x72@2x~ipad.png differ diff --git a/ios/AppIcon72x72~ipad.png b/ios/AppIcon72x72~ipad.png index 4269185b4db028c6493de3c72e1ac261cb27eb44..bc58950f83f700eae61690805986f04fb6d097c8 100644 Binary files a/ios/AppIcon72x72~ipad.png and b/ios/AppIcon72x72~ipad.png differ diff --git a/ios/AppIcon76x76@2x~ipad.png b/ios/AppIcon76x76@2x~ipad.png index 1edf9c464817d099746594c4715850a361fc298c..72d9fb991b64a8adab8a2ce34519c514d0da4a62 100644 Binary files a/ios/AppIcon76x76@2x~ipad.png and b/ios/AppIcon76x76@2x~ipad.png differ diff --git a/ios/AppIcon76x76~ipad.png b/ios/AppIcon76x76~ipad.png index a5651fe9d823d36b7732ff79e714681af4dae4d9..e4a3615201c53cbcd1586b15878841ae2f5a6266 100644 Binary files a/ios/AppIcon76x76~ipad.png and b/ios/AppIcon76x76~ipad.png differ diff --git a/qgcresources.qrc b/qgcresources.qrc index eb7ff201f253065d23771ca6e83ca8d987180729..61a6be11b0774acc41f4b850b3f48333027ce756 100644 --- a/qgcresources.qrc +++ b/qgcresources.qrc @@ -147,8 +147,8 @@ resources/Pause.svg resources/Play.svg resources/PowerButton.svg - resources/QGCLogoWhite.png - resources/QGCLogoBlack.png + resources/QGCLogoWhite.svg + resources/QGCLogoBlack.svg resources/QGroundControlConnect.svg resources/SplashScreen.png resources/Stop.svg diff --git a/resources/QGCLogoBlack.png b/resources/QGCLogoBlack.png deleted file mode 100644 index 31e792eeaadbfed832094c91580891bb814b4473..0000000000000000000000000000000000000000 Binary files a/resources/QGCLogoBlack.png and /dev/null differ diff --git a/resources/QGCLogoBlack.svg b/resources/QGCLogoBlack.svg new file mode 100644 index 0000000000000000000000000000000000000000..b242ff8c93e07b6b8e18941aa3bc5f0504afca78 --- /dev/null +++ b/resources/QGCLogoBlack.svg @@ -0,0 +1,30 @@ + + + + + + + + + + + + diff --git a/resources/QGCLogoWhite.png b/resources/QGCLogoWhite.png deleted file mode 100644 index cb52e4ef5822d782ecd629e9e40bf2b38e2a901e..0000000000000000000000000000000000000000 Binary files a/resources/QGCLogoWhite.png and /dev/null differ diff --git a/resources/QGCLogoWhite.svg b/resources/QGCLogoWhite.svg new file mode 100644 index 0000000000000000000000000000000000000000..9f045f9b2fa2e0945171669df26054ada1b947c1 --- /dev/null +++ b/resources/QGCLogoWhite.svg @@ -0,0 +1,30 @@ + + + + + + + + + + + + diff --git a/resources/icons/android_512x512.png b/resources/icons/android_512x512.png index 715ca39cd179c295576ac1c43375a8d04bc5ccd1..3340fece3ede9ffd105e5eab76040136d597b0d1 100644 Binary files a/resources/icons/android_512x512.png and b/resources/icons/android_512x512.png differ diff --git a/resources/icons/macx.icns b/resources/icons/macx.icns index 6111a01e1ce0cd693109ecf9e1cb5d20c21960c8..f58514d797aa993bb4e968d32d9b4e716c38172c 100644 Binary files a/resources/icons/macx.icns and b/resources/icons/macx.icns differ diff --git a/resources/icons/macx_128x128x32.png b/resources/icons/macx_128x128x32.png deleted file mode 100644 index 0cc381c8d040aa2f1442c2140c241563405d9841..0000000000000000000000000000000000000000 Binary files a/resources/icons/macx_128x128x32.png and /dev/null differ diff --git a/resources/icons/macx_16x16x1.png b/resources/icons/macx_16x16x1.png deleted file mode 100644 index 2e6fcb82f89f1b9d3e522efb7d639cad4c4efa35..0000000000000000000000000000000000000000 Binary files a/resources/icons/macx_16x16x1.png and /dev/null differ diff --git a/resources/icons/macx_16x16x32.png b/resources/icons/macx_16x16x32.png deleted file mode 100644 index 987d0e5413aeae2a745fe09b269f0fe1978ec0bc..0000000000000000000000000000000000000000 Binary files a/resources/icons/macx_16x16x32.png and /dev/null differ diff --git a/resources/icons/macx_32x32x1.png b/resources/icons/macx_32x32x1.png deleted file mode 100644 index 97836fcad0ff65f0da0a09b90de52985276d3805..0000000000000000000000000000000000000000 Binary files a/resources/icons/macx_32x32x1.png and /dev/null differ diff --git a/resources/icons/macx_32x32x32.png b/resources/icons/macx_32x32x32.png deleted file mode 100644 index efd6a3b3ccbc4831bfaedbdb4d2bbc8f1a1617c3..0000000000000000000000000000000000000000 Binary files a/resources/icons/macx_32x32x32.png and /dev/null differ diff --git a/resources/icons/macx_48x48x1.png b/resources/icons/macx_48x48x1.png deleted file mode 100644 index 3c1f686cbba1a4c485a7b1ab738d0b7f1ff85d1f..0000000000000000000000000000000000000000 Binary files a/resources/icons/macx_48x48x1.png and /dev/null differ diff --git a/resources/icons/macx_48x48x32.png b/resources/icons/macx_48x48x32.png deleted file mode 100644 index 07399ed5bc008593ee43b238e58e8a0c3adfbbb7..0000000000000000000000000000000000000000 Binary files a/resources/icons/macx_48x48x32.png and /dev/null differ diff --git a/resources/icons/qgroundcontrol.ico b/resources/icons/qgroundcontrol.ico index d9f813b9829f0876e0f1cc37e9592cae061ac660..383105455b6812bf1a5fcc4388f168d46e220ffb 100644 Binary files a/resources/icons/qgroundcontrol.ico and b/resources/icons/qgroundcontrol.ico differ diff --git a/resources/icons/qgroundcontrol.png b/resources/icons/qgroundcontrol.png index 0cc381c8d040aa2f1442c2140c241563405d9841..f52acb11cd1cc61e07a471200ab2209bfa6185f1 100644 Binary files a/resources/icons/qgroundcontrol.png and b/resources/icons/qgroundcontrol.png differ diff --git a/src/ui/toolbar/MainToolBar.qml b/src/ui/toolbar/MainToolBar.qml index 316bd99cb078e15caa8f88e63084dc5daa0c5d25..4dd075014eced4206bce0ab2f5b3b124ffc2d430 100644 --- a/src/ui/toolbar/MainToolBar.qml +++ b/src/ui/toolbar/MainToolBar.qml @@ -428,12 +428,14 @@ Rectangle { anchors.bottom: parent.bottom source: qgcPal.globalTheme == QGCPalette.Light ? "/res/QGCLogoBlack" : "/res/QGCLogoWhite" fillMode: Image.PreserveAspectFit + smooth: true + mipmap: true + antialiasing: true readonly property real _topBottomMargins: ScreenTools.defaultFontPixelHeight / 2 MouseArea { anchors.fill: parent - onClicked: mainWindow.showLeftMenu() } }