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
871397bd
Commit
871397bd
authored
Apr 04, 2016
by
Tomaz Canabrava
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Finish the qsTrlization of the qml components.
Signed-off-by:
Tomaz Canabrava
<
tomaz.canabrava@intel.com
>
parent
c8caf6f6
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
19 additions
and
19 deletions
+19
-19
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
No files found.
src/VehicleSetup/PX4FlowSensor.qml
View file @
871397bd
...
@@ -48,7 +48,7 @@ QGCView {
...
@@ -48,7 +48,7 @@ QGCView {
QGCLabel
{
QGCLabel
{
id
:
titleLabel
id
:
titleLabel
text
:
"
PX4Flow Camera
"
text
:
qsTr
(
"
PX4Flow Camera
"
)
font.weight
:
Font
.
DemiBold
font.weight
:
Font
.
DemiBold
}
}
...
...
src/VehicleSetup/SetupView.qml
View file @
871397bd
...
@@ -47,7 +47,7 @@ Rectangle {
...
@@ -47,7 +47,7 @@ Rectangle {
readonly
property
real
_defaultTextWidth
:
ScreenTools
.
defaultFontPixelWidth
readonly
property
real
_defaultTextWidth
:
ScreenTools
.
defaultFontPixelWidth
readonly
property
real
_margin
:
Math
.
round
(
_defaultTextHeight
/
2
)
readonly
property
real
_margin
:
Math
.
round
(
_defaultTextHeight
/
2
)
readonly
property
real
_buttonWidth
:
Math
.
round
(
_defaultTextWidth
*
18
)
readonly
property
real
_buttonWidth
:
Math
.
round
(
_defaultTextWidth
*
18
)
readonly
property
string
_armedVehicleText
:
"
This operation cannot be performed while vehicle is armed.
"
readonly
property
string
_armedVehicleText
:
qsTr
(
"
This operation cannot be performed while vehicle is armed.
"
)
property
string
_messagePanelText
:
"
missing message panel text
"
property
string
_messagePanelText
:
"
missing message panel text
"
property
bool
_fullParameterVehicleAvailable
:
QGroundControl
.
multiVehicleManager
.
parameterReadyVehicleAvailable
&&
!
QGroundControl
.
multiVehicleManager
.
activeVehicle
.
missingParameters
property
bool
_fullParameterVehicleAvailable
:
QGroundControl
.
multiVehicleManager
.
parameterReadyVehicleAvailable
&&
!
QGroundControl
.
multiVehicleManager
.
activeVehicle
.
missingParameters
...
...
src/VehicleSetup/VehicleSummary.qml
View file @
871397bd
...
@@ -94,8 +94,8 @@ Rectangle {
...
@@ -94,8 +94,8 @@ Rectangle {
color
:
setupComplete
?
qgcPal
.
text
:
qgcPal
.
warningText
color
:
setupComplete
?
qgcPal
.
text
:
qgcPal
.
warningText
font.weight
:
Font
.
DemiBold
font.weight
:
Font
.
DemiBold
text
:
setupComplete
?
text
:
setupComplete
?
"
Below you will find a summary of the settings for your vehicle. To the left are the setup menus for each component.
"
:
qsTr
(
"
Below you will find a summary of the settings for your vehicle. To the left are the setup menus for each component.
"
)
:
"
WARNING: Your vehicle requires setup prior to flight. Please resolve the items marked in red using the menu on the left.
"
qsTr
(
"
WARNING: Your vehicle requires setup prior to flight. Please resolve the items marked in red using the menu on the left.
"
)
property
bool
setupComplete
:
QGroundControl
.
multiVehicleManager
.
activeVehicle
?
QGroundControl
.
multiVehicleManager
.
activeVehicle
.
autopilot
.
setupComplete
:
false
property
bool
setupComplete
:
QGroundControl
.
multiVehicleManager
.
activeVehicle
?
QGroundControl
.
multiVehicleManager
.
activeVehicle
.
autopilot
.
setupComplete
:
false
}
}
...
...
src/ViewWidgets/CustomCommandWidget.qml
View file @
871397bd
...
@@ -96,12 +96,12 @@ QGCView {
...
@@ -96,12 +96,12 @@ QGCView {
anchors.bottom
:
parent
.
bottom
anchors.bottom
:
parent
.
bottom
anchors.horizontalCenter
:
parent
.
horizontalCenter
anchors.horizontalCenter
:
parent
.
horizontalCenter
QGCButton
{
QGCButton
{
text
:
"
Load Custom Qml file...
"
text
:
qsTr
(
"
Load Custom Qml file...
"
)
width
:
ScreenTools
.
defaultFontPixelWidth
*
22
width
:
ScreenTools
.
defaultFontPixelWidth
*
22
onClicked
:
controller
.
selectQmlFile
()
onClicked
:
controller
.
selectQmlFile
()
}
}
QGCButton
{
QGCButton
{
text
:
"
Reset
"
text
:
qsTr
(
"
Reset
"
)
width
:
ScreenTools
.
defaultFontPixelWidth
*
22
width
:
ScreenTools
.
defaultFontPixelWidth
*
22
onClicked
:
{
onClicked
:
{
controller
.
clearQmlFile
()
controller
.
clearQmlFile
()
...
...
src/ViewWidgets/LogDownload.qml
View file @
871397bd
...
@@ -67,7 +67,7 @@ QGCView {
...
@@ -67,7 +67,7 @@ QGCView {
selectionMode
:
SelectionMode
.
MultiSelection
selectionMode
:
SelectionMode
.
MultiSelection
TableViewColumn
{
TableViewColumn
{
title
:
"
Id
"
title
:
qsTr
(
"
Id
"
)
width
:
ScreenTools
.
defaultFontPixelWidth
*
6
width
:
ScreenTools
.
defaultFontPixelWidth
*
6
horizontalAlignment
:
Text
.
AlignHCenter
horizontalAlignment
:
Text
.
AlignHCenter
delegate
:
Text
{
delegate
:
Text
{
...
@@ -80,7 +80,7 @@ QGCView {
...
@@ -80,7 +80,7 @@ QGCView {
}
}
TableViewColumn
{
TableViewColumn
{
title
:
"
Date
"
title
:
qsTr
(
"
Date
"
)
width
:
ScreenTools
.
defaultFontPixelWidth
*
34
width
:
ScreenTools
.
defaultFontPixelWidth
*
34
horizontalAlignment
:
Text
.
AlignHCenter
horizontalAlignment
:
Text
.
AlignHCenter
delegate
:
Text
{
delegate
:
Text
{
...
@@ -91,7 +91,7 @@ QGCView {
...
@@ -91,7 +91,7 @@ QGCView {
if
(
controller
.
model
.
get
(
styleData
.
row
).
received
)
{
if
(
controller
.
model
.
get
(
styleData
.
row
).
received
)
{
var
d
=
controller
.
model
.
get
(
styleData
.
row
).
time
var
d
=
controller
.
model
.
get
(
styleData
.
row
).
time
if
(
d
.
getUTCFullYear
()
<
2010
)
if
(
d
.
getUTCFullYear
()
<
2010
)
return
"
Date Unknown
"
return
qsTr
(
"
Date Unknown
"
)
else
else
return
d
.
toLocaleString
()
return
d
.
toLocaleString
()
}
}
...
@@ -102,7 +102,7 @@ QGCView {
...
@@ -102,7 +102,7 @@ QGCView {
}
}
TableViewColumn
{
TableViewColumn
{
title
:
"
Size
"
title
:
qsTr
(
"
Size
"
)
width
:
ScreenTools
.
defaultFontPixelWidth
*
18
width
:
ScreenTools
.
defaultFontPixelWidth
*
18
horizontalAlignment
:
Text
.
AlignHCenter
horizontalAlignment
:
Text
.
AlignHCenter
delegate
:
Text
{
delegate
:
Text
{
...
@@ -115,7 +115,7 @@ QGCView {
...
@@ -115,7 +115,7 @@ QGCView {
}
}
TableViewColumn
{
TableViewColumn
{
title
:
"
Status
"
title
:
qsTr
(
"
Status
"
)
width
:
ScreenTools
.
defaultFontPixelWidth
*
22
width
:
ScreenTools
.
defaultFontPixelWidth
*
22
horizontalAlignment
:
Text
.
AlignHCenter
horizontalAlignment
:
Text
.
AlignHCenter
delegate
:
Text
{
delegate
:
Text
{
...
@@ -135,7 +135,7 @@ QGCView {
...
@@ -135,7 +135,7 @@ QGCView {
anchors.top
:
parent
.
top
anchors.top
:
parent
.
top
anchors.right
:
parent
.
right
anchors.right
:
parent
.
right
enabled
:
!
controller
.
requestingList
&&
!
controller
.
downloadingLogs
enabled
:
!
controller
.
requestingList
&&
!
controller
.
downloadingLogs
text
:
"
Refresh
"
text
:
qsTr
(
"
Refresh
"
)
onClicked
:
{
onClicked
:
{
controller
.
refresh
()
controller
.
refresh
()
}
}
...
@@ -147,7 +147,7 @@ QGCView {
...
@@ -147,7 +147,7 @@ QGCView {
anchors.top
:
refreshButton
.
bottom
anchors.top
:
refreshButton
.
bottom
anchors.right
:
parent
.
right
anchors.right
:
parent
.
right
enabled
:
!
controller
.
requestingList
&&
!
controller
.
downloadingLogs
&&
tableView
.
selection
.
count
>
0
enabled
:
!
controller
.
requestingList
&&
!
controller
.
downloadingLogs
&&
tableView
.
selection
.
count
>
0
text
:
"
Download
"
text
:
qsTr
(
"
Download
"
)
onClicked
:
{
onClicked
:
{
//-- Clear selection
//-- Clear selection
for
(
var
i
=
0
;
i
<
controller
.
model
.
count
;
i
++
)
{
for
(
var
i
=
0
;
i
<
controller
.
model
.
count
;
i
++
)
{
...
@@ -170,7 +170,7 @@ QGCView {
...
@@ -170,7 +170,7 @@ QGCView {
anchors.top
:
downloadButton
.
bottom
anchors.top
:
downloadButton
.
bottom
anchors.right
:
parent
.
right
anchors.right
:
parent
.
right
enabled
:
!
controller
.
requestingList
&&
!
controller
.
downloadingLogs
&&
controller
.
model
.
count
>
0
enabled
:
!
controller
.
requestingList
&&
!
controller
.
downloadingLogs
&&
controller
.
model
.
count
>
0
text
:
"
Erase All
"
text
:
qsTr
(
"
Erase All
"
)
onClicked
:
{
onClicked
:
{
eraseAllDialog
.
visible
=
true
eraseAllDialog
.
visible
=
true
}
}
...
@@ -179,8 +179,8 @@ QGCView {
...
@@ -179,8 +179,8 @@ QGCView {
visible
:
false
visible
:
false
icon
:
StandardIcon
.
Warning
icon
:
StandardIcon
.
Warning
standardButtons
:
StandardButton
.
Yes
|
StandardButton
.
No
standardButtons
:
StandardButton
.
Yes
|
StandardButton
.
No
title
:
"
Delete All Log Files
"
title
:
qsTr
(
"
Delete All Log Files
"
)
text
:
"
All log files will be erased permanently. Is this really what you want?
"
text
:
qsTr
(
"
All log files will be erased permanently. Is this really what you want?
"
)
onYes
:
{
onYes
:
{
controller
.
eraseAll
()
controller
.
eraseAll
()
eraseAllDialog
.
visible
=
false
eraseAllDialog
.
visible
=
false
...
@@ -196,7 +196,7 @@ QGCView {
...
@@ -196,7 +196,7 @@ QGCView {
anchors.margins
:
_margins
anchors.margins
:
_margins
anchors.top
:
eraseAllButton
.
bottom
anchors.top
:
eraseAllButton
.
bottom
anchors.right
:
parent
.
right
anchors.right
:
parent
.
right
text
:
"
Cancel
"
text
:
qsTr
(
"
Cancel
"
)
enabled
:
controller
.
requestingList
||
controller
.
downloadingLogs
enabled
:
controller
.
requestingList
||
controller
.
downloadingLogs
onClicked
:
{
onClicked
:
{
controller
.
cancel
()
controller
.
cancel
()
...
...
src/ViewWidgets/ViewWidget.qml
View file @
871397bd
...
@@ -56,7 +56,7 @@ Rectangle {
...
@@ -56,7 +56,7 @@ Rectangle {
horizontalAlignment
:
Text
.
AlignHCenter
horizontalAlignment
:
Text
.
AlignHCenter
verticalAlignment
:
Text
.
AlignVCenter
verticalAlignment
:
Text
.
AlignVCenter
text
:
"
missing connected implementation
"
text
:
qsTr
(
"
missing connected implementation
"
)
}
}
}
}
}
}
...
@@ -76,7 +76,7 @@ Rectangle {
...
@@ -76,7 +76,7 @@ Rectangle {
horizontalAlignment
:
Text
.
AlignHCenter
horizontalAlignment
:
Text
.
AlignHCenter
verticalAlignment
:
Text
.
AlignVCenter
verticalAlignment
:
Text
.
AlignVCenter
text
:
"
no vehicle connected
"
text
:
qsTr
(
"
no vehicle connected
"
)
}
}
}
}
}
}
...
...
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