Merge pull request #4265 from DonLakeFlyer/TBMultiVehicleFixes

Toolbar multi vehicle fixes

src/QmlControls/QGroundControl.Controls.qmldir

@@ -9,6 +9,7 @@ FactSliderPanel         1.0 FactSliderPanel.qml
 IndicatorButton         1.0 IndicatorButton.qml
 JoystickThumbPad        1.0 JoystickThumbPad.qml
 MainToolBar             1.0 MainToolBar.qml
+MainToolBarIndicators   1.0 MainToolBarIndicators.qml
 MissionCommandDialog    1.0 MissionCommandDialog.qml
 MissionItemEditor       1.0 MissionItemEditor.qml
 MissionItemIndexLabel   1.0 MissionItemIndexLabel.qml

src/ui/toolbar/MainToolBar.qml

@@ -7,17 +7,9 @@
  *
  ****************************************************************************/
 
-
-/**
- * @file
- *   @brief QGC Main Tool Bar
- *   @author Gus Grubba <mavlink@grubba.com>
- */
-
 import QtQuick              2.5
 import QtQuick.Layouts      1.2
 import QtQuick.Controls     1.2
-import QtQuick.Controls.Styles 1.2
 
 import QGroundControl                       1.0
 import QGroundControl.Controls              1.0
@@ -316,14 +308,18 @@ Rectangle {
         visible:        qgcPal.globalTheme == QGCPalette.Light
     }
 
+    RowLayout {
+        anchors.bottomMargin:   1
+        anchors.rightMargin:    ScreenTools.defaultFontPixelWidth / 2
+        anchors.fill:           parent
+        spacing:                mainWindow.tbSpacing * 2
+
         //---------------------------------------------
         // Toolbar Row
         Row {
             id:             viewRow
             height:         mainWindow.tbCellHeight
             spacing:        mainWindow.tbSpacing
-        anchors.left:           parent.left
-        anchors.bottomMargin:   1
             anchors.top:    parent.top
             anchors.bottom: parent.bottom
 
@@ -383,56 +379,65 @@ Rectangle {
             }
         }
 
-    Item {
-        id:                     vehicleIndicators
-        height:                 mainWindow.tbCellHeight
-        anchors.leftMargin:     mainWindow.tbSpacing * 2
-        anchors.left:           viewRow.right
-        anchors.right:          parent.right
+        //-------------------------------------------------------------------------
+        //-- Vehicle Selector
+        QGCButton {
+            id:                     vehicleSelectorButton
+            width:                  ScreenTools.defaultFontPixelHeight * 8
+            text:                   "Vehicle " + (activeVehicle ? activeVehicle.id : "None")
+            visible:                QGroundControl.multiVehicleManager.vehicles.count > 1
             anchors.verticalCenter: parent.verticalCenter
 
-        property bool vehicleConnectionLost: activeVehicle ? activeVehicle.connectionLost : false
+            menu: vehicleMenu
 
-        Loader {
-            id:                     indicatorLoader
-            source:                 activeVehicle && !parent.vehicleConnectionLost ? "MainToolBarIndicators.qml" : ""
-            anchors.left:           parent.left
-            anchors.verticalCenter: parent.verticalCenter
+            Menu {
+                id: vehicleMenu
             }
 
-        QGCLabel {
-            id:                     connectionLost
-            text:                   qsTr("COMMUNICATION LOST")
-            font.pointSize:         ScreenTools.largeFontPointSize
-            font.family:            ScreenTools.demiboldFontFamily
-            color:                  colorRed
-            anchors.rightMargin:    ScreenTools.defaultFontPixelWidth
-            anchors.right:          disconnectButton.left
-            anchors.verticalCenter: parent.verticalCenter
-            visible:                parent.vehicleConnectionLost
+            Component {
+                id: vehicleMenuItemComponent
+
+                MenuItem {
+                    checkable:      true
+                    onTriggered:    QGroundControl.multiVehicleManager.activeVehicle = vehicle
+
+                    property int vehicleId: Number(text.split(" ")[1])
+                    property var vehicle:   QGroundControl.multiVehicleManager.getVehicleById(vehicleId)
+                }
             }
 
-        QGCButton {
-            id:                     disconnectButton
-            anchors.rightMargin:     mainWindow.tbSpacing * 2
-            anchors.right:          parent.right
-            anchors.verticalCenter: parent.verticalCenter
-            text:                   qsTr("Disconnect")
-            visible:                parent.vehicleConnectionLost
-            primary:                true
-            onClicked:              activeVehicle.disconnectInactiveVehicle()
+            property var vehicleMenuItems: []
+
+            function updateVehicleMenu() {
+                // Remove old menu items
+                for (var i = 0; i < vehicleMenuItems.length; i++) {
+                    vehicleMenu.removeItem(vehicleMenuItems[i])
                 }
+                vehicleMenuItems.length = 0
 
-        Image {
-            anchors.rightMargin:    ScreenTools.defaultFontPixelWidth / 2
-            anchors.right:          parent.right
-            anchors.top:            parent.top
-            anchors.bottom:         parent.bottom
-            visible:                x > indicatorLoader.x + indicatorLoader.width && !disconnectButton.visible && source != ""
-            fillMode:               Image.PreserveAspectFit
-            source:                 activeVehicle ? activeVehicle.brandImage : ""
+                // Add new items
+                for (var i=0; i<QGroundControl.multiVehicleManager.vehicles.count; i++) {
+                    var vehicle = QGroundControl.multiVehicleManager.vehicles.get(i)
+                    var menuItem = vehicleMenuItemComponent.createObject(null, { "text": "Vehicle " + vehicle.id })
+                    vehicleMenuItems.push(menuItem)
+                    vehicleMenu.insertItem(i, menuItem)
+                }
+            }
+
+            Component.onCompleted: updateVehicleMenu()
+
+            Connections {
+                target:         QGroundControl.multiVehicleManager.vehicles
+                onCountChanged: vehicleSelectorButton.updateVehicleMenu()
+            }
         }
 
+        MainToolBarIndicators {
+            height:                 mainWindow.tbCellHeight
+            Layout.fillWidth:       true
+            anchors.verticalCenter: parent.verticalCenter
+            visible:                activeVehicle
+        }
     }
 
     // Progress bar