feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner Binding Editor UX improvement

Browse Source 
Binding Editor now shows which property type it expects.
Binding Editor now works with alias and unknown types.

Change-Id: I23d0bed3db5126de5107cf2f1f6b46485b89e1ea
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Aleksei German
2019-11-27 16:05:34 +01:00
parent 2ebffd3eaf
commit 7cf6632d7d
4 changed files with 38 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/plugins/qmldesigner/components/bindingeditor/bindingeditor.cpp
View File

@@ -102,9 +102,16 @@ void BindingEditor::setBackendValue(const QVariant &backendValue)
m_backendValue = backendValue;
const QObject *backendValueObj = backendValue.value<QObject*>();
const PropertyEditorValue *propertyEditorValue = qobject_cast<const PropertyEditorValue *>(backendValueObj);
const ModelNode node = propertyEditorValue->modelNode();
m_backendValueTypeName = propertyEditorValue->modelNode().metaInfo().propertyTypeName(
propertyEditorValue->name());
if (node.isValid())
{
m_backendValueTypeName = node.metaInfo().propertyTypeName(propertyEditorValue->name());
if (m_backendValueTypeName == "alias" || m_backendValueTypeName == "unknown")
if (QmlObjectNode::isValidQmlObjectNode(node))
m_backendValueTypeName = QmlObjectNode(node).instanceType(propertyEditorValue->name());
}
emit backendValueChanged();
}
@@ -154,8 +161,16 @@ void BindingEditor::prepareBindings()
for (auto objnode : allNodes) {
BindingEditorDialog::BindingOption binding;
for (auto propertyName : objnode.metaInfo().propertyNames())
if (m_backendValueTypeName == objnode.metaInfo().propertyTypeName(propertyName))
{
TypeName propertyTypeName = objnode.metaInfo().propertyTypeName(propertyName);
if ((propertyTypeName == "alias" || propertyTypeName == "unknown"))
if (QmlObjectNode::isValidQmlObjectNode(objnode))
propertyTypeName = QmlObjectNode(objnode).instanceType(propertyName);
if (m_backendValueTypeName == propertyTypeName)
binding.properties.append(QString::fromUtf8(propertyName));
}
if (!binding.properties.isEmpty() && objnode.hasId()) {
binding.item = objnode.displayName();
@@ -165,6 +180,16 @@ void BindingEditor::prepareBindings()
if (!bindings.isEmpty() && !m_dialog.isNull())
m_dialog->setAllBindings(bindings);
updateWindowName();
}
void BindingEditor::updateWindowName()
{
if (!m_dialog.isNull() && !m_backendValueTypeName.isEmpty())
{
m_dialog->setWindowTitle(m_dialog->defaultTitle() + " [" + m_backendValueTypeName + "]");
}
}
QVariant BindingEditor::backendValue() const