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
92db6e3c
Commit
92db6e3c
authored
Jan 02, 2016
by
Don Gagne
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #2511 from DonLakeFlyer/Colors
Colors
parents
e1b61e4d
c2516cc8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
APMFlightModesComponent.qml
src/AutoPilotPlugins/APM/APMFlightModesComponent.qml
+2
-2
QGCPalette.cc
src/QGCPalette.cc
+3
-3
No files found.
src/AutoPilotPlugins/APM/APMFlightModesComponent.qml
View file @
92db6e3c
...
...
@@ -91,7 +91,7 @@ QGCView {
QGCLabel
{
anchors.baseline
:
modeCombo
.
baseline
text
:
"
Flight Mode
"
+
index
+
"
:
"
color
:
controller
.
activeFlightMode
==
index
?
qgcPal
.
buttonHighlight
:
qgcPal
.
text
color
:
controller
.
activeFlightMode
==
index
?
"
yellow
"
:
qgcPal
.
text
}
FactComboBox
{
...
...
@@ -149,7 +149,7 @@ QGCView {
QGCLabel
{
anchors.baseline
:
optCombo
.
baseline
text
:
"
Channel option
"
+
index
+
"
:
"
color
:
controller
.
channelOptionEnabled
[
modelData
]
?
qgcPal
.
buttonHighlight
:
qgcPal
.
text
color
:
controller
.
channelOptionEnabled
[
modelData
]
?
"
yellow
"
:
qgcPal
.
text
}
FactComboBox
{
...
...
src/QGCPalette.cc
View file @
92db6e3c
...
...
@@ -49,7 +49,7 @@ QColor QGCPalette::_windowShadeDark[QGCPalette::_cThemes][QGCPalette::_cColorGro
};
QColor
QGCPalette
::
_text
[
QGCPalette
::
_cThemes
][
QGCPalette
::
_cColorGroups
]
=
{
{
QColor
(
"#
cccccc
"
),
QColor
(
"#000000"
)
},
{
QColor
(
"#
9d9d9d
"
),
QColor
(
"#000000"
)
},
{
QColor
(
0x58
,
0x58
,
0x58
),
QColor
(
0xFF
,
0xFF
,
0xFF
)
}
};
...
...
@@ -64,12 +64,12 @@ QColor QGCPalette::_button[QGCPalette::_cThemes][QGCPalette::_cColorGroups] = {
};
QColor
QGCPalette
::
_buttonText
[
QGCPalette
::
_cThemes
][
QGCPalette
::
_cColorGroups
]
=
{
{
QColor
(
"#
dedede
"
),
QColor
(
"#000000"
)
},
{
QColor
(
"#
9d9d9d
"
),
QColor
(
"#000000"
)
},
{
QColor
(
0x2c
,
0x2c
,
0x2c
),
QColor
(
0xFF
,
0xFF
,
0xFF
)
},
};
QColor
QGCPalette
::
_buttonHighlight
[
QGCPalette
::
_cThemes
][
QGCPalette
::
_cColorGroups
]
=
{
{
QColor
(
"#e4e4e4"
),
QColor
(
"#
e4e4
e4"
)
},
{
QColor
(
"#e4e4e4"
),
QColor
(
"#
91d1
e4"
)
},
{
QColor
(
0x58
,
0x58
,
0x58
),
QColor
(
237
,
235
,
51
)
},
};
...
...
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