diff --git a/qgroundcontrol.qrc b/qgroundcontrol.qrc
index 37046ce9762a649de9d10aaf7142df41f572618a..864404ad0659b2c3b82d22754513352a04e7d859 100644
--- a/qgroundcontrol.qrc
+++ b/qgroundcontrol.qrc
@@ -38,7 +38,6 @@
src/ui/MainWindowNative.qml
src/ui/MainWindowLeftPanel.qml
src/MissionEditor/MissionEditor.qml
- src/MissionEditor/MissionEditorHelp.qml
src/AutoPilotPlugins/PX4/PowerComponent.qml
src/AutoPilotPlugins/PX4/PowerComponentSummary.qml
src/VehicleSetup/PX4FlowSensor.qml
diff --git a/src/MissionEditor/MissionEditor.qml b/src/MissionEditor/MissionEditor.qml
index 52ca48c6362d429e9a9afdc181c3c5b67c1082aa..9dcfb1339b149eb8dc912bb9a1a4dc2baf5582ed 100644
--- a/src/MissionEditor/MissionEditor.qml
+++ b/src/MissionEditor/MissionEditor.qml
@@ -57,7 +57,6 @@ QGCView {
readonly property real _rightPanelOpacity: 0.8
readonly property int _toolButtonCount: 6
readonly property string _autoSyncKey: "AutoSync"
- readonly property string _showHelpKey: "ShowHelp"
readonly property int _addMissionItemsButtonAutoOffTimeout: 10000
readonly property var _defaultVehicleCoordinate: QtPositioning.coordinate(37.803784, -122.462276)
@@ -77,12 +76,9 @@ QGCView {
property bool _syncInProgress: _activeVehicle ? _activeVehicle.missionManager.inProgress : false
- property bool _showHelp: QGroundControl.flightMapSettings.loadBoolMapSetting(editorMap.mapName, _showHelpKey, true)
-
onGpsLockChanged: updateMapToVehiclePosition()
Component.onCompleted: {
- helpPanel.source = "MissionEditorHelp.qml"
updateMapToVehiclePosition()
}
@@ -410,16 +406,6 @@ QGCView {
}
}
- //-- Help Panel
- Loader {
- id: helpPanel
- width: parent.width * 0.65
- height: parent.height * 0.75
- z: QGroundControl.zOrderTopMost
- anchors.verticalCenter: parent.verticalCenter
- anchors.horizontalCenter: parent.horizontalCenter
- }
-
Item {
id: toolbarSpacer
height: mainWindow.tbHeight
@@ -570,14 +556,6 @@ QGCView {
checked = false
}
}
-
- RoundButton {
- id: helpButton
- buttonImage: "/qmlimages/Help.svg"
- exclusiveGroup: _dropButtonsExclusiveGroup
- z: QGroundControl.zOrderWidgets
- checked: _showHelp
- }
}
MissionItemStatus {
diff --git a/src/MissionEditor/MissionEditorHelp.qml b/src/MissionEditor/MissionEditorHelp.qml
deleted file mode 100644
index 62f1ee2c21d5f830407b387897ce863ef5c7a420..0000000000000000000000000000000000000000
--- a/src/MissionEditor/MissionEditorHelp.qml
+++ /dev/null
@@ -1,176 +0,0 @@
-/*=====================================================================
-
-QGroundControl Open Source Ground Control Station
-
-(c) 2009, 2015 QGROUNDCONTROL PROJECT
-
-This file is part of the QGROUNDCONTROL project
-
- QGROUNDCONTROL is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- QGROUNDCONTROL is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with QGROUNDCONTROL. If not, see .
-
-======================================================================*/
-
-import QtQuick 2.4
-import QtQuick.Controls 1.3
-import QtQuick.Dialogs 1.2
-
-import QGroundControl 1.0
-import QGroundControl.ScreenTools 1.0
-import QGroundControl.Controls 1.0
-import QGroundControl.Palette 1.0
-
-Rectangle {
- visible: helpButton.checked
- color: qgcPal.window
- opacity: _rightPanelOpacity
- radius: ScreenTools.defaultFontPixelHeight
- z: QGroundControl.zOrderTopMost
-
- readonly property real margins: ScreenTools.defaultFontPixelHeight
-
- Image {
- anchors.margins: ScreenTools.defaultFontPixelHeight
- anchors.top: parent.top
- anchors.right: parent.right
- width: ScreenTools.defaultFontPixelHeight * 1.5
- height: ScreenTools.defaultFontPixelHeight * 1.5
- source: (qgcPal.globalTheme === QGCPalette.Light) ? "/res/XDeleteBlack.svg" : "/res/XDelete.svg"
- fillMode: Image.PreserveAspectFit
- mipmap: true
- smooth: true
-
- MouseArea {
- anchors.fill: parent
- onClicked: helpButton.checked = false
- }
- }
-
- Item {
- anchors.margins: _margin
- anchors.fill: parent
-
- QGCLabel {
- id: helpTitle
- font.pixelSize: ScreenTools.mediumFontPixelSize
- text: "Mission Planner"
- }
-
- QGCLabel {
- id: helpIconLabel
- anchors.topMargin: ScreenTools.defaultFontPixelHeight
- anchors.top: helpTitle.bottom
- width: parent.width
- wrapMode: Text.WordWrap
- text: "Mission Planner tool buttons:"
- }
-
- Image {
- id: addMissionItemsHelpIcon
- anchors.topMargin: ScreenTools.defaultFontPixelHeight
- anchors.top: helpIconLabel.bottom
- width: ScreenTools.defaultFontPixelHeight * 3
- fillMode: Image.PreserveAspectFit
- mipmap: true
- smooth: true
- source: (qgcPal.globalTheme === QGCPalette.Light) ? "/qmlimages/MapAddMissionBlack.svg" : "/qmlimages/MapAddMission.svg"
- }
-
- QGCLabel {
- id: addMissionItemsHelpText
- anchors.leftMargin: ScreenTools.defaultFontPixelHeight
- anchors.left: mapTypeHelpIcon.right
- anchors.right: parent.right
- anchors.top: addMissionItemsHelpIcon.top
- wrapMode: Text.WordWrap
- text: "Add Mission Items
" +
- "When enabled, add mission items by clicking on the map."
- }
-
- Image {
- id: mapCenterHelpIcon
- anchors.topMargin: ScreenTools.defaultFontPixelHeight
- anchors.top: addMissionItemsHelpText.bottom
- width: ScreenTools.defaultFontPixelHeight * 3
- fillMode: Image.PreserveAspectFit
- mipmap: true
- smooth: true
- source: (qgcPal.globalTheme === QGCPalette.Light) ? "/qmlimages/MapCenterBlack.svg" : "/qmlimages/MapCenter.svg"
- }
-
- QGCLabel {
- id: mapCenterHelpText
- anchors.leftMargin: ScreenTools.defaultFontPixelHeight
- anchors.left: mapTypeHelpIcon.right
- anchors.right: parent.right
- anchors.top: mapCenterHelpIcon.top
- wrapMode: Text.WordWrap
- text: "Map Center
" +
- "Options for centering the map."
- }
-
- Image {
- id: syncHelpIcon
- anchors.topMargin: ScreenTools.defaultFontPixelHeight
- anchors.top: mapCenterHelpText.bottom
- width: ScreenTools.defaultFontPixelHeight * 3
- fillMode: Image.PreserveAspectFit
- mipmap: true
- smooth: true
- source: (qgcPal.globalTheme === QGCPalette.Light) ? "/qmlimages/MapSyncBlack.svg" : "/qmlimages/MapSync.svg"
- }
-
- QGCLabel {
- id: syncHelpText
- anchors.leftMargin: ScreenTools.defaultFontPixelHeight
- anchors.left: mapTypeHelpIcon.right
- anchors.right: parent.right
- anchors.top: syncHelpIcon.top
- wrapMode: Text.WordWrap
- text: "Sync
" +
- "Options for saving/loading mission items."
- }
-
- Image {
- id: mapTypeHelpIcon
- anchors.topMargin: ScreenTools.defaultFontPixelHeight
- anchors.top: syncHelpText.bottom
- width: ScreenTools.defaultFontPixelHeight * 3
- fillMode: Image.PreserveAspectFit
- mipmap: true
- smooth: true
- source: (qgcPal.globalTheme === QGCPalette.Light) ? "/qmlimages/MapTypeBlack.svg" : "/qmlimages/MapType.svg"
- }
-
- QGCLabel {
- id: mapTypeHelpText
- anchors.leftMargin: ScreenTools.defaultFontPixelHeight
- anchors.left: mapTypeHelpIcon.right
- anchors.right: parent.right
- anchors.top: mapTypeHelpIcon.top
- wrapMode: Text.WordWrap
- text: "Map Type
" +
- "Map type options."
- }
-
- QGCCheckBox {
- 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)
- }
- }
-}