Browse Source

Use consistent "Launch" naming

QGC4.4
DonLakeFlyer 5 years ago
parent
commit
a9935798cd
  1. 2
      src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml
  2. 4
      src/AutoPilotPlugins/PX4/SafetyComponent.qml
  3. 2
      src/FlightDisplay/GuidedActionsController.qml
  4. 2
      src/FlightMap/Widgets/CenterMapDropButton.qml
  5. 2
      src/FlightMap/Widgets/CenterMapDropPanel.qml
  6. 10
      src/MissionManager/MavCmdInfoCommon.json
  7. 2
      src/MissionManager/MissionSettings.FactMetaData.json
  8. 2
      src/MissionManager/MissionSettingsItem.cc
  9. 2
      src/MissionManager/SimpleMissionItem.cc
  10. 2
      src/PlanView/FWLandingPatternEditor.qml
  11. 4
      src/PlanView/MissionSettingsEditor.qml
  12. 4
      src/PlanView/SimpleItemEditor.qml

2
src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml

@ -80,7 +80,7 @@ Item { @@ -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.")

4
src/AutoPilotPlugins/PX4/SafetyComponent.qml

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

2
src/FlightDisplay/GuidedActionsController.qml

@ -60,7 +60,7 @@ Item { @@ -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)

2
src/FlightMap/Widgets/CenterMapDropButton.qml

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

2
src/FlightMap/Widgets/CenterMapDropPanel.qml

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

10
src/MissionManager/MavCmdInfoCommon.json

@ -138,8 +138,8 @@ @@ -138,8 +138,8 @@
{
"id": 20,
"rawName": "MAV_CMD_NAV_RETURN_TO_LAUNCH",
"friendlyName": "Return Home",
"description": "Send the vehicle back to the home position.",
"friendlyName": "Return To Launch",
"description": "Send the vehicle back to the launch position.",
"friendlyEdit": true,
"category": "Basic"
},
@ -501,8 +501,8 @@ @@ -501,8 +501,8 @@
{
"id": 179,
"rawName": "MAV_CMD_DO_SET_HOME",
"friendlyName": "Set home location",
"description": "Changes the home location either to the current location or a specified location.",
"friendlyName": "Set launch 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 @@ @@ -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" },

2
src/MissionManager/MissionSettings.FactMetaData.json

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

2
src/MissionManager/MissionSettingsItem.cc

@ -282,7 +282,7 @@ void MissionSettingsItem::_setHomeAltFromTerrain(double terrainAltitude) @@ -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)

2
src/MissionManager/SimpleMissionItem.cc

@ -387,7 +387,7 @@ QString SimpleMissionItem::commandName(void) const @@ -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:

2
src/PlanView/FWLandingPatternEditor.qml

@ -178,7 +178,7 @@ Rectangle { @@ -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

4
src/PlanView/MissionSettingsEditor.qml

@ -177,7 +177,7 @@ Rectangle { @@ -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 { @@ -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
}

4
src/PlanView/SimpleItemEditor.qml

@ -21,7 +21,7 @@ Rectangle { @@ -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 { @@ -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

Loading…
Cancel
Save