From aae467b695377e784d18f44b89d7220f9d0b6ac1 Mon Sep 17 00:00:00 2001 From: dogmaphobic Date: Wed, 21 Oct 2015 14:04:57 -0400 Subject: [PATCH] Light Icons for Plan View Help --- qgroundcontrol.qrc | 16 +++++++++---- src/FlightMap/Images/HelpBlack.svg | 15 +++++++++++++ src/FlightMap/Images/HomeBlack.svg | 9 ++++++++ src/FlightMap/Images/MapAddMissionBlack.svg | 10 +++++++++ src/FlightMap/Images/MapCenterBlack.svg | 12 ++++++++++ src/FlightMap/Images/MapHomeBlack.svg | 10 +++++++++ src/FlightMap/Images/MapSyncBlack.svg | 18 +++++++++++++++ src/FlightMap/Images/MapTypeBlack.svg | 10 +++++++++ src/FlightMap/Images/TrashDelete.svg | 6 ++--- src/FlightMap/Images/TrashDeleteBlack.svg | 11 +++++++++ src/FlightMap/Images/XDelete.svg | 6 ++--- src/FlightMap/Images/XDeleteBlack.svg | 10 +++++++++ src/MissionEditor/MissionEditor.qml | 25 +++++++++++---------- 13 files changed, 136 insertions(+), 22 deletions(-) create mode 100644 src/FlightMap/Images/HelpBlack.svg create mode 100644 src/FlightMap/Images/HomeBlack.svg create mode 100644 src/FlightMap/Images/MapAddMissionBlack.svg create mode 100644 src/FlightMap/Images/MapCenterBlack.svg create mode 100644 src/FlightMap/Images/MapHomeBlack.svg create mode 100644 src/FlightMap/Images/MapSyncBlack.svg create mode 100644 src/FlightMap/Images/MapTypeBlack.svg create mode 100644 src/FlightMap/Images/TrashDeleteBlack.svg create mode 100644 src/FlightMap/Images/XDeleteBlack.svg diff --git a/qgroundcontrol.qrc b/qgroundcontrol.qrc index 1381ea905a..b0c13016f8 100644 --- a/qgroundcontrol.qrc +++ b/qgroundcontrol.qrc @@ -65,17 +65,25 @@ src/FlightMap/Images/airplaneOpaque.svg src/FlightMap/Images/ZoomPlus.svg src/FlightMap/Images/ZoomMinus.svg - src/FlightMap/Images/TrashDelete.svg - src/FlightMap/Images/XDelete.svg src/FlightMap/Images/Help.svg + src/FlightMap/Images/HelpBlack.svg + src/FlightMap/Images/MapAddMission.svg + src/FlightMap/Images/MapAddMissionBlack.svg src/FlightMap/Images/MapCenter.svg + src/FlightMap/Images/MapCenterBlack.svg + src/FlightMap/Images/MapHome.svg + src/FlightMap/Images/MapHomeBlack.svg src/FlightMap/Images/MapSync.svg + src/FlightMap/Images/MapSyncBlack.svg src/FlightMap/Images/MapSyncChanged.svg src/FlightMap/Images/MapType.svg - src/FlightMap/Images/MapHome.svg - src/FlightMap/Images/MapAddMission.svg + src/FlightMap/Images/MapTypeBlack.svg + src/FlightMap/Images/TrashDelete.svg + src/FlightMap/Images/TrashDeleteBlack.svg + src/FlightMap/Images/XDelete.svg + src/FlightMap/Images/XDeleteBlack.svg diff --git a/src/FlightMap/Images/HelpBlack.svg b/src/FlightMap/Images/HelpBlack.svg new file mode 100644 index 0000000000..74988e5406 --- /dev/null +++ b/src/FlightMap/Images/HelpBlack.svg @@ -0,0 +1,15 @@ + + + + + + + + diff --git a/src/FlightMap/Images/HomeBlack.svg b/src/FlightMap/Images/HomeBlack.svg new file mode 100644 index 0000000000..ae78ea2b4c --- /dev/null +++ b/src/FlightMap/Images/HomeBlack.svg @@ -0,0 +1,9 @@ + + + + + + + diff --git a/src/FlightMap/Images/MapAddMissionBlack.svg b/src/FlightMap/Images/MapAddMissionBlack.svg new file mode 100644 index 0000000000..bf30563178 --- /dev/null +++ b/src/FlightMap/Images/MapAddMissionBlack.svg @@ -0,0 +1,10 @@ + + + + + + + + diff --git a/src/FlightMap/Images/MapCenterBlack.svg b/src/FlightMap/Images/MapCenterBlack.svg new file mode 100644 index 0000000000..c14f59d51a --- /dev/null +++ b/src/FlightMap/Images/MapCenterBlack.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + diff --git a/src/FlightMap/Images/MapHomeBlack.svg b/src/FlightMap/Images/MapHomeBlack.svg new file mode 100644 index 0000000000..e3ae61df8a --- /dev/null +++ b/src/FlightMap/Images/MapHomeBlack.svg @@ -0,0 +1,10 @@ + + + + + + + + diff --git a/src/FlightMap/Images/MapSyncBlack.svg b/src/FlightMap/Images/MapSyncBlack.svg new file mode 100644 index 0000000000..92cbcbe2a0 --- /dev/null +++ b/src/FlightMap/Images/MapSyncBlack.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + diff --git a/src/FlightMap/Images/MapTypeBlack.svg b/src/FlightMap/Images/MapTypeBlack.svg new file mode 100644 index 0000000000..2713c431ae --- /dev/null +++ b/src/FlightMap/Images/MapTypeBlack.svg @@ -0,0 +1,10 @@ + + + + + + + diff --git a/src/FlightMap/Images/TrashDelete.svg b/src/FlightMap/Images/TrashDelete.svg index 470443e06e..1b0826ba04 100644 --- a/src/FlightMap/Images/TrashDelete.svg +++ b/src/FlightMap/Images/TrashDelete.svg @@ -5,7 +5,7 @@ - - + + diff --git a/src/FlightMap/Images/TrashDeleteBlack.svg b/src/FlightMap/Images/TrashDeleteBlack.svg new file mode 100644 index 0000000000..17effa1454 --- /dev/null +++ b/src/FlightMap/Images/TrashDeleteBlack.svg @@ -0,0 +1,11 @@ + + + + + + + + + diff --git a/src/FlightMap/Images/XDelete.svg b/src/FlightMap/Images/XDelete.svg index 934ccfe9cf..e43804f78f 100644 --- a/src/FlightMap/Images/XDelete.svg +++ b/src/FlightMap/Images/XDelete.svg @@ -3,8 +3,8 @@ - + - - + + diff --git a/src/FlightMap/Images/XDeleteBlack.svg b/src/FlightMap/Images/XDeleteBlack.svg new file mode 100644 index 0000000000..2aea3867c5 --- /dev/null +++ b/src/FlightMap/Images/XDeleteBlack.svg @@ -0,0 +1,10 @@ + + + + + + + + + diff --git a/src/MissionEditor/MissionEditor.qml b/src/MissionEditor/MissionEditor.qml index 600817b238..e840da76c3 100644 --- a/src/MissionEditor/MissionEditor.qml +++ b/src/MissionEditor/MissionEditor.qml @@ -578,7 +578,7 @@ QGCView { anchors.right: parent.right width: ScreenTools.defaultFontPixelHeight * 1.5 height: ScreenTools.defaultFontPixelHeight * 1.5 - source: "/qmlimages/XDelete.svg" + source: (qgcPal.globalTheme === QGCPalette.Light) ? "/qmlimages/XDeleteBlack.svg" : "/qmlimages/XDelete.svg" fillMode: Image.PreserveAspectFit mipmap: true smooth: true @@ -616,7 +616,7 @@ QGCView { fillMode: Image.PreserveAspectFit mipmap: true smooth: true - source: "/qmlimages/MapAddMission.svg" + source: (qgcPal.globalTheme === QGCPalette.Light) ? "/qmlimages/MapAddMissionBlack.svg" : "/qmlimages/MapAddMission.svg" } QGCLabel { @@ -638,7 +638,7 @@ QGCView { fillMode: Image.PreserveAspectFit mipmap: true smooth: true - source: "/qmlimages/TrashDelete.svg" + source: (qgcPal.globalTheme === QGCPalette.Light) ? "/qmlimages/TrashDeleteBlack.svg" : "/qmlimages/TrashDelete.svg" } QGCLabel { @@ -660,7 +660,7 @@ QGCView { fillMode: Image.PreserveAspectFit mipmap: true smooth: true - source: "/qmlimages/MapHome.svg" + source: (qgcPal.globalTheme === QGCPalette.Light) ? "/qmlimages/MapHomeBlack.svg" : "/qmlimages/MapHome.svg" } QGCLabel { @@ -683,7 +683,7 @@ QGCView { fillMode: Image.PreserveAspectFit mipmap: true smooth: true - source: "/qmlimages/MapCenter.svg" + source: (qgcPal.globalTheme === QGCPalette.Light) ? "/qmlimages/MapCenterBlack.svg" : "/qmlimages/MapCenter.svg" } QGCLabel { @@ -705,7 +705,7 @@ QGCView { fillMode: Image.PreserveAspectFit mipmap: true smooth: true - source: "/qmlimages/MapSync.svg" + source: (qgcPal.globalTheme === QGCPalette.Light) ? "/qmlimages/MapSyncBlack.svg" : "/qmlimages/MapSync.svg" } QGCLabel { @@ -727,7 +727,7 @@ QGCView { fillMode: Image.PreserveAspectFit mipmap: true smooth: true - source: "/qmlimages/MapType.svg" + source: (qgcPal.globalTheme === QGCPalette.Light) ? "/qmlimages/MapTypeBlack.svg" : "/qmlimages/MapType.svg" } QGCLabel { @@ -742,12 +742,13 @@ QGCView { } QGCCheckBox { - anchors.left: parent.left - anchors.bottom: parent.bottom - checked: !_showHelp - text: "Don't show me again" + anchors.left: parent.left + anchors.bottom: parent.bottom + anchors.margins: _margin + checked: !_showHelp + text: "Don't show me again" - onClicked: QGroundControl.flightMapSettings.saveBoolMapSetting(editorMap.mapName, _showHelpKey, !checked) + onClicked: QGroundControl.flightMapSettings.saveBoolMapSetting(editorMap.mapName, _showHelpKey, !checked) } } // Item - margin } // Item - Help Panel -- GitLab