From 81abc2ce7a73700c26eb211aef99b7f81c0d0f7c Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Date: Fri, 8 Jan 2010 17:17:48 +0100
Subject: [PATCH] Qml Designer: color adjustment in property editor
---
.../propertyeditor/Qt/CheckBox.qml | 22 +++++++++----------
.../propertyeditor/Qt/DoubleSpinBox.qml | 2 +-
.../qmldesigner/propertyeditor/Qt/SpinBox.qml | 2 +-
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/CheckBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/CheckBox.qml
index f5ad1b91acd..83b06e95678 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/CheckBox.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/CheckBox.qml
@@ -22,17 +22,17 @@ QCheckBox { //This is a special CheckBox that does color coding for states
Script {
function evaluate() {
- if (baseStateFlag) {
- if (backendValue.isInModel)
+ if (baseStateFlag) {
+ if (backendValue != null && backendValue.isInModel)
CheckBox.setStyleSheet("color: white;");
- else
- CheckBox.setStyleSheet("color: gray;");
- } else {
- if (backendValue.IsInSubState)
- CheckBox.setStyleSheet("color: blue;");
- else
- CheckBox.setStyleSheet("color: gray;");
- }
- }
+ else
+ CheckBox.setStyleSheet("color: gray;");
+ } else {
+ if (backendValue != null && backendValue.isInSubState)
+ CheckBox.setStyleSheet("color: #7799FF;");
+ else
+ CheckBox.setStyleSheet("color: gray;");
+ }
+ }
}
}
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/DoubleSpinBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/DoubleSpinBox.qml
index d7926804799..9827d7e58a1 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/DoubleSpinBox.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/DoubleSpinBox.qml
@@ -31,7 +31,7 @@ QWidget { //This is a special DoubleSpinBox that does color coding for states
DoubleSpinBox.setStyleSheet("color: gray;");
} else {
if (backendValue != null && backendValue.isInSubState)
- DoubleSpinBox.setStyleSheet("color: blue;");
+ DoubleSpinBox.setStyleSheet("color: #7799FF;");
else
DoubleSpinBox.setStyleSheet("color: gray;");
}
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/SpinBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/SpinBox.qml
index 868236afc13..5ecefa96a2d 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/SpinBox.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/SpinBox.qml
@@ -29,7 +29,7 @@ QWidget { //This is a special SpinBox that does color coding for states
SpinBox.setStyleSheet("color: gray;");
} else {
if (backendValue != null && backendValue.isInSubState)
- SpinBox.setStyleSheet("color: blue;");
+ SpinBox.setStyleSheet("color: #7799FF;");
else
SpinBox.setStyleSheet("color: gray;");
}
--
GitLab