Merge pull request #4841 from DonLakeFlyer/PlanToolbar

Plan toolbar: Add battery space

src/MissionEditor/PlanToolBar.qml

@@ -96,25 +96,29 @@ Rectangle {
         GridLayout {
             anchors.top:    parent.top
             anchors.bottom: parent.bottom
-            columns:                4
+            columns:        5
             rowSpacing:     0
-            columnSpacing:          _margins
+            columnSpacing:  _margins / 4
 
             QGCLabel {
                 text:               qsTr("Selected waypoint")
-                Layout.columnSpan: 4
+                Layout.columnSpan:  5
                 font.pointSize:     ScreenTools.smallFontPointSize
             }
 
             QGCLabel { text: qsTr("Distance:") }
             QGCLabel { text: _distanceText }
 
+            Item { width: 1; height: 1 }
+
             QGCLabel { text: qsTr("Gradient:") }
             QGCLabel { text: _gradientText }
 
             QGCLabel { text: qsTr("Alt diff:") }
             QGCLabel { text: _altDifferenceText }
 
+            Item { width: 1; height: 1 }
+
             QGCLabel { text: qsTr("Azimuth:") }
             QGCLabel { text: _azimuthText }
         }
@@ -122,25 +126,49 @@ Rectangle {
         GridLayout {
             anchors.top:    parent.top
             anchors.bottom: parent.bottom
-            columns:                4
+            columns:        5
             rowSpacing:     0
-            columnSpacing:          _margins
+            columnSpacing:  _margins / 4
 
             QGCLabel {
                 text:               qsTr("Total mission")
-                Layout.columnSpan: 4
+                Layout.columnSpan:  5
                 font.pointSize:     ScreenTools.smallFontPointSize
             }
 
             QGCLabel { text: qsTr("Distance:") }
             QGCLabel { text: _missionDistanceText }
 
+            Item { width: 1; height: 1 }
+
             QGCLabel { text: qsTr("Max telem dist:") }
             QGCLabel { text: _missionMaxTelemetryText }
 
             QGCLabel { text: qsTr("Time:") }
             QGCLabel { text: _missionTimeText }
         }
+
+        GridLayout {
+            anchors.top:    parent.top
+            anchors.bottom: parent.bottom
+            columns:        3
+            rowSpacing:     0
+            columnSpacing:  _margins / 4
+
+            QGCLabel {
+                text:               qsTr("Battery")
+                Layout.columnSpan:  3
+                font.pointSize:     ScreenTools.smallFontPointSize
+            }
+
+            QGCLabel { text: qsTr("Batteries required:") }
+            QGCLabel { text: "--.--" }
+
+            Item { width: 1; height: 1 }
+
+            QGCLabel { text: qsTr("Swap waypoint:") }
+            QGCLabel { text: "--" }
+        }
     }
 
     QGCButton {