Merge pull request #8976 from DonLakeFlyer/TelemetryValueBar

Fly: Telemetry value bar

custom-example/custom.pri

@@ -55,14 +55,6 @@ RESOURCES += \
 QML_IMPORT_PATH += \
    $$PWD/res
 
-LinuxBuild {
-
-    # Our QT_INSTALL_LIBS
-    QT_LIB_LIST += \
-        libQt5VirtualKeyboard.so.5 \
-
-}
-
 # Our own, custom sources
 SOURCES += \
     $$PWD/src/CustomPlugin.cc \

custom-example/qgcresources.qrc

@@ -22,6 +22,7 @@
 		<file alias="gear-black.svg">../resources/gear-black.svg</file>
 		<file alias="gear-white.svg">../resources/gear-white.svg</file>
 		<file alias="helicoptericon.svg">../resources/helicoptericon.svg</file>
+		<file alias="BingNoTileBytes.dat">../resources/BingNoTileBytes.dat</file>
 		<file alias="JoystickBezel.png">../resources/JoystickBezel.png</file>
 		<file alias="JoystickBezelLight.png">../resources/JoystickBezelLight.png</file>
 		<file alias="land.svg">../resources/land.svg</file>

custom-example/qgroundcontrol.qrc

@@ -9,7 +9,6 @@
 		<file alias="GPSRTKIndicator.qml">../src/ui/toolbar/GPSRTKIndicator.qml</file>
 		<file alias="JoystickIndicator.qml">../src/ui/toolbar/JoystickIndicator.qml</file>
 		<file alias="LinkIndicator.qml">../src/ui/toolbar/LinkIndicator.qml</file>
-		<file alias="MainToolBar.qml">../src/ui/toolbar/MainToolBar.qml</file>
 		<file alias="MainToolBarIndicators.qml">../src/ui/toolbar/MainToolBarIndicators.qml</file>
 		<file alias="MessageIndicator.qml">../src/ui/toolbar/MessageIndicator.qml</file>
 		<file alias="ModeIndicator.qml">../src/ui/toolbar/ModeIndicator.qml</file>
@@ -50,7 +49,6 @@
 		<file alias="FWLandingPatternEditor.qml">../src/PlanView/FWLandingPatternEditor.qml</file>
 		<file alias="GeneralSettings.qml">../src/ui/preferences/GeneralSettings.qml</file>
 		<file alias="GeoTagPage.qml">../src/AnalyzeView/GeoTagPage.qml</file>
-		<file alias="HealthPageWidget.qml">../src/FlightMap/Widgets/HealthPageWidget.qml</file>
 		<file alias="HelpSettings.qml">../src/ui/preferences/HelpSettings.qml</file>
 		<file alias="JoystickConfig.qml">../src/VehicleSetup/JoystickConfig.qml</file>
 		<file alias="JoystickConfigAdvanced.qml">../src/VehicleSetup/JoystickConfigAdvanced.qml</file>
@@ -65,6 +63,7 @@
 		<file alias="MAVLinkInspectorPage.qml">../src/AnalyzeView/MAVLinkInspectorPage.qml</file>
 		<file alias="MavlinkSettings.qml">../src/ui/preferences/MavlinkSettings.qml</file>
 		<file alias="MicrohardSettings.qml">../src/Microhard/MicrohardSettings.qml</file>
+		<file alias="MissionCommandTreeEditorTestWindow.qml">../src/MissionManager/MissionCommandTreeEditorTestWindow.qml</file>
 		<file alias="MissionSettingsEditor.qml">../src/PlanView/MissionSettingsEditor.qml</file>
 		<file alias="MockLink.qml">../src/ui/preferences/MockLink.qml</file>
 		<file alias="MockLinkSettings.qml">../src/ui/preferences/MockLinkSettings.qml</file>
@@ -77,7 +76,6 @@
 		<file alias="PX4FlowSensor.qml">../src/VehicleSetup/PX4FlowSensor.qml</file>
 		<file alias="QGCInstrumentWidget.qml">../src/FlightMap/Widgets/QGCInstrumentWidget.qml</file>
 		<file alias="QGCInstrumentWidgetAlternate.qml">../src/FlightMap/Widgets/QGCInstrumentWidgetAlternate.qml</file>
