Pasting items from layout context menu pastes them at menu origin

nyalldawson · nyalldawson · commit 17656f23c6bd · 2017-12-07T08:50:01.000+10:00
instead of final cursor position
diff --git a/python/gui/layout/qgslayoutview.sip b/python/gui/layout/qgslayoutview.sip
@@ -212,6 +212,18 @@ class QgsLayoutView: QGraphicsView
 
  A list of pasted items is returned.
 
+.. seealso:: copySelectedItems()
+.. seealso:: hasItemsInClipboard()
+ :rtype: list of QgsLayoutItem
+%End
+
+    QList< QgsLayoutItem * > pasteItems( QPointF layoutPoint );
+%Docstring
+ Pastes items from clipboard, at the specified ``layoutPoint``,
+ in layout units.
+
+ A list of pasted items is returned.
+
 .. seealso:: copySelectedItems()
 .. seealso:: hasItemsInClipboard()
  :rtype: list of QgsLayoutItem
diff --git a/src/app/layout/qgslayoutappmenuprovider.cpp b/src/app/layout/qgslayoutappmenuprovider.cpp
@@ -94,9 +94,10 @@ QMenu *QgsLayoutAppMenuProvider::createContextMenu( QWidget *parent, QgsLayout *
   else if ( mDesigner->view()->hasItemsInClipboard() )
   {
     QAction *pasteAction = new QAction( tr( "Paste" ), menu );
-    connect( pasteAction, &QAction::triggered, this, [this]()
+    connect( pasteAction, &QAction::triggered, this, [this, menu]()
     {
-      mDesigner->paste();
+      QPointF pt = mDesigner->view()->mapToScene( mDesigner->view()->mapFromGlobal( menu->pos() ) );
+      mDesigner->view()->pasteItems( pt );
     } );
     menu->addAction( pasteAction );
     menu->addSeparator();
diff --git a/src/gui/layout/qgslayoutview.cpp b/src/gui/layout/qgslayoutview.cpp
@@ -369,6 +369,26 @@ QList< QgsLayoutItem * > QgsLayoutView::pasteItems( QgsLayoutView::PasteMode mod
   return pastedItems;
 }
 
+QList<QgsLayoutItem *> QgsLayoutView::pasteItems( QPointF layoutPoint )
+{
+  QList< QgsLayoutItem * > pastedItems;
+  QDomDocument doc;
+  QClipboard *clipboard = QApplication::clipboard();
+  if ( doc.setContent( clipboard->mimeData()->data( QStringLiteral( "text/xml" ) ) ) )
+  {
+    QDomElement docElem = doc.documentElement();
+    if ( docElem.tagName() == QLatin1String( "LayoutItemClipboard" ) )
+    {
+      currentLayout()->undoStack()->beginMacro( tr( "Paste Items" ) );
+      currentLayout()->undoStack()->beginCommand( currentLayout(), tr( "Paste Items" ) );
+      pastedItems = currentLayout()->addItemsFromXml( docElem, doc, QgsReadWriteContext(), &layoutPoint, false );
+      currentLayout()->undoStack()->endCommand();
+      currentLayout()->undoStack()->endMacro();
+    }
+  }
+  return pastedItems;
+}
+
 bool QgsLayoutView::hasItemsInClipboard() const
 {
   QDomDocument doc;
diff --git a/src/gui/layout/qgslayoutview.h b/src/gui/layout/qgslayoutview.h
@@ -247,6 +247,17 @@ class GUI_EXPORT QgsLayoutView: public QGraphicsView
      */
     QList< QgsLayoutItem * > pasteItems( PasteMode mode );
 
+    /**
+     * Pastes items from clipboard, at the specified \a layoutPoint,
+     * in layout units.
+     *
+     * A list of pasted items is returned.
+     *
+     * \see copySelectedItems()
+     * \see hasItemsInClipboard()
+     */
+    QList< QgsLayoutItem * > pasteItems( QPointF layoutPoint );
+
     /**
      * Returns true if the current clipboard contains layout items.
      * \see pasteItems()

Original file line number	Diff line number	Diff line change
`@@ -94,9 +94,10 @@ QMenu QgsLayoutAppMenuProvider::createContextMenu( QWidget parent, QgsLayout *`
`94`	`94`	`else if ( mDesigner->view()->hasItemsInClipboard() )`
`95`	`95`	`{`
`96`	`96`	`QAction *pasteAction = new QAction( tr( "Paste" ), menu );`
`97`		`- connect( pasteAction, &QAction::triggered, this, [this]()`
	`97`	`+ connect( pasteAction, &QAction::triggered, this, [this, menu]()`
`98`	`98`	`{`
`99`		`- mDesigner->paste();`
	`99`	`+ QPointF pt = mDesigner->view()->mapToScene( mDesigner->view()->mapFromGlobal( menu->pos() ) );`
	`100`	`+ mDesigner->view()->pasteItems( pt );`
`100`	`101`	`} );`
`101`	`102`	`menu->addAction( pasteAction );`
`102`	`103`	`menu->addSeparator();`