diff options
| author | Henning Gruendl <henning.gruendl@qt.io> | 2020-07-09 11:13:11 +0200 |
|---|---|---|
| committer | Henning Gründl <henning.gruendl@qt.io> | 2020-07-10 10:10:02 +0000 |
| commit | c8981526212cb74f6151cd262ff6215f34c3f62f (patch) | |
| tree | 25ed64f72049df94017b3f4f90ce65e74f12cf77 /share | |
| parent | 58ea14aea7c676633ffe83afe69d62b3f802e9a0 (diff) | |
QmlDesigner: Add change type name dialog
* Add a change type name dialog showing all incompatible properties
* Fix ExpressionTextField triggering twice on pressing enter
* Fix compare operator
Task-number: QDS-1946
Change-Id: Ic384f6dcce44297b43839c17874108b39af909da
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Diffstat (limited to 'share')
| -rw-r--r-- | share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/ItemPane.qml | 9 | ||||
| -rw-r--r-- | share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ExpressionTextField.qml | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/ItemPane.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/ItemPane.qml index 77af9247cf5..db877b65cd7 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/ItemPane.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/ItemPane.qml @@ -99,10 +99,19 @@ Rectangle { showButtons: false fixedSize: true + property bool blockEditingFinished: false + onEditingFinished: { + if (typeLineEdit.blockEditingFinished) + return + + typeLineEdit.blockEditingFinished = true + if (visible) changeTypeName(typeLineEdit.text.trim()) visible = false + + typeLineEdit.blockEditingFinished = false } } diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ExpressionTextField.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ExpressionTextField.qml index 6209325e7e3..e0de0d3b88f 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ExpressionTextField.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ExpressionTextField.qml @@ -132,7 +132,7 @@ StudioControls.TextField { event.accepted = true; - if (list.length == 1) + if (list.length === 1) textField.commitCompletion() } else { |