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
3df9b40f
Unverified
Commit
3df9b40f
authored
6 years ago
by
Don Gagne
Committed by
GitHub
6 years ago
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #6560 from DonLakeFlyer/Fixes
Various fixes
parents
81aa4b4a
5fca2d75
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
17 additions
and
20 deletions
+17
-20
GuidedActionConfirm.qml
src/FlightDisplay/GuidedActionConfirm.qml
+6
-8
GuidedActionList.qml
src/FlightDisplay/GuidedActionList.qml
+3
-3
GuidedActionsController.qml
src/FlightDisplay/GuidedActionsController.qml
+2
-2
SimpleItemEditor.qml
src/PlanView/SimpleItemEditor.qml
+1
-1
SliderSwitch.qml
src/QmlControls/SliderSwitch.qml
+4
-5
MainWindowInner.qml
src/ui/MainWindowInner.qml
+1
-1
No files found.
src/FlightDisplay/GuidedActionConfirm.qml
View file @
3df9b40f
...
...
@@ -18,13 +18,12 @@ import QGroundControl.Palette 1.0
/// Guided actions confirmation dialog
Rectangle
{
id
:
_root
border.color
:
qgcPal
.
alertBorder
border.width
:
1
width
:
confirmColumn
.
width
+
(
_margins
*
4
)
height
:
confirmColumn
.
height
+
(
_margins
*
4
)
radius
:
ScreenTools
.
defaultFontPixelHeight
/
2
color
:
qgcPal
.
alertBackground
opacity
:
0.9
color
:
qgcPal
.
window
border.color
:
_emergencyAction
?
"
red
"
:
qgcPal
.
windowShade
border.width
:
_emergencyAction
?
4
:
1
z
:
guidedController
.
z
visible
:
false
...
...
@@ -36,7 +35,8 @@ Rectangle {
property
var
actionData
property
bool
hideTrigger
:
false
property
real
_margins
:
ScreenTools
.
defaultFontPixelWidth
property
real
_margins
:
ScreenTools
.
defaultFontPixelWidth
property
bool
_emergencyAction
:
action
===
guidedController
.
actionEmergencyStop
onHideTriggerChanged
:
{
if
(
hideTrigger
)
{
...
...
@@ -78,7 +78,6 @@ Rectangle {
QGCLabel
{
id
:
titleText
color
:
qgcPal
.
alertText
anchors.left
:
slider
.
left
anchors.right
:
slider
.
right
horizontalAlignment
:
Text
.
AlignHCenter
...
...
@@ -87,7 +86,6 @@ Rectangle {
QGCLabel
{
id
:
messageText
color
:
qgcPal
.
alertText
anchors.left
:
slider
.
left
anchors.right
:
slider
.
right
horizontalAlignment
:
Text
.
AlignHCenter
...
...
@@ -127,7 +125,7 @@ Rectangle {
sourceSize.height
:
width
source
:
"
/res/XDelete.svg
"
fillMode
:
Image
.
PreserveAspectFit
color
:
qgcPal
.
alertT
ext
color
:
qgcPal
.
t
ext
QGCMouseArea
{
fillItem
:
parent
onClicked
:
{
...
...
This diff is collapsed.
Click to expand it.
src/FlightDisplay/GuidedActionList.qml
View file @
3df9b40f
...
...
@@ -85,9 +85,9 @@ Rectangle {
}
QGCButton
{
id
:
actionButton
anchors.horizontalCenter
:
parent
.
horizontalCenter
text
:
modelData
.
title
id
:
actionButton
text
:
modelData
.
title
Layout.alignment
:
Qt
.
AlignCenter
onClicked
:
{
_root
.
visible
=
false
...
...
This diff is collapsed.
Click to expand it.
src/FlightDisplay/GuidedActionsController.qml
View file @
3df9b40f
...
...
@@ -32,7 +32,7 @@ Item {
property
var
actionList
property
var
altitudeSlider
readonly
property
string
emergencyStopTitle
:
qsTr
(
"
E
mergency Stop
"
)
readonly
property
string
emergencyStopTitle
:
qsTr
(
"
E
MERGENCY STOP
"
)
readonly
property
string
armTitle
:
qsTr
(
"
Arm
"
)
readonly
property
string
disarmTitle
:
qsTr
(
"
Disarm
"
)
readonly
property
string
rtlTitle
:
qsTr
(
"
RTL
"
)
...
...
@@ -52,7 +52,7 @@ Item {
readonly
property
string
armMessage
:
qsTr
(
"
Arm the vehicle.
"
)
readonly
property
string
disarmMessage
:
qsTr
(
"
Disarm the vehicle
"
)
readonly
property
string
emergencyStopMessage
:
qsTr
(
"
WARNING: T
his will stop all motors. If vehicle is currently in air it will crash
.
"
)
readonly
property
string
emergencyStopMessage
:
qsTr
(
"
WARNING: T
HIS WILL STOP ALL MOTORS. IF VEHICLE IS CURRENTLY IN THE AIR IT WILL CRASH
.
"
)
readonly
property
string
takeoffMessage
:
qsTr
(
"
Takeoff from ground and hold position.
"
)
readonly
property
string
startMissionMessage
:
qsTr
(
"
Takeoff from ground and start the current mission.
"
)
readonly
property
string
continueMissionMessage
:
qsTr
(
"
Continue the mission from the current waypoint.
"
)
...
...
This diff is collapsed.
Click to expand it.
src/PlanView/SimpleItemEditor.qml
View file @
3df9b40f
...
...
@@ -132,7 +132,7 @@ Rectangle {
text
:
qsTr
(
"
TerrF
"
)
exclusiveGroup
:
altRadios
checked
:
missionItem
.
altitudeMode
===
altModeValue
visible
:
missionItem
.
supportsTerrainFrame
||
missionItem
.
altitudeMode
===
altModeValue
visible
:
missionItem
.
altitudeMode
===
altModeValue
readonly
property
int
altModeValue
:
_altModeTerrainFrame
readonly
property
string
helpText
:
qsTr
(
"
Using terrain reference frame
"
)
...
...
This diff is collapsed.
Click to expand it.
src/QmlControls/SliderSwitch.qml
View file @
3df9b40f
...
...
@@ -11,7 +11,7 @@ Rectangle {
implicitWidth
:
label
.
contentWidth
+
(
_diameter
*
2.5
)
+
(
_border
*
4
)
implicitHeight
:
label
.
height
*
2.5
radius
:
height
/
2
color
:
qgcPal
.
text
color
:
qgcPal
.
windowShade
signal
accept
///< Action confirmed
signal
reject
///< Action rejected
...
...
@@ -29,7 +29,7 @@ Rectangle {
anchors.horizontalCenter
:
parent
.
horizontalCenter
anchors.verticalCenter
:
parent
.
verticalCenter
text
:
confirmText
color
:
qgcPal
.
window
color
:
qgcPal
.
buttonText
}
Rectangle
{
...
...
@@ -39,8 +39,7 @@ Rectangle {
height
:
_diameter
width
:
_diameter
radius
:
_diameter
/
2
color
:
qgcPal
.
windowShade
opacity
:
0.8
color
:
qgcPal
.
primaryButton
QGCColoredImage
{
anchors.centerIn
:
parent
...
...
@@ -50,7 +49,7 @@ Rectangle {
fillMode
:
Image
.
PreserveAspectFit
smooth
:
false
mipmap
:
false
color
:
qgcPal
.
t
ext
color
:
qgcPal
.
buttonT
ext
cache
:
false
source
:
"
/res/ArrowRight.svg
"
}
...
...
This diff is collapsed.
Click to expand it.
src/ui/MainWindowInner.qml
View file @
3df9b40f
...
...
@@ -175,7 +175,7 @@ Item {
MessageDialog
{
id
:
activeConnectionsCloseDialog
title
:
qsTr
(
"
%1 close
"
).
arg
(
QGroundControl
.
appName
)
text
:
qsTr
(
"
There are still active connections to vehicles.
Do you want to disconnect these before closing
?
"
)
text
:
qsTr
(
"
There are still active connections to vehicles.
Are you sure you want to exit
?
"
)
standardButtons
:
StandardButton
.
Yes
|
StandardButton
.
Cancel
modality
:
Qt
.
ApplicationModal
visible
:
false
...
...
This diff is collapsed.
Click to expand it.
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