From ca50fc36e4ff3b31fa3292290c88eb6ecb96282c Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@digia.com>
Date: Fri, 20 Sep 2013 17:53:04 +0200
Subject: [PATCH] QmlDesigner.PropertyEditor: fix color editing in
TextEditSpecifics
Change-Id: I90c9743d6ec19b557721c45913da480f30b34e16
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
---
.../QtQuick/TextEditSpecifics.qml | 36 ++++++++++---------
1 file changed, 19 insertions(+), 17 deletions(-)
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/TextEditSpecifics.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/TextEditSpecifics.qml
index 696338e7ad7..056c5f7d96a 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/TextEditSpecifics.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/TextEditSpecifics.qml
@@ -38,32 +38,34 @@ Column {
Section {
anchors.left: parent.left
anchors.right: parent.right
- caption: "Color"
- GridLayout {
- columns: 2
- rows: 2
- Label {
- text: "Text Color"
- }
- LineEdit {
- backendValue: backendValues.color
- }
- Label {
- text: "Style Color"
- }
- LineEdit {
- backendValue: backendValues.styleColor
- }
+ caption: qsTr("Text Color")
+
+ ColorEditor {
+ caption: qsTr(" Text Color")
+ backendendValue: backendValues.color
+ supportGradient: true
}
}
+ Section {
+ anchors.left: parent.left
+ anchors.right: parent.right
+ caption: qsTr("Selection Color")
+
+ ColorEditor {
+ caption: qsTr("Selection Color")
+ backendendValue: backendValues.selectionColor
+ supportGradient: false
+ }
+ }
+
StandardTextSection {
showIsWrapping: true
useLineEdit: true
}
FontSection {
- showStyle: true
+ showStyle: false
}
}
--
GitLab