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
c20c359f
Commit
c20c359f
authored
Mar 24, 2016
by
Tomaz Canabrava
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Translate FlightDisplay
Signed-off-by:
Tomaz Canabrava
<
tomaz.canabrava@intel.com
>
parent
1957086f
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
23 additions
and
23 deletions
+23
-23
FlightDisplayView.qml
src/FlightDisplay/FlightDisplayView.qml
+3
-3
FlightDisplayViewMap.qml
src/FlightDisplay/FlightDisplayViewMap.qml
+1
-1
FlightDisplayViewVideo.qml
src/FlightDisplay/FlightDisplayViewVideo.qml
+1
-1
FlightDisplayViewWidgets.qml
src/FlightDisplay/FlightDisplayViewWidgets.qml
+18
-18
No files found.
src/FlightDisplay/FlightDisplayView.qml
View file @
c20c359f
...
@@ -113,9 +113,9 @@ QGCView {
...
@@ -113,9 +113,9 @@ QGCView {
MessageDialog
{
MessageDialog
{
id
:
px4JoystickSupport
id
:
px4JoystickSupport
text
:
"
Joystick support requires MAVLink MANUAL_CONTROL support.
"
+
text
:
qsTr
(
"
Joystick support requires MAVLink MANUAL_CONTROL support.
"
)
+
"
The firmware you are running does not normally support this.
"
+
qsTr
(
"
The firmware you are running does not normally support this.
"
)
+
"
It will only work if you have modified the firmware to add MANUAL_CONTROL support.
"
qsTr
(
"
It will only work if you have modified the firmware to add MANUAL_CONTROL support.
"
)
}
}
Connections
{
Connections
{
...
...
src/FlightDisplay/FlightDisplayViewMap.qml
View file @
c20c359f
...
@@ -119,7 +119,7 @@ FlightMap {
...
@@ -119,7 +119,7 @@ FlightMap {
sourceItem
:
MissionItemIndexLabel
{
sourceItem
:
MissionItemIndexLabel
{
isCurrentItem
:
true
isCurrentItem
:
true
label
:
"
G
"
label
:
qsTr
(
"
G
"
,
"
Goto here waypoint
"
)
// second string is translator's hint.
}
}
}
}
...
...
src/FlightDisplay/FlightDisplayViewVideo.qml
View file @
c20c359f
...
@@ -42,7 +42,7 @@ Item {
...
@@ -42,7 +42,7 @@ Item {
color
:
Qt
.
rgba
(
0
,
0
,
0
,
0.75
)
color
:
Qt
.
rgba
(
0
,
0
,
0
,
0.75
)
visible
:
!
_controller
.
videoRunning
visible
:
!
_controller
.
videoRunning
QGCLabel
{
QGCLabel
{
text
:
"
NO VIDEO
"
text
:
qsTr
(
"
NO VIDEO
"
)
font.weight
:
Font
.
DemiBold
font.weight
:
Font
.
DemiBold
color
:
"
white
"
color
:
"
white
"
font.pixelSize
:
_mainIsMap
?
12
*
ScreenTools
.
fontHRatio
:
20
*
ScreenTools
.
fontHRatio
font.pixelSize
:
_mainIsMap
?
12
*
ScreenTools
.
fontHRatio
:
20
*
ScreenTools
.
fontHRatio
...
...
src/FlightDisplay/FlightDisplayViewWidgets.qml
View file @
c20c359f
...
@@ -172,7 +172,7 @@ Item {
...
@@ -172,7 +172,7 @@ Item {
QGCCheckBox
{
QGCCheckBox
{
id
:
followVehicleCheckBox
id
:
followVehicleCheckBox
text
:
"
Follow Vehicle
"
text
:
qsTr
(
"
Follow Vehicle
"
)
checked
:
_flightMap
?
_flightMap
.
_followVehicle
:
false
checked
:
_flightMap
?
_flightMap
.
_followVehicle
:
false
anchors.baseline
:
centerMapButton
.
baseline
anchors.baseline
:
centerMapButton
.
baseline
...
@@ -184,7 +184,7 @@ Item {
...
@@ -184,7 +184,7 @@ Item {
QGCButton
{
QGCButton
{
id
:
centerMapButton
id
:
centerMapButton
text
:
"
Center map on Vehicle
"
text
:
qsTr
(
"
Center map on Vehicle
"
)
enabled
:
_activeVehicle
&&
!
followVehicleCheckBox
.
checked
enabled
:
_activeVehicle
&&
!
followVehicleCheckBox
.
checked
property
var
activeVehicle
:
QGroundControl
.
multiVehicleManager
.
activeVehicle
property
var
activeVehicle
:
QGroundControl
.
multiVehicleManager
.
activeVehicle
...
@@ -232,7 +232,7 @@ Item {
...
@@ -232,7 +232,7 @@ Item {
}
}
QGCButton
{
QGCButton
{
text
:
"
Clear flight trails
"
text
:
qsTr
(
"
Clear flight trails
"
)
enabled
:
QGroundControl
.
multiVehicleManager
.
activeVehicle
enabled
:
QGroundControl
.
multiVehicleManager
.
activeVehicle
onClicked
:
{
onClicked
:
{
...
@@ -387,7 +387,7 @@ Item {
...
@@ -387,7 +387,7 @@ Item {
_activeVehicle
.
setCurrentMissionSequence
(
_flightMap
.
_retaskSequence
)
_activeVehicle
.
setCurrentMissionSequence
(
_flightMap
.
_retaskSequence
)
break
;
break
;
default
:
default
:
console
.
warn
(
"
Internal error: unknown confirmActionCode
"
,
confirmActionCode
)
console
.
warn
(
qsTr
(
"
Internal error: unknown confirmActionCode
"
)
,
confirmActionCode
)
}
}
}
}
...
@@ -404,21 +404,21 @@ Item {
...
@@ -404,21 +404,21 @@ Item {
confirmActionCode
=
actionCode
confirmActionCode
=
actionCode
switch
(
confirmActionCode
)
{
switch
(
confirmActionCode
)
{
case
confirmArm
:
case
confirmArm
:
guidedModeConfirm
.
confirmText
=
"
arm
"
guidedModeConfirm
.
confirmText
=
qsTr
(
"
arm
"
)
break
;
break
;
case
confirmDisarm
:
case
confirmDisarm
:
guidedModeConfirm
.
confirmText
=
"
disarm
"
guidedModeConfirm
.
confirmText
=
qsTr
(
"
disarm
"
)
break
;
break
;
case
confirmEmergencyStop
:
case
confirmEmergencyStop
:
guidedModeConfirm
.
confirmText
=
"
STOP ALL MOTORS!
"
guidedModeConfirm
.
confirmText
=
qsTr
(
"
STOP ALL MOTORS!
"
)
break
;
break
;
case
confirmTakeoff
:
case
confirmTakeoff
:
altitudeSlider
.
visible
=
true
altitudeSlider
.
visible
=
true
altitudeSlider
.
setInitialValueMeters
(
10
)
altitudeSlider
.
setInitialValueMeters
(
10
)
guidedModeConfirm
.
confirmText
=
"
takeoff
"
guidedModeConfirm
.
confirmText
=
qsTr
(
"
takeoff
"
)
break
;
break
;
case
confirmLand
:
case
confirmLand
:
guidedModeConfirm
.
confirmText
=
"
land
"
guidedModeConfirm
.
confirmText
=
qsTr
(
"
land
"
)
break
;
break
;
case
confirmHome
:
case
confirmHome
:
guidedModeConfirm
.
confirmText
=
"
return to launch
"
guidedModeConfirm
.
confirmText
=
"
return to launch
"
...
@@ -426,13 +426,13 @@ Item {
...
@@ -426,13 +426,13 @@ Item {
case
confirmChangeAlt
:
case
confirmChangeAlt
:
altitudeSlider
.
visible
=
true
altitudeSlider
.
visible
=
true
altitudeSlider
.
setInitialValueAppSettingsDistanceUnits
(
_activeVehicle
.
altitudeAMSL
.
value
)
altitudeSlider
.
setInitialValueAppSettingsDistanceUnits
(
_activeVehicle
.
altitudeAMSL
.
value
)
guidedModeConfirm
.
confirmText
=
"
change altitude
"
guidedModeConfirm
.
confirmText
=
qsTr
(
"
change altitude
"
)
break
;
break
;
case
confirmGoTo
:
case
confirmGoTo
:
guidedModeConfirm
.
confirmText
=
"
move vehicle
"
guidedModeConfirm
.
confirmText
=
qsTr
(
"
move vehicle
"
)
break
;
break
;
case
confirmRetask
:
case
confirmRetask
:
_guidedModeBar
.
confirmText
=
"
active waypoint change
"
_guidedModeBar
.
confirmText
=
qsTr
(
"
active waypoint change
"
)
break
;
break
;
}
}
guidedModeBar
.
visible
=
false
guidedModeBar
.
visible
=
false
...
@@ -450,24 +450,24 @@ Item {
...
@@ -450,24 +450,24 @@ Item {
spacing
:
_margins
spacing
:
_margins
QGCButton
{
QGCButton
{
text
:
(
_activeVehicle
&&
_activeVehicle
.
armed
)
?
(
_activeVehicle
.
flying
?
"
Emergency Stop
"
:
"
Disarm
"
)
:
"
Arm
"
text
:
(
_activeVehicle
&&
_activeVehicle
.
armed
)
?
(
_activeVehicle
.
flying
?
qsTr
(
"
Emergency Stop
"
)
:
qsTr
(
"
Disarm
"
))
:
qsTr
(
"
Arm
"
)
onClicked
:
_guidedModeBar
.
confirmAction
(
_activeVehicle
.
armed
?
(
_activeVehicle
.
flying
?
_guidedModeBar
.
confirmEmergencyStop
:
_guidedModeBar
.
confirmDisarm
)
:
_guidedModeBar
.
confirmArm
)
onClicked
:
_guidedModeBar
.
confirmAction
(
_activeVehicle
.
armed
?
(
_activeVehicle
.
flying
?
_guidedModeBar
.
confirmEmergencyStop
:
_guidedModeBar
.
confirmDisarm
)
:
_guidedModeBar
.
confirmArm
)
}
}
QGCButton
{
QGCButton
{
text
:
"
RTL
"
text
:
qsTr
(
"
RTL
"
)
visible
:
_activeVehicle
&&
_activeVehicle
.
guidedModeSupported
&&
_activeVehicle
.
flying
visible
:
_activeVehicle
&&
_activeVehicle
.
guidedModeSupported
&&
_activeVehicle
.
flying
onClicked
:
_guidedModeBar
.
confirmAction
(
_guidedModeBar
.
confirmHome
)
onClicked
:
_guidedModeBar
.
confirmAction
(
_guidedModeBar
.
confirmHome
)
}
}
QGCButton
{
QGCButton
{
text
:
(
_activeVehicle
&&
_activeVehicle
.
flying
)
?
"
Land
"
:
"
Takeoff
"
text
:
(
_activeVehicle
&&
_activeVehicle
.
flying
)
?
qsTr
(
"
Land
"
):
qsTr
(
"
Takeoff
"
)
visible
:
_activeVehicle
&&
_activeVehicle
.
guidedModeSupported
&&
_activeVehicle
.
armed
visible
:
_activeVehicle
&&
_activeVehicle
.
guidedModeSupported
&&
_activeVehicle
.
armed
onClicked
:
_guidedModeBar
.
confirmAction
(
_activeVehicle
.
flying
?
_guidedModeBar
.
confirmLand
:
_guidedModeBar
.
confirmTakeoff
)
onClicked
:
_guidedModeBar
.
confirmAction
(
_activeVehicle
.
flying
?
_guidedModeBar
.
confirmLand
:
_guidedModeBar
.
confirmTakeoff
)
}
}
QGCButton
{
QGCButton
{
text
:
"
Pause
"
text
:
qsTr
(
"
Pause
"
)
visible
:
_activeVehicle
&&
_activeVehicle
.
pauseVehicleSupported
&&
_activeVehicle
.
flying
visible
:
_activeVehicle
&&
_activeVehicle
.
pauseVehicleSupported
&&
_activeVehicle
.
flying
onClicked
:
{
onClicked
:
{
guidedModeHideTimer
.
restart
()
guidedModeHideTimer
.
restart
()
...
@@ -476,7 +476,7 @@ Item {
...
@@ -476,7 +476,7 @@ Item {
}
}
QGCButton
{
QGCButton
{
text
:
"
Change Altitude
"
text
:
qsTr
(
"
Change Altitude
"
)
visible
:
_activeVehicle
&&
_activeVehicle
.
guidedModeSupported
&&
_activeVehicle
.
armed
visible
:
_activeVehicle
&&
_activeVehicle
.
guidedModeSupported
&&
_activeVehicle
.
armed
onClicked
:
_guidedModeBar
.
confirmAction
(
_guidedModeBar
.
confirmChangeAlt
)
onClicked
:
_guidedModeBar
.
confirmAction
(
_guidedModeBar
.
confirmChangeAlt
)
}
}
...
@@ -557,7 +557,7 @@ Item {
...
@@ -557,7 +557,7 @@ Item {
QGCLabel
{
QGCLabel
{
anchors.horizontalCenter
:
parent
.
horizontalCenter
anchors.horizontalCenter
:
parent
.
horizontalCenter
text
:
"
Alt (rel)
"
text
:
qsTr
(
"
Alt (rel)
"
)
}
}
QGCLabel
{
QGCLabel
{
...
...
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