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

QmlDesigner: Add QmlItemNode::createQmlItemNodeFromImage overload

Browse Source 
We need a parent property overload so we can add a item to a non
default property.

Change-Id: I2044126f1c9f4cb112d1b96db163b70cd12b9042
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
This commit is contained in:
Marco Bubke
2014-05-07 14:56:46 +02:00
parent 234cc766ed
commit 49347f3cf5
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qmldesigner/designercore/include/qmlitemnode.h
View File

@@ -69,6 +69,10 @@ public:
const QString &imageName,
const QPointF &position,
QmlItemNode parentQmlItemNode);
static QmlItemNode createQmlItemNodeFromImage(AbstractView *view,
const QString &imageName,
const QPointF &position,
NodeAbstractProperty parentproperty);
QmlModelStateGroup states() const;
QList<QmlItemNode> children() const;

15
src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp
View File

@@ -162,11 +162,19 @@ QmlItemNode QmlItemNode::createQmlItemNode(AbstractView *view, const ItemLibrary
QmlItemNode QmlItemNode::createQmlItemNodeFromImage(AbstractView *view, const QString &imageName, const QPointF &position, QmlItemNode parentQmlItemNode)
{
QmlItemNode newQmlItemNode;
if (!parentQmlItemNode.isValid())
parentQmlItemNode = QmlItemNode(view->rootModelNode());
if (parentQmlItemNode.isValid()) {
NodeAbstractProperty parentProperty = parentQmlItemNode.defaultNodeAbstractProperty();
return QmlItemNode::createQmlItemNodeFromImage(view, imageName, position, parentProperty);
}
QmlItemNode QmlItemNode::createQmlItemNodeFromImage(AbstractView *view, const QString &imageName, const QPointF &position, NodeAbstractProperty parentproperty)
{
QmlItemNode newQmlItemNode;
if (parentproperty.isValid()) {
RewriterTransaction transaction = view->beginRewriterTransaction(QByteArrayLiteral("QmlItemNode::createQmlItemNodeFromImage"));
if (view->model()->hasNodeMetaInfo("QtQuick.Image")) {
@@ -185,7 +193,7 @@ QmlItemNode QmlItemNode::createQmlItemNodeFromImage(AbstractView *view, const QS
}
newQmlItemNode = QmlItemNode(view->createModelNode("QtQuick.Image", metaInfo.majorVersion(), metaInfo.minorVersion(), propertyPairList));
parentQmlItemNode.defaultNodeAbstractProperty().reparentHere(newQmlItemNode);
parentproperty.reparentHere(newQmlItemNode);
newQmlItemNode.setId(view->generateNewId("image"));
@@ -199,7 +207,6 @@ QmlItemNode QmlItemNode::createQmlItemNodeFromImage(AbstractView *view, const QS
Q_ASSERT(newQmlItemNode.isValid());
}
return newQmlItemNode;
}