From 508e2ebcc4b710ee9e40d15c35f8d23358de168b Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@digia.com>
Date: Fri, 20 Sep 2013 17:53:25 +0200
Subject: [PATCH] QmlDesigner.PropertyEditor: fix color editing in
TextSpecifics
Change-Id: I62b34d2b1043ac403c0965c0ce1cf96ef4182d3e
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
---
.../QtQuick/TextSpecifics.qml | 34 ++++++++++---------
1 file changed, 18 insertions(+), 16 deletions(-)
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/TextSpecifics.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/TextSpecifics.qml
index fc21545d978..bb28928324f 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/TextSpecifics.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/TextSpecifics.qml
@@ -39,26 +39,28 @@ Column {
Section {
anchors.left: parent.left
anchors.right: parent.right
- caption: "Color"
- GridLayout {
- columns: 2
- rows: 2
- Label {
- text: "Text"
- }
- LineEdit {
- backendValue: backendValues.color
- }
- Label {
- text: "style"
- }
- 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("Style Color")
+
+ ColorEditor {
+ caption: qsTr("Style Color")
+ backendendValue: backendValues.styleColor
+ supportGradient: false
+ }
+ }
+
StandardTextSection {
useLineEdit: true
showIsWrapping: true
--
GitLab