diff --git a/qgroundcontrol.qrc b/qgroundcontrol.qrc
index b5e879ef6908cfbd7cffd7f94e045f9b629683b6..f6d196c447cd224c7018aa32be1f39d18d745bc0 100644
--- a/qgroundcontrol.qrc
+++ b/qgroundcontrol.qrc
@@ -63,13 +63,16 @@
src/FlightMap/Images/scale_end.png
src/FlightMap/Images/airplaneOutline.svg
src/FlightMap/Images/airplaneOpaque.svg
- src/FlightMap/Images/MapType.svg
- src/FlightMap/Images/MapCenter.svg
src/FlightMap/Images/ZoomPlus.svg
src/FlightMap/Images/ZoomMinus.svg
- resources/Sync.png
+ src/FlightMap/Images/MapCenter.svg
+ src/FlightMap/Images/MapSync.svg
+ src/FlightMap/Images/MapType.svg
+ src/FlightMap/Images/MapHome.svg
+ src/FlightMap/Images/MapAddMission.svg
+
src/test.qml
diff --git a/resources/Sync.png b/resources/Sync.png
deleted file mode 100644
index ea9bcccf7df54515ad6c399c2a26fb5ac7f1ac06..0000000000000000000000000000000000000000
Binary files a/resources/Sync.png and /dev/null differ
diff --git a/src/FlightMap/Images/MapHomeTearDrop.svg b/src/FlightMap/Images/MapAddMission.svg
similarity index 54%
rename from src/FlightMap/Images/MapHomeTearDrop.svg
rename to src/FlightMap/Images/MapAddMission.svg
index ee5587c25f35787a910398362657c03306cda928..a74d313b8f34d5cad0df1ab0b4e1416d80f841d8 100644
--- a/src/FlightMap/Images/MapHomeTearDrop.svg
+++ b/src/FlightMap/Images/MapAddMission.svg
@@ -2,8 +2,9 @@
diff --git a/src/FlightMap/Images/MapHome.svg b/src/FlightMap/Images/MapHome.svg
new file mode 100644
index 0000000000000000000000000000000000000000..3344ab9c4dc509db2854cc6fa9be72eee03e58c6
--- /dev/null
+++ b/src/FlightMap/Images/MapHome.svg
@@ -0,0 +1,11 @@
+
+
+
diff --git a/src/FlightMap/Images/MapSync.svg b/src/FlightMap/Images/MapSync.svg
new file mode 100644
index 0000000000000000000000000000000000000000..ddf5dc4c0288611b34212a4d42609dd52a3788a2
--- /dev/null
+++ b/src/FlightMap/Images/MapSync.svg
@@ -0,0 +1,29 @@
+
+
+
diff --git a/src/FlightMap/qmldir b/src/FlightMap/qmldir
index 692c7d79e8c117d490ece8a017fcee71f2613457..18f0c2102c25453cc461098561ad975af8b5c506 100644
--- a/src/FlightMap/qmldir
+++ b/src/FlightMap/qmldir
@@ -19,4 +19,4 @@ QGCSpeedWidget 1.0 QGCSpeedWidget.qml
# MapQuickItems
VehicleMapItem 1.0 VehicleMapItem.qml
-MissionItemIndicator 1.0 MissionItemIndicator.qml
+MissionItemIndicator 1.0 MissionItemIndicator.qml
diff --git a/src/MissionEditor/MissionEditor.qml b/src/MissionEditor/MissionEditor.qml
index 28b0e3a984d8e46371121e0753d5c2ae7ed8e1d3..b8ab367435507a7f8112d44b1094e05896d06093 100644
--- a/src/MissionEditor/MissionEditor.qml
+++ b/src/MissionEditor/MissionEditor.qml
@@ -130,88 +130,44 @@ QGCView {
}
}
- Rectangle {
+ Image {
id: addMissionItemsButton
anchors.rightMargin: ScreenTools.defaultFontPixelHeight
anchors.right: homePositionManagerButton.left
anchors.top: homePositionManagerButton.top
- radius: (ScreenTools.defaultFontPixelHeight * 3) / 2
- width: radius * 2
- height: radius * 2
- border.width: 2
- border.color: "white"
- color: _addMissionItems ? _qgcPal.buttonHighlight : "black"
- opacity: _addMissionItems ? 0.75 : 1.0
-
+ width: ScreenTools.defaultFontPixelHeight * 3
+ fillMode: Image.PreserveAspectFit
+ mipmap: true
+ smooth: true
+ source: "/qmlimages/MapAddMission.svg"
+ opacity: _addMissionItems ? 1.0 : 0.75
MouseArea {
anchors.fill: parent
-
onClicked: {
_addMissionItems = !_addMissionItems
_showHomePositionManager = false
}
}
-
- Rectangle {
- anchors.verticalCenter: parent.verticalCenter
- anchors.horizontalCenter: parent.horizontalCenter
- width: ScreenTools.defaultFontPixelHeight * 1.5
- height: width
- radius: width / 2
- border.width: 2
- border.color: "white"
- color: "transparent"
-
- QGCLabel {
- anchors.fill: parent
- horizontalAlignment: Text.AlignHCenter
- verticalAlignment: Text.AlignVCenter
- color: "white"
- text: "1"
- }
- }
}
- Rectangle {
+ Image {
id: homePositionManagerButton
anchors.rightMargin: ScreenTools.defaultFontPixelHeight
anchors.right: centerMapButton.left
anchors.top: centerMapButton.top
- radius: (ScreenTools.defaultFontPixelHeight * 3) / 2
- width: radius * 2
- height: radius * 2
- border.width: 2
- border.color: "white"
- color: _showHomePositionManager ? _qgcPal.buttonHighlight : "black"
- opacity: _showHomePositionManager ? 0.75 : 1.0
-
+ width: ScreenTools.defaultFontPixelHeight * 3
+ fillMode: Image.PreserveAspectFit
+ mipmap: true
+ smooth: true
+ source: "/qmlimages/MapHome.svg"
+ opacity: _showHomePositionManager ? 1.0 : 0.75
MouseArea {
anchors.fill: parent
-
onClicked: {
_showHomePositionManager = !_showHomePositionManager
_addMissionItems = false
}
}
-
- Rectangle {
- anchors.verticalCenter: parent.verticalCenter
- anchors.horizontalCenter: parent.horizontalCenter
- width: ScreenTools.defaultFontPixelHeight * 1.5
- height: width
- radius: width / 2
- border.width: 2
- border.color: "white"
- color: "transparent"
-
- QGCLabel {
- anchors.fill: parent
- horizontalAlignment: Text.AlignHCenter
- verticalAlignment: Text.AlignVCenter
- color: "white"
- text: "H"
- }
- }
}
DropButton {
@@ -296,7 +252,7 @@ This code will need to wait for Qml 5.5 support since Map.visibleRegion is only
anchors.right: mapTypeButton.left
anchors.top: mapTypeButton.top
dropDirection: dropDown
- buttonImage: "/qmlimages/Sync.png"
+ buttonImage: "/qmlimages/MapSync.svg"
viewportMargins: ScreenTools.defaultFontPixelWidth / 2
exclusiveGroup: _dropButtonsExclusiveGroup
@@ -571,9 +527,9 @@ This code will need to wait for Qml 5.5 support since Map.visibleRegion is only
QGCLabel {
width: parent.width
wrapMode: Text.WordWrap
- text: "To add a new home position, click in the Map to set the position. " +
+ text: "To add a new home position, click on the Map to set the position. " +
"Then give it a new name and click Add/Update. " +
- "To change the current home position, click in the Map to set the new position. " +
+ "To change the current home position, click on the Map to set the new position. " +
"Then click Add/Update without changing the name."
}
@@ -716,28 +672,18 @@ This code will need to wait for Qml 5.5 support since Map.visibleRegion is only
anchors.top: helpTitle.bottom
width: parent.width
wrapMode: Text.WordWrap
- text: "In the upper right corner of the map you will see the Mission Planner tools:"
+ text: "Mission Planner tool buttons:"
}
- Rectangle {
- id: addMissionItemsHelpIcon
- anchors.topMargin: ScreenTools.defaultFontPixelHeight
- anchors.top: helpIconLabel.bottom
- anchors.horizontalCenter: mapTypeHelpIcon.horizontalCenter
- width: ScreenTools.defaultFontPixelHeight * 1.5
- height: width
- radius: width / 2
- border.width: 2
- border.color: "white"
- color: _qgcPal.window
-
- QGCLabel {
- anchors.fill: parent
- horizontalAlignment: Text.AlignHCenter
- verticalAlignment: Text.AlignVCenter
- color: "white"
- text: "1"
- }
+ Image {
+ id: addMissionItemsHelpIcon
+ anchors.topMargin: ScreenTools.defaultFontPixelHeight
+ anchors.top: helpIconLabel.bottom
+ width: ScreenTools.defaultFontPixelHeight * 3
+ fillMode: Image.PreserveAspectFit
+ mipmap: true
+ smooth: true
+ source: "/qmlimages/MapAddMission.svg"
}
QGCLabel {
@@ -747,30 +693,19 @@ This code will need to wait for Qml 5.5 support since Map.visibleRegion is only
anchors.right: parent.right
anchors.top: addMissionItemsHelpIcon.top
wrapMode: Text.WordWrap
- text: "This is the Add Mission Items tool. " +
- "Click it to turn on the ability to add mission items by clicking in the map. " +
- "Click it again to turn it off."
+ text: "Add Mission Items
" +
+ "When enabled, add mission items by clicking on the map."
}
- Rectangle {
- id: homePositionManagerHelpIcon
- anchors.topMargin: ScreenTools.defaultFontPixelHeight
- anchors.top: addMissionItemsHelpText.bottom
- anchors.horizontalCenter: mapTypeHelpIcon.horizontalCenter
- width: ScreenTools.defaultFontPixelHeight * 1.5
- height: width
- radius: width / 2
- border.width: 2
- border.color: "white"
- color: _qgcPal.window
-
- QGCLabel {
- anchors.fill: parent
- horizontalAlignment: Text.AlignHCenter
- verticalAlignment: Text.AlignVCenter
- color: "white"
- text: "H"
- }
+ Image {
+ id: homePositionManagerHelpIcon
+ anchors.topMargin: ScreenTools.defaultFontPixelHeight
+ anchors.top: addMissionItemsHelpText.bottom
+ width: ScreenTools.defaultFontPixelHeight * 3
+ fillMode: Image.PreserveAspectFit
+ mipmap: true
+ smooth: true
+ source: "/qmlimages/MapHome.svg"
}
QGCLabel {
@@ -780,8 +715,8 @@ This code will need to wait for Qml 5.5 support since Map.visibleRegion is only
anchors.right: parent.right
anchors.top: homePositionManagerHelpIcon.top
wrapMode: Text.WordWrap
- text: "This is the Home Position Manager tool. " +
- "This tool allows you to select/add/update home positions. " +
+ text: "Home Position Manager
" +
+ "When enabled, allows you to select/add/update home positions. " +
"You can save multiple home position to represent multiple flying areas."
}
@@ -803,8 +738,8 @@ This code will need to wait for Qml 5.5 support since Map.visibleRegion is only
anchors.right: parent.right
anchors.top: mapCenterHelpIcon.top
wrapMode: Text.WordWrap
- text: "This is the Map Center tool. " +
- "It will show a set of options which will center the map."
+ text: "Map Center
" +
+ "Options for centering the map."
}
Image {
@@ -815,7 +750,7 @@ This code will need to wait for Qml 5.5 support since Map.visibleRegion is only
fillMode: Image.PreserveAspectFit
mipmap: true
smooth: true
- source: "/qmlimages/Sync.png"
+ source: "/qmlimages/MapSync.svg"
}
QGCLabel {
@@ -825,8 +760,8 @@ This code will need to wait for Qml 5.5 support since Map.visibleRegion is only
anchors.right: parent.right
anchors.top: syncHelpIcon.top
wrapMode: Text.WordWrap
- text: "This is the Sync tool. " +
- "It will show a set of options for saving/loading mission items."
+ text: "Sync
" +
+ "Options for saving/loading mission items."
}
Image {
@@ -847,8 +782,8 @@ This code will need to wait for Qml 5.5 support since Map.visibleRegion is only
anchors.right: parent.right
anchors.top: mapTypeHelpIcon.top
wrapMode: Text.WordWrap
- text: "This is the Map Type tool. " +
- "It will show a set of options for selecting map types."
+ text: "Map Type
" +
+ "Map type options."
}
} // Item - Help Panel
} // Item