diff --git a/custom-example/custom.pri b/custom-example/custom.pri
index 3acd082039051bd3bed9476467786eb6f030ece5..c5325f5537302e5070158246d47085f6b3b29e25 100644
--- a/custom-example/custom.pri
+++ b/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 \
diff --git a/custom-example/qgcresources.qrc b/custom-example/qgcresources.qrc
index 02caa15f2a8979682fb4f2579bf3ccefaf5bc707..c0b4815c56d504a19adf1fe012304074b6990104 100644
--- a/custom-example/qgcresources.qrc
+++ b/custom-example/qgcresources.qrc
@@ -22,6 +22,7 @@
../resources/gear-black.svg
../resources/gear-white.svg
../resources/helicoptericon.svg
+ ../resources/BingNoTileBytes.dat
../resources/JoystickBezel.png
../resources/JoystickBezelLight.png
../resources/land.svg
diff --git a/custom-example/qgroundcontrol.qrc b/custom-example/qgroundcontrol.qrc
index 17049b34814054997bfc8a21f9d52288a583d56a..7af3c9352f94219baefe05a30d6392499f0ac3c4 100644
--- a/custom-example/qgroundcontrol.qrc
+++ b/custom-example/qgroundcontrol.qrc
@@ -9,7 +9,6 @@
../src/ui/toolbar/GPSRTKIndicator.qml
../src/ui/toolbar/JoystickIndicator.qml
../src/ui/toolbar/LinkIndicator.qml
- ../src/ui/toolbar/MainToolBar.qml
../src/ui/toolbar/MainToolBarIndicators.qml
../src/ui/toolbar/MessageIndicator.qml
../src/ui/toolbar/ModeIndicator.qml
@@ -50,7 +49,6 @@
../src/PlanView/FWLandingPatternEditor.qml
../src/ui/preferences/GeneralSettings.qml
../src/AnalyzeView/GeoTagPage.qml
- ../src/FlightMap/Widgets/HealthPageWidget.qml
../src/ui/preferences/HelpSettings.qml
../src/VehicleSetup/JoystickConfig.qml
../src/VehicleSetup/JoystickConfigAdvanced.qml
@@ -65,6 +63,7 @@
../src/AnalyzeView/MAVLinkInspectorPage.qml
../src/ui/preferences/MavlinkSettings.qml
../src/Microhard/MicrohardSettings.qml
+ ../src/MissionManager/MissionCommandTreeEditorTestWindow.qml
../src/PlanView/MissionSettingsEditor.qml
../src/ui/preferences/MockLink.qml
../src/ui/preferences/MockLinkSettings.qml
@@ -77,7 +76,6 @@
../src/VehicleSetup/PX4FlowSensor.qml
../src/FlightMap/Widgets/QGCInstrumentWidget.qml
../src/FlightMap/Widgets/QGCInstrumentWidgetAlternate.qml
- ../src/QmlControls/QGCViewDialogContainer.qml
../src/AnalyzeView/AnalyzePage.qml
../src/QmlControls/AppMessages.qml
../src/QmlControls/AxisMonitor.qml
@@ -107,6 +105,8 @@
../src/QmlControls/JoystickThumbPad.qml
../src/QmlControls/KMLOrSHPFileDialog.qml
../src/QmlControls/LogReplayStatusBar.qml
+ ../src/ui/toolbar/MainStatusIndicator.qml
+ ../src/ui/toolbar/MainToolBar.qml
../src/QmlControls/MainWindowSavedState.qml
../src/QmlControls/MAVLinkChart.qml
../src/QmlControls/MAVLinkMessageButton.qml
@@ -161,6 +161,7 @@
../src/QmlControls/QGCToolBarButton.qml
../src/QmlControls/QGCToolInsets.qml
../src/QmlControls/QGCViewDialog.qml
+ ../src/QmlControls/QGCViewDialogContainer.qml
../src/QmlControls/QGCViewMessage.qml
../src/QmlControls/QGroundControl/Controls/qmldir
../src/PlanView/RallyPointEditorHeader.qml
@@ -179,9 +180,10 @@
../src/PlanView/SurveyMapVisual.qml
../src/PlanView/TerrainStatus.qml
../src/PlanView/TakeoffItemMapVisual.qml
- ../src/ui/toolbar/ToolBarBase.qml
../src/QmlControls/ToolStrip.qml
../src/PlanView/TransectStyleComplexItemStats.qml
+ ../src/PlanView/TransectStyleComplexItemTabBar.qml
+ ../src/PlanView/TransectStyleComplexItemTerrainFollow.qml
../src/QmlControls/VehicleRotationCal.qml
../src/QmlControls/VehicleSummaryRow.qml
../src/QmlControls/VerticalFactValueGrid.qml
@@ -335,5 +337,8 @@
../src/comm/APMArduSubMockLink.params
../src/comm/PX4MockLink.params
+ ../src/comm/MockLink.Version.MetaData.json
+ ../src/comm/MockLink.Version.MetaData.json.gz
+ ../src/comm/MockLink.Parameter.MetaData.json
diff --git a/custom-example/src/CustomPlugin.cc b/custom-example/src/CustomPlugin.cc
index ace69a877a3825decb2b52aca92c2c810ccc8565..b386a51424c0b5b9eb5840919645225a060abcf9 100644
--- a/custom-example/src/CustomPlugin.cc
+++ b/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;
}
}
diff --git a/custom-example/src/FirmwarePlugin/CustomFirmwarePluginFactory.cc b/custom-example/src/FirmwarePlugin/CustomFirmwarePluginFactory.cc
index 36ece796fa76ad158dcd78c99b45869e3b404409..cf670a3f89d477d0eabae12b83c6180e74ce9a26 100644
--- a/custom-example/src/FirmwarePlugin/CustomFirmwarePluginFactory.cc
+++ b/custom-example/src/FirmwarePlugin/CustomFirmwarePluginFactory.cc
@@ -22,11 +22,18 @@ CustomFirmwarePluginFactory::CustomFirmwarePluginFactory()
}
-QList CustomFirmwarePluginFactory::supportedFirmwareTypes() const
+QList CustomFirmwarePluginFactory::supportedFirmwareClasses() const
{
- QList list;
- list.append(MAV_AUTOPILOT_PX4);
- return list;
+ QList firmwareClasses;
+ firmwareClasses.append(QGCMAVLink::FirmwareClassPX4);
+ return firmwareClasses;
+}
+
+QList CustomFirmwarePluginFactory::supportedVehicleClasses(void) const
+{
+ QList 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 CustomFirmwarePluginFactory::supportedVehicleTypes(void) const
-{
- QList mavTypes;
- mavTypes.append(MAV_TYPE_QUADROTOR);
- return mavTypes;
-}
diff --git a/custom-example/src/FirmwarePlugin/CustomFirmwarePluginFactory.h b/custom-example/src/FirmwarePlugin/CustomFirmwarePluginFactory.h
index ffe39bea6860b005b0f0f3ad90fe92dd58dbdfcc..8a39a3e29b29f1c199a97a2d1b7de39288d9bbaa 100644
--- a/custom-example/src/FirmwarePlugin/CustomFirmwarePluginFactory.h
+++ b/custom-example/src/FirmwarePlugin/CustomFirmwarePluginFactory.h
@@ -26,9 +26,9 @@ class CustomFirmwarePluginFactory : public FirmwarePluginFactory
Q_OBJECT
public:
CustomFirmwarePluginFactory();
- QList supportedFirmwareTypes () const final;
- FirmwarePlugin* firmwarePluginForAutopilot (MAV_AUTOPILOT autopilotType, MAV_TYPE vehicleType) final;
- QList supportedVehicleTypes (void) const final;
+ QList supportedFirmwareClasses(void) const final;
+ QList supportedVehicleClasses(void) const final;
+ FirmwarePlugin* firmwarePluginForAutopilot (MAV_AUTOPILOT autopilotType, MAV_TYPE vehicleType) final;
private:
CustomFirmwarePlugin* _pluginInstance;
diff --git a/qgroundcontrol.qrc b/qgroundcontrol.qrc
index 5c19b2258f1614833cbf3821de72010dcd7b48e4..5a1f2fe6c7eb7bc4f1bbf8ae8bd4449cf266484e 100644
--- a/qgroundcontrol.qrc
+++ b/qgroundcontrol.qrc
@@ -232,6 +232,7 @@
src/FlightDisplay/PreFlightSoundCheck.qml
src/FlightDisplay/PreFlightCheckListShowAction.qml
src/FlightDisplay/TerrainProgress.qml
+ src/FlightDisplay/TelemetryValuesBar.qml
src/FlightDisplay/VehicleWarnings.qml
src/QmlControls/QGroundControl/FlightDisplay/qmldir
src/FlightMap/MapItems/CameraTriggerIndicator.qml
diff --git a/src/FlightDisplay/FlyView.qml b/src/FlightDisplay/FlyView.qml
index 7323c8cc90cb4a7f011a56b96df78cec97d41f1d..3919c769eff6022cd2fac9a4543b5ea1a7888521 100644
--- a/src/FlightDisplay/FlyView.qml
+++ b/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 {
diff --git a/src/FlightDisplay/FlyViewWidgetLayer.qml b/src/FlightDisplay/FlyViewWidgetLayer.qml
index 6ebdd017b4409a5550dac732599118719d8dfda9..4228d2a5c68fa28d5f77d28474cb2c37f3fefdf0 100644
--- a/src/FlightDisplay/FlyViewWidgetLayer.qml
+++ b/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
}
diff --git a/src/FlightDisplay/GuidedActionConfirm.qml b/src/FlightDisplay/GuidedActionConfirm.qml
index edbe014882974c6331307a099d3c02aae1c6c89f..63272eb48b69a7e907fdc725607e5f52b4eb4c5b 100644
--- a/src/FlightDisplay/GuidedActionConfirm.qml
+++ b/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()
+ }
+ }
}
}
}
+
diff --git a/src/FlightDisplay/TelemetryValuesBar.qml b/src/FlightDisplay/TelemetryValuesBar.qml
new file mode 100644
index 0000000000000000000000000000000000000000..1f4b1e1f173edc17ff3bd7bf268c328cc918e845
--- /dev/null
+++ b/src/FlightDisplay/TelemetryValuesBar.qml
@@ -0,0 +1,54 @@
+/****************************************************************************
+ *
+ * (c) 2009-2016 QGROUNDCONTROL PROJECT
+ *
+ * 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
+ }
+ }
+}
diff --git a/src/FlightMap/Images/MapAddMission.svg b/src/FlightMap/Images/MapAddMission.svg
index 2cbcb9ca21e833160e3c5e9f0ad52e6d3cefdf97..fa1fc752dd31cc20a40e4bde9a13f6051b2df44c 100644
--- a/src/FlightMap/Images/MapAddMission.svg
+++ b/src/FlightMap/Images/MapAddMission.svg
@@ -6,5 +6,5 @@
-
+
diff --git a/src/FlightMap/Images/MapCenter.svg b/src/FlightMap/Images/MapCenter.svg
index 37f6fc0ef8d55d23f1cf359d4e3244d9a5e9717f..312ff09e5725c07751da8fdc67186e1e5f2401b4 100644
--- a/src/FlightMap/Images/MapCenter.svg
+++ b/src/FlightMap/Images/MapCenter.svg
@@ -3,10 +3,10 @@
diff --git a/src/FlightMap/Images/MapDrawShape.svg b/src/FlightMap/Images/MapDrawShape.svg
index a73a7ad97a5c57c13230cfe6cbe6c3cb5264613e..bcd0c3b859782db03d16fab9859f5387937f5356 100644
--- a/src/FlightMap/Images/MapDrawShape.svg
+++ b/src/FlightMap/Images/MapDrawShape.svg
@@ -3,7 +3,7 @@
diff --git a/src/FlightMap/Images/MapSync.svg b/src/FlightMap/Images/MapSync.svg
index 2f90fd148d9e73923f3629570c220cfe1d64de20..8d19283411c89c9f53673fc3afda243814a12574 100644
--- a/src/FlightMap/Images/MapSync.svg
+++ b/src/FlightMap/Images/MapSync.svg
@@ -2,12 +2,12 @@