summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Hartmann <Thomas.Hartmann@digia.com>2014-04-16 09:59:28 +0200
committerThomas Hartmann <Thomas.Hartmann@digia.com>2014-04-22 11:21:45 +0200
commit68b1886de8472464bb1c99c5a4c9d4b300e89d7e (patch)
tree991ebc6af44823af2f16713ba734f25010499fb5
parent6db907f935313760c402deb9f56fab3a53b6b53c (diff)
downloadqt-creator-68b1886de8472464bb1c99c5a4c9d4b300e89d7e.tar.gz
QmlDesigner.PropertyEditor: Hide TextInput specifics properties for TextEdit
Task-number: QTCREATORBUG-12035 Change-Id: I39fef53ce9203a58ba3ce2a0e09e8b4d69a14fa7 Reviewed-by: Marco Bubke <marco.bubke@digia.com>
-rw-r--r--share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/TextEditSpecifics.qml1
-rw-r--r--share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/TextInputSection.qml10
-rw-r--r--share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/TextInputSpecifics.qml3
3 files changed, 8 insertions, 6 deletions
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/TextEditSpecifics.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/TextEditSpecifics.qml
index bd9c40aade..1437b56a56 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/TextEditSpecifics.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/TextEditSpecifics.qml
@@ -84,6 +84,5 @@ Column {
}
TextInputSection {
- showEchoMode: false
}
}
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/TextInputSection.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/TextInputSection.qml
index 57f34ed665..b32d6d1bd5 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/TextInputSection.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/TextInputSection.qml
@@ -37,7 +37,7 @@ Section {
anchors.right: parent.right
caption: qsTr("Text Input")
- property bool showEchoMode: false
+ property bool isTextInput: false
id: textInputSection
SectionLayout {
@@ -46,21 +46,23 @@ Section {
Label {
+ visible: textInputSection.isTextInput
text: qsTr("Input mask")
}
LineEdit {
+ visible: textInputSection.isTextInput
backendValue: backendValues.inputMask
Layout.fillWidth: true
}
Label {
- visible: textInputSection.showEchoMode
+ visible: textInputSection.isTextInput
text: qsTr("Echo mode")
}
ComboBox {
- visible: textInputSection.showEchoMode
+ visible: textInputSection.isTextInput
Layout.fillWidth: true
backendValue: backendValues.echoMode
scope: "TextInput"
@@ -68,11 +70,13 @@ Section {
}
Label {
+ visible: textInputSection.isTextInput
text: qsTr("Pass. char")
toolTip: qsTr("Character displayed when users enter passwords.")
}
LineEdit {
+ visible: textInputSection.isTextInput
backendValue: backendValues.passwordCharacter
Layout.fillWidth: true
}
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/TextInputSpecifics.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/TextInputSpecifics.qml
index 79ec6e5908..5270bc9618 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/TextInputSpecifics.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/TextInputSpecifics.qml
@@ -70,7 +70,6 @@ Column {
}
TextInputSection {
- showEchoMode: true
-
+ isTextInput: true
}
}