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
f65bf438
Unverified
Commit
f65bf438
authored
Feb 15, 2020
by
Don Gagne
Committed by
GitHub
Feb 15, 2020
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #8333 from dakejahl/pr-support_checklist_section_colored_text
Support for checklist status text color
parents
80cdb116
adc519c7
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
0 deletions
+12
-0
QGCPalette.cc
src/QGCPalette.cc
+3
-0
QGCPalette.h
src/QGCPalette.h
+3
-0
PreFlightCheckButton.qml
src/QmlControls/PreFlightCheckButton.qml
+1
-0
PreFlightCheckGroup.qml
src/QmlControls/PreFlightCheckGroup.qml
+4
-0
SectionHeader.qml
src/QmlControls/SectionHeader.qml
+1
-0
No files found.
src/QGCPalette.cc
View file @
f65bf438
...
...
@@ -77,6 +77,9 @@ void QGCPalette::_buildMap()
DECLARE_QGC_COLOR
(
alertText
,
"#000000"
,
"#000000"
,
"#000000"
,
"#000000"
)
DECLARE_QGC_COLOR
(
missionItemEditor
,
"#585858"
,
"#dbfef8"
,
"#585858"
,
"#585d83"
)
DECLARE_QGC_COLOR
(
hoverColor
,
"#585858"
,
"#dbfef8"
,
"#585858"
,
"#585d83"
)
DECLARE_QGC_COLOR
(
statusFailedText
,
"#9d9d9d"
,
"#000000"
,
"#707070"
,
"#ffffff"
)
DECLARE_QGC_COLOR
(
statusPassedText
,
"#9d9d9d"
,
"#000000"
,
"#707070"
,
"#ffffff"
)
DECLARE_QGC_COLOR
(
statusPendingText
,
"#9d9d9d"
,
"#000000"
,
"#707070"
,
"#ffffff"
)
// Colors are not affecting by theming
DECLARE_QGC_COLOR
(
mapWidgetBorderLight
,
"#ffffff"
,
"#ffffff"
,
"#ffffff"
,
"#ffffff"
)
...
...
src/QGCPalette.h
View file @
f65bf438
...
...
@@ -115,6 +115,9 @@ public:
DEFINE_QGC_COLOR
(
alertText
,
setAlertText
)
DEFINE_QGC_COLOR
(
missionItemEditor
,
setMissionItemEditor
)
DEFINE_QGC_COLOR
(
hoverColor
,
setHoverColor
)
DEFINE_QGC_COLOR
(
statusFailedText
,
setstatusFailedText
)
DEFINE_QGC_COLOR
(
statusPassedText
,
setstatusPassedText
)
DEFINE_QGC_COLOR
(
statusPendingText
,
setstatusPendingText
)
QGCPalette
(
QObject
*
parent
=
nullptr
);
~
QGCPalette
();
...
...
src/QmlControls/PreFlightCheckButton.qml
View file @
f65bf438
...
...
@@ -32,6 +32,7 @@ QGCButton {
property
bool
telemetryFailure
:
false
///< true: telemetry check failing, false: telemetry check passing
property
bool
allowTelemetryFailureOverride
:
false
///< true: user can click past telemetry failure
property
bool
passed
:
_manualState
===
_statePassed
&&
_telemetryState
===
_statePassed
property
bool
failed
:
_manualState
===
_stateFailed
||
_telemetryState
===
_stateFailed
property
int
_manualState
:
manualText
===
""
?
_statePassed
:
_statePending
property
int
_telemetryState
:
_statePassed
...
...
src/QmlControls/PreFlightCheckGroup.qml
View file @
f65bf438
...
...
@@ -17,6 +17,7 @@ import QGroundControl.ScreenTools 1.0
Column
{
property
string
name
property
bool
passed
:
false
property
bool
failed
:
false
spacing
:
ScreenTools
.
defaultFontPixelHeight
/
2
...
...
@@ -47,6 +48,7 @@ Column {
anchors.left
:
parent
.
left
anchors.right
:
parent
.
right
text
:
name
+
(
passed
?
qsTr
(
"
(passed)
"
)
:
""
)
color
:
failed
?
qgcPal
.
statusFailedText
:
(
passed
?
qgcPal
.
statusPassedText
:
qgcPal
.
statusPendingText
)
}
Column
{
...
...
@@ -58,9 +60,11 @@ Column {
for
(
var
i
=
0
;
i
<
children
.
length
;
i
++
)
{
if
(
!
children
[
i
].
passed
)
{
passed
=
false
failed
=
children
[
i
].
failed
return
}
}
failed
=
false
passed
=
true
}
}
...
...
src/QmlControls/SectionHeader.qml
View file @
f65bf438
...
...
@@ -10,6 +10,7 @@ FocusScope {
id
:
_root
height
:
column
.
height
property
alias
color
:
label
.
color
property
alias
text
:
label
.
text
property
bool
checked
:
true
property
bool
showSpacer
:
true
...
...
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