Skip to content

Q
qgroundcontrol
Unverified Commit 7c9bf8a3 authored by Gus Grubba's avatar Gus Grubba Committed by GitHub
Browse files
Options

Merge pull request #7243 from mavlink/checkBox 

Check box colors
parents 0d045b06 45ffe414
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 4 deletions
src/QGCApplication.cc
View file @ 7c9bf8a3
...@@ -181,6 +181,7 @@ QGCApplication::QGCApplication(int &argc, char* argv[], bool unitTesting) ...@@ -181,6 +181,7 @@ QGCApplication::QGCApplication(int &argc, char* argv[], bool unitTesting)
#if defined (__macos__) #if defined (__macos__)
locale = QLocale(locale.name()); locale = QLocale(locale.name());
#endif #endif
qDebug() << "System reported locale:" << locale << locale.name();
//-- Our localization //-- Our localization
if(_QGCTranslator.load(locale, "qgc_", "", ":/localization")) if(_QGCTranslator.load(locale, "qgc_", "", ":/localization"))
_app->installTranslator(&_QGCTranslator); _app->installTranslator(&_QGCTranslator);
......
src/QmlControls/QGCCheckBox.qml
View file @ 7c9bf8a3
...@@ -36,14 +36,14 @@ CheckBox { ...@@ -36,14 +36,14 @@ CheckBox {
implicitHeight: implicitWidth implicitHeight: implicitWidth
Rectangle { Rectangle {
anchors.fill: parent anchors.fill: parent
color: _qgcPal.window color: "white"
border.color: _qgcPal.text border.color: qgcPal.text
border.width: 1 border.width: 1
opacity: control.checkedState === Qt.PartiallyChecked ? 0.5 : 1 opacity: control.checkedState === Qt.PartiallyChecked ? 0.5 : 1
QGCColoredImage { QGCColoredImage {
source: "/qmlimages/checkbox-check.svg" source: "/qmlimages/checkbox-check.svg"
color: _qgcPal.text color: "black"
opacity: control.checkedState === Qt.Checked ? control.enabled ? 1 : 0.5 : 0 opacity: control.checkedState === Qt.Checked ? (control.enabled ? 1 : 0.5) : 0
mipmap: true mipmap: true
fillMode: Image.PreserveAspectFit fillMode: Image.PreserveAspectFit
width: parent.width * 0.75 width: parent.width * 0.75
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment