QmlDesigner.formEditor: wire up instancesCompleted() to tools

diff --git a/src/plugins/qmldesigner/components/formeditor/abstractformeditortool.h b/src/plugins/qmldesigner/components/formeditor/abstractformeditortool.h
index b48703a..8e35685 100644 (file)
--- a/src/plugins/qmldesigner/components/formeditor/abstractformeditortool.h
+++ b/src/plugins/qmldesigner/components/formeditor/abstractformeditortool.h
@@ -77,6 +77,8 @@ public:
 
     virtual void formEditorItemsChanged(const QList<FormEditorItem*> &itemList) = 0;
 
+    virtual void instancesCompleted(const QList<FormEditorItem*> &itemList) = 0;
+
     void setItems(const QList<FormEditorItem*> &itemList);
     QList<FormEditorItem*> items() const;
 

diff --git a/src/plugins/qmldesigner/components/formeditor/anchortool.cpp b/src/plugins/qmldesigner/components/formeditor/anchortool.cpp
index c35a347..202180d 100644 (file)
--- a/src/plugins/qmldesigner/components/formeditor/anchortool.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/anchortool.cpp
@@ -213,6 +213,10 @@ void AnchorTool::formEditorItemsChanged(const QList<FormEditorItem*> &)
     m_anchorIndicator.updateItems(view()->scene()->allFormEditorItems());
 }
 
+void AnchorTool::instancesCompleted(const QList<FormEditorItem*> &itemList)
+{
+}
+
 AnchorLineHandleItem* AnchorTool::topAnchorLineHandleItem(const QList<QGraphicsItem*> & itemList)
 {
     foreach (QGraphicsItem *item, itemList) {

diff --git a/src/plugins/qmldesigner/components/formeditor/anchortool.h b/src/plugins/qmldesigner/components/formeditor/anchortool.h
index 830c970..541d92c 100644 (file)
--- a/src/plugins/qmldesigner/components/formeditor/anchortool.h
+++ b/src/plugins/qmldesigner/components/formeditor/anchortool.h
@@ -70,6 +70,8 @@ public:
 
     void formEditorItemsChanged(const QList<FormEditorItem*> &itemList);
 
+    void instancesCompleted(const QList<FormEditorItem*> &itemList);
+
     static AnchorLineHandleItem* topAnchorLineHandleItem(const QList<QGraphicsItem*> & itemList);
 
 private slots:

diff --git a/src/plugins/qmldesigner/components/formeditor/dragtool.cpp b/src/plugins/qmldesigner/components/formeditor/dragtool.cpp
index 1224760..2752c2b 100644 (file)
--- a/src/plugins/qmldesigner/components/formeditor/dragtool.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/dragtool.cpp
@@ -206,6 +206,10 @@ void DragTool::formEditorItemsChanged(const QList<FormEditorItem*> & itemList)
     }
 }
 