-		<file alias="QGCViewDialogContainer.qml">../src/QmlControls/QGCViewDialogContainer.qml</file>
 		<file alias="QGroundControl/Controls/AnalyzePage.qml">../src/AnalyzeView/AnalyzePage.qml</file>
 		<file alias="QGroundControl/Controls/AppMessages.qml">../src/QmlControls/AppMessages.qml</file>
 		<file alias="QGroundControl/Controls/AxisMonitor.qml">../src/QmlControls/AxisMonitor.qml</file>
@@ -107,6 +105,8 @@
 		<file alias="QGroundControl/Controls/JoystickThumbPad.qml">../src/QmlControls/JoystickThumbPad.qml</file>
 		<file alias="QGroundControl/Controls/KMLOrSHPFileDialog.qml">../src/QmlControls/KMLOrSHPFileDialog.qml</file>
 		<file alias="QGroundControl/Controls/LogReplayStatusBar.qml">../src/QmlControls/LogReplayStatusBar.qml</file>
+		<file alias="QGroundControl/Controls/MainStatusIndicator.qml">../src/ui/toolbar/MainStatusIndicator.qml</file>
+		<file alias="QGroundControl/Controls/MainToolBar.qml">../src/ui/toolbar/MainToolBar.qml</file>
 		<file alias="QGroundControl/Controls/MainWindowSavedState.qml">../src/QmlControls/MainWindowSavedState.qml</file>
 		<file alias="QGroundControl/Controls/MAVLinkChart.qml">../src/QmlControls/MAVLinkChart.qml</file>
 		<file alias="QGroundControl/Controls/MAVLinkMessageButton.qml">../src/QmlControls/MAVLinkMessageButton.qml</file>
@@ -161,6 +161,7 @@
 		<file alias="QGroundControl/Controls/QGCToolBarButton.qml">../src/QmlControls/QGCToolBarButton.qml</file>
 		<file alias="QGroundControl/Controls/QGCToolInsets.qml">../src/QmlControls/QGCToolInsets.qml</file>
 		<file alias="QGroundControl/Controls/QGCViewDialog.qml">../src/QmlControls/QGCViewDialog.qml</file>
+		<file alias="QGroundControl/Controls/QGCViewDialogContainer.qml">../src/QmlControls/QGCViewDialogContainer.qml</file>
 		<file alias="QGroundControl/Controls/QGCViewMessage.qml">../src/QmlControls/QGCViewMessage.qml</file>
 		<file alias="QGroundControl/Controls/qmldir">../src/QmlControls/QGroundControl/Controls/qmldir</file>
 		<file alias="QGroundControl/Controls/RallyPointEditorHeader.qml">../src/PlanView/RallyPointEditorHeader.qml</file>
@@ -179,9 +180,10 @@
 		<file alias="QGroundControl/Controls/SurveyMapVisual.qml">../src/PlanView/SurveyMapVisual.qml</file>
 		<file alias="QGroundControl/Controls/TerrainStatus.qml">../src/PlanView/TerrainStatus.qml</file>
 		<file alias="QGroundControl/Controls/TakeoffItemMapVisual.qml">../src/PlanView/TakeoffItemMapVisual.qml</file>
-		<file alias="QGroundControl/Controls/ToolBarBase.qml">../src/ui/toolbar/ToolBarBase.qml</file>
 		<file alias="QGroundControl/Controls/ToolStrip.qml">../src/QmlControls/ToolStrip.qml</file>
 		<file alias="QGroundControl/Controls/TransectStyleComplexItemStats.qml">../src/PlanView/TransectStyleComplexItemStats.qml</file>
+		<file alias="QGroundControl/Controls/TransectStyleComplexItemTabBar.qml">../src/PlanView/TransectStyleComplexItemTabBar.qml</file>
+		<file alias="QGroundControl/Controls/TransectStyleComplexItemTerrainFollow.qml">../src/PlanView/TransectStyleComplexItemTerrainFollow.qml</file>
 		<file alias="QGroundControl/Controls/VehicleRotationCal.qml">../src/QmlControls/VehicleRotationCal.qml</file>
 		<file alias="QGroundControl/Controls/VehicleSummaryRow.qml">../src/QmlControls/VehicleSummaryRow.qml</file>
 		<file alias="QGroundControl/Controls/VerticalFactValueGrid.qml">../src/QmlControls/VerticalFactValueGrid.qml</file>
