Option to create undo commands whan adding composer items from xml

qgis · Dec 7, 2011 · f1c4d53 · f1c4d53
1 parent d4c497b
commit f1c4d53
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 3 deletions.
diff --git a/python/core/qgscomposition.sip b/python/core/qgscomposition.sip
@@ -102,6 +102,13 @@ class QgsComposition: QGraphicsScene
     /**Reads settings from xml file*/
     bool readXML( const QDomElement& compositionElem, const QDomDocument& doc );
 
+    /**Add items from XML representation to the graphics scene (for project file reading, pasting items from clipboard)
+      @param elem items parent element, e.g. <Composer> or <ComposerItemClipboard>
+      @param doc xml document
+      @param addUndoCommands insert AddItem commands if true (e.g. for copy/paste)
+      @param pos item position. Optional, take position from xml if 0*/
+    void addItemsFromXML( const QDomElement& elem, const QDomDocument& doc, bool addUndoCommands = false, QPointF* pos = 0 );
+
     /**Adds item to z list. Usually called from constructor of QgsComposerItem*/
     void addItemToZList( QgsComposerItem* item );
     /**Removes item from z list. Usually called from destructor of QgsComposerItem*/

diff --git a/src/core/composer/qgscomposition.cpp b/src/core/composer/qgscomposition.cpp
@@ -261,7 +261,7 @@ bool QgsComposition::readXML( const QDomElement& compositionElem, const QDomDocu
   return true;
 }
 
-void QgsComposition::addItemsFromXML( const QDomElement& elem, const QDomDocument& doc, QPointF* pos )
+void QgsComposition::addItemsFromXML( const QDomElement& elem, const QDomDocument& doc, bool addUndoCommands, QPointF* pos )
 {
   QDomNodeList composerLabelList = elem.elementsByTagName( "ComposerLabel" );
   for ( int i = 0; i < composerLabelList.size(); ++i )
@@ -274,6 +274,10 @@ void QgsComposition::addItemsFromXML( const QDomElement& elem, const QDomDocumen
       newLabel->setItemPosition( pos->x(), pos->y() );
     }
     addComposerLabel( newLabel );
+    if ( addUndoCommands )
+    {
+      pushAddRemoveCommand( newLabel, tr( "Label added" ) );
+    }
   }
   // map
   QDomNodeList composerMapList = elem.elementsByTagName( "ComposerMap" );
@@ -287,6 +291,10 @@ void QgsComposition::addItemsFromXML( const QDomElement& elem, const QDomDocumen
       newMap->setItemPosition( pos->x(), pos->y() );
     }
     addComposerMap( newMap );
+    if ( addUndoCommands )
+    {
+      pushAddRemoveCommand( newMap, tr( "Map added" ) );
+    }
   }
   // arrow
   QDomNodeList composerArrowList = elem.elementsByTagName( "ComposerArrow" );
@@ -300,6 +308,10 @@ void QgsComposition::addItemsFromXML( const QDomElement& elem, const QDomDocumen
       newArrow->setItemPosition( pos->x(), pos->y() );
     }
     addComposerArrow( newArrow );
+    if ( addUndoCommands )
+    {
+      pushAddRemoveCommand( newArrow, tr( "Arrow added" ) );
+    }
   }
   // scalebar
   QDomNodeList composerScaleBarList = elem.elementsByTagName( "ComposerScaleBar" );
@@ -313,6 +325,10 @@ void QgsComposition::addItemsFromXML( const QDomElement& elem, const QDomDocumen
       newScaleBar->setItemPosition( pos->x(), pos->y() );
     }
     addComposerScaleBar( newScaleBar );
+    if ( addUndoCommands )
+    {
+      pushAddRemoveCommand( newScaleBar, tr( "Scale bar added" ) );
+    }
   }
   // shape
   QDomNodeList composerShapeList = elem.elementsByTagName( "ComposerShape" );
@@ -326,6 +342,10 @@ void QgsComposition::addItemsFromXML( const QDomElement& elem, const QDomDocumen
       newShape->setItemPosition( pos->x(), pos->y() );
     }
     addComposerShape( newShape );
+    if ( addUndoCommands )
+    {
+      pushAddRemoveCommand( newShape, tr( "Shape added" ) );
+    }
   }
   // picture
   QDomNodeList composerPictureList = elem.elementsByTagName( "ComposerPicture" );
@@ -339,6 +359,10 @@ void QgsComposition::addItemsFromXML( const QDomElement& elem, const QDomDocumen
       newPicture->setItemPosition( pos->x(), pos->y() );
     }
     addComposerPicture( newPicture );
+    if ( addUndoCommands )
+    {
+      pushAddRemoveCommand( newPicture, tr( "Picture added" ) );
+    }
   }
   // legend
   QDomNodeList composerLegendList = elem.elementsByTagName( "ComposerLegend" );
@@ -352,6 +376,10 @@ void QgsComposition::addItemsFromXML( const QDomElement& elem, const QDomDocumen
       newLegend->setItemPosition( pos->x(), pos->y() );
     }
     addComposerLegend( newLegend );
+    if ( addUndoCommands )
+    {
+      pushAddRemoveCommand( newLegend, tr( "Legend added" ) );
+    }
   }
   // table
   QDomNodeList composerTableList = elem.elementsByTagName( "ComposerAttributeTable" );
@@ -365,6 +393,10 @@ void QgsComposition::addItemsFromXML( const QDomElement& elem, const QDomDocumen
       newTable->setItemPosition( pos->x(), pos->y() );
     }
     addComposerTable( newTable );
+    if ( addUndoCommands )
+    {
+      pushAddRemoveCommand( newTable, tr( "Table added" ) );
+    }
   }
 }
 

diff --git a/src/core/composer/qgscomposition.h b/src/core/composer/qgscomposition.h
@@ -144,8 +144,9 @@ class CORE_EXPORT QgsComposition: public QGraphicsScene
     /**Add items from XML representation to the graphics scene (for project file reading, pasting items from clipboard)
       @param elem items parent element, e.g. <Composer> or <ComposerItemClipboard>
       @param doc xml document
+      @param addUndoCommands insert AddItem commands if true (e.g. for copy/paste)
       @param pos item position. Optional, take position from xml if 0*/
-    void addItemsFromXML( const QDomElement& elem, const QDomDocument& doc, QPointF* pos = 0 );
+    void addItemsFromXML( const QDomElement& elem, const QDomDocument& doc, bool addUndoCommands = false, QPointF* pos = 0 );
 
     /**Adds item to z list. Usually called from constructor of QgsComposerItem*/
     void addItemToZList( QgsComposerItem* item );

diff --git a/src/gui/qgscomposerview.cpp b/src/gui/qgscomposerview.cpp
@@ -461,7 +461,7 @@ void QgsComposerView::keyPressEvent( QKeyEvent * e )
         if ( composition() )
         {
           QPointF pt = mapToScene( mapFromGlobal( QCursor::pos() ) );
-          composition()->addItemsFromXML( docElem, doc, &pt );
+          composition()->addItemsFromXML( docElem, doc, true, &pt );
         }
       }
     }