Merge pull request #4725 from DonLakeFlyer/Power

Power: Page not loading correctly

src/AutoPilotPlugins/PX4/PowerComponent.qml

@@ -29,25 +29,24 @@ SetupPage {
             width:  Math.max(availableWidth, innerColumn.width)
             height: innerColumn.height
 
+            property int textEditWidth:    ScreenTools.defaultFontPixelWidth * 8
+
+            property Fact battNumCells:         controller.getParameterFact(-1, "BAT_N_CELLS")
+            property Fact battHighVolt:         controller.getParameterFact(-1, "BAT_V_CHARGED")
+            property Fact battLowVolt:          controller.getParameterFact(-1, "BAT_V_EMPTY")
+            property Fact battVoltLoadDrop:     controller.getParameterFact(-1, "BAT_V_LOAD_DROP")
+            property Fact battVoltageDivider:   controller.getParameterFact(-1, "BAT_V_DIV")
+            property Fact battAmpsPerVolt:      controller.getParameterFact(-1, "BAT_A_PER_V")
+            property Fact uavcanEnable:         controller.getParameterFact(-1, "UAVCAN_ENABLE", false)
+
+            readonly property string highlightPrefix:   "<font color=\"" + qgcPal.warningText + "\">"
+            readonly property string highlightSuffix:   "</font>"
+
             ColumnLayout {
                 id:                         innerColumn
                 anchors.horizontalCenter:   parent.horizontalCenter
                 spacing:                    ScreenTools.defaultFontPixelHeight
 
-                property int textEditWidth:    ScreenTools.defaultFontPixelWidth * 8
-
-                property Fact battNumCells:         controller.getParameterFact(-1, "BAT_N_CELLS")
-                property Fact battHighVolt:         controller.getParameterFact(-1, "BAT_V_CHARGED")
-                property Fact battLowVolt:          controller.getParameterFact(-1, "BAT_V_EMPTY")
-                property Fact battVoltLoadDrop:     controller.getParameterFact(-1, "BAT_V_LOAD_DROP")
-                property Fact battVoltageDivider:   controller.getParameterFact(-1, "BAT_V_DIV")
-                property Fact battAmpsPerVolt:      controller.getParameterFact(-1, "BAT_A_PER_V")
-                property Fact uavcanEnable:         controller.getParameterFact(-1, "UAVCAN_ENABLE", false)
-
-                readonly property string highlightPrefix:   "<font color=\"" + qgcPal.warningText + "\">"
-                readonly property string highlightSuffix:   "</font>"
-
-
                 function getBatteryImage()
                 {
                     switch(battNumCells.value) {

src/QmlControls/QGCGroupBox.qml

@@ -7,11 +7,11 @@
  *
  ****************************************************************************/
 
-import QtQuick                  2.3
-import QtQuick.Controls         1.2
+import QtQuick          2.3
+import QtQuick.Controls 2.0
 
 import QGroundControl.Palette       1.0
-import QGroundControl.ScreenTools 1.0
+import QGroundControl.ScreenTools   1.0
 
 GroupBox {
     id: control