Merge pull request #5529 from bluerobotics/pr-vehicle-setup-armed-transition-jacob

Rework disabling of setup pages

src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml

@@ -22,6 +22,7 @@ import QGroundControl.ScreenTools   1.0
 SetupPage {
     id:                 safetyPage
     pageComponent:      safetyPageComponent
+    visibleWhileArmed:   true
 
     Component {
         id: safetyPageComponent

src/AutoPilotPlugins/Common/SetupPage.qml

@@ -32,8 +32,51 @@ QGCView {
 
     property real _margins: ScreenTools.defaultFontPixelHeight / 2
 
+    property bool visibleWhileArmed: false
+
+    property bool vehicleArmed: QGroundControl.multiVehicleManager.activeVehicle ? QGroundControl.multiVehicleManager.activeVehicle.armed : false
+
+    onVehicleArmedChanged: {
+        if (visibleWhileArmed) {
+            return
+        }
+
+        if (vehicleArmed) {
+            disabledWhileArmed.visible = true
+            setupView.viewPanel.enabled = false
+        } else {
+            disabledWhileArmed.visible = false
+            setupView.viewPanel.enabled = true
+        }
+    }
+
     QGCPalette { id: qgcPal; colorGroupEnabled: setupPanel.enabled }
 
+    // Overlay to display when vehicle is armed and the setup page needs
+    // to be disabled
+    Item {
+        id: disabledWhileArmed
+        visible: false
+        z: 9999
+        anchors.fill: parent
+        Rectangle {
+            anchors.fill: parent
+            color: "black"
+            opacity: 0.5
+        }
+
+        QGCLabel {
+            anchors.margins:        defaultTextWidth * 2
+            anchors.fill:           parent
+            verticalAlignment:      Text.AlignVCenter
+            horizontalAlignment:    Text.AlignHCenter
+            wrapMode:               Text.WordWrap
+            font.pointSize:         ScreenTools.largeFontPointSize
+            color:                  "red"
+            text:                   "Setup disabled while the vehicle is armed"
+        }
+    }
+
     QGCViewPanel {
         id:             setupPanel
         anchors.fill:   parent
@@ -68,7 +111,6 @@ QGCView {
                 id:                 pageLoader
                 anchors.topMargin:  _margins
                 anchors.top:        headingColumn.bottom
-
             }
         }
     }

src/VehicleSetup/FirmwareUpgrade.qml

@@ -12,6 +12,7 @@ import QtQuick 2.3
 import QtQuick.Controls 1.2
 import QtQuick.Controls.Styles 1.4
 import QtQuick.Dialogs 1.2
+import QtQuick.Layouts 1.3
 
 import QGroundControl               1.0
 import QGroundControl.Controls      1.0
@@ -21,16 +22,26 @@ import QGroundControl.Palette       1.0
 import QGroundControl.Controllers   1.0
 import QGroundControl.ScreenTools   1.0
 
-QGCView {
-    id:         qgcView
-    viewPanel:  panel
+SetupPage {
+    id:            firmwarePage
+    pageComponent: firmwarePageComponent
+    pageName:      "Firmware" // For building setup page title: 'Firmware Setup'
+
+    Component {
+        id: firmwarePageComponent
+
+        ColumnLayout {
+            width:   availableWidth
+            height:  availableHeight
+            spacing: ScreenTools.defaultFontPixelHeight
 
             // Those user visible strings are hard to translate because we can't send the
             // HTML strings to translation as this can create a security risk. we need to find
-    // a better way to hightlight them, or use less hightlights.
+            // a better way to hightlight them, or use less highlights.
 
             // User visible strings
-    readonly property string title:             "FIRMWARE"
+            readonly property string title:   "Firmware Setup" // Popup dialog title
+
             readonly property string highlightPrefix:   "<font color=\"" + qgcPal.warningText + "\">"
             readonly property string highlightSuffix:   "</font>"
             readonly property string welcomeText:       qsTr("%1 can upgrade the firmware on Pixhawk devices, SiK Radios and PX4 Flow Smart Cameras.").arg(QGroundControl.appName)
@@ -117,7 +128,7 @@ QGCView {
                 }
             }
 
-    onCompleted: {
+            Component.onCompleted: {
                 if (controllerCompleted) {
                     // We can only start the board search when the Qml and Controller are completely done loading
                     controller.startBoardSearch()
@@ -386,29 +397,15 @@ QGCView {
                 }
             }
 
-    QGCViewPanel {
-        id:             panel
-        anchors.fill:   parent
-
-        QGCLabel {
-            id:             titleLabel
-            text:           title
-            font.pointSize: ScreenTools.mediumFontPointSize
-        }
-
             ProgressBar {
                 id:                 progressBar
-            anchors.topMargin:  ScreenTools.defaultFontPixelHeight
-            anchors.top:        titleLabel.bottom
-            width:              parent.width
+                Layout.preferredWidth:              parent.width
             }
 
             TextArea {
                 id:                 statusTextArea
-            anchors.topMargin:  ScreenTools.defaultFontPixelHeight
-            anchors.top:        progressBar.bottom
-            anchors.bottom:     parent.bottom
-            width:              parent.width
+                Layout.preferredWidth:              parent.width
+                Layout.fillHeight:  true
                 readOnly:           true
                 frameVisible:       false
                 font.pointSize:     ScreenTools.defaultFontPointSize
@@ -420,5 +417,6 @@ QGCView {
                     backgroundColor:    qgcPal.windowShade
                 }
             }
-    } // QGCViewPabel
-} // QGCView
+        } // ColumnLayout
+    } // Component
+} // SetupPage

src/VehicleSetup/SetupView.qml

@@ -56,24 +56,14 @@ Rectangle {
     function showFirmwarePanel()
     {
         if (!ScreenTools.isMobile) {
-            if (QGroundControl.multiVehicleManager.activeVehicleAvailable && QGroundControl.multiVehicleManager.activeVehicle.armed) {
-                _messagePanelText = _armedVehicleText
-                panelLoader.setSourceComponent(messagePanelComponent)
-            } else {
             panelLoader.setSource("FirmwareUpgrade.qml")
         }
     }
-    }
 
     function showJoystickPanel()
     {
-        if (QGroundControl.multiVehicleManager.activeVehicleAvailable && QGroundControl.multiVehicleManager.activeVehicle.armed) {
-            _messagePanelText = _armedVehicleText
-            panelLoader.setSourceComponent(messagePanelComponent)
-        } else {
         panelLoader.setSource("JoystickConfig.qml")
     }
-    }
 
     function showParametersPanel()
     {
@@ -87,14 +77,10 @@ Rectangle {
 
     function showVehicleComponentPanel(vehicleComponent)
     {
-        if (QGroundControl.multiVehicleManager.activeVehicle.armed && !vehicleComponent.allowSetupWhileArmed) {
-            _messagePanelText = _armedVehicleText
-            panelLoader.setSourceComponent(messagePanelComponent)
-        } else {
         var autopilotPlugin = QGroundControl.multiVehicleManager.activeVehicle.autopilot
         var prereq = autopilotPlugin.prerequisiteSetup(vehicleComponent)
         if (prereq !== "") {
-                //-- TODO: This cannot be trasnlated when built this way.
+            //-- TODO: This cannot be translated when built this way.
             _messagePanelText = prereq + " setup must be completed prior to " + vehicleComponent.name + " setup."
             panelLoader.setSourceComponent(messagePanelComponent)
         } else {
@@ -108,7 +94,6 @@ Rectangle {
             }
         }
     }
-    }
 
     Component.onCompleted: showSummaryPanel()
 
@@ -170,6 +155,7 @@ Rectangle {
             }
         }
     }
+
     Component {
         id: missingParametersVehicleSummaryComponent