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

QmlDesigner.componentView: update and bug fixing

Browse Source 
I implemented nodeReparented() (bugfix)
I use ModelNode::ComponentSource instead of childNode.type() == "QtQuick.Component"
to catch "implicit" components.

Change-Id: Ie5bd48afbb5a5b10c3544406b1229aafc5dabed5
Reviewed-on: http://codereview.qt.nokia.com/416
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
This commit is contained in:
Thomas Hartmann
2011-06-09 10:53:22 +02:00
parent f37e589e94
commit 0793a8dfb8
1 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/plugins/qmldesigner/components/integration/componentview.cpp
View File

@@ -127,22 +127,24 @@ void ComponentView::searchForComponentAndAddToList(const ModelNode &node)
nodeList.append(node.allSubModelNodes()); nodeList.append(node.allSubModelNodes());
foreach (const ModelNode &childNode, nodeList) { foreach (const ModelNode &node, nodeList) {
if (childNode.type() == "QtQuick.Component") { if (node.nodeSourceType() == ModelNode::ComponentSource) {
if (!childNode.id().isEmpty()) { if (!node.id().isEmpty()) {
QStandardItem *item = new QStandardItem(childNode.id()); QStandardItem *item = new QStandardItem(node.id());
item->setData(QVariant::fromValue(childNode), ModelNodeRole); item->setData(QVariant::fromValue(node), ModelNodeRole);
item->setEditable(false); item->setEditable(false);
m_standardItemModel->appendRow(item); m_standardItemModel->appendRow(item);
} else { } else {
QString description; QString description;
if (!childNode.parentProperty().parentModelNode().id().isEmpty()) ModelNode parentNode = node.parentProperty().parentModelNode();
description = childNode.parentProperty().parentModelNode().id() + QLatin1Char(' '); if (parentNode.isValid())
if (!parentNode.id().isEmpty())
description = node.parentProperty().parentModelNode().id() + QLatin1Char(' ');
else else
description = childNode.parentProperty().parentModelNode().simplifiedTypeName() + QLatin1Char(' '); description = node.parentProperty().parentModelNode().simplifiedTypeName() + QLatin1Char(' ');
description += childNode.parentProperty().name(); description += node.parentProperty().name();
QStandardItem *item = new QStandardItem(description); QStandardItem *item = new QStandardItem(description);
item->setData(QVariant::fromValue(childNode), ModelNodeRole); item->setData(QVariant::fromValue(node), ModelNodeRole);
item->setEditable(false); item->setEditable(false);
m_standardItemModel->appendRow(item); m_standardItemModel->appendRow(item);
} }
@@ -166,7 +168,7 @@ void ComponentView::searchForComponentAndRemoveFromList(const ModelNode &node)
foreach (const ModelNode &childNode, nodeList) { foreach (const ModelNode &childNode, nodeList) {
if (childNode.type() == "QtQuick.Component") { if (childNode.nodeSourceType() == ModelNode::ComponentSource) {
if (!childNode.id().isEmpty()) { if (!childNode.id().isEmpty()) {
for (int row = 0; row < m_standardItemModel->rowCount(); row++) { for (int row = 0; row < m_standardItemModel->rowCount(); row++) {
if (m_standardItemModel->item(row)->text() == childNode.id()) if (m_standardItemModel->item(row)->text() == childNode.id())
@@ -182,7 +184,12 @@ void ComponentView::searchForComponentAndRemoveFromList(const ModelNode &node)
} }
void ComponentView::nodeAboutToBeReparented(const ModelNode &/*node*/, const NodeAbstractProperty &/*newPropertyParent*/, const NodeAbstractProperty &/*oldPropertyParent*/, AbstractView::PropertyChangeFlags /*propertyChange*/) {} void ComponentView::nodeAboutToBeReparented(const ModelNode &/*node*/, const NodeAbstractProperty &/*newPropertyParent*/, const NodeAbstractProperty &/*oldPropertyParent*/, AbstractView::PropertyChangeFlags /*propertyChange*/) {}
void ComponentView::nodeReparented(const ModelNode &/*node*/, const NodeAbstractProperty &/*newPropertyParent*/, const NodeAbstractProperty &/*oldPropertyParent*/, AbstractView::PropertyChangeFlags /*propertyChange*/) {}
void ComponentView::nodeReparented(const ModelNode &node, const NodeAbstractProperty &/*newPropertyParent*/, const NodeAbstractProperty &/*oldPropertyParent*/, AbstractView::PropertyChangeFlags /*propertyChange*/)
{
searchForComponentAndAddToList(node);
}
void ComponentView::nodeIdChanged(const ModelNode& /*node*/, const QString& /*newId*/, const QString& /*oldId*/) {} void ComponentView::nodeIdChanged(const ModelNode& /*node*/, const QString& /*newId*/, const QString& /*oldId*/) {}
void ComponentView::propertiesAboutToBeRemoved(const QList<AbstractProperty>& /*propertyList*/) {} void ComponentView::propertiesAboutToBeRemoved(const QList<AbstractProperty>& /*propertyList*/) {}
void ComponentView::propertiesRemoved(const QList<AbstractProperty>& /*propertyList*/) {} void ComponentView::propertiesRemoved(const QList<AbstractProperty>& /*propertyList*/) {}