diff --git a/qgroundcontrol.qrc b/qgroundcontrol.qrc
index 1381ea905ac7700437896ad634bc7b0e3fff4fe4..b0c13016f84dd3cf3d94e56dcca9a2ef6f7d7bdb 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 0000000000000000000000000000000000000000..74988e5406befad1aec14f337bd61f3191e4d9ea
--- /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 0000000000000000000000000000000000000000..ae78ea2b4c2445f74e23b4027c5be4fd3bd9fd2e
--- /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 0000000000000000000000000000000000000000..bf305631784d892dd15623ea1dc0f1dca19cbd28
--- /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 0000000000000000000000000000000000000000..c14f59d51ac5c171ab470b8b4159094d8a75361c
--- /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 0000000000000000000000000000000000000000..e3ae61df8a4af662b58dff39b98ccd446376ba71
--- /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 0000000000000000000000000000000000000000..92cbcbe2a061a8c80a1e10cb6823cff28e4f0a6c
--- /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 0000000000000000000000000000000000000000..2713c431aece1bb0344931c0c0007577b8f4dc2d
--- /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 470443e06efa5f26e9da68f45c83eb9785111d25..1b0826ba046132064adf73ab0793056024898f77 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 0000000000000000000000000000000000000000..17effa14549bd9623d9624dab30619399475345b
--- /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 934ccfe9cfcd6b1b77368781ec22977732167ffc..e43804f78f6b9a693a4255398081f56b2cdefae6 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 0000000000000000000000000000000000000000..2aea3867c5c2c96a8a9cb1e7be60582a57676564
--- /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 600817b2386759384e952af791eefce45e4fd6a4..e840da76c341b7f9919ab6181a543ec729767dd8 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