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
901cf22d
Unverified
Commit
901cf22d
authored
6 years ago
by
Don Gagne
Committed by
GitHub
6 years ago
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #6961 from Williangalvani/disabledCheckbox
Style tweaks
parents
f739d087
2091f598
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
19 additions
and
8 deletions
+19
-8
QGCPalette.cc
src/QGCPalette.cc
+2
-2
QGCCheckBox.qml
src/QmlControls/QGCCheckBox.qml
+11
-1
QGCComboBox.qml
src/QmlControls/QGCComboBox.qml
+5
-5
QGCTextField.qml
src/QmlControls/QGCTextField.qml
+1
-0
No files found.
src/QGCPalette.cc
View file @
901cf22d
...
...
@@ -59,8 +59,8 @@ void QGCPalette::_buildMap(void)
DECLARE_QGC_COLOR
(
buttonHighlightText
,
"#2c2c2c"
,
"#ffffff"
,
"#2c2c2c"
,
"#000000"
)
DECLARE_QGC_COLOR
(
primaryButton
,
"#585858"
,
"#8cb3be"
,
"#585858"
,
"#8cb3be"
)
DECLARE_QGC_COLOR
(
primaryButtonText
,
"#2c2c2c"
,
"#000000"
,
"#2c2c2c"
,
"#000000"
)
DECLARE_QGC_COLOR
(
textField
,
"#ffffff"
,
"#ffffff"
,
"#
585858
"
,
"#ffffff"
)
DECLARE_QGC_COLOR
(
textFieldText
,
"#808080"
,
"#000000"
,
"#
bfbfbf
"
,
"#000000"
)
DECLARE_QGC_COLOR
(
textField
,
"#ffffff"
,
"#ffffff"
,
"#
707070
"
,
"#ffffff"
)
DECLARE_QGC_COLOR
(
textFieldText
,
"#808080"
,
"#000000"
,
"#
000000
"
,
"#000000"
)
DECLARE_QGC_COLOR
(
mapButton
,
"#585858"
,
"#000000"
,
"#585858"
,
"#000000"
)
DECLARE_QGC_COLOR
(
mapButtonHighlight
,
"#585858"
,
"#be781c"
,
"#585858"
,
"#be781c"
)
DECLARE_QGC_COLOR
(
mapIndicator
,
"#585858"
,
"#be781c"
,
"#585858"
,
"#be781c"
)
...
...
This diff is collapsed.
Click to expand it.
src/QmlControls/QGCCheckBox.qml
View file @
901cf22d
...
...
@@ -53,14 +53,24 @@ CheckBox {
Rectangle
{
id
:
baserect
g
radient
:
Gradient
{
property
var
enabledG
radient
:
Gradient
{
GradientStop
{
color
:
"
#eee
"
;
position
:
0
}
GradientStop
{
color
:
control
.
pressed
?
"
#eee
"
:
"
#fff
"
;
position
:
0.1
}
GradientStop
{
color
:
"
#fff
"
;
position
:
1
}
}
property
var
disabledGradient
:
Gradient
{
GradientStop
{
color
:
"
#999
"
;
position
:
0
}
GradientStop
{
color
:
__qgcPal
.
textField
;
position
:
0.1
}
GradientStop
{
color
:
__qgcPal
.
textField
;
position
:
0.9
}
GradientStop
{
color
:
"
#999
"
;
position
:
1
}
}
gradient
:
control
.
enabled
?
enabledGradient
:
disabledGradient
radius
:
ScreenTools
.
defaultFontPixelHeight
*
0.16
anchors.fill
:
parent
border.color
:
control
.
activeFocus
?
"
#47b
"
:
"
#999
"
opacity
:
control
.
enabled
?
1
:
0.5
}
Image
{
...
...
This diff is collapsed.
Click to expand it.
src/QmlControls/QGCComboBox.qml
View file @
901cf22d
...
...
@@ -40,9 +40,9 @@ Button {
background
:
Rectangle
{
implicitWidth
:
ScreenTools
.
implicitComboBoxWidth
implicitHeight
:
ScreenTools
.
implicitComboBoxHeight
color
:
control
.
_qgcPal
.
button
border.width
:
control
.
_showBorder
?
1
:
0
border.color
:
control
.
_qgcPal
.
buttonText
color
:
control
.
_qgcPal
.
textField
border.width
:
enabled
?
1
:
0
border.color
:
"
#999
"
QGCColoredImage
{
id
:
image
...
...
@@ -52,7 +52,7 @@ Button {
anchors.rightMargin
:
_dropImageMargin
anchors.right
:
parent
.
right
source
:
"
/qmlimages/arrow-down.png
"
color
:
control
.
_qgcPal
.
button
Text
color
:
control
.
_qgcPal
.
textField
Text
}
}
...
...
@@ -67,7 +67,7 @@ Button {
anchors.verticalCenter
:
parent
.
verticalCenter
anchors.horizontalCenter
:
centeredLabel
?
parent
.
horizontalCenter
:
undefined
text
:
control
.
currentText
color
:
control
.
_qgcPal
.
button
Text
color
:
control
.
_qgcPal
.
textField
Text
font.pointSize
:
pointSize
}
}
...
...
This diff is collapsed.
Click to expand it.
src/QmlControls/QGCTextField.qml
View file @
901cf22d
...
...
@@ -61,6 +61,7 @@ TextField {
Rectangle
{
anchors.fill
:
parent
border.width
:
enabled
?
1
:
0
border.color
:
root
.
activeFocus
?
"
#47b
"
:
"
#999
"
color
:
qgcPal
.
textField
}
...
...
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