@@ -335,5 +337,8 @@
 	<qresource prefix="/MockLink">
 		<file alias="APMArduSubMockLink.params">../src/comm/APMArduSubMockLink.params</file>
 		<file alias="PX4MockLink.params">../src/comm/PX4MockLink.params</file>
+		<file alias="Version.MetaData.json">../src/comm/MockLink.Version.MetaData.json</file>
+		<file alias="Version.MetaData.json.gz">../src/comm/MockLink.Version.MetaData.json.gz</file>
+		<file alias="Parameter.MetaData.json">../src/comm/MockLink.Parameter.MetaData.json</file>
 	</qresource>
 </RCC>

custom-example/src/CustomPlugin.cc

@@ -159,11 +159,11 @@ bool CustomPlugin::adjustSettingMetaData(const QString& settingsGroup, FactMetaD
     if (settingsGroup == AppSettings::settingsGroup) {
         // This tells QGC than when you are creating Plans while not connected to a vehicle
         // the specific firmware/vehicle the plan is for.
-        if (metaData.name() == AppSettings::offlineEditingFirmwareTypeName) {
-            metaData.setRawDefaultValue(MAV_AUTOPILOT_PX4);
+        if (metaData.name() == AppSettings::offlineEditingFirmwareClassName) {
+            metaData.setRawDefaultValue(QGCMAVLink::FirmwareClassPX4);
             return false;
-        } else if (metaData.name() == AppSettings::offlineEditingVehicleTypeName) {
-            metaData.setRawDefaultValue(MAV_TYPE_QUADROTOR);
+        } else if (metaData.name() == AppSettings::offlineEditingVehicleClassName) {
+            metaData.setRawDefaultValue(QGCMAVLink::VehicleClassMultiRotor);
             return false;
         }
     }

custom-example/src/FirmwarePlugin/CustomFirmwarePluginFactory.cc

@@ -22,11 +22,18 @@ CustomFirmwarePluginFactory::CustomFirmwarePluginFactory()
 
 }
 
-QList<MAV_AUTOPILOT> CustomFirmwarePluginFactory::supportedFirmwareTypes() const
+QList<QGCMAVLink::FirmwareClass_t> CustomFirmwarePluginFactory::supportedFirmwareClasses() const
 {
-    QList<MAV_AUTOPILOT> list;
-    list.append(MAV_AUTOPILOT_PX4);
-    return list;
+    QList<QGCMAVLink::FirmwareClass_t> firmwareClasses;
+    firmwareClasses.append(QGCMAVLink::FirmwareClassPX4);
+    return firmwareClasses;
+}
+
+QList<QGCMAVLink::VehicleClass_t> CustomFirmwarePluginFactory::supportedVehicleClasses(void) const
+{
+    QList<QGCMAVLink::VehicleClass_t> vehicleClasses;
+    vehicleClasses.append(QGCMAVLink::VehicleClassMultiRotor);
+    return vehicleClasses;
 }
 
 FirmwarePlugin* CustomFirmwarePluginFactory::firmwarePluginForAutopilot(MAV_AUTOPILOT autopilotType, MAV_TYPE /*vehicleType*/)
@@ -39,11 +46,3 @@ FirmwarePlugin* CustomFirmwarePluginFactory::firmwarePluginForAutopilot(MAV_AUTO
     }
     return nullptr;
 }
-
-
-QList<MAV_TYPE> CustomFirmwarePluginFactory::supportedVehicleTypes(void) const
-{
-    QList<MAV_TYPE> mavTypes;
-    mavTypes.append(MAV_TYPE_QUADROTOR);
-    return mavTypes;
-}

custom-example/src/FirmwarePlugin/CustomFirmwarePluginFactory.h

@@ -26,9 +26,9 @@ class CustomFirmwarePluginFactory : public FirmwarePluginFactory
     Q_OBJECT
 public:
     CustomFirmwarePluginFactory();
-    QList<MAV_AUTOPILOT>    supportedFirmwareTypes      () const final;
-    FirmwarePlugin*         firmwarePluginForAutopilot  (MAV_AUTOPILOT autopilotType, MAV_TYPE vehicleType) final;
-    QList<MAV_TYPE>         supportedVehicleTypes       (void) const final;
+    QList<QGCMAVLink::FirmwareClass_t>  supportedFirmwareClasses(void) const final;
+    QList<QGCMAVLink::VehicleClass_t>   supportedVehicleClasses(void) const final;
+    FirmwarePlugin*                     firmwarePluginForAutopilot  (MAV_AUTOPILOT autopilotType, MAV_TYPE vehicleType) final;
 
 private:
     CustomFirmwarePlugin*   _pluginInstance;

