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
3ae7cbb2
Commit
3ae7cbb2
authored
Apr 13, 2016
by
Don Gagne
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #3224 from tcanabrava/qstr_qml_v5
Qstr qml v5
parents
b16f0917
2bc9d6b6
Changes
86
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
86 changed files
with
893 additions
and
896 deletions
+893
-896
APMAirframeComponent.qml
src/AutoPilotPlugins/APM/APMAirframeComponent.qml
+4
-4
APMAirframeComponentSummary.qml
src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml
+1
-1
APMCameraComponent.qml
src/AutoPilotPlugins/APM/APMCameraComponent.qml
+29
-29
APMCameraComponentSummary.qml
src/AutoPilotPlugins/APM/APMCameraComponentSummary.qml
+4
-4
APMFlightModesComponent.qml
src/AutoPilotPlugins/APM/APMFlightModesComponent.qml
+9
-6
APMFlightModesComponentSummary.qml
src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml
+6
-6
APMNotSupported.qml
src/AutoPilotPlugins/APM/APMNotSupported.qml
+1
-1
APMPowerComponent.qml
src/AutoPilotPlugins/APM/APMPowerComponent.qml
+10
-10
APMPowerComponentSummary.qml
src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml
+2
-2
APMRadioComponentSummary.qml
src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml
+8
-8
APMSafetyComponentCopter.qml
src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml
+25
-24
APMSafetyComponentPlane.qml
src/AutoPilotPlugins/APM/APMSafetyComponentPlane.qml
+8
-8
APMSafetyComponentRover.qml
src/AutoPilotPlugins/APM/APMSafetyComponentRover.qml
+1
-1
APMSafetyComponentSummaryCopter.qml
src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml
+26
-26
APMSafetyComponentSummaryPlane.qml
src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml
+8
-8
APMSafetyComponentSummaryRover.qml
src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml
+1
-1
APMSensorsComponent.qml
src/AutoPilotPlugins/APM/APMSensorsComponent.qml
+26
-26
APMSensorsComponentSummary.qml
src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml
+8
-8
APMTuningComponentCopter.qml
src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml
+13
-13
ESP8266Component.qml
src/AutoPilotPlugins/Common/ESP8266Component.qml
+26
-26
ESP8266ComponentSummary.qml
src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml
+5
-5
RadioComponent.qml
src/AutoPilotPlugins/Common/RadioComponent.qml
+27
-31
AirframeComponent.qml
src/AutoPilotPlugins/PX4/AirframeComponent.qml
+11
-11
AirframeComponentSummary.qml
src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml
+5
-5
FlightModesComponentSummary.qml
src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml
+11
-11
PX4AdvancedFlightModes.qml
src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml
+45
-45
PX4RadioComponentSummary.qml
src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml
+14
-14
PX4SimpleFlightModes.qml
src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml
+4
-4
PX4TuningComponentCopter.qml
src/AutoPilotPlugins/PX4/PX4TuningComponentCopter.qml
+12
-13
PX4TuningComponentPlane.qml
src/AutoPilotPlugins/PX4/PX4TuningComponentPlane.qml
+16
-16
PowerComponent.qml
src/AutoPilotPlugins/PX4/PowerComponent.qml
+34
-34
PowerComponentSummary.qml
src/AutoPilotPlugins/PX4/PowerComponentSummary.qml
+3
-3
SafetyComponent.qml
src/AutoPilotPlugins/PX4/SafetyComponent.qml
+14
-15
SafetyComponentSummary.qml
src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml
+7
-7
SensorsComponent.qml
src/AutoPilotPlugins/PX4/SensorsComponent.qml
+35
-35
SensorsComponentSummary.qml
src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml
+10
-10
SensorsComponentSummaryFixedWing.qml
...AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml
+8
-8
FactCheckBox.qml
src/FactSystem/FactControls/FactCheckBox.qml
+1
-1
FactPanel.qml
src/FactSystem/FactControls/FactPanel.qml
+1
-1
FactTextField.qml
src/FactSystem/FactControls/FactTextField.qml
+1
-1
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
+20
-20
QGCCompassWidget.qml
src/FlightMap/Widgets/QGCCompassWidget.qml
+1
-1
ValuesWidget.qml
src/FlightMap/Widgets/ValuesWidget.qml
+4
-4
VibrationWidget.qml
src/FlightMap/Widgets/VibrationWidget.qml
+6
-6
MissionEditor.qml
src/MissionEditor/MissionEditor.qml
+21
-21
MissionItemStatus.qml
src/MissionEditor/MissionItemStatus.qml
+4
-5
SimpleItemEditor.qml
src/MissionEditor/SimpleItemEditor.qml
+3
-3
SurveyItemEditor.qml
src/MissionEditor/SurveyItemEditor.qml
+5
-5
MissionCommandDialog.qml
src/QmlControls/MissionCommandDialog.qml
+1
-1
MissionItemEditor.qml
src/QmlControls/MissionItemEditor.qml
+6
-6
ModeSwitchDisplay.qml
src/QmlControls/ModeSwitchDisplay.qml
+2
-2
ParameterEditor.qml
src/QmlControls/ParameterEditor.qml
+19
-19
ParameterEditorDialog.qml
src/QmlControls/ParameterEditorDialog.qml
+14
-14
QGCButton.qml
src/QmlControls/QGCButton.qml
+3
-7
QGCMobileFileDialog.qml
src/QmlControls/QGCMobileFileDialog.qml
+4
-4
QGCView.qml
src/QmlControls/QGCView.qml
+19
-19
QmlTest.qml
src/QmlControls/QmlTest.qml
+28
-28
SliderSwitch.qml
src/QmlControls/SliderSwitch.qml
+1
-1
VehicleRotationCal.qml
src/QmlControls/VehicleRotationCal.qml
+2
-2
OfflineMap.qml
src/QtLocationPlugin/QMLControl/OfflineMap.qml
+43
-43
FirmwareUpgrade.qml
src/VehicleSetup/FirmwareUpgrade.qml
+26
-22
JoystickConfig.qml
src/VehicleSetup/JoystickConfig.qml
+23
-23
PX4FlowSensor.qml
src/VehicleSetup/PX4FlowSensor.qml
+1
-1
SetupView.qml
src/VehicleSetup/SetupView.qml
+1
-1
VehicleSummary.qml
src/VehicleSetup/VehicleSummary.qml
+2
-2
CustomCommandWidget.qml
src/ViewWidgets/CustomCommandWidget.qml
+2
-2
LogDownload.qml
src/ViewWidgets/LogDownload.qml
+11
-11
ViewWidget.qml
src/ViewWidgets/ViewWidget.qml
+2
-2
MainWindowInner.qml
src/ui/MainWindowInner.qml
+5
-5
MainWindowLeftPanel.qml
src/ui/MainWindowLeftPanel.qml
+8
-8
BluetoothSettings.qml
src/ui/preferences/BluetoothSettings.qml
+7
-7
DebugWindow.qml
src/ui/preferences/DebugWindow.qml
+9
-9
GeneralSettings.qml
src/ui/preferences/GeneralSettings.qml
+24
-24
LinkSettings.qml
src/ui/preferences/LinkSettings.qml
+13
-13
LogReplaySettings.qml
src/ui/preferences/LogReplaySettings.qml
+4
-4
MavlinkSettings.qml
src/ui/preferences/MavlinkSettings.qml
+5
-5
MockLink.qml
src/ui/preferences/MockLink.qml
+6
-6
MockLinkSettings.qml
src/ui/preferences/MockLinkSettings.qml
+8
-8
SerialSettings.qml
src/ui/preferences/SerialSettings.qml
+10
-10
TcpSettings.qml
src/ui/preferences/TcpSettings.qml
+3
-3
UdpSettings.qml
src/ui/preferences/UdpSettings.qml
+5
-5
MainToolBar.qml
src/ui/toolbar/MainToolBar.qml
+26
-26
MainToolBarIndicators.qml
src/ui/toolbar/MainToolBarIndicators.qml
+1
-1
No files found.
src/AutoPilotPlugins/APM/APMAirframeComponent.qml
View file @
3ae7cbb2
...
...
@@ -73,7 +73,7 @@ QGCView {
anchors.right
:
parent
.
right
anchors.margins
:
_margins
wrapMode
:
Text
.
WordWrap
text
:
"
Select you drone to load the default parameters for it.
"
text
:
qsTr
(
"
Select you drone to load the default parameters for it.
"
)
}
Flow
{
...
...
@@ -118,7 +118,7 @@ QGCView {
anchors.rightMargin
:
_margins
anchors.left
:
parent
.
left
anchors.right
:
applyButton
.
right
text
:
"
Please select your airframe type
"
text
:
qsTr
(
"
Please select your airframe type
"
)
font.pixelSize
:
ScreenTools
.
mediumFontPixelSize
wrapMode
:
Text
.
WordWrap
}
...
...
@@ -126,8 +126,8 @@ QGCView {
QGCButton
{
id
:
applyButton
anchors.right
:
parent
.
right
text
:
"
Load common parameters
"
onClicked
:
showDialog
(
applyRestartDialogComponent
,
"
Load common parameters
"
,
qgcView
.
showDialogDefaultWidth
,
StandardButton
.
Close
)
text
:
qsTr
(
"
Load common parameters
"
)
onClicked
:
showDialog
(
applyRestartDialogComponent
,
qsTr
(
"
Load common parameters
"
)
,
qgcView
.
showDialogDefaultWidth
,
StandardButton
.
Close
)
}
}
...
...
src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml
View file @
3ae7cbb2
...
...
@@ -27,7 +27,7 @@ FactPanel {
VehicleSummaryRow
{
id
:
nameRow
;
labelText
:
"
Frame Type:
"
labelText
:
qsTr
(
"
Frame Type:
"
)
valueText
:
sysIdFact
.
valueString
===
"
0
"
?
"
Plus
"
:
sysIdFact
.
valueString
===
"
1
"
?
"
X
"
:
sysIdFact
.
valueString
===
"
2
"
?
"
V
"
...
...
src/AutoPilotPlugins/APM/APMCameraComponent.qml
View file @
3ae7cbb2
...
...
@@ -175,17 +175,17 @@ QGCView {
ListModel
{
id
:
gimbalOutModel
ListElement
{
text
:
"
Disabled
"
;
value
:
0
}
ListElement
{
text
:
"
Channel 5
"
;
value
:
5
}
ListElement
{
text
:
"
Channel 6
"
;
value
:
6
}
ListElement
{
text
:
"
Channel 7
"
;
value
:
7
}
ListElement
{
text
:
"
Channel 8
"
;
value
:
8
}
ListElement
{
text
:
"
Channel 9
"
;
value
:
9
}
ListElement
{
text
:
"
Channel 10
"
;
value
:
10
}
ListElement
{
text
:
"
Channel 11
"
;
value
:
11
}
ListElement
{
text
:
"
Channel 12
"
;
value
:
12
}
ListElement
{
text
:
"
Channel 13
"
;
value
:
13
}
ListElement
{
text
:
"
Channel 14
"
;
value
:
14
}
ListElement
{
text
:
qsTr
(
"
Disabled
"
)
;
value
:
0
}
ListElement
{
text
:
qsTr
(
"
Channel 5
"
)
;
value
:
5
}
ListElement
{
text
:
qsTr
(
"
Channel 6
"
)
;
value
:
6
}
ListElement
{
text
:
qsTr
(
"
Channel 7
"
)
;
value
:
7
}
ListElement
{
text
:
qsTr
(
"
Channel 8
"
)
;
value
:
8
}
ListElement
{
text
:
qsTr
(
"
Channel 9
"
)
;
value
:
9
}
ListElement
{
text
:
qsTr
(
"
Channel 10
"
)
;
value
:
10
}
ListElement
{
text
:
qsTr
(
"
Channel 11
"
)
;
value
:
11
}
ListElement
{
text
:
qsTr
(
"
Channel 12
"
)
;
value
:
12
}
ListElement
{
text
:
qsTr
(
"
Channel 13
"
)
;
value
:
13
}
ListElement
{
text
:
qsTr
(
"
Channel 14
"
)
;
value
:
14
}
}
Component
{
...
...
@@ -210,7 +210,7 @@ QGCView {
QGCLabel
{
id
:
directionLabel
text
:
"
Gimbal
"
+
directionTitle
text
:
qsTr
(
"
Gimbal
"
)
+
directionTitle
font.weight
:
Font
.
DemiBold
}
...
...
@@ -228,7 +228,7 @@ QGCView {
anchors.topMargin
:
_margins
anchors.left
:
servoReverseCheckBox
.
left
anchors.top
:
parent
.
top
text
:
"
Stabilize
"
text
:
qsTr
(
"
Stabilize
"
)
fact
:
mountStabFact
checkedValue
:
1
uncheckedValue
:
0
...
...
@@ -240,7 +240,7 @@ QGCView {
anchors.margins
:
_margins
anchors.top
:
mountStabCheckBox
.
bottom
anchors.right
:
parent
.
right
text
:
"
Servo reverse
"
text
:
qsTr
(
"
Servo reverse
"
)
checkedValue
:
1
uncheckedValue
:
0
fact
:
servoReverseFact
...
...
@@ -252,7 +252,7 @@ QGCView {
anchors.margins
:
_margins
anchors.left
:
parent
.
left
anchors.baseline
:
gimbalOutCombo
.
baseline
text
:
"
Output channel:
"
text
:
qsTr
(
"
Output channel:
"
)
}
QGCComboBox
{
...
...
@@ -272,7 +272,7 @@ QGCView {
anchors.margins
:
_margins
anchors.left
:
parent
.
left
anchors.baseline
:
mountRcInCombo
.
baseline
text
:
"
Input channel:
"
text
:
qsTr
(
"
Input channel:
"
)
enabled
:
directionEnabled
}
...
...
@@ -292,7 +292,7 @@ QGCView {
anchors.margins
:
_margins
anchors.left
:
parent
.
left
anchors.baseline
:
mountAngMinField
.
baseline
text
:
"
Gimbal angle limits:
"
text
:
qsTr
(
"
Gimbal angle limits:
"
)
enabled
:
directionEnabled
}
...
...
@@ -301,7 +301,7 @@ QGCView {
anchors.margins
:
_margins
anchors.left
:
mountAngLabel
.
right
anchors.baseline
:
mountAngMinField
.
baseline
text
:
"
min
"
text
:
qsTr
(
"
min
"
)
enabled
:
directionEnabled
}
...
...
@@ -319,7 +319,7 @@ QGCView {
anchors.margins
:
_margins
anchors.left
:
mountAngMinField
.
right
anchors.baseline
:
mountAngMinField
.
baseline
text
:
"
max
"
text
:
qsTr
(
"
max
"
)
enabled
:
directionEnabled
}
...
...
@@ -337,7 +337,7 @@ QGCView {
anchors.margins
:
_margins
anchors.left
:
parent
.
left
anchors.baseline
:
servoPWMMinField
.
baseline
text
:
"
Servo PWM limits:
"
text
:
qsTr
(
"
Servo PWM limits:
"
)
enabled
:
directionEnabled
}
...
...
@@ -345,7 +345,7 @@ QGCView {
id
:
servoPWMMinLabel
anchors.left
:
mountAngMinLabel
.
left
anchors.baseline
:
servoPWMMinField
.
baseline
text
:
"
min
"
text
:
qsTr
(
"
min
"
)
enabled
:
directionEnabled
}
...
...
@@ -364,7 +364,7 @@ QGCView {
anchors.margins
:
_margins
anchors.left
:
servoPWMMinField
.
right
anchors.baseline
:
servoPWMMinField
.
baseline
text
:
"
max
"
text
:
qsTr
(
"
max
"
)
enabled
:
directionEnabled
}
...
...
@@ -392,7 +392,7 @@ QGCView {
QGCLabel
{
id
:
settingsLabel
text
:
"
Gimbal Settings
"
text
:
qsTr
(
"
Gimbal Settings
"
)
font.weight
:
Font
.
DemiBold
}
...
...
@@ -409,7 +409,7 @@ QGCView {
anchors.margins
:
_margins
anchors.left
:
parent
.
left
anchors.baseline
:
gimbalTypeCombo
.
baseline
text
:
"
Type:
"
text
:
qsTr
(
"
Type:
"
)
}
FactComboBox
{
...
...
@@ -431,7 +431,7 @@ QGCView {
anchors.right
:
parent
.
right
anchors.top
:
gimbalTypeCombo
.
bottom
wrapMode
:
Text
.
WordWrap
text
:
"
Gimbal Type changes takes affect next reboot of autopilot
"
text
:
qsTr
(
"
Gimbal Type changes takes affect next reboot of autopilot
"
)
}
QGCLabel
{
...
...
@@ -439,7 +439,7 @@ QGCView {
anchors.margins
:
_margins
anchors.left
:
parent
.
left
anchors.baseline
:
gimbalModeCombo
.
baseline
text
:
"
Default Mode:
"
text
:
qsTr
(
"
Default Mode:
"
)
}
FactComboBox
{
...
...
@@ -469,7 +469,7 @@ QGCView {
id
:
gimbalDirectionTiltLoader
sourceComponent
:
gimbalDirectionSettings
property
string
directionTitle
:
"
Tilt
"
property
string
directionTitle
:
qsTr
(
"
Tilt
"
)
property
bool
directionEnabled
:
_tiltEnabled
property
int
gimbalOutIndex
:
0
property
Fact
mountRcInFact
:
_mountRCInTilt
...
...
@@ -488,7 +488,7 @@ QGCView {
anchors.top
:
gimbalDirectionTiltLoader
.
bottom
sourceComponent
:
gimbalDirectionSettings
property
string
directionTitle
:
"
Roll
"
property
string
directionTitle
:
qsTr
(
"
Roll
"
)
property
bool
directionEnabled
:
_rollEnabled
property
int
gimbalOutIndex
:
0
property
Fact
mountRcInFact
:
_mountRCInRoll
...
...
@@ -507,7 +507,7 @@ QGCView {
anchors.top
:
gimbalDirectionRollLoader
.
bottom
sourceComponent
:
gimbalDirectionSettings
property
string
directionTitle
:
"
Pan
"
property
string
directionTitle
:
qsTr
(
"
Pan
"
)
property
bool
directionEnabled
:
_panEnabled
property
int
gimbalOutIndex
:
0
property
Fact
mountRcInFact
:
_mountRCInPan
...
...
src/AutoPilotPlugins/APM/APMCameraComponentSummary.qml
View file @
3ae7cbb2
...
...
@@ -28,22 +28,22 @@ FactPanel {
VehicleSummaryRow
{
visible
:
_mountTypeExists
labelText
:
"
Gimbal type:
"
labelText
:
qsTr
(
"
Gimbal type:
"
)
valueText
:
_mountTypeValue
}
VehicleSummaryRow
{
labelText
:
"
Tilt input channel:
"
labelText
:
qsTr
(
"
Tilt input channel:
"
)
valueText
:
_mountRCInTilt
.
enumStringValue
}
VehicleSummaryRow
{
labelText
:
"
Pan input channel:
"
labelText
:
qsTr
(
"
Pan input channel:
"
)
valueText
:
_mountRCInPan
.
enumStringValue
}
VehicleSummaryRow
{
labelText
:
"
Roll input channel:
"
labelText
:
qsTr
(
"
Roll input channel:
"
)
valueText
:
_mountRCInRoll
.
enumStringValue
}
}
...
...
src/AutoPilotPlugins/APM/APMFlightModesComponent.qml
View file @
3ae7cbb2
...
...
@@ -62,7 +62,7 @@ QGCView {
QGCLabel
{
id
:
flightModeLabel
text
:
"
Flight Mode Settings
"
+
(
_fltmodeChExists
?
""
:
"
(Channel 5)
"
)
text
:
qsTr
(
"
Flight Mode Settings
"
)
+
(
_fltmodeChExists
?
""
:
qsTr
(
"
(Channel 5)
"
)
)
font.weight
:
Font
.
DemiBold
}
...
...
@@ -88,13 +88,16 @@ QGCView {
QGCLabel
{
id
:
modeChannelLabel
anchors.baseline
:
modeChannelCombo
.
baseline
text
:
"
Flight mode channel:
"
text
:
qsTr
(
"
Flight mode channel:
"
)
}
QGCComboBox
{
id
:
modeChannelCombo
width
:
ScreenTools
.
defaultFontPixelWidth
*
15
model
:
[
"
Not assigned
"
,
"
Channel 1
"
,
"
Channel 2
"
,
"
Channel 3
"
,
"
Channel 4
"
,
"
Channel 5
"
,
"
Channel 6
"
,
"
Channel 7
"
,
"
Channel 8
"
]
model
:
[
qsTr
(
"
Not assigned
"
),
qsTr
(
"
Channel 1
"
),
qsTr
(
"
Channel 2
"
),
qsTr
(
"
Channel 3
"
),
qsTr
(
"
Channel 4
"
),
qsTr
(
"
Channel 5
"
),
qsTr
(
"
Channel 6
"
),
qsTr
(
"
Channel 7
"
),
qsTr
(
"
Channel 8
"
)
]
currentIndex
:
_fltmodeCh
.
value
onActivated
:
_fltmodeCh
.
value
=
index
}
...
...
@@ -112,7 +115,7 @@ QGCView {
QGCLabel
{
anchors.baseline
:
modeCombo
.
baseline
text
:
"
Flight Mode
"
+
index
+
"
:
"
text
:
qsTr
(
"
Flight Mode
"
)
+
index
+
"
:
"
color
:
controller
.
activeFlightMode
==
index
?
"
yellow
"
:
qgcPal
.
text
}
...
...
@@ -137,7 +140,7 @@ QGCView {
anchors.leftMargin
:
_margins
anchors.top
:
parent
.
top
anchors.left
:
flightModeSettings
.
right
text
:
"
Channel Options
"
text
:
qsTr
(
"
Channel Options
"
)
font.weight
:
Font
.
DemiBold
visible
:
_channelOptionCount
!=
0
}
...
...
@@ -170,7 +173,7 @@ QGCView {
QGCLabel
{
anchors.baseline
:
optCombo
.
baseline
text
:
"
Channel option
"
+
index
+
"
:
"
text
:
qsTr
(
"
Channel option %1 :
"
).
arg
(
index
)
color
:
controller
.
channelOptionEnabled
[
modelData
]
?
"
yellow
"
:
qgcPal
.
text
}
...
...
src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml
View file @
3ae7cbb2
...
...
@@ -26,32 +26,32 @@ FactPanel {
anchors.margins
:
8
VehicleSummaryRow
{
labelText
:
"
Flight Mode 1:
"
labelText
:
qsTr
(
"
Flight Mode 1:
"
)
valueText
:
flightMode1
.
enumStringValue
}
VehicleSummaryRow
{
labelText
:
"
Flight Mode 2:
"
labelText
:
qsTr
(
"
Flight Mode 2:
"
)
valueText
:
flightMode2
.
enumStringValue
}
VehicleSummaryRow
{
labelText
:
"
Flight Mode 3:
"
labelText
:
qsTr
(
"
Flight Mode 3:
"
)
valueText
:
flightMode3
.
enumStringValue
}
VehicleSummaryRow
{
labelText
:
"
Flight Mode 4:
"
labelText
:
qsTr
(
"
Flight Mode 4:
"
)
valueText
:
flightMode4
.
enumStringValue
}
VehicleSummaryRow
{
labelText
:
"
Flight Mode 5:
"
labelText
:
qsTr
(
"
Flight Mode 5:
"
)
valueText
:
flightMode5
.
enumStringValue
}
VehicleSummaryRow
{
labelText
:
"
Flight Mode 6:
"
labelText
:
qsTr
(
"
Flight Mode 6:
"
)
valueText
:
flightMode6
.
enumStringValue
}
}
...
...
src/AutoPilotPlugins/APM/APMNotSupported.qml
View file @
3ae7cbb2
...
...
@@ -27,7 +27,7 @@ import QGroundControl.Controls 1.0
QGCLabel
{
anchors.fill
:
parent
text
:
"
Not supported
"
text
:
qsTr
(
"
Not supported
"
)
horizontalAlignment
:
Text
.
AlignHCenter
verticalAlignment
:
Text
.
AlignVCenter
}
src/AutoPilotPlugins/APM/APMPowerComponent.qml
View file @
3ae7cbb2
...
...
@@ -67,7 +67,7 @@ QGCView {
id
:
sensorModel
ListElement
{
text
:
"
Power Module 90A
"
text
:
qsTr
(
"
Power Module 90A
"
)
voltPin
:
2
currPin
:
3
voltMult
:
10.1
...
...
@@ -75,7 +75,7 @@ QGCView {
}
ListElement
{
text
:
"
Power Module HV
"
text
:
qsTr
(
"
Power Module HV
"
)
voltPin
:
2
currPin
:
3
voltMult
:
12.02
...
...
@@ -91,7 +91,7 @@ QGCView {
}
ListElement
{
text
:
"
Other
"
text
:
qsTr
(
"
Other
"
)
}
}
...
...
@@ -110,7 +110,7 @@ QGCView {
anchors.margins
:
_margins
anchors.left
:
parent
.
left
anchors.baseline
:
monitorCombo
.
baseline
text
:
"
Battery monitor:
"
text
:
qsTr
(
"
Battery monitor:
"
)
}
FactComboBox
{
...
...
@@ -128,7 +128,7 @@ QGCView {
anchors.margins
:
_margins
anchors.left
:
parent
.
left
anchors.baseline
:
capacityField
.
baseline
text
:
"
Battery capacity:
"
text
:
qsTr
(
"
Battery capacity:
"
)
}
FactTextField
{
...
...
@@ -146,7 +146,7 @@ QGCView {
anchors.margins
:
_margins
anchors.left
:
parent
.
left
anchors.baseline
:
sensorCombo
.
baseline
text
:
"
Power sensor:
"
text
:
qsTr
(
"
Power sensor:
"
)
}
QGCComboBox
{
...
...
@@ -174,7 +174,7 @@ QGCView {
anchors.margins
:
_margins
anchors.left
:
parent
.
left
anchors.baseline
:
currPinCombo
.
baseline
text
:
"
Current pin:
"
text
:
qsTr
(
"
Current pin:
"
)
visible
:
_showAdvanced
}
...
...
@@ -194,7 +194,7 @@ QGCView {
anchors.margins
:
_margins
anchors.left
:
parent
.
left
anchors.baseline
:
voltPinCombo
.
baseline
text
:
"
Voltage pin:
"
text
:
qsTr
(
"
Voltage pin:
"
)
visible
:
_showAdvanced
}
...
...
@@ -214,7 +214,7 @@ QGCView {
anchors.margins
:
_margins
anchors.left
:
parent
.
left
anchors.baseline
:
voltMultField
.
baseline
text
:
"
Voltage multiplier:
"
text
:
qsTr
(
"
Voltage multiplier:
"
)
visible
:
_showAdvanced
}
...
...
@@ -233,7 +233,7 @@ QGCView {
anchors.margins
:
_margins
anchors.left
:
parent
.
left
anchors.baseline
:
ampPerVoltField
.
baseline
text
:
"
Amps per volt:
"
text
:
qsTr
(
"
Amps per volt:
"
)
visible
:
_showAdvanced
}
...
...
src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml
View file @
3ae7cbb2
...
...
@@ -45,12 +45,12 @@ FactPanel {
anchors.margins
:
8
VehicleSummaryRow
{
labelText
:
"
Battery monitor:
"
labelText
:
qsTr
(
"
Battery monitor:
"
)
valueText
:
battMonitor
.
enumStringValue
}
VehicleSummaryRow
{
labelText
:
"
Battery capacity:
"
labelText
:
qsTr
(
"
Battery capacity:
"
)
valueText
:
battCapacity
.
valueString
}
}
...
...
src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml
View file @
3ae7cbb2
...
...
@@ -24,23 +24,23 @@ FactPanel {
anchors.margins
:
8
VehicleSummaryRow
{
labelText
:
"
Roll:
"
valueText
:
mapRollFact
.
value
==
0
?
"
Setup required
"
:
"
Channel
"
+
mapRollFact
.
valueString
labelText
:
qsTr
(
"
Roll:
"
)
valueText
:
mapRollFact
.
value
==
0
?
qsTr
(
"
Setup required
"
)
:
qsTr
(
"
Channel %1
"
).
arg
(
mapRollFact
.
valueString
)
}
VehicleSummaryRow
{
labelText
:
"
Pitch:
"
valueText
:
mapPitchFact
.
value
==
0
?
"
Setup required
"
:
"
Channel
"
+
mapPitchFact
.
valueString
labelText
:
qsTr
(
"
Pitch:
"
)
valueText
:
mapPitchFact
.
value
==
0
?
qsTr
(
"
Setup required
"
)
:
qsTr
(
"
Channel %1
"
).
arg
(
mapPitchFact
.
valueString
)
}
VehicleSummaryRow
{
labelText
:
"
Yaw:
"
valueText
:
mapYawFact
.
value
==
0
?
"
Setup required
"
:
"
Channel
"
+
mapYawFact
.
valueString
labelText
:
qsTr
(
"
Yaw:
"
)
valueText
:
mapYawFact
.
value
==
0
?
qsTr
(
"
Setup required
"
)
:
qsTr
(
"
Channel %1
"
).
arg
(
mapYawFact
.
valueString
)
}
VehicleSummaryRow
{
labelText
:
"
Throttle:
"
valueText
:
mapThrottleFact
.
value
==
0
?
"
Setup required
"
:
"
Channel
"
+
mapThrottleFact
.
valueString
labelText
:
qsTr
(
"
Throttle:
"
)
valueText
:
mapThrottleFact
.
value
==
0
?
qsTr
(
"
Setup required
"
)
:
qsTr
(
"
Channel %1
"
).
arg
(
mapThrottleFact
.
valueString
)
}
}
}
src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml
View file @
3ae7cbb2
This diff is collapsed.
Click to expand it.
src/AutoPilotPlugins/APM/APMSafetyComponentPlane.qml
View file @
3ae7cbb2
...
...
@@ -64,7 +64,7 @@ QGCView {
QGCLabel
{
id
:
failsafeTriggersLabel
text
:
"
Failsafe Triggers
"
text
:
qsTr
(
"
Failsafe Triggers
"
)
font.weight
:
Font
.
DemiBold
}
...
...
@@ -83,7 +83,7 @@ QGCView {
anchors.margins
:
_margins
anchors.left
:
parent
.
left
anchors.baseline
:
throttlePWMField
.
baseline
text
:
"
Throttle PWM threshold:
"
text
:
qsTr
(
"
Throttle PWM threshold:
"
)
checked
:
_failsafeThrEnable
.
value
==
1
onClicked
:
_failsafeThrEnable
.
value
=
(
checked
?
1
:
0
)
...
...
@@ -104,7 +104,7 @@ QGCView {
anchors.margins
:
_margins
anchors.left
:
parent
.
left
anchors.baseline
:
voltageField
.
baseline
text
:
"
Voltage threshold:
"
text
:
qsTr
(
"
Voltage threshold:
"
)
checked
:
_failsafeBattVoltage
.
value
!=
0
onClicked
:
_failsafeBattVoltage
.
value
=
checked
?
10.5
:
0
...
...
@@ -125,7 +125,7 @@ QGCView {
anchors.margins
:
_margins
anchors.left
:
parent
.
left
anchors.baseline
:
mahField
.
baseline
text
:
"
MAH threshold:
"
text
:
qsTr
(
"
MAH threshold:
"
)
checked
:
_failsafeBattMah
.
value
!=
0
onClicked
:
_failsafeBattMah
.
value
=
checked
?
600
:
0
...
...
@@ -146,7 +146,7 @@ QGCView {
anchors.margins
:
_margins
anchors.left
:
parent
.
left
anchors.top
:
mahField
.
bottom
text
:
"
GCS failsafe
"
text
:
qsTr
(
"
GCS failsafe
"
)
checked
:
_failsafeGCSEnable
.
value
!=
0
onClicked
:
_failsafeGCSEnable
.
value
=
checked
?
1
:
0
...
...
@@ -157,7 +157,7 @@ QGCView {
id
:
rtlLabel
anchors.leftMargin
:
_margins
anchors.left
:
failsafeTriggerSettings
.
right
text
:
"
Return to Launch
"
text
:
qsTr
(
"
Return to Launch
"
)
font.weight
:
Font
.
DemiBold
}
...
...
@@ -175,7 +175,7 @@ QGCView {
anchors.margins
:
_margins
anchors.left
:
parent
.
left
anchors.top
:
parent
.
top
text
:
"
Return at current altitude
"
text
:
qsTr
(
"
Return at current altitude
"
)
checked
:
_rtlAltFact
.
value
<
0
exclusiveGroup
:
returnAltRadioGroup
...
...
@@ -187,7 +187,7 @@ QGCView {
anchors.topMargin
:
_margins
/
2
anchors.left
:
returnAtCurrentRadio
.
left
anchors.top
:
returnAtCurrentRadio
.
bottom
text
:
"
Return at specified altitude:
"
text
:
qsTr
(
"
Return at specified altitude:
"
)
exclusiveGroup
:
returnAltRadioGroup
checked
:
_rtlAltFact
.
value
>=
0
...
...
src/AutoPilotPlugins/APM/APMSafetyComponentRover.qml
View file @
3ae7cbb2
...
...
@@ -27,7 +27,7 @@ import QGroundControl.Controls 1.0
QGCLabel
{
anchors.fill
:
parent
text
:
"
Not supported
"
text
:
qsTr
(
"
Not supported
"
)
horizontalAlignment
:
Text
.
AlignHCenter
verticalAlignment
:
Text
.
AlignVCenter
}
src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml
View file @
3ae7cbb2
...
...
@@ -51,35 +51,35 @@ FactPanel {
function
setFailsafeThrEnableText
()
{
switch
(
_failsafeThrEnable
.
value
)
{
case
0
:
_failsafeThrEnableText
=
"
Disabled
"
_failsafeThrEnableText
=
qsTr
(
"
Disabled
"
)
break
case
1
:
_failsafeThrEnableText
=
"
Always RTL
"
_failsafeThrEnableText
=
qsTr
(
"
Always RTL
"
)
break
case
2
:
_failsafeThrEnableText
=
"
Continue with Mission in Auto Mode
"
_failsafeThrEnableText
=
qsTr
(
"
Continue with Mission in Auto Mode
"
)
break
case
3
:
_failsafeThrEnableText
=
"
Always Land
"
_failsafeThrEnableText
=
qsTr
(
"
Always Land
"
)
break
default
:
_failsafeThrEnableText
=
"
Unknown
"
_failsafeThrEnableText
=
qsTr
(
"
Unknown
"
)
}
}
function
setFailsafeBattEnableText
()
{
switch
(
_failsafeBattEnable
.
value
)
{
case
0
:
_failsafeBattEnableText
=
"
Disabled
"
_failsafeBattEnableText
=
qsTr
(
"
Disabled
"
)
break
case
1
:
_failsafeBattEnableText
=
"
Land
"
_failsafeBattEnableText
=
qsTr
(
"
Land
"
)
break
case
2
:
_failsafeBattEnableText
=
"
Return to Launch
"
_failsafeBattEnableText
=
qsTr
(
"
Return to Launch
"
)
break
default
:
_failsafeThrEnableText
=
"
Unknown
"
_failsafeThrEnableText
=
qsTr
(
"
Unknown
"
)
}
}
...
...
@@ -88,54 +88,54 @@ FactPanel {
anchors.margins
:
8
VehicleSummaryRow
{
labelText
:
"
Arming Checks:
"
valueText
:
_armingCheck
.
value
&
1
?
"
Enabled
"
:
"
Some disabled
"
labelText
:
qsTr
(
"
Arming Checks:
"
)
valueText
:
_armingCheck
.
value
&
1
?
qsTr
(
"
Enabled
"
)
:
qsTr
(
"
Some disabled
"
)
}
VehicleSummaryRow
{
labelText
:
"
Throttle failsafe:
"
labelText
:
qsTr
(
"
Throttle failsafe:
"
)
valueText
:
_failsafeThrEnableText
}
VehicleSummaryRow
{
labelText
:
"
Battery failsafe:
"
labelText
:
qsTr
(
"
Battery failsafe:
"
)
valueText
:
_failsafeBattEnableText
}
VehicleSummaryRow
{
labelText
:
"
GeoFence:
"
labelText
:
qsTr
(
"
GeoFence:
"
)
valueText
:
_fenceEnable
.
value
==
0
||
_fenceType
==
0
?
"
Disabled
"
:
qsTr
(
"
Disabled
"
)
:
(
_fenceType
.
value
==
1
?
"
Altitude
"
:
(
_fenceType
.
value
==
2
?
"
Circle
"
:
"
Altitude,Circle
"
))
qsTr
(
"
Altitude
"
)
:
(
_fenceType
.
value
==
2
?
qsTr
(
"
Circle
"
)
:
qsTr
(
"
Altitude,Circle
"
)
))
}
VehicleSummaryRow
{
labelText
:
"
GeoFence:
"
labelText
:
qsTr
(
"
GeoFence:
"
)
valueText
:
_fenceAction
.
value
==
0
?
"
Report only
"
:
(
_fenceAction
.
value
==
1
?
"
RTL or Land
"
:
"
Unknown
"
)
qsTr
(
"
Report only
"
)
: