summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Hartmann <Thomas.Hartmann@digia.com>2013-09-20 17:53:04 +0200
committerThomas Hartmann <Thomas.Hartmann@digia.com>2013-09-20 17:55:02 +0200
commitca50fc36e4ff3b31fa3292290c88eb6ecb96282c (patch)
tree21a7d45bfb7b3243f64401d3b47fbb819614630f
parenta2511021c29df653ef0a58b96d3a08496b1d35d0 (diff)
downloadqt-creator-ca50fc36e4ff3b31fa3292290c88eb6ecb96282c.tar.gz
QmlDesigner.PropertyEditor: fix color editing in TextEditSpecifics
Change-Id: I90c9743d6ec19b557721c45913da480f30b34e16 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
-rw-r--r--share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/TextEditSpecifics.qml36
1 files changed, 19 insertions, 17 deletions
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/TextEditSpecifics.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/TextEditSpecifics.qml
index 696338e7ad..056c5f7d96 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
}
}