Merge pull request #8410 from DonLakeFlyer/FlyPlanTitles

Put back ToolStrip titles which were mysteriously removed

src/FlightDisplay/FlightDisplayView.qml

@@ -571,6 +571,7 @@ Item {
             anchors.top:        parent.top
             z:                  _mapAndVideo.z + 4
             maxHeight:          parent.height - toolStrip.y + (_flightVideo.visible ? (_flightVideo.y - parent.height) : 0)
+            title:              qsTr("Fly")
 
             property bool _anyActionAvailable: _guidedController.showStartMission || _guidedController.showResumeMission || _guidedController.showChangeAlt || _guidedController.showLandAbort
             property var _actionModel: [

src/PlanView/PlanView.qml

@@ -570,6 +570,7 @@ Item {
             anchors.top:        parent.top
             z:                  QGroundControl.zOrderWidgets
             maxHeight:          parent.height - toolStrip.y
+            title:              qsTr("Plan")
 
             //readonly property int flyButtonIndex:       0
             readonly property int fileButtonIndex:      0

src/QmlControls/ToolStrip.qml

@@ -24,6 +24,7 @@ Rectangle {
 
     property alias  model:              repeater.model
     property real   maxHeight           ///< Maximum height for control, determines whether text is hidden to make control shorter
+    property alias  title:              titleLabel.text
 
     property AbstractButton lastClickedButton: null
 
@@ -71,6 +72,15 @@ Rectangle {
             anchors.right:  parent.right
             spacing:        ScreenTools.defaultFontPixelWidth * 0.25
 
+            QGCLabel {
+                id:                     titleLabel
+                anchors.left:           parent.left
+                anchors.right:          parent.right
+                horizontalAlignment:    Text.AlignHCenter
+                font.pointSize:         ScreenTools.smallFontPointSize
+                visible:                title != ""
+            }
+
             Repeater {
                 id: repeater