Browse Source

Merge pull request #3566 from DonLakeFlyer/PlannedHome

Planned Home Position: Tweaks to wording to help with confusion
QGC4.4
Don Gagne 9 years ago committed by GitHub
parent
commit
c26993a0fa
  1. 2
      src/MissionEditor/SimpleItemEditor.qml
  2. 4
      src/QmlControls/MissionItemEditor.qml

2
src/MissionEditor/SimpleItemEditor.qml

@ -42,7 +42,7 @@ Rectangle { @@ -42,7 +42,7 @@ Rectangle {
wrapMode: Text.WordWrap
font.pointSize: ScreenTools.smallFontPointSize
text: missionItem.sequenceNumber == 0 ?
qsTr("Planned home position.") :
qsTr("Planned home position. Actual home position set by Vehicle.") :
(missionItem.rawEdit ?
qsTr("Provides advanced access to all commands/parameters. Be very careful!") :
missionItem.commandDescription)

4
src/QmlControls/MissionItemEditor.qml

@ -141,7 +141,9 @@ Rectangle { @@ -141,7 +141,9 @@ Rectangle {
anchors.fill: commandPicker
visible: missionItem.sequenceNumber == 0 || !missionItem.isCurrentItem || !missionItem.isSimpleItem
verticalAlignment: Text.AlignVCenter
text: missionItem.sequenceNumber == 0 ? qsTr("Home Position") : (missionItem.isSimpleItem ? missionItem.commandName : qsTr("Survey"))
text: missionItem.sequenceNumber == 0 ?
qsTr("Planned Home Position") :
(missionItem.isSimpleItem ? missionItem.commandName : qsTr("Survey"))
color: _outerTextColor
}

Loading…
Cancel
Save