summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Hartmann <Thomas.Hartmann@digia.com>2013-09-20 17:53:16 +0200
committerThomas Hartmann <Thomas.Hartmann@digia.com>2013-09-20 17:55:10 +0200
commit16c50459851df2e4107b1d5ee1fd4fdfe1dc034c (patch)
treeb989d315944223485a68b1700b8ae510cff31c18
parentca50fc36e4ff3b31fa3292290c88eb6ecb96282c (diff)
downloadqt-creator-16c50459851df2e4107b1d5ee1fd4fdfe1dc034c.tar.gz
QmlDesigner.PropertyEditor: fix color editing in TextInputSpecifics
Change-Id: I2e966f20df778f01ae1ea854f58ace37f8e767a9 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
-rw-r--r--share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/TextInputSpecifics.qml36
1 files changed, 19 insertions, 17 deletions
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/TextInputSpecifics.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/TextInputSpecifics.qml
index abe887f35a..84c6c134f0 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/TextInputSpecifics.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/TextInputSpecifics.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 {
useLineEdit: false
showIsWrapping: false
}
FontSection {
- showStyle: true
+ showStyle: false
}
}