qgroundcontrol.qrc

@@ -232,6 +232,7 @@
         <file alias="QGroundControl/FlightDisplay/PreFlightSoundCheck.qml">src/FlightDisplay/PreFlightSoundCheck.qml</file>
         <file alias="QGroundControl/FlightDisplay/PreFlightCheckListShowAction.qml">src/FlightDisplay/PreFlightCheckListShowAction.qml</file>
         <file alias="QGroundControl/FlightDisplay/TerrainProgress.qml">src/FlightDisplay/TerrainProgress.qml</file>
+        <file alias="QGroundControl/FlightDisplay/TelemetryValuesBar.qml">src/FlightDisplay/TelemetryValuesBar.qml</file>
         <file alias="QGroundControl/FlightDisplay/VehicleWarnings.qml">src/FlightDisplay/VehicleWarnings.qml</file>
         <file alias="QGroundControl/FlightDisplay/qmldir">src/QmlControls/QGroundControl/FlightDisplay/qmldir</file>
         <file alias="QGroundControl/FlightMap/CameraTriggerIndicator.qml">src/FlightMap/MapItems/CameraTriggerIndicator.qml</file>

src/FlightDisplay/FlyView.qml

@@ -52,7 +52,6 @@ Item {
     property var    _guidedController:      guidedActionsController
     property var    _guidedActionList:      guidedActionList
     property var    _guidedAltSlider:       guidedAltSlider
-    property var    _guidedConfirm:         guidedActionConfirm
     property real   _toolsMargin:           ScreenTools.defaultFontPixelWidth * 0.75
     property rect   _centerViewport:        Qt.rect(0, 0, width, height)
     property real   _rightPanelWidth:       ScreenTools.defaultFontPixelWidth * 30
@@ -77,7 +76,6 @@ Item {
 
     FlyViewWidgetLayer {
         id:                     widgetLayer
-        anchors.rightMargin:    _toolsMargin
         anchors.top:            parent.top
         anchors.bottom:         parent.bottom
         anchors.left:           parent.left
@@ -100,12 +98,11 @@ Item {
     GuidedActionsController {
         id:                 guidedActionsController
         missionController:  _missionController
-        confirmDialog:      _guidedConfirm
         actionList:         _guidedActionList
         altitudeSlider:     _guidedAltSlider
     }
 
-    GuidedActionConfirm {
+    /*GuidedActionConfirm {
         id:                         guidedActionConfirm
         anchors.margins:            _margins
         anchors.bottom:             parent.bottom
@@ -113,7 +110,7 @@ Item {
         z:                          QGroundControl.zOrderTopMost
         guidedController:           _guidedController
         altitudeSlider:             _guidedAltSlider
-    }
+    }*/
 
     GuidedActionList {
         id:                         guidedActionList
@@ -144,7 +141,7 @@ Item {
         rightPanelWidth:        ScreenTools.defaultFontPixelHeight * 9
         pipMode:                !_mainWindowIsMap
         toolInsets:             customOverlay.totalToolInsets
-        mapName:                    "FlightDisplayView"
+        mapName:                "FlightDisplayView"
     }
 
     FlyViewVideo {

src/FlightDisplay/FlyViewWidgetLayer.qml

@@ -18,6 +18,7 @@ import QtQuick.Window           2.2
 import QtQml.Models             2.1
 
 import QGroundControl               1.0
+import QGroundControl.Controls      1.0
 import QGroundControl.Airspace      1.0
 import QGroundControl.Airmap        1.0
 import QGroundControl.Controllers   1.0
@@ -50,18 +51,18 @@ Item {
 
     QGCToolInsets {
         id:                     _totalToolInsets
-        leftEdgeCenterInset:    toolStrip.leftInset
         leftEdgeTopInset:       toolStrip.leftInset
+        leftEdgeCenterInset:    toolStrip.leftInset
         leftEdgeBottomInset:    parentToolInsets.leftEdgeBottomInset
-        rightEdgeCenterInset:   instrumentPanel.rightInset
-        rightEdgeTopInset:      instrumentPanel.rightInset
-        rightEdgeBottomInset:   instrumentPanel.rightInset
-        topEdgeCenterInset:     parentToolInsets.topEdgeCenterInset
+        rightEdgeTopInset:      parentToolInsets.rightEdgeTopInset
+        rightEdgeCenterInset:   parentToolInsets.rightEdgeCenterInset
+        rightEdgeBottomInset:   parentToolInsets.rightEdgeBottomInset
         topEdgeLeftInset:       parentToolInsets.topEdgeLeftInset
+        topEdgeCenterInset:     parentToolInsets.topEdgeCenterInset
         topEdgeRightInset:      parentToolInsets.topEdgeRightInset
-        bottomEdgeCenterInset:  mapScale.centerInset
         bottomEdgeLeftInset:    parentToolInsets.bottomEdgeLeftInset
-        bottomEdgeRightInset:   parentToolInsets.bottomEdgeRightInset
+        bottomEdgeCenterInset:  mapScale.centerInset
+        bottomEdgeRightInset:   telemetryPanel.bottomInset
     }
 
     FlyViewMissionCompleteDialog {
@@ -84,6 +85,30 @@ Item {
         property real rightInset: visible ? parent.width - x : 0
     }
 
+    TelemetryValuesBar {
+        id:                 telemetryPanel
+        x:                  recalcXPosition()
+        anchors.margins:    _toolsMargin
+        anchors.bottom:     parent.bottom
+
+        function recalcXPosition() {
+            // First try centered
+            var halfRootWidth   = _root.width / 2
+            var halfPanelWidth  = telemetryPanel.width / 2
+            var leftX           = (halfRootWidth - halfPanelWidth) - _toolsMargin
+            var rightX          = (halfRootWidth + halfPanelWidth) + _toolsMargin
+            if (leftX >= parentToolInsets.leftEdgeBottomInset || rightX <= parentToolInsets.rightEdgeBottomInset ) {
+                // It will fit in the horizontalCenter
+                return halfRootWidth - halfPanelWidth
+            } else {
+                // Anchor to left edge
+                return parentToolInsets.leftEdgeBottomInset + _toolsMargin
+            }
+        }
+
+        property real bottomInset: height
+    }
+
     //-- Virtual Joystick
     Loader {
         id:                         virtualJoystickMultiTouch
@@ -105,11 +130,11 @@ Item {
     FlyViewToolStrip {
         id:                     toolStrip
         anchors.leftMargin:     _toolsMargin + parentToolInsets.leftEdgeCenterInset
-        anchors.topMargin:      _toolsMargin + parentToolInsets.leftEdgeTopInset
+        anchors.topMargin:      _toolsMargin + parentToolInsets.topEdgeLeftInset
         anchors.left:           parent.left
         anchors.top:            parent.top
         z:                      QGroundControl.zOrderWidgets
-        maxHeight:              parent.height - y - parentToolInsets.leftEdgeBottomInset - _toolsMargin
+        maxHeight:              parent.height - y - parentToolInsets.bottomEdgeLeftInset - _toolsMargin
         visible:                !QGroundControl.videoManager.fullScreen
 
         onDisplayPreFlightChecklist: preFlightChecklistPopup.open()
@@ -131,14 +156,13 @@ Item {
     }
 
     MapScale {
-        id:                     mapScale
-        anchors.leftMargin:     parentToolInsets.leftEdgeBottomInset + _toolsMargin
-        anchors.bottomMargin:   parentToolInsets.bottomEdgeCenterInset + _toolsMargin
-        anchors.left:           parent.left
-        anchors.bottom:         parent.bottom
-        mapControl:             _mapControl
-        buttonsOnLeft:          true
-        visible:                !ScreenTools.isTinyScreen && QGroundControl.corePlugin.options.flyView.showMapScale && mapControl.pipState.state !== mapControl.pipState.pipState
+        id:                 mapScale
+        anchors.margins:    _toolsMargin
+        anchors.left:       toolStrip.right
+        anchors.top:        parent.top
+        mapControl:         _mapControl
+        buttonsOnLeft:      false
+        visible:            !ScreenTools.isTinyScreen && QGroundControl.corePlugin.options.flyView.showMapScale && mapControl.pipState.state !== mapControl.pipState.pipState
 
         property real centerInset: visible ? parent.height - y : 0
     }

src/FlightDisplay/GuidedActionConfirm.qml

@@ -7,28 +7,26 @@
  *
  ****************************************************************************/
 
-import QtQuick                  2.3
-import QtQuick.Controls         1.2
+import QtQuick          2.12
+import QtQuick.Controls 2.4
+import QtQuick.Layouts  1.12
 
 import QGroundControl               1.0
 import QGroundControl.ScreenTools   1.0
 import QGroundControl.Controls      1.0
 import QGroundControl.Palette       1.0
 
-/// Guided actions confirmation dialog
 Rectangle {
-    id:             _root
-    width:          confirmColumn.width  + (_margins * 4)
-    height:         confirmColumn.height + (_margins * 4)
-    radius:         ScreenTools.defaultFontPixelHeight / 2
-    color:          qgcPal.window
-    border.color:   _emergencyAction ? "red" : qgcPal.windowShade
-    border.width:   _emergencyAction ? 4 : 1
-    visible:        false
+    id:                     _root
+    Layout.minimumWidth:    mainLayout.width + (_margins * 2)
+    Layout.preferredHeight: mainLayout.height + (_margins * 2)
+    radius:                 ScreenTools.defaultFontPixelWidth / 2
+    color:                  qgcPal.windowShadeLight
+    visible:                false
 
     property var    guidedController
     property var    altitudeSlider
-    property alias  title:              titleText.text
+    property string title                                       // Currently unused
     property alias  message:            messageText.text
     property int    action
     property var    actionData
@@ -37,9 +35,11 @@ Rectangle {
     property alias  optionText:         optionCheckBox.text
     property alias  optionChecked:      optionCheckBox.checked
 
-    property real _margins:         ScreenTools.defaultFontPixelWidth
+    property real _margins:         ScreenTools.defaultFontPixelWidth / 2
     property bool _emergencyAction: action === guidedController.actionEmergencyStop
 
+    Component.onCompleted: guidedController.confirmDialog = this
+
     onHideTriggerChanged: {
         if (hideTrigger) {
             confirmCancelled()
@@ -50,7 +50,7 @@ Rectangle {
         if (immediate) {
             visible = true
         } else {
-            // We delay showing the confirmation for a small amount in order to any other state
+            // We delay showing the confirmation for a small amount in order for any other state
             // changes to propogate through the system. This way only the final state shows up.
             visibleTimer.restart()
         }
@@ -76,76 +76,70 @@ Rectangle {
 
     QGCPalette { id: qgcPal }
 
-    DeadMouseArea {
-        anchors.fill: parent
-    }
-
-    Column {
-        id:                 confirmColumn
-        anchors.margins:    _margins
-        anchors.centerIn:   parent
-        spacing:            _margins
-
-        QGCLabel {
-            id:                     titleText
-            anchors.left:           slider.left
-            anchors.right:          slider.right
-            horizontalAlignment:    Text.AlignHCenter
-            font.pointSize:         ScreenTools.largeFontPointSize
-        }
+    ColumnLayout {
+        id:                         mainLayout
+        anchors.horizontalCenter:   parent.horizontalCenter
+        spacing:                    _margins
 
         QGCLabel {
             id:                     messageText
-            anchors.left:           slider.left
-            anchors.right:          slider.right
+            Layout.fillWidth:       true
             horizontalAlignment:    Text.AlignHCenter
             wrapMode:               Text.WordWrap
         }
 
         QGCCheckBox {
-            id:                         optionCheckBox
-            anchors.horizontalCenter:   parent.horizontalCenter
-            text:                       ""
-            visible:                    text !== ""
+            id:                 optionCheckBox
+            Layout.alignment:   Qt.AlignHCenter
+            text:               ""
+            visible:            text !== ""
         }
 
-        // Action confirmation control
-        SliderSwitch {
-            id:             slider
-            confirmText:    qsTr("Slide to confirm")
-            width:          Math.max(implicitWidth, ScreenTools.defaultFontPixelWidth * 30)
-
-            onAccept: {
-                _root.visible = false
-                var altitudeChange = 0
-                if (altitudeSlider.visible) {
-                    altitudeChange = altitudeSlider.getAltitudeChangeValue()
-                    altitudeSlider.visible = false
-                }
-                hideTrigger = false
-                guidedController.executeAction(_root.action, _root.actionData, altitudeChange, _root.optionChecked)
-                if (mapIndicator) {
-                    mapIndicator.actionConfirmed()
-                    mapIndicator = undefined
+        RowLayout {
+            Layout.alignment:       Qt.AlignHCenter
+            spacing:                ScreenTools.defaultFontPixelWidth
+
+            SliderSwitch {
+                id:                     slider
+                confirmText:            qsTr("Slide to confirm")
+                Layout.minimumWidth:    Math.max(implicitWidth, ScreenTools.defaultFontPixelWidth * 30)
+
+                onAccept: {
+                    _root.visible = false
+                    var altitudeChange = 0
+                    if (altitudeSlider.visible) {
+                        altitudeChange = altitudeSlider.getAltitudeChangeValue()
+                        altitudeSlider.visible = false
+                    }
+                    hideTrigger = false
+                    guidedController.executeAction(_root.action, _root.actionData, altitudeChange, _root.optionChecked)
+                    if (mapIndicator) {
+                        mapIndicator.actionConfirmed()
+                        mapIndicator = undefined
+                    }
                 }
             }
-        }
-    }
 
-    QGCColoredImage {
-        anchors.margins:    _margins
-        anchors.top:        parent.top
-        anchors.right:      parent.right
-        width:              ScreenTools.defaultFontPixelHeight
-        height:             width
-        sourceSize.height:  width
-        source:             "/res/XDelete.svg"
-        fillMode:           Image.PreserveAspectFit
-        color:              qgcPal.text
-
-        QGCMouseArea {
-            fillItem:   parent
-            onClicked:  confirmCancelled()
+            Rectangle {
+                height: slider.height * 0.75
+                width:  height
+                radius: height / 2
+                color:  qgcPal.primaryButton
+
+                QGCColoredImage {
+                    anchors.margins:    parent.height / 4
+                    anchors.fill:       parent
+                    source:             "/res/XDelete.svg"
+                    fillMode:           Image.PreserveAspectFit
+                    color:              qgcPal.text
+                }
+
+                QGCMouseArea {
+                    fillItem:   parent
+                    onClicked:  confirmCancelled()
+                }
+            }
         }
     }
 }
+

src/FlightDisplay/TelemetryValuesBar.qml

+/****************************************************************************
+ *
+ *   (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+ *
+ * QGroundControl is licensed according to the terms in the file
+ * COPYING.md in the root of the source code directory.
+ *
+ ****************************************************************************/
+
+import QtQuick                      2.12
+import QtQuick.Layouts              1.12
+
+import QGroundControl               1.0
+import QGroundControl.ScreenTools   1.0
+import QGroundControl.Vehicle       1.0
+import QGroundControl.Controls      1.0
+import QGroundControl.Palette       1.0
+
+Rectangle {
+    id:                 telemetryPanel
+    height:             telemetryLayout.height + (_toolsMargin * 2)
+    width:              telemetryLayout.width + (_toolsMargin * 2)
+    color:              Qt.hsla(_baseBGColor.hslHue, _baseBGColor.hslSaturation, _baseBGColor.hslLightness, 0.5)
+    radius:             ScreenTools.defaultFontPixelWidth / 2
+
+    property color _baseBGColor: qgcPal.window
+
+    DeadMouseArea { anchors.fill: parent }
+
+    ColumnLayout {
+        id:                 telemetryLayout
+        anchors.margins:    _toolsMargin
+        anchors.top:        parent.top
+        anchors.left:       parent.left
+
+        HorizontalFactValueGrid {
+            id:                     valueArea
+            userSettingsGroup:      telemetryBarUserSettingsGroup
+            defaultSettingsGroup:   telemetryBarDefaultSettingsGroup
+
+            QGCMouseArea {
+                anchors.fill:   parent
+                visible:        !parent.settingsUnlocked
+                onClicked:      parent.settingsUnlocked = true
+            }
+        }
+
+        GuidedActionConfirm {
+            Layout.fillWidth:   true
+            guidedController:   _guidedController
+            altitudeSlider:     _guidedAltSlider
+        }
+    }
+}

src/FlightMap/Images/MapAddMission.svg

@@ -6,5 +6,5 @@
 	<path fill="#FFFFFF" d="M-55.213,94.612V84.146h-10.386v-4.373h10.385V69.384h4.425v10.389h10.387v4.373h-10.386v10.466
 		C-50.788,94.612-55.213,94.612-55.213,94.612z"/>
 </g>