Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
c26993a0
Commit
c26993a0
authored
Jun 14, 2016
by
Don Gagne
Committed by
GitHub
Jun 14, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #3566 from DonLakeFlyer/PlannedHome
Planned Home Position: Tweaks to wording to help with confusion
parents
5fa30e0c
5d0f4d4a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
SimpleItemEditor.qml
src/MissionEditor/SimpleItemEditor.qml
+1
-1
MissionItemEditor.qml
src/QmlControls/MissionItemEditor.qml
+3
-1
No files found.
src/MissionEditor/SimpleItemEditor.qml
View file @
c26993a0
...
...
@@ -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
)
...
...
src/QmlControls/MissionItemEditor.qml
View file @
c26993a0
...
...
@@ -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
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment