Commands which apply to all vehicles

Plus other ui tweaks

src/FlightDisplay/MultiVehicleList.qml

@@ -18,55 +18,93 @@ import QGroundControl.Palette       1.0
 import QGroundControl.Vehicle       1.0
 import QGroundControl.FlightMap     1.0
 
-QGCListView {
+Item {
+    property var guidedActionsController
+
+    property real   _margin:        ScreenTools.defaultFontPixelWidth / 2
+    property real   _widgetHeight:  ScreenTools.defaultFontPixelHeight * 3
+    property color  _textColor:     "black"
+    property real   _rectOpacity:   0.8
+
+    QGCPalette { id: qgcPal }
+
+    NoMouseThroughRectangle {
+        id:             mvCommands
+        anchors.left:   parent.left
+        anchors.right:  parent.right
+        height:         mvCommandsColumn.height + (_margin *2)
+        color:          qgcPal.missionItemEditor
+        opacity:        _rectOpacity
+        radius:         _margin
+
+        Column {
+            id:                 mvCommandsColumn
+            anchors.margins:    _margin
+            anchors.top:        parent.top
+            anchors.left:       parent.left
+            anchors.right:      parent.right
+            spacing:            _margin
+
+            QGCLabel {
+                anchors.left:   parent.left
+                anchors.right:  parent.right
+                text:           qsTr("The following commands will be applied to all vehicles")
+                color:          _textColor
+                wrapMode:       Text.WordWrap
+                font.pointSize: ScreenTools.smallFontPointSize
+            }
+
+            Row {
+                spacing:            _margin
+
+                QGCButton {
+                    text:       "Pause"
+                    onClicked:  guidedActionsController.confirmAction(guidedActionsController.actionMVPause)
+                }
+
+                QGCButton {
+                    text:       "Start Mision"
+                    onClicked:  guidedActionsController.confirmAction(guidedActionsController.actionMVStartMission)
+                }
+            }
+        }
+    }
+
+    QGCListView {
         id:                 missionItemEditorListView
+        anchors.left:       parent.left
+        anchors.right:      parent.right
+        anchors.topMargin:  _margin
+        anchors.top:        mvCommands.bottom
+        anchors.bottom:     parent.bottom
         spacing:            ScreenTools.defaultFontPixelHeight / 2
         orientation:        ListView.Vertical
         model:              QGroundControl.multiVehicleManager.vehicles
         cacheBuffer:        _cacheBuffer < 0 ? 0 : _cacheBuffer
         clip:               true
 
-    property real _margin:          ScreenTools.defaultFontPixelWidth / 2
         property real _cacheBuffer:     height * 2
-    property real _widgetHeight:    ScreenTools.defaultFontPixelHeight * 3
 
         delegate: Rectangle {
             width:      parent.width
             height:     innerColumn.y + innerColumn.height + _margin
             color:      qgcPal.missionItemEditor
-        opacity:    0.8
+            opacity:    _rectOpacity
             radius:     _margin
 
             property var    _vehicle:   object
-        property color  _textColor: "black"
 
-        QGCPalette { id: qgcPal }
-
-        Row {
-            id:                 widgetLayout
+            ColumnLayout {
+                id:                 innerColumn
                 anchors.margins:    _margin
                 anchors.top:        parent.top
-            anchors.right:      parent.right
-            spacing:            ScreenTools.defaultFontPixelWidth / 2
-            layoutDirection:    Qt.RightToLeft
-
-            QGCCompassWidget {
-                size:       _widgetHeight
-                vehicle:    _vehicle
-            }
-
-            QGCAttitudeWidget {
-                size:       _widgetHeight
-                vehicle:    _vehicle
-            }
-        }
+                anchors.left:       parent.left
+                anchors.right:      parent.left
+                spacing:            _margin
 
                 RowLayout {
-            anchors.top:    widgetLayout.top
-            anchors.bottom: widgetLayout.bottom
                     anchors.left:   parent.left
-            anchors.right:  widgetLayout.left
-            spacing:        ScreenTools.defaultFontPixelWidth / 2
+                    anchors.right:  parent.left
 
                     QGCLabel {
                         Layout.alignment:   Qt.AlignTop
@@ -74,27 +112,34 @@ QGCListView {
                         color:              _textColor
                     }
 
+                    ColumnLayout {
+                        Layout.alignment:   Qt.AlignCenter
+                        spacing:            _margin
+
                         FlightModeMenu {
+                            anchors.horizontalCenter:   parent.horizontalCenter
                             font.pointSize:             ScreenTools.largeFontPointSize
                             color:                      _textColor
                             activeVehicle:              _vehicle
                         }
+
+                        QGCLabel {
+                            anchors.horizontalCenter:   parent.horizontalCenter
+                            text:                       _vehicle.armed ? qsTr("Armed") : qsTr("Disarmed")
+                            color:                      _textColor
+                        }
                     }
 
-        Column {
-            id:                 innerColumn
-            anchors.margins:    _margin
-            anchors.left:       parent.left
-            anchors.right:      parent.right
-            anchors.top:        widgetLayout.bottom
-            spacing:            _margin
+                    QGCCompassWidget {
+                        size:       _widgetHeight
+                        vehicle:    _vehicle
+                    }
 
-            Rectangle {
-                anchors.left:   parent.left
-                anchors.right:  parent.right
-                height:         5
-                color:          "green"
+                    QGCAttitudeWidget {
+                        size:       _widgetHeight
+                        vehicle:    _vehicle
                     }
+                } // RowLayout
 
                 Row {
                     spacing: ScreenTools.defaultFontPixelWidth
@@ -106,13 +151,13 @@ QGCListView {
                     }
 
                     QGCButton {
-                    text:       "Start"
+                        text:       "Start Mission"
                         visible:    _vehicle.armed && _vehicle.flightMode != _vehicle.missionFlightMode
-                    onClicked:  _vehicle.flightMode = _vehicle.missionFlightMode
+                        onClicked:  _vehicle.startMission()
                     }
 
                     QGCButton {
-                    text:       "Stop"
+                        text:       "Pause"
                         visible:    _vehicle.armed && _vehicle.pauseVehicleSupported
                         onClicked:  _vehicle.pauseVehicle()
                     }
@@ -128,8 +173,8 @@ QGCListView {
                         visible:    _vehicle.armed && _vehicle.flightMode != _vehicle.takeControlFlightMode
                         onClicked:  _vehicle.flightMode = _vehicle.takeControlFlightMode
                     }
-
-            }
-        }
-    }
-} // QGCListView
+                } // Row
+            } // ColumnLayout
+        } // delegate - Rectangle
+    } // QGCListView
+} // Item