More multiframe undo improvements

qgis · Aug 8, 2012 · c2f768f · c2f768f
1 parent b40d0af
commit c2f768f
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 10 deletions.
diff --git a/src/core/composer/qgscomposerframe.h b/src/core/composer/qgscomposerframe.h
@@ -46,8 +46,6 @@ class QgsComposerFrame: public QgsComposerItem
 
   private:
     QgsComposerFrame(); //forbidden
-
-    QgsComposition* mComposition;
     QgsComposerMultiFrame* mMultiFrame;
     QRectF mSection;
 };

diff --git a/src/core/composer/qgscomposermultiframe.cpp b/src/core/composer/qgscomposermultiframe.cpp
@@ -160,13 +160,16 @@ void QgsComposerMultiFrame::update()
 
 void QgsComposerMultiFrame::deleteFrames()
 {
+  ResizeMode bkResizeMode = mResizeMode;
+  mResizeMode = UseExistingFrames;
   QList<QgsComposerFrame*>::iterator frameIt = mFrameItems.begin();
   for ( ; frameIt != mFrameItems.end(); ++frameIt )
   {
-    mComposition->removeComposerItem( *frameIt );
+    mComposition->removeComposerItem( *frameIt, false );
     delete *frameIt;
   }
   mFrameItems.clear();
+  mResizeMode = bkResizeMode;
 }
 
 bool QgsComposerMultiFrame::_writeXML( QDomElement& elem, QDomDocument& doc, bool ignoreFrames ) const

diff --git a/src/core/composer/qgscomposermultiframecommand.cpp b/src/core/composer/qgscomposermultiframecommand.cpp
@@ -38,7 +38,7 @@ void QgsComposerMultiFrameCommand::undo()
 
 void QgsComposerMultiFrameCommand::redo()
 {
-  if ( !checkFirstRun() )
+  if ( checkFirstRun() )
   {
     return;
   }

diff --git a/src/core/composer/qgscomposition.cpp b/src/core/composer/qgscomposition.cpp
@@ -1176,7 +1176,7 @@ void QgsComposition::addComposerHtmlFrame( QgsComposerHtml* html, QgsComposerFra
   emit selectedItemChanged( frame );
 }
 
-void QgsComposition::removeComposerItem( QgsComposerItem* item )
+void QgsComposition::removeComposerItem( QgsComposerItem* item, bool createCommand )
 {
   QgsComposerMap* map = dynamic_cast<QgsComposerMap *>( item );
   if ( !map || !map->isDrawing() ) //don't delete a composer map while it draws
@@ -1203,14 +1203,23 @@ void QgsComposition::removeComposerItem( QgsComposerItem* item )
     }
     else
     {
-      emit itemRemoved( item );
-      if ( item->type() == QgsComposerItem::ComposerFrame ) //multiframe tracks item changes
+      if ( createCommand )
       {
-
+        if ( item->type() == QgsComposerItem::ComposerFrame ) //multiframe tracks item changes
+        {
+          item->beginItemCommand( tr( "Frame deleted" ) );
+          emit itemRemoved( item );
+          item->endItemCommand();
+        }
+        else
+        {
+          emit itemRemoved( item );
+          pushAddRemoveCommand( item, tr( "Item deleted" ), QgsAddRemoveItemCommand::Removed );
+        }
       }
       else
       {
-        pushAddRemoveCommand( item, tr( "Item deleted" ), QgsAddRemoveItemCommand::Removed );
+        emit itemRemoved( item );
       }
     }
   }

diff --git a/src/core/composer/qgscomposition.h b/src/core/composer/qgscomposition.h
@@ -229,7 +229,7 @@ class CORE_EXPORT QgsComposition: public QGraphicsScene
     void addComposerHtmlFrame( QgsComposerHtml* html, QgsComposerFrame* frame );
 
     /**Remove item from the graphics scene. Additionally to QGraphicsScene::removeItem, this function considers undo/redo command*/
-    void removeComposerItem( QgsComposerItem* item );
+    void removeComposerItem( QgsComposerItem* item, bool createCommand = true );
 
     /**Convenience function to create a QgsAddRemoveItemCommand, connect its signals and push it to the undo stack*/
     void pushAddRemoveCommand( QgsComposerItem* item, const QString& text, QgsAddRemoveItemCommand::State state = QgsAddRemoveItemCommand::Added );