From 44a441e7e974ee32502c1bfb3c0480306cddb290 Mon Sep 17 00:00:00 2001 From: Gus Grubba Date: Wed, 26 Oct 2016 22:26:41 -0400 Subject: [PATCH] Replacing a few placeholder icons with real ones. --- qgcresources.qrc | 4 +-- src/AnalyzeView/AnalyzeView.qml | 22 ++++++++-------- src/AnalyzeView/GeoTagIcon.png | Bin 502 -> 0 bytes src/AnalyzeView/GeoTagIcon.svg | 17 ++++++++++++ src/AnalyzeView/LogDownloadIcon.png | Bin 502 -> 0 bytes src/AnalyzeView/LogDownloadIcon.svg | 23 ++++++++++++++++ src/QmlControls/SubMenuButton.qml | 5 +++- src/ui/toolbar/Images/Analyze.svg | 51 ++++++++++++------------------------ 8 files changed, 74 insertions(+), 48 deletions(-) delete mode 100644 src/AnalyzeView/GeoTagIcon.png create mode 100644 src/AnalyzeView/GeoTagIcon.svg delete mode 100644 src/AnalyzeView/LogDownloadIcon.png create mode 100644 src/AnalyzeView/LogDownloadIcon.svg diff --git a/qgcresources.qrc b/qgcresources.qrc index 703a836..0ac994c 100644 --- a/qgcresources.qrc +++ b/qgcresources.qrc @@ -54,11 +54,11 @@ src/AutoPilotPlugins/PX4/Images/DatalinkLossLight.svg src/AutoPilotPlugins/PX4/Images/GeoFence.svg src/AutoPilotPlugins/PX4/Images/GeoFenceLight.svg - src/AnalyzeView/GeoTagIcon.png + src/AnalyzeView/GeoTagIcon.svg src/AutoPilotPlugins/PX4/Images/LandMode.svg src/AutoPilotPlugins/PX4/Images/LandModeCopter.svg src/AutoPilotPlugins/APM/Images/LightsComponentIcon.png - src/AnalyzeView/LogDownloadIcon.png + src/AnalyzeView/LogDownloadIcon.svg src/AutoPilotPlugins/PX4/Images/LowBattery.svg src/AutoPilotPlugins/PX4/Images/LowBatteryLight.svg src/AutoPilotPlugins/Common/Images/MotorComponentIcon.svg diff --git a/src/AnalyzeView/AnalyzeView.qml b/src/AnalyzeView/AnalyzeView.qml index 33545d0..cb82779 100644 --- a/src/AnalyzeView/AnalyzeView.qml +++ b/src/AnalyzeView/AnalyzeView.qml @@ -86,25 +86,25 @@ Rectangle { model: ListModel { ListElement { - buttonImage: "/qmlimages/LogDownloadIcon" - buttonText: qsTr("Log Download") - pageSource: "LogDownloadPage.qml" + buttonImage: "/qmlimages/LogDownloadIcon" + buttonText: qsTr("Log Download") + pageSource: "LogDownloadPage.qml" } ListElement { - buttonImage: "/qmlimages/GeoTagIcon" - buttonText: qsTr("GeoTag Images") - pageSource: "GeoTagPage.qml" + buttonImage: "/qmlimages/GeoTagIcon" + buttonText: qsTr("GeoTag Images") + pageSource: "GeoTagPage.qml" } } Component.onCompleted: itemAt(0).checked = true SubMenuButton { - imageResource: buttonImage - setupIndicator: false - exclusiveGroup: setupButtonGroup - text: buttonText - onClicked: panelLoader.source = pageSource + imageResource: buttonImage + setupIndicator: false + exclusiveGroup: setupButtonGroup + text: buttonText + onClicked: panelLoader.source = pageSource } } } diff --git a/src/AnalyzeView/GeoTagIcon.png b/src/AnalyzeView/GeoTagIcon.png deleted file mode 100644 index 6aa8343a341df18048e0c9feeeb9491e2c63aaa8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 502 zcmV4hVSb4Mz~&Q&|7Z z&UwJ@ya9HBqBx1P)|D|~jGYBW85^yg3FfMA>TTaE1&sNT#y*VM?;of8n{sAmb;d5v ze@+Qw)dJLAlrS2yOnPkt6^w0b0LoXJ8)gQo!9o%_VWy?AMG=6O#<5&5Q|*DVRb=cn z7tECMj?WMocgX=`r5xXWWvs-)FsLb8VIDTEUyBx0V_-Us)96-ZnAugOg1M)>6Gv?H z>r=qYDPK9UIKo#Q4Wr>eb%AQ+{%b-|9Wuzjl=m_e8>@;fUxNgc0iXf9?3gmJ1}FkP z{oa{=7H|yJlpT9g9C6;UK%3f;B*8n=0H~ZdoiCme>fy2mfXo|L`!|i0kA&D6$0H?1Qb3707*qoM6N<$f(`)6&Hw-a diff --git a/src/AnalyzeView/GeoTagIcon.svg b/src/AnalyzeView/GeoTagIcon.svg new file mode 100644 index 0000000..ba15cb0 --- /dev/null +++ b/src/AnalyzeView/GeoTagIcon.svg @@ -0,0 +1,17 @@ + + + + + + diff --git a/src/AnalyzeView/LogDownloadIcon.png b/src/AnalyzeView/LogDownloadIcon.png deleted file mode 100644 index 6aa8343a341df18048e0c9feeeb9491e2c63aaa8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 502 zcmV4hVSb4Mz~&Q&|7Z z&UwJ@ya9HBqBx1P)|D|~jGYBW85^yg3FfMA>TTaE1&sNT#y*VM?;of8n{sAmb;d5v ze@+Qw)dJLAlrS2yOnPkt6^w0b0LoXJ8)gQo!9o%_VWy?AMG=6O#<5&5Q|*DVRb=cn z7tECMj?WMocgX=`r5xXWWvs-)FsLb8VIDTEUyBx0V_-Us)96-ZnAugOg1M)>6Gv?H z>r=qYDPK9UIKo#Q4Wr>eb%AQ+{%b-|9Wuzjl=m_e8>@;fUxNgc0iXf9?3gmJ1}FkP z{oa{=7H|yJlpT9g9C6;UK%3f;B*8n=0H~ZdoiCme>fy2mfXo|L`!|i0kA&D6$0H?1Qb3707*qoM6N<$f(`)6&Hw-a diff --git a/src/AnalyzeView/LogDownloadIcon.svg b/src/AnalyzeView/LogDownloadIcon.svg new file mode 100644 index 0000000..a8d9b0b --- /dev/null +++ b/src/AnalyzeView/LogDownloadIcon.svg @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + diff --git a/src/QmlControls/SubMenuButton.qml b/src/QmlControls/SubMenuButton.qml index 640458c..6698d27 100644 --- a/src/QmlControls/SubMenuButton.qml +++ b/src/QmlControls/SubMenuButton.qml @@ -7,9 +7,11 @@ import QGroundControl.Palette 1.0 import QGroundControl.ScreenTools 1.0 Button { + id: _rootButton property bool setupComplete: true ///< true: setup complete indicator shows as completed property bool setupIndicator: true ///< true: show setup complete indicator property string imageResource: "/qmlimages/subMenuButtonImage.png" ///< Button image + property size sourceSize: Qt.size(ScreenTools.defaultFontPixelHeight * 2, ScreenTools.defaultFontPixelHeight * 2) text: "Button" ///< Pass in your own button text @@ -40,9 +42,10 @@ Button { width: ScreenTools.defaultFontPixelHeight * 2 height: ScreenTools.defaultFontPixelHeight * 2 fillMode: Image.PreserveAspectFit - smooth: true + mipmap: true color: control.setupComplete ? qgcPal.button : "red" source: control.imageResource + sourceSize: _rootButton.sourceSize } QGCLabel { diff --git a/src/ui/toolbar/Images/Analyze.svg b/src/ui/toolbar/Images/Analyze.svg index 3088987..d96303a 100644 --- a/src/ui/toolbar/Images/Analyze.svg +++ b/src/ui/toolbar/Images/Analyze.svg @@ -1,34 +1,17 @@ - - - - - - - - - - + + + + + + +