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
5f005e57
Commit
5f005e57
authored
Mar 24, 2016
by
Tomaz Canabrava
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
More qsTr aditions
Signed-off-by:
Tomaz Canabrava
<
tomaz.canabrava@intel.com
>
parent
60a6a31f
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
97 additions
and
97 deletions
+97
-97
MainWindowInner.qml
src/ui/MainWindowInner.qml
+5
-5
MainWindowLeftPanel.qml
src/ui/MainWindowLeftPanel.qml
+7
-7
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
+12
-12
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
No files found.
src/ui/MainWindowInner.qml
View file @
5f005e57
...
@@ -124,8 +124,8 @@ Item {
...
@@ -124,8 +124,8 @@ Item {
MessageDialog
{
MessageDialog
{
id
:
unsavedMissionCloseDialog
id
:
unsavedMissionCloseDialog
title
:
"
QGroundControl close
"
title
:
qsTr
(
"
QGroundControl close
"
)
text
:
"
You have a mission edit in progress which has not been saved/sent. If you close you will lose changes. Are you sure you want to close?
"
text
:
qsTr
(
"
You have a mission edit in progress which has not been saved/sent. If you close you will lose changes. Are you sure you want to close?
"
)
standardButtons
:
StandardButton
.
Yes
|
StandardButton
.
No
standardButtons
:
StandardButton
.
Yes
|
StandardButton
.
No
modality
:
Qt
.
ApplicationModal
modality
:
Qt
.
ApplicationModal
visible
:
false
visible
:
false
...
@@ -143,8 +143,8 @@ Item {
...
@@ -143,8 +143,8 @@ Item {
MessageDialog
{
MessageDialog
{
id
:
activeConnectionsCloseDialog
id
:
activeConnectionsCloseDialog
title
:
"
QGroundControl close
"
title
:
qsTr
(
"
QGroundControl close
"
)
text
:
"
There are still active connections to vehicles. Do you want to disconnect these before closing?
"
text
:
qsTr
(
"
There are still active connections to vehicles. Do you want to disconnect these before closing?
"
)
standardButtons
:
StandardButton
.
Yes
|
StandardButton
.
Cancel
standardButtons
:
StandardButton
.
Yes
|
StandardButton
.
Cancel
modality
:
Qt
.
ApplicationModal
modality
:
Qt
.
ApplicationModal
visible
:
false
visible
:
false
...
@@ -238,7 +238,7 @@ Item {
...
@@ -238,7 +238,7 @@ Item {
messageFlick
.
flick
(
0
,
-
5000
)
messageFlick
.
flick
(
0
,
-
5000
)
activeVehicle
.
resetMessages
()
activeVehicle
.
resetMessages
()
}
else
{
}
else
{
messageText
.
text
=
"
No Messages
"
messageText
.
text
=
qsTr
(
"
No Messages
"
)
}
}
currentPopUp
=
messageArea
currentPopUp
=
messageArea
messageArea
.
visible
=
true
messageArea
.
visible
=
true
...
...
src/ui/MainWindowLeftPanel.qml
View file @
5f005e57
...
@@ -158,14 +158,14 @@ Item {
...
@@ -158,14 +158,14 @@ Item {
spacing
:
ScreenTools
.
defaultFontPixelHeight
spacing
:
ScreenTools
.
defaultFontPixelHeight
QGCLabel
{
QGCLabel
{
text
:
"
Preferences
"
text
:
qsTr
(
"
Preferences
"
)
anchors.horizontalCenter
:
parent
.
horizontalCenter
anchors.horizontalCenter
:
parent
.
horizontalCenter
}
}
QGCButton
{
QGCButton
{
anchors.left
:
parent
.
left
anchors.left
:
parent
.
left
anchors.right
:
parent
.
right
anchors.right
:
parent
.
right
text
:
"
General
"
text
:
qsTr
(
"
General
"
)
exclusiveGroup
:
panelActionGroup
exclusiveGroup
:
panelActionGroup
onClicked
:
{
onClicked
:
{
if
(
__rightPanel
.
source
!=
"
GeneralSettings.qml
"
)
{
if
(
__rightPanel
.
source
!=
"
GeneralSettings.qml
"
)
{
...
@@ -178,7 +178,7 @@ Item {
...
@@ -178,7 +178,7 @@ Item {
QGCButton
{
QGCButton
{
anchors.left
:
parent
.
left
anchors.left
:
parent
.
left
anchors.right
:
parent
.
right
anchors.right
:
parent
.
right
text
:
"
Comm Links
"
text
:
qsTr
(
"
Comm Links
"
)
exclusiveGroup
:
panelActionGroup
exclusiveGroup
:
panelActionGroup
onClicked
:
{
onClicked
:
{
if
(
__rightPanel
.
source
!=
"
LinkSettings.qml
"
)
{
if
(
__rightPanel
.
source
!=
"
LinkSettings.qml
"
)
{
...
@@ -191,7 +191,7 @@ Item {
...
@@ -191,7 +191,7 @@ Item {
QGCButton
{
QGCButton
{
anchors.left
:
parent
.
left
anchors.left
:
parent
.
left
anchors.right
:
parent
.
right
anchors.right
:
parent
.
right
text
:
"
Offline Maps
"
text
:
qsTr
(
"
Offline Maps
"
)
exclusiveGroup
:
panelActionGroup
exclusiveGroup
:
panelActionGroup
onClicked
:
{
onClicked
:
{
if
(
__rightPanel
.
source
!=
"
OfflineMap.qml
"
)
{
if
(
__rightPanel
.
source
!=
"
OfflineMap.qml
"
)
{
...
@@ -204,7 +204,7 @@ Item {
...
@@ -204,7 +204,7 @@ Item {
QGCButton
{
QGCButton
{
anchors.left
:
parent
.
left
anchors.left
:
parent
.
left
anchors.right
:
parent
.
right
anchors.right
:
parent
.
right
text
:
"
MavLink
"
text
:
qsTr
(
"
MavLink
"
)
exclusiveGroup
:
panelActionGroup
exclusiveGroup
:
panelActionGroup
onClicked
:
{
onClicked
:
{
if
(
__rightPanel
.
source
!=
"
MavlinkSettings.qml
"
)
{
if
(
__rightPanel
.
source
!=
"
MavlinkSettings.qml
"
)
{
...
@@ -230,7 +230,7 @@ Item {
...
@@ -230,7 +230,7 @@ Item {
QGCButton
{
QGCButton
{
anchors.left
:
parent
.
left
anchors.left
:
parent
.
left
anchors.right
:
parent
.
right
anchors.right
:
parent
.
right
text
:
"
Mock Link
"
text
:
qsTr
(
"
Mock Link
"
)
visible
:
ScreenTools
.
isDebug
visible
:
ScreenTools
.
isDebug
exclusiveGroup
:
panelActionGroup
exclusiveGroup
:
panelActionGroup
onClicked
:
{
onClicked
:
{
...
@@ -244,7 +244,7 @@ Item {
...
@@ -244,7 +244,7 @@ Item {
QGCButton
{
QGCButton
{
anchors.left
:
parent
.
left
anchors.left
:
parent
.
left
anchors.right
:
parent
.
right
anchors.right
:
parent
.
right
text
:
"
Debug
"
text
:
qsTr
(
"
Debug
"
)
visible
:
ScreenTools
.
isDebug
visible
:
ScreenTools
.
isDebug
exclusiveGroup
:
panelActionGroup
exclusiveGroup
:
panelActionGroup
onClicked
:
{
onClicked
:
{
...
...
src/ui/preferences/BluetoothSettings.qml
View file @
5f005e57
...
@@ -40,7 +40,7 @@ Item {
...
@@ -40,7 +40,7 @@ Item {
}
}
QGCLabel
{
QGCLabel
{
text
:
"
Bluetooth Not Available
"
text
:
qsTr
(
"
Bluetooth Not Available
"
)
visible
:
!
QGroundControl
.
linkManager
.
isBluetoothAvailable
visible
:
!
QGroundControl
.
linkManager
.
isBluetoothAvailable
anchors.centerIn
:
parent
anchors.centerIn
:
parent
}
}
...
@@ -59,7 +59,7 @@ Item {
...
@@ -59,7 +59,7 @@ Item {
QGCLabel
{
QGCLabel
{
id
:
btLabel
id
:
btLabel
text
:
"
Bluetooth Link Settings
"
text
:
qsTr
(
"
Bluetooth Link Settings
"
)
}
}
Rectangle
{
Rectangle
{
height
:
1
height
:
1
...
@@ -73,7 +73,7 @@ Item {
...
@@ -73,7 +73,7 @@ Item {
Row
{
Row
{
spacing
:
ScreenTools
.
defaultFontPixelWidth
spacing
:
ScreenTools
.
defaultFontPixelWidth
QGCLabel
{
QGCLabel
{
text
:
"
Device:
"
text
:
qsTr
(
"
Device:
"
)
width
:
_firstColumn
width
:
_firstColumn
}
}
QGCLabel
{
QGCLabel
{
...
@@ -85,7 +85,7 @@ Item {
...
@@ -85,7 +85,7 @@ Item {
visible
:
!
ScreenTools
.
isiOS
visible
:
!
ScreenTools
.
isiOS
spacing
:
ScreenTools
.
defaultFontPixelWidth
spacing
:
ScreenTools
.
defaultFontPixelWidth
QGCLabel
{
QGCLabel
{
text
:
"
Address:
"
text
:
qsTr
(
"
Address:
"
)
width
:
_firstColumn
width
:
_firstColumn
}
}
QGCLabel
{
QGCLabel
{
...
@@ -98,7 +98,7 @@ Item {
...
@@ -98,7 +98,7 @@ Item {
width
:
parent
.
width
width
:
parent
.
width
}
}
QGCLabel
{
QGCLabel
{
text
:
"
Bluetooth Devices:
"
text
:
qsTr
(
"
Bluetooth Devices:
"
)
}
}
Item
{
Item
{
width
:
hostRow
.
width
width
:
hostRow
.
width
...
@@ -152,7 +152,7 @@ Item {
...
@@ -152,7 +152,7 @@ Item {
anchors.horizontalCenter
:
parent
.
horizontalCenter
anchors.horizontalCenter
:
parent
.
horizontalCenter
QGCButton
{
QGCButton
{
width
:
ScreenTools
.
defaultFontPixelWidth
*
10
width
:
ScreenTools
.
defaultFontPixelWidth
*
10
text
:
"
Scan
"
text
:
qsTr
(
"
Scan
"
)
enabled
:
subEditConfig
&&
subEditConfig
.
linkType
===
LinkConfiguration
.
TypeBluetooth
&&
!
subEditConfig
.
scanning
enabled
:
subEditConfig
&&
subEditConfig
.
linkType
===
LinkConfiguration
.
TypeBluetooth
&&
!
subEditConfig
.
scanning
onClicked
:
{
onClicked
:
{
if
(
subEditConfig
)
if
(
subEditConfig
)
...
@@ -161,7 +161,7 @@ Item {
...
@@ -161,7 +161,7 @@ Item {
}
}
QGCButton
{
QGCButton
{
width
:
ScreenTools
.
defaultFontPixelWidth
*
10
width
:
ScreenTools
.
defaultFontPixelWidth
*
10
text
:
"
Stop
"
text
:
qsTr
(
"
Stop
"
)
enabled
:
subEditConfig
&&
subEditConfig
.
linkType
===
LinkConfiguration
.
TypeBluetooth
&&
subEditConfig
.
scanning
enabled
:
subEditConfig
&&
subEditConfig
.
linkType
===
LinkConfiguration
.
TypeBluetooth
&&
subEditConfig
.
scanning
onClicked
:
{
onClicked
:
{
if
(
subEditConfig
)
if
(
subEditConfig
)
...
...
src/ui/preferences/DebugWindow.qml
View file @
5f005e57
...
@@ -55,7 +55,7 @@ QGCView {
...
@@ -55,7 +55,7 @@ QGCView {
anchors.left
:
parent
.
left
anchors.left
:
parent
.
left
columns
:
2
columns
:
2
Text
{
Text
{
text
:
"
Qt Platform:
"
text
:
qsTr
(
"
Qt Platform:
"
)
color
:
qgcPal
.
text
color
:
qgcPal
.
text
}
}
Text
{
Text
{
...
@@ -63,7 +63,7 @@ QGCView {
...
@@ -63,7 +63,7 @@ QGCView {
color
:
qgcPal
.
text
color
:
qgcPal
.
text
}
}
Text
{
Text
{
text
:
"
Default font width:
"
text
:
qsTr
(
"
Default font width:
"
)
color
:
qgcPal
.
text
color
:
qgcPal
.
text
}
}
Text
{
Text
{
...
@@ -71,7 +71,7 @@ QGCView {
...
@@ -71,7 +71,7 @@ QGCView {
color
:
qgcPal
.
text
color
:
qgcPal
.
text
}
}
Text
{
Text
{
text
:
"
Default font height:
"
text
:
qsTr
(
"
Default font height:
"
)
color
:
qgcPal
.
text
color
:
qgcPal
.
text
}
}
Text
{
Text
{
...
@@ -79,7 +79,7 @@ QGCView {
...
@@ -79,7 +79,7 @@ QGCView {
color
:
qgcPal
.
text
color
:
qgcPal
.
text
}
}
Text
{
Text
{
text
:
"
Default font pixel size:
"
text
:
qsTr
(
"
Default font pixel size:
"
)
color
:
qgcPal
.
text
color
:
qgcPal
.
text
}
}
Text
{
Text
{
...
@@ -87,7 +87,7 @@ QGCView {
...
@@ -87,7 +87,7 @@ QGCView {
color
:
qgcPal
.
text
color
:
qgcPal
.
text
}
}
Text
{
Text
{
text
:
"
Default font point size:
"
text
:
qsTr
(
"
Default font point size:
"
)
color
:
qgcPal
.
text
color
:
qgcPal
.
text
}
}
Text
{
Text
{
...
@@ -95,7 +95,7 @@ QGCView {
...
@@ -95,7 +95,7 @@ QGCView {
color
:
qgcPal
.
text
color
:
qgcPal
.
text
}
}
Text
{
Text
{
text
:
"
QML Screen Desktop:
"
text
:
qsTr
(
"
QML Screen Desktop:
"
)
color
:
qgcPal
.
text
color
:
qgcPal
.
text
}
}
Text
{
Text
{
...
@@ -103,7 +103,7 @@ QGCView {
...
@@ -103,7 +103,7 @@ QGCView {
color
:
qgcPal
.
text
color
:
qgcPal
.
text
}
}
Text
{
Text
{
text
:
"
QML Screen Size:
"
text
:
qsTr
(
"
QML Screen Size:
"
)
color
:
qgcPal
.
text
color
:
qgcPal
.
text
}
}
Text
{
Text
{
...
@@ -111,7 +111,7 @@ QGCView {
...
@@ -111,7 +111,7 @@ QGCView {
color
:
qgcPal
.
text
color
:
qgcPal
.
text
}
}
Text
{
Text
{
text
:
"
QML Pixel Density:
"
text
:
qsTr
(
"
QML Pixel Density:
"
)
color
:
qgcPal
.
text
color
:
qgcPal
.
text
}
}
Text
{
Text
{
...
@@ -119,7 +119,7 @@ QGCView {
...
@@ -119,7 +119,7 @@ QGCView {
color
:
qgcPal
.
text
color
:
qgcPal
.
text
}
}
Text
{
Text
{
text
:
"
QML Pixel Ratio:
"
text
:
qsTr
(
"
QML Pixel Ratio:
"
)
color
:
qgcPal
.
text
color
:
qgcPal
.
text
}
}
Text
{
Text
{
...
...
src/ui/preferences/GeneralSettings.qml
View file @
5f005e57
...
@@ -56,7 +56,7 @@ Rectangle {
...
@@ -56,7 +56,7 @@ Rectangle {
spacing
:
ScreenTools
.
defaultFontPixelHeight
/
2
spacing
:
ScreenTools
.
defaultFontPixelHeight
/
2
QGCLabel
{
QGCLabel
{
text
:
"
General Settings
"
text
:
qsTr
(
"
General Settings
"
)
font.pixelSize
:
ScreenTools
.
mediumFontPixelSize
font.pixelSize
:
ScreenTools
.
mediumFontPixelSize
}
}
Rectangle
{
Rectangle
{
...
@@ -78,7 +78,7 @@ Rectangle {
...
@@ -78,7 +78,7 @@ Rectangle {
QGCLabel
{
QGCLabel
{
id
:
distanceUnitsLabel
id
:
distanceUnitsLabel
anchors.baseline
:
distanceUnitsCombo
.
baseline
anchors.baseline
:
distanceUnitsCombo
.
baseline
text
:
"
Distance units:
"
text
:
qsTr
(
"
Distance units:
"
)
}
}
FactComboBox
{
FactComboBox
{
...
@@ -90,7 +90,7 @@ Rectangle {
...
@@ -90,7 +90,7 @@ Rectangle {
QGCLabel
{
QGCLabel
{
anchors.baseline
:
distanceUnitsCombo
.
baseline
anchors.baseline
:
distanceUnitsCombo
.
baseline
text
:
"
(requires reboot to take affect)
"
text
:
qsTr
(
"
(requires reboot to take affect)
"
)
}
}
}
}
...
@@ -101,7 +101,7 @@ Rectangle {
...
@@ -101,7 +101,7 @@ Rectangle {
QGCLabel
{
QGCLabel
{
anchors.baseline
:
speedUnitsCombo
.
baseline
anchors.baseline
:
speedUnitsCombo
.
baseline
width
:
distanceUnitsLabel
.
width
width
:
distanceUnitsLabel
.
width
text
:
"
Speed units:
"
text
:
qsTr
(
"
Speed units:
"
)
}
}
FactComboBox
{
FactComboBox
{
...
@@ -113,14 +113,14 @@ Rectangle {
...
@@ -113,14 +113,14 @@ Rectangle {
QGCLabel
{
QGCLabel
{
anchors.baseline
:
speedUnitsCombo
.
baseline
anchors.baseline
:
speedUnitsCombo
.
baseline
text
:
"
(requires reboot to take affect)
"
text
:
qsTr
(
"
(requires reboot to take affect)
"
)
}
}
}
}
//-----------------------------------------------------------------
//-----------------------------------------------------------------
//-- Audio preferences
//-- Audio preferences
QGCCheckBox
{
QGCCheckBox
{
text
:
"
Mute all audio output
"
text
:
qsTr
(
"
Mute all audio output
"
)
checked
:
QGroundControl
.
isAudioMuted
checked
:
QGroundControl
.
isAudioMuted
onClicked
:
{
onClicked
:
{
QGroundControl
.
isAudioMuted
=
checked
QGroundControl
.
isAudioMuted
=
checked
...
@@ -130,7 +130,7 @@ Rectangle {
...
@@ -130,7 +130,7 @@ Rectangle {
//-- Prompt Save Log
//-- Prompt Save Log
QGCCheckBox
{
QGCCheckBox
{
id
:
promptSaveLog
id
:
promptSaveLog
text
:
"
Prompt to save Flight Data Log after each flight
"
text
:
qsTr
(
"
Prompt to save Flight Data Log after each flight
"
)
checked
:
QGroundControl
.
isSaveLogPrompt
checked
:
QGroundControl
.
isSaveLogPrompt
visible
:
!
ScreenTools
.
isMobile
visible
:
!
ScreenTools
.
isMobile
onClicked
:
{
onClicked
:
{
...
@@ -140,7 +140,7 @@ Rectangle {
...
@@ -140,7 +140,7 @@ Rectangle {
//-----------------------------------------------------------------
//-----------------------------------------------------------------
//-- Prompt Save even if not armed
//-- Prompt Save even if not armed
QGCCheckBox
{
QGCCheckBox
{
text
:
"
Prompt to save Flight Data Log even if vehicle was not armed
"
text
:
qsTr
(
"
Prompt to save Flight Data Log even if vehicle was not armed
"
)
checked
:
QGroundControl
.
isSaveLogPromptNotArmed
checked
:
QGroundControl
.
isSaveLogPromptNotArmed
visible
:
!
ScreenTools
.
isMobile
visible
:
!
ScreenTools
.
isMobile
enabled
:
promptSaveLog
.
checked
enabled
:
promptSaveLog
.
checked
...
@@ -152,7 +152,7 @@ Rectangle {
...
@@ -152,7 +152,7 @@ Rectangle {
//-- Clear settings
//-- Clear settings
QGCCheckBox
{
QGCCheckBox
{
id
:
clearCheck
id
:
clearCheck
text
:
"
Clear all settings on next start
"
text
:
qsTr
(
"
Clear all settings on next start
"
)
checked
:
false
checked
:
false
onClicked
:
{
onClicked
:
{
checked
?
clearDialog
.
visible
=
true
:
QGroundControl
.
clearDeleteAllSettingsNextBoot
()
checked
?
clearDialog
.
visible
=
true
:
QGroundControl
.
clearDeleteAllSettingsNextBoot
()
...
@@ -162,8 +162,8 @@ Rectangle {
...
@@ -162,8 +162,8 @@ Rectangle {
visible
:
false
visible
:
false
icon
:
StandardIcon
.
Warning
icon
:
StandardIcon
.
Warning
standardButtons
:
StandardButton
.
Yes
|
StandardButton
.
No
standardButtons
:
StandardButton
.
Yes
|
StandardButton
.
No
title
:
"
Clear Settings
"
title
:
qsTr
(
"
Clear Settings
"
)
text
:
"
All saved settings will be reset the next time you start QGroundControl. Is this really what you want?
"
text
:
qsTr
(
"
All saved settings will be reset the next time you start QGroundControl. Is this really what you want?
"
)
onYes
:
{
onYes
:
{
QGroundControl
.
deleteAllSettingsNextBoot
()
QGroundControl
.
deleteAllSettingsNextBoot
()
clearDialog
.
visible
=
false
clearDialog
.
visible
=
false
...
@@ -182,7 +182,7 @@ Rectangle {
...
@@ -182,7 +182,7 @@ Rectangle {
QGCCheckBox
{
QGCCheckBox
{
id
:
announcePercentCheckbox
id
:
announcePercentCheckbox
anchors.baseline
:
announcePercent
.
baseline
anchors.baseline
:
announcePercent
.
baseline
text
:
"
Announce battery percent lower than:
"
text
:
qsTr
(
"
Announce battery percent lower than:
"
)
checked
:
_percentRemainingAnnounce
.
value
!=
0
checked
:
_percentRemainingAnnounce
.
value
!=
0
onClicked
:
{
onClicked
:
{
...
@@ -212,7 +212,7 @@ Rectangle {
...
@@ -212,7 +212,7 @@ Rectangle {
QGCLabel
{
QGCLabel
{
anchors.baseline
:
mapProviders
.
baseline
anchors.baseline
:
mapProviders
.
baseline
width
:
ScreenTools
.
defaultFontPixelWidth
*
16
width
:
ScreenTools
.
defaultFontPixelWidth
*
16
text
:
"
Map Providers:
"
text
:
qsTr
(
"
Map Providers:
"
)
}
}
QGCComboBox
{
QGCComboBox
{
id
:
mapProviders
id
:
mapProviders
...
@@ -221,7 +221,7 @@ Rectangle {
...
@@ -221,7 +221,7 @@ Rectangle {
Component.onCompleted
:
{
Component.onCompleted
:
{
var
index
=
mapProviders
.
find
(
QGroundControl
.
flightMapSettings
.
mapProvider
)
var
index
=
mapProviders
.
find
(
QGroundControl
.
flightMapSettings
.
mapProvider
)
if
(
index
<
0
)
{
if
(
index
<
0
)
{
console
.
warn
(
"
Active map provider not in combobox
"
,
QGroundControl
.
flightMapSettings
.
mapProvider
)
console
.
warn
(
qsTr
(
"
Active map provider not in combobox
"
)
,
QGroundControl
.
flightMapSettings
.
mapProvider
)
}
else
{
}
else
{
mapProviders
.
currentIndex
=
index
mapProviders
.
currentIndex
=
index
}
}
...
@@ -229,7 +229,7 @@ Rectangle {
...
@@ -229,7 +229,7 @@ Rectangle {
onActivated
:
{
onActivated
:
{
if
(
index
!=
-
1
)
{
if
(
index
!=
-
1
)
{
currentIndex
=
index
currentIndex
=
index
console
.
log
(
"
New map provider:
"
+
model
[
index
])
console
.
log
(
qsTr
(
"
New map provider:
"
)
+
model
[
index
])
QGroundControl
.
flightMapSettings
.
mapProvider
=
model
[
index
]
QGroundControl
.
flightMapSettings
.
mapProvider
=
model
[
index
]
}
}
}
}
...
@@ -242,12 +242,12 @@ Rectangle {
...
@@ -242,12 +242,12 @@ Rectangle {
QGCLabel
{
QGCLabel
{
anchors.baseline
:
paletteCombo
.
baseline
anchors.baseline
:
paletteCombo
.
baseline
width
:
ScreenTools
.
defaultFontPixelWidth
*
16
width
:
ScreenTools
.
defaultFontPixelWidth
*
16
text
:
"
Style:
"
text
:
qsTr
(
"
Style:
"
)
}
}
QGCComboBox
{
QGCComboBox
{
id
:
paletteCombo
id
:
paletteCombo
width
:
ScreenTools
.
defaultFontPixelWidth
*
16
width
:
ScreenTools
.
defaultFontPixelWidth
*
16
model
:
[
"
Indoor
"
,
"
Outdoor
"
]
model
:
[
qsTr
(
"
Indoor
"
),
qsTr
(
"
Outdoor
"
)
]
currentIndex
:
QGroundControl
.
isDarkStyle
?
0
:
1
currentIndex
:
QGroundControl
.
isDarkStyle
?
0
:
1
onActivated
:
{
onActivated
:
{
if
(
index
!=
-
1
)
{
if
(
index
!=
-
1
)
{
...
@@ -271,28 +271,28 @@ Rectangle {
...
@@ -271,28 +271,28 @@ Rectangle {
spacing
:
ScreenTools
.
defaultFontPixelWidth
*
2
spacing
:
ScreenTools
.
defaultFontPixelWidth
*
2
QGCCheckBox
{
QGCCheckBox
{
text
:
"
Pixhawk
"
text
:
qsTr
(
"
Pixhawk
"
)
visible
:
!
ScreenTools
.
isiOS
visible
:
!
ScreenTools
.
isiOS
checked
:
QGroundControl
.
linkManager
.
autoconnectPixhawk
checked
:
QGroundControl
.
linkManager
.
autoconnectPixhawk
onClicked
:
QGroundControl
.
linkManager
.
autoconnectPixhawk
=
checked
onClicked
:
QGroundControl
.
linkManager
.
autoconnectPixhawk
=
checked
}
}
QGCCheckBox
{
QGCCheckBox
{
text
:
"
SiK Radio
"
text
:
qsTr
(
"
SiK Radio
"
)
visible
:
!
ScreenTools
.
isiOS
visible
:
!
ScreenTools
.
isiOS
checked
:
QGroundControl
.
linkManager
.
autoconnect3DRRadio
checked
:
QGroundControl
.
linkManager
.
autoconnect3DRRadio
onClicked
:
QGroundControl
.
linkManager
.
autoconnect3DRRadio
=
checked
onClicked
:
QGroundControl
.
linkManager
.
autoconnect3DRRadio
=
checked
}
}
QGCCheckBox
{
QGCCheckBox
{
text
:
"
PX4 Flow
"
text
:
qsTr
(
"
PX4 Flow
"
)
visible
:
!
ScreenTools
.
isiOS
visible
:
!
ScreenTools
.
isiOS
checked
:
QGroundControl
.
linkManager
.
autoconnectPX4Flow
checked
:
QGroundControl
.
linkManager
.
autoconnectPX4Flow
onClicked
:
QGroundControl
.
linkManager
.
autoconnectPX4Flow
=
checked
onClicked
:
QGroundControl
.
linkManager
.
autoconnectPX4Flow
=
checked
}
}
QGCCheckBox
{
QGCCheckBox
{
text
:
"
UDP
"
text
:
qsTr
(
"
UDP
"
)
checked
:
QGroundControl
.
linkManager
.
autoconnectUDP
checked
:
QGroundControl
.
linkManager
.
autoconnectUDP
onClicked
:
QGroundControl
.
linkManager
.
autoconnectUDP
=
checked
onClicked
:
QGroundControl
.
linkManager
.
autoconnectUDP
=
checked
}
}
...
@@ -306,7 +306,7 @@ Rectangle {
...
@@ -306,7 +306,7 @@ Rectangle {
//-----------------------------------------------------------------
//-----------------------------------------------------------------
//-- Virtual joystick settings
//-- Virtual joystick settings
QGCCheckBox
{
QGCCheckBox
{
text
:
"
Virtual Joystick
"
text
:
qsTr
(
"
Virtual Joystick
"
)
checked
:
QGroundControl
.
virtualTabletJoystick
checked
:
QGroundControl
.
virtualTabletJoystick
onClicked
:
QGroundControl
.
virtualTabletJoystick
=
checked
onClicked
:
QGroundControl
.
virtualTabletJoystick
=
checked
}
}
...
@@ -322,7 +322,7 @@ Rectangle {
...
@@ -322,7 +322,7 @@ Rectangle {
spacing
:
ScreenTools
.
defaultFontPixelWidth
spacing
:
ScreenTools
.
defaultFontPixelWidth
QGCLabel
{
QGCLabel
{
text
:
"
Offline mission editing vehicle type:
"
text
:
qsTr
(
"
Offline mission editing vehicle type:
"
)
anchors.baseline
:
offlineTypeCombo
.
baseline
anchors.baseline
:
offlineTypeCombo
.
baseline
}
}
...
@@ -342,7 +342,7 @@ Rectangle {
...
@@ -342,7 +342,7 @@ Rectangle {
//-----------------------------------------------------------------
//-----------------------------------------------------------------
//-- Experimental Survey settings
//-- Experimental Survey settings
QGCCheckBox
{
QGCCheckBox
{
text
:
"
Experimental Survey [WIP - no bugs reports please]
"
text
:
qsTr
(
"
Experimental Survey [WIP - no bugs reports please]
"
)
checked
:
QGroundControl
.
experimentalSurvey
checked
:
QGroundControl
.
experimentalSurvey
onClicked
:
QGroundControl
.
experimentalSurvey
=
checked
onClicked
:
QGroundControl
.
experimentalSurvey
=
checked
}
}
...
...
src/ui/preferences/LinkSettings.qml
View file @
5f005e57
...
@@ -73,7 +73,7 @@ Rectangle {
...
@@ -73,7 +73,7 @@ Rectangle {
anchors.margins
:
ScreenTools
.
defaultFontPixelWidth
anchors.margins
:
ScreenTools
.
defaultFontPixelWidth
spacing
:
ScreenTools
.
defaultFontPixelHeight
/
2
spacing
:
ScreenTools
.
defaultFontPixelHeight
/
2
QGCLabel
{
QGCLabel
{
text
:
"
Comm Link Settings
"
text
:
qsTr
(
"
Comm Link Settings
"
)
font.pixelSize
:
ScreenTools
.
mediumFontPixelSize
font.pixelSize
:
ScreenTools
.
mediumFontPixelSize
}
}
Rectangle
{
Rectangle
{
...
@@ -110,7 +110,7 @@ Rectangle {
...
@@ -110,7 +110,7 @@ Rectangle {
anchors.horizontalCenter
:
parent
.
horizontalCenter
anchors.horizontalCenter
:
parent
.
horizontalCenter
QGCButton
{
QGCButton
{
width
:
ScreenTools
.
defaultFontPixelWidth
*
10
width
:
ScreenTools
.
defaultFontPixelWidth
*
10
text
:
"
Delete
"
text
:
qsTr
(
"
Delete
"
)
enabled
:
_currentSelection
&&
!
_currentSelection
.
dynamic
enabled
:
_currentSelection
&&
!
_currentSelection
.
dynamic
onClicked
:
{
onClicked
:
{
if
(
_currentSelection
)
if
(
_currentSelection
)
...
@@ -121,8 +121,8 @@ Rectangle {
...
@@ -121,8 +121,8 @@ Rectangle {
visible
:
false
visible
:
false
icon
:
StandardIcon
.
Warning
icon
:
StandardIcon
.
Warning
standardButtons
:
StandardButton
.
Yes
|
StandardButton
.
No
standardButtons
:
StandardButton
.
Yes
|
StandardButton
.
No
title
:
"
Remove Link Configuration
"
title
:
qsTr
(
"
Remove Link Configuration
"
)
text
:
_currentSelection
?
"
Remove
"
+
_currentSelection
.
name
+
"
. Is this really what you want?
"
:
""
text
:
_currentSelection
?
qsTr
(
"
Remove %1. Is this really what you want?
"
).
arg
(
_currentSelection
.
name
)
:
""
onYes
:
{
onYes
:
{
if
(
_currentSelection
)
if
(
_currentSelection
)
QGroundControl
.
linkManager
.
removeConfiguration
(
_currentSelection
)
QGroundControl
.
linkManager
.
removeConfiguration
(
_currentSelection
)
...
@@ -134,20 +134,20 @@ Rectangle {
...
@@ -134,20 +134,20 @@ Rectangle {
}
}
}
}
QGCButton
{
QGCButton
{
text
:
"
Edit
"
text
:
qsTr
(
"
Edit
"
)
enabled
:
_currentSelection
&&
!
_currentSelection
.
link
enabled
:
_currentSelection
&&
!
_currentSelection
.
link
onClicked
:
{
onClicked
:
{
_linkRoot
.
openCommSettings
(
_currentSelection
)
_linkRoot
.
openCommSettings
(
_currentSelection
)
}
}
}
}
QGCButton
{
QGCButton
{
text
:
"
Add
"
text
:
qsTr
(
"
Add
"
)
onClicked
:
{
onClicked
:
{
_linkRoot
.
openCommSettings
(
null
)
_linkRoot
.
openCommSettings
(
null
)
}
}
}
}
QGCButton
{
QGCButton
{
text
:
"
Connect
"
text
:
qsTr
(
"
Connect
"
)
enabled
:
_currentSelection
&&
!
_currentSelection
.
link
enabled
:
_currentSelection
&&
!
_currentSelection
.
link
onClicked
:
{
onClicked
:
{
QGroundControl
.
linkManager
.
createConnectedLink
(
_currentSelection
)
QGroundControl
.
linkManager
.
createConnectedLink
(
_currentSelection
)
...
@@ -155,7 +155,7 @@ Rectangle {
...
@@ -155,7 +155,7 @@ Rectangle {
}
}
}
}
QGCButton
{
QGCButton
{
text
:
"
Disconnect
"
text
:
qsTr
(
"
Disconnect
"
)
enabled
:
_currentSelection
&&
_currentSelection
.
link
enabled
:
_currentSelection
&&
_currentSelection
.
link
onClicked
:
{
onClicked
:
{
QGroundControl
.
linkManager
.
disconnectLink
(
_currentSelection
.
link
,
false
)
QGroundControl
.
linkManager
.
disconnectLink
(
_currentSelection
.
link
,
false
)
...
@@ -213,7 +213,7 @@ Rectangle {
...
@@ -213,7 +213,7 @@ Rectangle {
anchors.margins
:
ScreenTools
.
defaultFontPixelWidth
anchors.margins
:
ScreenTools
.
defaultFontPixelWidth
spacing
:
ScreenTools
.
defaultFontPixelHeight
/
2
spacing
:
ScreenTools
.
defaultFontPixelHeight
/
2
QGCLabel
{
QGCLabel
{
text
:
linkConfig
?
"
Edit Link Configuration Settings (WIP)
"
:
"
Create New Link Configuration (WIP)
"
text
:
linkConfig
?
qsTr
(
"
Edit Link Configuration Settings (WIP)
"
)
:
qsTr
(
"
Create New Link Configuration (WIP)
"
)
font.pixelSize
:
ScreenTools
.
mediumFontPixelSize
font.pixelSize
:
ScreenTools
.
mediumFontPixelSize
}
}
Rectangle
{
Rectangle
{
...
@@ -228,7 +228,7 @@ Rectangle {
...
@@ -228,7 +228,7 @@ Rectangle {
Row
{
Row
{
spacing
:
ScreenTools
.
defaultFontPixelWidth
spacing
:
ScreenTools
.
defaultFontPixelWidth
QGCLabel
{
QGCLabel
{
text
:
"
Name:
"
text
:
qsTr
(
"
Name:
"
)
width
:
_firstColumn
width
:
_firstColumn
anchors.verticalCenter
:
parent
.
verticalCenter
anchors.verticalCenter
:
parent
.
verticalCenter
}
}
...
@@ -242,7 +242,7 @@ Rectangle {
...
@@ -242,7 +242,7 @@ Rectangle {
Row
{
Row
{
spacing
:
ScreenTools
.
defaultFontPixelWidth
spacing
:
ScreenTools
.
defaultFontPixelWidth
QGCLabel
{
QGCLabel
{
text
:
"
Type:
"
text
:
qsTr
(
"
Type:
"
)
width
:
_firstColumn
width
:
_firstColumn
anchors.verticalCenter
:
parent
.
verticalCenter
anchors.verticalCenter
:
parent
.
verticalCenter
}
}
...
@@ -354,7 +354,7 @@ Rectangle {
...
@@ -354,7 +354,7 @@ Rectangle {
}
}
QGCButton
{
QGCButton
{
width
:
ScreenTools
.
defaultFontPixelWidth
*
10
width
:
ScreenTools
.
defaultFontPixelWidth
*
10
text
:
"
Cancel
"
text
:
qsTr
(
"
Cancel
"
)
onClicked
:
{
onClicked
:
{
QGroundControl
.
linkManager
.
cancelConfigurationEditing
(
editConfig
)
QGroundControl
.
linkManager
.
cancelConfigurationEditing
(
editConfig
)
editConfig
=
null
editConfig
=
null
...
...
src/ui/preferences/LogReplaySettings.qml
View file @
5f005e57
...
@@ -45,7 +45,7 @@ Item {
...
@@ -45,7 +45,7 @@ Item {
width
:
parent
.
width
width
:
parent
.
width
spacing
:
ScreenTools
.
defaultFontPixelHeight
/
2
spacing
:
ScreenTools
.
defaultFontPixelHeight
/
2
QGCLabel
{
QGCLabel
{
text
:
"
Log Replay Link Settings
"
text
:
qsTr
(
"
Log Replay Link Settings
"
)
}
}
Item
{
Item
{
height
:
ScreenTools
.
defaultFontPixelHeight
/
2
height
:
ScreenTools
.
defaultFontPixelHeight
/
2
...
@@ -54,7 +54,7 @@ Item {
...
@@ -54,7 +54,7 @@ Item {
Row
{
Row
{
spacing
:
ScreenTools
.
defaultFontPixelWidth
spacing
:
ScreenTools
.
defaultFontPixelWidth
QGCLabel
{
QGCLabel
{
text
:
"
Log File:
"
text
:
qsTr
(
"
Log File:
"
)
width
:
_firstColumn
width
:
_firstColumn
anchors.verticalCenter
:
parent
.
verticalCenter
anchors.verticalCenter
:
parent
.
verticalCenter
}
}
...
@@ -65,7 +65,7 @@ Item {
...
@@ -65,7 +65,7 @@ Item {
anchors.verticalCenter
:
parent
.
verticalCenter
anchors.verticalCenter
:
parent
.
verticalCenter
}
}
QGCButton
{
QGCButton
{
text
:
"
Browse
"
text
:
qsTr
(
"
Browse
"
)
onClicked
:
{
onClicked
:
{
fileDialog
.
visible
=
true
fileDialog
.
visible
=
true
}
}
...
@@ -73,7 +73,7 @@ Item {
...
@@ -73,7 +73,7 @@ Item {
}
}
FileDialog
{
FileDialog
{
id
:
fileDialog
id
:
fileDialog
title
:
"
Please choose a file
"
title
:
qsTr
(
"
Please choose a file
"
)
folder
:
shortcuts
.
home
folder
:
shortcuts
.
home
visible
:
false
visible
:
false
selectExisting
:
true
selectExisting
:
true
...
...
src/ui/preferences/MavlinkSettings.qml
View file @
5f005e57
...
@@ -54,7 +54,7 @@ Rectangle {
...
@@ -54,7 +54,7 @@ Rectangle {
anchors.left
:
parent
.
left
anchors.left
:
parent
.
left
anchors.top
:
parent
.
top
anchors.top
:
parent
.
top
QGCLabel
{
QGCLabel
{
text
:
"
MavLink Settings
"
text
:
qsTr
(
"
MavLink Settings
"
)
font.pixelSize
:
ScreenTools
.
mediumFontPixelSize
font.pixelSize
:
ScreenTools
.
mediumFontPixelSize
}
}
Rectangle
{
Rectangle
{
...
@@ -67,7 +67,7 @@ Rectangle {
...
@@ -67,7 +67,7 @@ Rectangle {
Row
{
Row
{
spacing
:
ScreenTools
.
defaultFontPixelWidth
spacing
:
ScreenTools
.
defaultFontPixelWidth
QGCLabel
{
QGCLabel
{
text
:
"
Ground Station MavLink System ID:
"
text
:
qsTr
(
"
Ground Station MavLink System ID:
"
)
anchors.verticalCenter
:
parent
.
verticalCenter
anchors.verticalCenter
:
parent
.
verticalCenter
}
}
QGCTextField
{
QGCTextField
{
...
@@ -84,7 +84,7 @@ Rectangle {
...
@@ -84,7 +84,7 @@ Rectangle {
//-----------------------------------------------------------------
//-----------------------------------------------------------------
//-- Mavlink Heartbeats
//-- Mavlink Heartbeats
QGCCheckBox
{
QGCCheckBox
{
text
:
"
Emit heartbeat
"
text
:
qsTr
(
"
Emit heartbeat
"
)
checked
:
QGroundControl
.
multiVehicleManager
.
gcsHeartBeatEnabled
checked
:
QGroundControl
.
multiVehicleManager
.
gcsHeartBeatEnabled
onClicked
:
{
onClicked
:
{
QGroundControl
.
multiVehicleManager
.
gcsHeartBeatEnabled
=
checked
QGroundControl
.
multiVehicleManager
.
gcsHeartBeatEnabled
=
checked
...
@@ -93,7 +93,7 @@ Rectangle {
...
@@ -93,7 +93,7 @@ Rectangle {
//-----------------------------------------------------------------
//-----------------------------------------------------------------
//-- Mavlink Multiplexing
//-- Mavlink Multiplexing
QGCCheckBox
{
QGCCheckBox
{
text
:
"
Enable multiplexing (forward packets to all other links)
"
text
:
qsTr
(
"
Enable multiplexing (forward packets to all other links)
"
)
checked
:
QGroundControl
.
isMultiplexingEnabled
checked
:
QGroundControl
.
isMultiplexingEnabled
onClicked
:
{
onClicked
:
{
QGroundControl
.
isMultiplexingEnabled
=
checked
QGroundControl
.
isMultiplexingEnabled
=
checked
...
@@ -102,7 +102,7 @@ Rectangle {
...
@@ -102,7 +102,7 @@ Rectangle {
//-----------------------------------------------------------------
//-----------------------------------------------------------------
//-- Mavlink Version Check
//-- Mavlink Version Check
QGCCheckBox
{
QGCCheckBox
{
text
:
"
Only accept MAVs with same protocol version
"
text
:
qsTr
(
"
Only accept MAVs with same protocol version
"
)
checked
:
QGroundControl
.
isVersionCheckEnabled
checked
:
QGroundControl
.
isVersionCheckEnabled
onClicked
:
{
onClicked
:
{
QGroundControl
.
isVersionCheckEnabled
=
checked
QGroundControl
.
isVersionCheckEnabled
=
checked
...
...
src/ui/preferences/MockLink.qml
View file @
5f005e57
...
@@ -50,27 +50,27 @@ Rectangle {
...
@@ -50,27 +50,27 @@ Rectangle {
spacing
:
ScreenTools
.
defaultFontPixelHeight
spacing
:
ScreenTools
.
defaultFontPixelHeight
QGCButton
{
QGCButton
{
text
:
"
PX4 Vehicle
"
text
:
qsTr
(
"
PX4 Vehicle
"
)
onClicked
:
QGroundControl
.
startPX4MockLink
(
sendStatusText
.
checked
)
onClicked
:
QGroundControl
.
startPX4MockLink
(
sendStatusText
.
checked
)
}
}
QGCButton
{
QGCButton
{
text
:
"
APM ArduCopter Vehicle
"
text
:
qsTr
(
"
APM ArduCopter Vehicle
"
)
onClicked
:
QGroundControl
.
startAPMArduCopterMockLink
(
sendStatusText
.
checked
)
onClicked
:
QGroundControl
.
startAPMArduCopterMockLink
(
sendStatusText
.
checked
)
}
}
QGCButton
{
QGCButton
{
text
:
"
APM ArduPlane Vehicle
"
text
:
qsTr
(
"
APM ArduPlane Vehicle
"
)
onClicked
:
QGroundControl
.
startAPMArduPlaneMockLink
(
sendStatusText
.
checked
)
onClicked
:
QGroundControl
.
startAPMArduPlaneMockLink
(
sendStatusText
.
checked
)
}
}
QGCButton
{
QGCButton
{
text
:
"
Generic Vehicle
"
text
:
qsTr
(
"
Generic Vehicle
"
)
onClicked
:
QGroundControl
.
startGenericMockLink
(
sendStatusText
.
checked
)
onClicked
:
QGroundControl
.
startGenericMockLink
(
sendStatusText
.
checked
)
}
}
QGCCheckBox
{
QGCCheckBox
{
id
:
sendStatusText
id
:
sendStatusText
text
:
"
Send status text + voice
"
text
:
qsTr
(
"
Send status text + voice
"
)
}
}
QGCButton
{
QGCButton
{
text
:
"
Stop All MockLinks
"
text
:
qsTr
(
"
Stop All MockLinks
"
)
onClicked
:
QGroundControl
.
stopAllMockLinks
()
onClicked
:
QGroundControl
.
stopAllMockLinks
()
}
}
}
}
...
...
src/ui/preferences/MockLinkSettings.qml
View file @
5f005e57
...
@@ -64,7 +64,7 @@ Item {
...
@@ -64,7 +64,7 @@ Item {
width
:
mockLinkSettings
.
width
width
:
mockLinkSettings
.
width
spacing
:
ScreenTools
.
defaultFontPixelHeight
/
2
spacing
:
ScreenTools
.
defaultFontPixelHeight
/
2
QGCLabel
{
QGCLabel
{
text
:
"
Mock Link Settings
"
text
:
qsTr
(
"
Mock Link Settings
"
)
}
}
Item
{
Item
{
height
:
ScreenTools
.
defaultFontPixelHeight
/
2
height
:
ScreenTools
.
defaultFontPixelHeight
/
2
...
@@ -72,7 +72,7 @@ Item {
...
@@ -72,7 +72,7 @@ Item {
}
}
QGCCheckBox
{
QGCCheckBox
{
id
:
sendStatus
id
:
sendStatus
text
:
"
Send Status Text and Voice
"
text
:
qsTr
(
"
Send Status Text and Voice
"
)
checked
:
false
checked
:
false
}
}
Item
{
Item
{
...
@@ -83,19 +83,19 @@ Item {
...
@@ -83,19 +83,19 @@ Item {
ExclusiveGroup
{
id
:
autoPilotGroup
}
ExclusiveGroup
{
id
:
autoPilotGroup
}
QGCRadioButton
{
QGCRadioButton
{
id
:
px4Firmware
id
:
px4Firmware
text
:
"
PX4 Firmware
"
text
:
qsTr
(
"
PX4 Firmware
"
)
checked
:
false
checked
:
false
exclusiveGroup
:
autoPilotGroup
exclusiveGroup
:
autoPilotGroup
}
}
QGCRadioButton
{
QGCRadioButton
{
id
:
apmFirmware
id
:
apmFirmware
text
:
"
APM Firmware
"
text
:
qsTr
(
"
APM Firmware
"
)
checked
:
false
checked
:
false
exclusiveGroup
:
autoPilotGroup
exclusiveGroup
:
autoPilotGroup
}
}
QGCRadioButton
{
QGCRadioButton
{
id
:
genericFirmware
id
:
genericFirmware
text
:
"
Generic Firmware
"
text
:
qsTr
(
"
Generic Firmware
"
)
checked
:
false
checked
:
false
exclusiveGroup
:
autoPilotGroup
exclusiveGroup
:
autoPilotGroup
}
}
...
@@ -105,7 +105,7 @@ Item {
...
@@ -105,7 +105,7 @@ Item {
width
:
parent
.
width
width
:
parent
.
width
}
}
QGCLabel
{
QGCLabel
{
text
:
"
APM Vehicle Type
"
text
:
qsTr
(
"
APM Vehicle Type
"
)
visible
:
apmFirmware
.
checked
visible
:
apmFirmware
.
checked
}
}
ColumnLayout
{
ColumnLayout
{
...
@@ -113,13 +113,13 @@ Item {
...
@@ -113,13 +113,13 @@ Item {
ExclusiveGroup
{
id
:
apmVehicleGroup
}
ExclusiveGroup
{
id
:
apmVehicleGroup
}
QGCRadioButton
{
QGCRadioButton
{
id
:
copterVehicle
id
:
copterVehicle
text
:
"
ArduCopter
"
text
:
qsTr
(
"
ArduCopter
"
)
checked
:
false
checked
:
false
exclusiveGroup
:
apmVehicleGroup
exclusiveGroup
:
apmVehicleGroup
}
}
QGCRadioButton
{
QGCRadioButton
{
id
:
planeVehicle
id
:
planeVehicle
text
:
"
ArduPlane
"
text
:
qsTr
(
"
ArduPlane
"
)
checked
:
false
checked
:
false
exclusiveGroup
:
apmVehicleGroup
exclusiveGroup
:
apmVehicleGroup
}
}
...
...
src/ui/preferences/SerialSettings.qml
View file @
5f005e57
...
@@ -45,7 +45,7 @@ Item {
...
@@ -45,7 +45,7 @@ Item {
spacing
:
ScreenTools
.
defaultFontPixelHeight
/
2
spacing
:
ScreenTools
.
defaultFontPixelHeight
/
2
QGCLabel
{
QGCLabel
{
id
:
serialLabel
id
:
serialLabel
text
:
"
Serial Link Settings
"
text
:
qsTr
(
"
Serial Link Settings
"
)
}
}
Rectangle
{
Rectangle
{
height
:
1
height
:
1
...
@@ -59,7 +59,7 @@ Item {
...
@@ -59,7 +59,7 @@ Item {
Row
{
Row
{
spacing
:
ScreenTools
.
defaultFontPixelWidth
spacing
:
ScreenTools
.
defaultFontPixelWidth
QGCLabel
{
QGCLabel
{
text
:
"
Serial Port:
"
text
:
qsTr
(
"
Serial Port:
"
)
width
:
_firstColumn
width
:
_firstColumn
anchors.verticalCenter
:
parent
.
verticalCenter
anchors.verticalCenter
:
parent
.
verticalCenter
}
}
...
@@ -79,7 +79,7 @@ Item {
...
@@ -79,7 +79,7 @@ Item {
subEditConfig
.
portName
=
QGroundControl
.
linkManager
.
serialPorts
[
0
]
subEditConfig
.
portName
=
QGroundControl
.
linkManager
.
serialPorts
[
0
]
var
index
=
commPortCombo
.
find
(
subEditConfig
.
portDisplayName
)
var
index
=
commPortCombo
.
find
(
subEditConfig
.
portDisplayName
)
if
(
index
===
-
1
)
{
if
(
index
===
-
1
)
{
console
.
warn
(
"
Serial Port not present
"
,
subEditConfig
.
portName
)
console
.
warn
(
qsTr
(
"
Serial Port not present
"
)
,
subEditConfig
.
portName
)
}
else
{
}
else
{
commPortCombo
.
currentIndex
=
index
commPortCombo
.
currentIndex
=
index
}
}
...
@@ -92,7 +92,7 @@ Item {
...
@@ -92,7 +92,7 @@ Item {
Row
{
Row
{
spacing
:
ScreenTools
.
defaultFontPixelWidth
spacing
:
ScreenTools
.
defaultFontPixelWidth
QGCLabel
{
QGCLabel
{
text
:
"
Baud Rate:
"
text
:
qsTr
(
"
Baud Rate:
"
)
width
:
_firstColumn
width
:
_firstColumn
anchors.verticalCenter
:
parent
.
verticalCenter
anchors.verticalCenter
:
parent
.
verticalCenter
}
}
...
@@ -113,7 +113,7 @@ Item {
...
@@ -113,7 +113,7 @@ Item {
}
}
var
index
=
baudCombo
.
find
(
baud
)
var
index
=
baudCombo
.
find
(
baud
)
if
(
index
===
-
1
)
{
if
(
index
===
-
1
)
{
console
.
warn
(
"
Baud rate name not in combo box
"
,
baud
)
console
.
warn
(
qsTr
(
"
Baud rate name not in combo box
"
)
,
baud
)
}
else
{
}
else
{
baudCombo
.
currentIndex
=
index
baudCombo
.
currentIndex
=
index
}
}
...
@@ -128,7 +128,7 @@ Item {
...
@@ -128,7 +128,7 @@ Item {
//-- Advanced Serial Settings
//-- Advanced Serial Settings
QGCCheckBox
{
QGCCheckBox
{
id
:
showAdvanced
id
:
showAdvanced
text
:
"
Show Advanced Serial Settings
"
text
:
qsTr
(
"
Show Advanced Serial Settings
"
)
}
}
Item
{
Item
{
height
:
ScreenTools
.
defaultFontPixelHeight
/
2
height
:
ScreenTools
.
defaultFontPixelHeight
/
2
...
@@ -136,7 +136,7 @@ Item {
...
@@ -136,7 +136,7 @@ Item {
}
}
//-- Flow Control
//-- Flow Control
QGCCheckBox
{
QGCCheckBox
{
text
:
"
Enable Flow Control
"
text
:
qsTr
(
"
Enable Flow Control
"
)
checked
:
subEditConfig
?
subEditConfig
.
flowControl
!==
0
:
false
checked
:
subEditConfig
?
subEditConfig
.
flowControl
!==
0
:
false
visible
:
showAdvanced
.
checked
visible
:
showAdvanced
.
checked
onCheckedChanged
:
{
onCheckedChanged
:
{
...
@@ -150,14 +150,14 @@ Item {
...
@@ -150,14 +150,14 @@ Item {
spacing
:
ScreenTools
.
defaultFontPixelWidth
spacing
:
ScreenTools
.
defaultFontPixelWidth
visible
:
showAdvanced
.
checked
visible
:
showAdvanced
.
checked
QGCLabel
{
QGCLabel
{
text
:
"
Parity:
"
text
:
qsTr
(
"
Parity:
"
)
width
:
_firstColumn
width
:
_firstColumn
anchors.verticalCenter
:
parent
.
verticalCenter
anchors.verticalCenter
:
parent
.
verticalCenter
}
}
QGCComboBox
{
QGCComboBox
{
id
:
parityCombo
id
:
parityCombo
width
:
_firstColumn
width
:
_firstColumn
model
:
[
"
None
"
,
"
Even
"
,
"
Odd
"
]
model
:
[
qsTr
(
"
None
"
),
qsTr
(
"
Even
"
),
qsTr
(
"
Odd
"
)
]
anchors.verticalCenter
:
parent
.
verticalCenter
anchors.verticalCenter
:
parent
.
verticalCenter
onActivated
:
{
onActivated
:
{
if
(
index
!=
-
1
)
{
if
(
index
!=
-
1
)
{
...
@@ -217,7 +217,7 @@ Item {
...
@@ -217,7 +217,7 @@ Item {
spacing
:
ScreenTools
.
defaultFontPixelWidth
spacing
:
ScreenTools
.
defaultFontPixelWidth
visible
:
showAdvanced
.
checked
visible
:
showAdvanced
.
checked
QGCLabel
{
QGCLabel
{
text
:
"
Stop Bits:
"
text
:
qsTr
(
"
Stop Bits:
"
)
width
:
_firstColumn
width
:
_firstColumn
anchors.verticalCenter
:
parent
.
verticalCenter
anchors.verticalCenter
:
parent
.
verticalCenter
}
}
...
...
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