diff --git a/src/AutoPilotPlugins/PX4/PowerComponent.qml b/src/AutoPilotPlugins/PX4/PowerComponent.qml
index 7b7bc5c4178eda02c18253df9bee8f0d16eb9d8c..06db44fc48863f7ca50a491a56a126d65147652c 100644
--- a/src/AutoPilotPlugins/PX4/PowerComponent.qml
+++ b/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: ""
+ readonly property string highlightSuffix: ""
+
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: ""
- readonly property string highlightSuffix: ""
-
-
function getBatteryImage()
{
switch(battNumCells.value) {
diff --git a/src/QmlControls/QGCGroupBox.qml b/src/QmlControls/QGCGroupBox.qml
index 196ef18078dd6c06679d8618b1d8705311f08563..01f88c35277ae13d7bf44a98d8486e0a7057be03 100644
--- a/src/QmlControls/QGCGroupBox.qml
+++ b/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