Merge branch 'master' of https://github.com/mavlink/qgroundcontrol into pr-analyze-float

src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml

@@ -80,7 +80,7 @@ Item {
     readonly property string mrLoiterModeDescription:   qsTr("The multirotor hovers at the current position and altitude. ")
 
     readonly property string returnModeName:            qsTr("Return")
-    readonly property string returnModeDescription:     qsTr("The vehicle returns to the home position, loiters and then lands. ")
+    readonly property string returnModeDescription:     qsTr("The vehicle returns to the launch position, loiters and then lands. ")
 
     readonly property string offboardModeName:          qsTr("Offboard")
     readonly property string offboardModeDescription:   qsTr("All flight control aspects are controlled by an offboard system.")

src/AutoPilotPlugins/PX4/SafetyComponent.qml

@@ -410,7 +410,7 @@ SetupPage {
                 }
 
                 QGCLabel {
-                    text:               qsTr("Return Home Settings")
+                    text:               qsTr("Return To Launch Settings")
                 }
 
                 Rectangle {
@@ -449,7 +449,7 @@ SetupPage {
                             }
 
                             QGCLabel {
-                                text:                   qsTr("Return home, then:")
+                                text:                   qsTr("Return to launch, then:")
                                 Layout.columnSpan:      2
                             }
                             Row {

src/FlightDisplay/GuidedActionsController.qml

@@ -60,7 +60,7 @@ Item {
     readonly property string continueMissionMessage:            qsTr("Continue the mission from the current waypoint.")
     readonly property string resumeMissionUploadFailMessage:    qsTr("Upload of resume mission failed. Confirm to retry upload")
     readonly property string landMessage:                       qsTr("Land the vehicle at the current position.")
-    readonly property string rtlMessage:                        qsTr("Return to the home position of the vehicle.")
+    readonly property string rtlMessage:                        qsTr("Return to the launch position of the vehicle.")
     readonly property string changeAltMessage:                  qsTr("Change the altitude of the vehicle up or down.")
     readonly property string gotoMessage:                       qsTr("Move the vehicle to the specified location.")
              property string setWaypointMessage:                qsTr("Adjust current waypoint to %1.").arg(_actionData)

src/FlightMap/Widgets/CenterMapDropButton.qml

@@ -186,7 +186,7 @@ DropButton {
             }
 
             QGCButton {
-                text:               qsTr("Home")
+                text:               qsTr("Launch")
                 Layout.fillWidth:   true
                 enabled:            !followVehicleCheckBox.checked
 

src/FlightMap/Widgets/CenterMapDropPanel.qml

@@ -51,7 +51,7 @@ ColumnLayout {
     }
 
     QGCButton {
-        text:               qsTr("Home")
+        text:               qsTr("Launch")
         Layout.fillWidth:   true
 
         onClicked: {

src/MissionManager/MavCmdInfoCommon.json

@@ -138,8 +138,8 @@
         {
             "id":           20,
             "rawName":      "MAV_CMD_NAV_RETURN_TO_LAUNCH",
-            "friendlyName": "Return Home",
+            "friendlyName": "Return To Launch",
-            "description":  "Send the vehicle back to the home position.",
+            "description":  "Send the vehicle back to the launch position.",
             "friendlyEdit": true,
             "category":     "Basic"
         },
@@ -501,8 +501,8 @@
         {
             "id":                   179,
             "rawName":              "MAV_CMD_DO_SET_HOME",
-            "friendlyName":         "Set home location",
+            "friendlyName":         "Set launch location",
-            "description":          "Changes the home location either to the current location or a specified location.",
+            "description":          "Changes the launch location either to the current location or a specified location.",
             "specifiesCoordinate":  true,
             "standaloneCoordinate": true,
             "friendlyEdit":         true,
@@ -983,7 +983,7 @@
         { "id": 252, "rawName": "MAV_CMD_OVERRIDE_GOTO", "friendlyName": "Override goto" },
         { "id": 300, "rawName": "MAV_CMD_MISSION_START", "friendlyName": "Mission start" },
         { "id": 400, "rawName": "MAV_CMD_COMPONENT_ARM_DISARM", "friendlyName": "Arm/Disarm" },
-        { "id": 410, "rawName": "MAV_CMD_GET_HOME_POSITION", "friendlyName": "Get home position" },
+        { "id": 410, "rawName": "MAV_CMD_GET_HOME_POSITION", "friendlyName": "Get launch position" },
         { "id": 500, "rawName": "MAV_CMD_START_RX_PAIR", "friendlyName": "Bind Spektrum receiver" },
         { "id": 510, "rawName": "MAV_CMD_GET_MESSAGE_INTERVAL", "friendlyName": "Get message interval" },
         { "id": 511, "rawName": "MAV_CMD_SET_MESSAGE_INTERVAL", "friendlyName": "Set message interval" },

src/MissionManager/MissionSettings.FactMetaData.json

@@ -1,7 +1,7 @@
 [
 {
     "name":             "PlannedHomePositionAltitude",
-    "shortDescription": "Planned home position altitude",
+    "shortDescription": "Launch position altitude",
     "type":             "double",
     "units":            "m",
     "decimalPlaces":    1,

src/MissionManager/MissionSettingsItem.cc

@@ -282,7 +282,7 @@ void MissionSettingsItem::_setHomeAltFromTerrain(double terrainAltitude)
 
 QString MissionSettingsItem::abbreviation(void) const
 {
-    return _flyView ? tr("H") : tr("Launch");
+    return _flyView ? tr("L") : tr("Launch");
 }
 
 void MissionSettingsItem::_updateHomePosition(const QGeoCoordinate& homePosition)

src/MissionManager/SimpleMissionItem.cc

@@ -387,7 +387,7 @@ QString SimpleMissionItem::commandName(void) const
 QString SimpleMissionItem::abbreviation() const
 {
     if (homePosition())
-        return tr("H");
+        return tr("L");
 
     switch(command()) {
     case MAV_CMD_NAV_TAKEOFF:

src/PlanView/FWLandingPatternEditor.qml

@@ -178,7 +178,7 @@ Rectangle {
 
         QGCCheckBox {
             anchors.right:  parent.right
-            text:           qsTr("Altitudes relative to home")
+            text:           qsTr("Altitudes relative to launch")
             checked:        missionItem.altitudesAreRelative
             visible:        QGroundControl.corePlugin.options.showMissionAbsoluteAltitude || !missionItem.altitudesAreRelative
             onClicked:      missionItem.altitudesAreRelative = checked

src/PlanView/MissionSettingsEditor.qml

@@ -177,7 +177,7 @@ Rectangle {
                 id:             plannedHomePositionSection
                 anchors.left:   parent.left
                 anchors.right:  parent.right
-                text:           qsTr("Planned Home Position")
+                text:           qsTr("Launch Position")
                 visible:        !_vehicleHasHomePosition
                 checked:        false
             }
@@ -213,7 +213,7 @@ Rectangle {
                 }
 
                 QGCButton {
-                    text:                       qsTr("Set Home To Map Center")
+                    text:                       qsTr("Set To Map Center")
                     onClicked:                  missionItem.coordinate = map.center
                     anchors.horizontalCenter:   parent.horizontalCenter
                 }

src/PlanView/SimpleItemEditor.qml

@@ -21,7 +21,7 @@ Rectangle {
     property real _margin:                  ScreenTools.defaultFontPixelHeight / 2
     property bool _supportsTerrainFrame:    missionItem
 
-    property string _altModeRelativeHelpText:       qsTr("Altitude relative to home altitude")
+    property string _altModeRelativeHelpText:       qsTr("Altitude relative to launch altitude")
     property string _altModeAbsoluteHelpText:       qsTr("Altitude above mean sea level")
     property string _altModeAboveTerrainHelpText:   qsTr("Altitude above terrain\nActual AMSL altitude: %1 %2").arg(missionItem.amslAltAboveTerrain.valueString).arg(missionItem.amslAltAboveTerrain.units)
     property string _altModeTerrainFrameHelpText:   qsTr("Using terrain reference frame")
@@ -188,7 +188,7 @@ Rectangle {
                             id: altHamburgerMenu
 
                             QGCMenuItem {
-                                text:           qsTr("Altitude Relative To Home")
+                                text:           qsTr("Altitude Relative To Launch")
                                 checkable:      true
                                 checked:        missionItem.altitudeMode === QGroundControl.AltitudeModeRelative
                                 onTriggered:    missionItem.altitudeMode = QGroundControl.AltitudeModeRelative

src/QmlControls/ToolStrip.qml

@@ -19,7 +19,7 @@ Rectangle {
     id:         _root
     color:      qgcPal.globalTheme === QGCPalette.Light ? QGroundControl.corePlugin.options.toolbarBackgroundLight : QGroundControl.corePlugin.options.toolbarBackgroundDark
     width:      _idealWidth < repeater.contentWidth ? repeater.contentWidth : _idealWidth
-    height:     Math.min(maxHeight, toolStripColumn.height + (toolStripColumn.anchors.margins * 2))
+    height:     Math.min(maxHeight, toolStripColumn.height + (flickable.anchors.margins * 2))
     radius:     ScreenTools.defaultFontPixelWidth / 2
 
     property alias  model:              repeater.model
@@ -56,6 +56,7 @@ Rectangle {
     }
 
     QGCFlickable {
+        id:                 flickable
         anchors.margins:    ScreenTools.defaultFontPixelWidth * 0.4
         anchors.top:        parent.top
         anchors.left:       parent.left