Commit 95bcd088 authored by Thomas Hartmann's avatar Thomas Hartmann

QmlDesigner.PropertyEditor: Fix TextEditSpecifics

I moved the property format into Text section, because
having two sections with even the same name was confusing.
The format property also is not really related to "Text Input".

Since the distinction between plain and rich text is very important,
it makes sense to have this property in the first section.

Change-Id: I4d66ed4a24fe0d99d394c17d149c830db2c6d3b8
Task-number: QTCREATORBUG-12452
Reviewed-by: default avatarTim Jenssen <tim.jenssen@digia.com>
parent 672e7042
......@@ -50,6 +50,7 @@ Section {
property bool showIsWrapping: false
property bool showVerticalAlignment: false
property bool useLineEdit: true
property bool showFormatProperty: false
SectionLayout {
columns: 2
......@@ -92,5 +93,17 @@ Section {
AligmentVerticalButtons {
visible: showVerticalAlignment
}
Label {
visible: showFormatProperty
text: qsTr("Format")
}
ComboBox {
visible: showFormatProperty
model: ["PlainText", "RichText", "AutoText"]
backendValue: backendValues.textFormat
Layout.fillWidth: true
}
}
}
......@@ -38,6 +38,7 @@ Column {
StandardTextSection {
showIsWrapping: true
useLineEdit: true
showFormatProperty: true
}
Section {
......@@ -69,20 +70,6 @@ Column {
showStyle: false
}
Section {
caption: qsTr("Text Input")
SectionLayout {
Label {
text: qsTr("Format")
}
ComboBox {
model: ["PlainText", "RichText", "AutoText"]
backendValue: backendValues.textFormat
Layout.fillWidth: true
}
}
}
TextInputSection {
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment