Commit 0551ea39 authored by Gus Grubba's avatar Gus Grubba

If in vehicle setup view and advanced mode is switched off, go to summary page.

parent 4f876248
...@@ -98,8 +98,16 @@ Rectangle { ...@@ -98,8 +98,16 @@ Rectangle {
Component.onCompleted: showSummaryPanel() Component.onCompleted: showSummaryPanel()
Connections { Connections {
target: QGroundControl.multiVehicleManager target: QGroundControl.corePlugin
onShowAdvancedUIChanged: {
if(!QGroundControl.corePlugin.showAdvancedUI) {
showSummaryPanel()
}
}
}
Connections {
target: QGroundControl.multiVehicleManager
onParameterReadyVehicleAvailableChanged: { onParameterReadyVehicleAvailableChanged: {
if(!QGroundControl.skipSetupPage) { if(!QGroundControl.skipSetupPage) {
if (QGroundControl.multiVehicleManager.parameterReadyVehicleAvailable || summaryButton.checked || setupButtonGroup.current != firmwareButton) { if (QGroundControl.multiVehicleManager.parameterReadyVehicleAvailable || summaryButton.checked || setupButtonGroup.current != firmwareButton) {
...@@ -116,10 +124,8 @@ Rectangle { ...@@ -116,10 +124,8 @@ Rectangle {
Component { Component {
id: noComponentsVehicleSummaryComponent id: noComponentsVehicleSummaryComponent
Rectangle { Rectangle {
color: qgcPal.windowShade color: qgcPal.windowShade
QGCLabel { QGCLabel {
anchors.margins: _defaultTextWidth * 2 anchors.margins: _defaultTextWidth * 2
anchors.fill: parent anchors.fill: parent
...@@ -129,7 +135,6 @@ Rectangle { ...@@ -129,7 +135,6 @@ Rectangle {
font.pointSize: ScreenTools.mediumFontPointSize font.pointSize: ScreenTools.mediumFontPointSize
text: qsTr("%1 does not currently support setup of your vehicle type. ").arg(QGroundControl.appName) + text: qsTr("%1 does not currently support setup of your vehicle type. ").arg(QGroundControl.appName) +
"If your vehicle is already configured you can still Fly." "If your vehicle is already configured you can still Fly."
onLinkActivated: Qt.openUrlExternally(link) onLinkActivated: Qt.openUrlExternally(link)
} }
} }
...@@ -137,10 +142,8 @@ Rectangle { ...@@ -137,10 +142,8 @@ Rectangle {
Component { Component {
id: disconnectedVehicleSummaryComponent id: disconnectedVehicleSummaryComponent
Rectangle { Rectangle {
color: qgcPal.windowShade color: qgcPal.windowShade
QGCLabel { QGCLabel {
anchors.margins: _defaultTextWidth * 2 anchors.margins: _defaultTextWidth * 2
anchors.fill: parent anchors.fill: parent
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment