Ensure item widgets are deleted if loading composer templates

qgis · Sep 5, 2012 · 351ccc0 · 351ccc0
1 parent fd514a0
commit 351ccc0
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 16 deletions.
diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp
@@ -915,18 +915,14 @@ void QgsComposer::on_mActionLoadFromTemplate_triggered()
     return;
   }
 
-  emit composerWillBeRemoved( mView );
-
-  QDomDocument templateDocument;
-  if ( !templateDocument.setContent( &templateFile, false ) )
+  if ( mComposition )
   {
-    QMessageBox::warning( 0, tr( "Read error" ), tr( "Content of template file is not valid" ) );
-    return;
+    QDomDocument templateDoc;
+    if ( templateDoc.setContent( &templateFile ) )
+    {
+      mComposition->loadFromTemplate( templateDoc, true );
+    }
   }
-
-  deleteItemWidgets();
-  readXML( templateDocument );
-  emit composerAdded( mView );
 }
 
 void QgsComposer::on_mActionMoveItemContent_triggered()

diff --git a/src/app/composer/qgscomposerhtmlwidget.cpp b/src/app/composer/qgscomposerhtmlwidget.cpp
@@ -6,7 +6,7 @@
 #include <QFileDialog>
 #include <QSettings>
 
-QgsComposerHtmlWidget::QgsComposerHtmlWidget( QgsComposerHtml* html, QgsComposerFrame* frame ): mHtml( html ), mFrame( frame )
+QgsComposerHtmlWidget::QgsComposerHtmlWidget( QgsComposerHtml* html, QgsComposerFrame* frame ): QWidget(), mHtml( html ), mFrame( frame )
 {
   setupUi( this );
 

diff --git a/src/core/composer/qgscomposermultiframe.cpp b/src/core/composer/qgscomposermultiframe.cpp
@@ -226,14 +226,14 @@ void QgsComposerMultiFrame::deleteFrames()
 {
   ResizeMode bkResizeMode = mResizeMode;
   mResizeMode = UseExistingFrames;
-  mComposition->blockSignals( true );
+  QObject::disconnect( mComposition, SIGNAL( itemRemoved( QgsComposerItem* ) ), this, SLOT( handleFrameRemoval( QgsComposerItem* ) ) );
   QList<QgsComposerFrame*>::iterator frameIt = mFrameItems.begin();
   for ( ; frameIt != mFrameItems.end(); ++frameIt )
   {
     mComposition->removeComposerItem( *frameIt, false );
     delete *frameIt;
   }
-  mComposition->blockSignals( false );
+  QObject::connect( mComposition, SIGNAL( itemRemoved( QgsComposerItem* ) ), this, SLOT( handleFrameRemoval( QgsComposerItem* ) ) );
   mFrameItems.clear();
   mResizeMode = bkResizeMode;
 }

diff --git a/src/core/composer/qgscomposition.cpp b/src/core/composer/qgscomposition.cpp
@@ -316,12 +316,25 @@ bool QgsComposition::readXML( const QDomElement& compositionElem, const QDomDocu
 
 bool QgsComposition::loadFromTemplate( const QDomDocument& doc, bool addUndoCommands )
 {
-  //delete multiframes and its items
   deleteAndRemoveMultiFrames();
 
-  //delete all other items
-  clear();
+  //delete all items and emit itemRemoved signal
+  QList<QGraphicsItem *> itemList = items();
+  QList<QGraphicsItem *>::iterator itemIter = itemList.begin();
+  for ( ; itemIter != itemList.end(); ++itemIter )
+  {
+    QgsComposerItem* cItem = dynamic_cast<QgsComposerItem*>( *itemIter );
+    if ( cItem )
+    {
+      removeItem( cItem );
+      emit itemRemoved( cItem );
+      delete cItem;
+    }
+  }
+  mItemZList.clear();
+
   mPages.clear();
+  mUndoStack.clear();
 
   //read general settings
   QDomElement compositionElem = doc.documentElement().firstChildElement( "Composition" );