From 95da38c5b09282c66f907c03ab5d15fed90c82d8 Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Mon, 18 Mar 2013 14:24:14 +0100 Subject: [PATCH] QmlDesigner.FormEditor: Add instancePropertyChange to tools Change-Id: Ibd2e30f97117ec2c20240e115e57f387fd220686 Reviewed-by: Thomas Hartmann (cherry picked from commit 0edde8f83e290f4ad736813b8740bb3fdbe742b2) Reviewed-by: Marco Bubke --- .../components/formeditor/abstractformeditortool.h | 1 + src/plugins/qmldesigner/components/formeditor/dragtool.cpp | 3 +++ src/plugins/qmldesigner/components/formeditor/dragtool.h | 1 + src/plugins/qmldesigner/components/formeditor/movetool.cpp | 4 ++++ src/plugins/qmldesigner/components/formeditor/movetool.h | 1 + src/plugins/qmldesigner/components/formeditor/resizetool.cpp | 4 ++++ src/plugins/qmldesigner/components/formeditor/resizetool.h | 1 + .../qmldesigner/components/formeditor/selectiontool.cpp | 4 ++++ src/plugins/qmldesigner/components/formeditor/selectiontool.h | 1 + 9 files changed, 20 insertions(+) diff --git a/src/plugins/qmldesigner/components/formeditor/abstractformeditortool.h b/src/plugins/qmldesigner/components/formeditor/abstractformeditortool.h index 4fab136c49a..c43c6ad9aa0 100644 --- a/src/plugins/qmldesigner/components/formeditor/abstractformeditortool.h +++ b/src/plugins/qmldesigner/components/formeditor/abstractformeditortool.h @@ -82,6 +82,7 @@ public: virtual void instancesCompleted(const QList &itemList) = 0; virtual void instancesParentChanged(const QList &itemList) = 0; + virtual void instancePropertyChange(const QList > &propertyList) = 0; void setItems(const QList &itemList); QList items() const; diff --git a/src/plugins/qmldesigner/components/formeditor/dragtool.cpp b/src/plugins/qmldesigner/components/formeditor/dragtool.cpp index 08273674329..6bf3bd48d19 100644 --- a/src/plugins/qmldesigner/components/formeditor/dragtool.cpp +++ b/src/plugins/qmldesigner/components/formeditor/dragtool.cpp @@ -244,6 +244,9 @@ void DragTool::instancesParentChanged(const QList &itemList) m_moveManipulator.synchronizeInstanceParent(itemList); } +void DragTool::instancePropertyChange(const QList > & /*propertyList*/) +{ +} void DragTool::clearMoveDelay() { diff --git a/src/plugins/qmldesigner/components/formeditor/dragtool.h b/src/plugins/qmldesigner/components/formeditor/dragtool.h index 16a1a6bf3d8..c6e9f9e0536 100644 --- a/src/plugins/qmldesigner/components/formeditor/dragtool.h +++ b/src/plugins/qmldesigner/components/formeditor/dragtool.h @@ -84,6 +84,7 @@ public: void selectedItemsChanged(const QList &itemList); void instancesParentChanged(const QList &itemList); + void instancePropertyChange(const QList > &propertyList) QTC_OVERRIDE; void updateMoveManipulator(); diff --git a/src/plugins/qmldesigner/components/formeditor/movetool.cpp b/src/plugins/qmldesigner/components/formeditor/movetool.cpp index 0394a863ee7..59fb681dc40 100644 --- a/src/plugins/qmldesigner/components/formeditor/movetool.cpp +++ b/src/plugins/qmldesigner/components/formeditor/movetool.cpp @@ -268,6 +268,10 @@ void MoveTool::instancesParentChanged(const QList &itemList) m_moveManipulator.synchronizeInstanceParent(itemList); } +void MoveTool::instancePropertyChange(const QList > & /*propertyList*/) +{ +} + bool MoveTool::haveSameParent(const QList &itemList) { if (itemList.isEmpty()) diff --git a/src/plugins/qmldesigner/components/formeditor/movetool.h b/src/plugins/qmldesigner/components/formeditor/movetool.h index c078393091d..e9609a8471c 100644 --- a/src/plugins/qmldesigner/components/formeditor/movetool.h +++ b/src/plugins/qmldesigner/components/formeditor/movetool.h @@ -69,6 +69,7 @@ public: void instancesCompleted(const QList &itemList); void instancesParentChanged(const QList &itemList); + void instancePropertyChange(const QList > &propertyList) QTC_OVERRIDE; void updateMoveManipulator(); diff --git a/src/plugins/qmldesigner/components/formeditor/resizetool.cpp b/src/plugins/qmldesigner/components/formeditor/resizetool.cpp index 34ff0a78439..e6a3478fcd7 100644 --- a/src/plugins/qmldesigner/components/formeditor/resizetool.cpp +++ b/src/plugins/qmldesigner/components/formeditor/resizetool.cpp @@ -208,6 +208,10 @@ void ResizeTool::instancesCompleted(const QList &/*itemList*/) { } +void ResizeTool::instancePropertyChange(const QList > & /*propertyList*/) +{ +} + void ResizeTool::instancesParentChanged(const QList &/*itemList*/) { diff --git a/src/plugins/qmldesigner/components/formeditor/resizetool.h b/src/plugins/qmldesigner/components/formeditor/resizetool.h index 46a7f84dc35..9fe93fb11fa 100644 --- a/src/plugins/qmldesigner/components/formeditor/resizetool.h +++ b/src/plugins/qmldesigner/components/formeditor/resizetool.h @@ -71,6 +71,7 @@ public: void instancesParentChanged(const QList &itemList); void instancesCompleted(const QList &itemList); + void instancePropertyChange(const QList > &propertyList) QTC_OVERRIDE; private: diff --git a/src/plugins/qmldesigner/components/formeditor/selectiontool.cpp b/src/plugins/qmldesigner/components/formeditor/selectiontool.cpp index 682bf7f0b0e..62b685df4f6 100644 --- a/src/plugins/qmldesigner/components/formeditor/selectiontool.cpp +++ b/src/plugins/qmldesigner/components/formeditor/selectiontool.cpp @@ -284,6 +284,10 @@ void SelectionTool::instancesParentChanged(const QList &/*item } +void SelectionTool::instancePropertyChange(const QList > & /*propertyList*/) +{ +} + 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 f9bfdeba4e6..be75091cf6e 100644 --- a/src/plugins/qmldesigner/components/formeditor/selectiontool.h +++ b/src/plugins/qmldesigner/components/formeditor/selectiontool.h @@ -82,6 +82,7 @@ public: void instancesCompleted(const QList &itemList); void instancesParentChanged(const QList &itemList); + void instancePropertyChange(const QList > &propertyList) QTC_OVERRIDE; void selectUnderPoint(QGraphicsSceneMouseEvent *event);