Browse Source

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

QGC4.4
Gus Grubba 6 years ago
parent
commit
0551ea39bc
  1. 15
      src/VehicleSetup/SetupView.qml

15
src/VehicleSetup/SetupView.qml

@ -98,8 +98,16 @@ Rectangle { @@ -98,8 +98,16 @@ Rectangle {
Component.onCompleted: showSummaryPanel()
Connections {
target: QGroundControl.multiVehicleManager
target: QGroundControl.corePlugin
onShowAdvancedUIChanged: {
if(!QGroundControl.corePlugin.showAdvancedUI) {
showSummaryPanel()
}
}
}
Connections {
target: QGroundControl.multiVehicleManager
onParameterReadyVehicleAvailableChanged: {
if(!QGroundControl.skipSetupPage) {
if (QGroundControl.multiVehicleManager.parameterReadyVehicleAvailable || summaryButton.checked || setupButtonGroup.current != firmwareButton) {
@ -116,10 +124,8 @@ Rectangle { @@ -116,10 +124,8 @@ Rectangle {
Component {
id: noComponentsVehicleSummaryComponent
Rectangle {
color: qgcPal.windowShade
QGCLabel {
anchors.margins: _defaultTextWidth * 2
anchors.fill: parent
@ -129,7 +135,6 @@ Rectangle { @@ -129,7 +135,6 @@ Rectangle {
font.pointSize: ScreenTools.mediumFontPointSize
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."
onLinkActivated: Qt.openUrlExternally(link)
}
}
@ -137,10 +142,8 @@ Rectangle { @@ -137,10 +142,8 @@ Rectangle {
Component {
id: disconnectedVehicleSummaryComponent
Rectangle {
color: qgcPal.windowShade
QGCLabel {
anchors.margins: _defaultTextWidth * 2
anchors.fill: parent

Loading…
Cancel
Save