+void DragTool::instancesCompleted(const QList<FormEditorItem*> &itemList)
+{
+}
+
 void DragTool::clearMoveDelay()
 {
     m_blockMove = false;

diff --git a/src/plugins/qmldesigner/components/formeditor/dragtool.h b/src/plugins/qmldesigner/components/formeditor/dragtool.h
index d506b9b..74d59c3 100644 (file)
--- a/src/plugins/qmldesigner/components/formeditor/dragtool.h
+++ b/src/plugins/qmldesigner/components/formeditor/dragtool.h
@@ -100,6 +100,8 @@ public:
 
     void formEditorItemsChanged(const QList<FormEditorItem*> &itemList);
 
+    void instancesCompleted(const QList<FormEditorItem*> &itemList);
+
     void clearMoveDelay();
 
 protected:

diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp
index 5884215..706ebcc 100644 (file)
--- a/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp
@@ -437,6 +437,15 @@ void FormEditorView::auxiliaryDataChanged(const ModelNode &node, const QString &
 
 void FormEditorView::instancesCompleted(const QVector<ModelNode> &completedNodeList)
 {
+    QList<FormEditorItem*> itemNodeList;
+    foreach (const ModelNode &node, completedNodeList) {
+        QmlItemNode qmlItemNode(node);
+        if (qmlItemNode.isValid() && scene()->hasItemForQmlItemNode(qmlItemNode)) {
+            scene()->synchronizeParent(qmlItemNode);
+            itemNodeList.append(scene()->itemForQmlItemNode(qmlItemNode));
+        }
+    }
+    currentTool()->instancesCompleted(itemNodeList);
 }
 
 

diff --git a/src/plugins/qmldesigner/components/formeditor/itemcreatortool.cpp b/src/plugins/qmldesigner/components/formeditor/itemcreatortool.cpp
index 3bc9b1d..6b1f1ff 100644 (file)
--- a/src/plugins/qmldesigner/components/formeditor/itemcreatortool.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/itemcreatortool.cpp
@@ -32,7 +32,7 @@
 #include "formeditorview.h"
 
 #include <metainfo.h>
-#include <itemlibrary.h>
+#include <itemlibrarywidget.h>
 
 #include <QApplication>
 #include <QGraphicsSceneMouseEvent>
@@ -139,6 +139,10 @@ void ItemCreatorTool::formEditorItemsChanged(const QList<FormEditorItem*> &/*ite
 {
 }
 
+void ItemCreatorTool::instancesCompleted(const QList<FormEditorItem*> &/*itemList*/)
+{
+}
+
 void ItemCreatorTool::setItemString(const QString &itemString)
 {
     m_itemString = itemString;

diff --git a/src/plugins/qmldesigner/components/formeditor/itemcreatortool.h b/src/plugins/qmldesigner/components/formeditor/itemcreatortool.h
index 0efa0cc..49524fa 100644 (file)
--- a/src/plugins/qmldesigner/components/formeditor/itemcreatortool.h
+++ b/src/plugins/qmldesigner/components/formeditor/itemcreatortool.h
@@ -67,6 +67,8 @@ public:
 
     void formEditorItemsChanged(const QList<FormEditorItem*> &itemList);
 
+    void instancesCompleted(const QList<FormEditorItem*> &itemList);
+
     void setItemString(const QString &itemString);
 
     FormEditorItem* calculateContainer(const QPointF &point);

diff --git a/src/plugins/qmldesigner/components/formeditor/movetool.cpp b/src/plugins/qmldesigner/components/formeditor/movetool.cpp
index 0e1db25..ecbfd95 100644 (file)
--- a/src/plugins/qmldesigner/components/formeditor/movetool.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/movetool.cpp
@@ -233,6 +233,10 @@ void MoveTool::selectedItemsChanged(const QList<FormEditorItem*> &itemList)
     updateMoveManipulator();
 }
 
+void MoveTool::instancesCompleted(const QList<FormEditorItem*> &itemList)
+{
+}
+
 bool MoveTool::haveSameParent(const QList<FormEditorItem*> &itemList)
 {
     if (itemList.isEmpty())

diff --git a/src/plugins/qmldesigner/components/formeditor/movetool.h b/src/plugins/qmldesigner/components/formeditor/movetool.h
index 3dce822..5c986fc 100644 (file)
--- a/src/plugins/qmldesigner/components/formeditor/movetool.h
+++ b/src/plugins/qmldesigner/components/formeditor/movetool.h
@@ -64,9 +64,9 @@ public:
 
     void selectedItemsChanged(const QList<FormEditorItem*> &itemList);
 
-    void updateMoveManipulator();
-
+    void instancesCompleted(const QList<FormEditorItem*> &/*itemList*/);
 
+    void updateMoveManipulator();
 
     void beginWithPoint(const QPointF &beginPoint);
 

diff --git a/src/plugins/qmldesigner/components/formeditor/resizetool.cpp b/src/plugins/qmldesigner/components/formeditor/resizetool.cpp
index 7aefee3..30e01ef 100644 (file)
--- a/src/plugins/qmldesigner/components/formeditor/resizetool.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/resizetool.cpp
@@ -180,4 +180,8 @@ void ResizeTool::formEditorItemsChanged(const QList<FormEditorItem*> &itemList)
     m_resizeIndicator.updateItems(itemList);
 }
 
+ void ResizeTool::instancesCompleted(const QList<FormEditorItem*> &/*itemList*/)
+ {
+ }
+
 }

diff --git a/src/plugins/qmldesigner/components/formeditor/resizetool.h b/src/plugins/qmldesigner/components/formeditor/resizetool.h
index 803e4db..4cee102 100644 (file)
--- a/src/plugins/qmldesigner/components/formeditor/resizetool.h
+++ b/src/plugins/qmldesigner/components/formeditor/resizetool.h
@@ -65,6 +65,8 @@ public:
 
     void formEditorItemsChanged(const QList<FormEditorItem*> &itemList);
 
+    void instancesCompleted(const QList<FormEditorItem*> &itemList);
+
 private:
     SelectionIndicator m_selectionIndicator;
     ResizeIndicator m_resizeIndicator;

diff --git a/src/plugins/qmldesigner/components/formeditor/selectiontool.cpp b/src/plugins/qmldesigner/components/formeditor/selectiontool.cpp
index 5fc65de..8ecb713 100644 (file)
--- a/src/plugins/qmldesigner/components/formeditor/selectiontool.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/selectiontool.cpp
@@ -261,6 +261,10 @@ void SelectionTool::formEditorItemsChanged(const QList<FormEditorItem*> &itemLis
     m_resizeIndicator.updateItems(itemList);
 }
 
+void SelectionTool::instancesCompleted(const QList<FormEditorItem*> &/*itemList*/)
+{
+}
+
 void SelectionTool::selectUnderPoint(QGraphicsSceneMouseEvent *event)
 {
     m_singleSelectionManipulator.begin(event->scenePos());

diff --git a/src/plugins/qmldesigner/components/formeditor/selectiontool.h b/src/plugins/qmldesigner/components/formeditor/selectiontool.h
index fc885e5..6ecf9a3 100644 (file)
--- a/src/plugins/qmldesigner/components/formeditor/selectiontool.h
+++ b/src/plugins/qmldesigner/components/formeditor/selectiontool.h
@@ -76,6 +76,8 @@ public:
 
     void formEditorItemsChanged(const QList<FormEditorItem*> &itemList);
 
+    void instancesCompleted(const QList<FormEditorItem*> &itemList);
+
     void selectUnderPoint(QGraphicsSceneMouseEvent *event);
 
     void setSelectOnlyContentItems(bool selectOnlyContentItems);