python/core/qgscomposition.sip

@@ -107,6 +107,11 @@ class QgsComposition: QGraphicsScene
     /**Reads settings from xml file*/
     bool readXML( const QDomElement& compositionElem, const QDomDocument& doc );
 
+    /**Load a template document
+        @param doc template document
+        @param substitutionMap map with text to replace. Text needs to be enclosed by brackets (e.g. '[text]' )*/
+    bool loadFromTemplate( const QDomDocument& doc, QMap<QString, QString>* substitutionMap = 0, bool addUndoCommands = false );
+
     /**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

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, 0, false );
+    }
   }
-
-  deleteItemWidgets();
-  readXML( templateDocument );
-  emit composerAdded( mView );
 }
 
 void QgsComposer::on_mActionMoveItemContent_triggered()

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 );
 

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;
 }

src/core/composer/qgscomposition.cpp

@@ -60,13 +60,7 @@ QgsComposition::QgsComposition():
 QgsComposition::~QgsComposition()
 {
   removePaperItems();
-
-  QSet<QgsComposerMultiFrame*>::iterator multiFrameIt = mMultiFrames.begin();
-  for ( ; multiFrameIt != mMultiFrames.end(); ++multiFrameIt )
-  {
-    delete *multiFrameIt;
-  }
-  mMultiFrames.clear();
+  deleteAndRemoveMultiFrames();
 
   // make sure that all composer items are removed before
   // this class is deconstructed - to avoid segfaults
@@ -320,6 +314,62 @@ bool QgsComposition::readXML( const QDomElement& compositionElem, const QDomDocu
   return true;
 }
 
+bool QgsComposition::loadFromTemplate( const QDomDocument& doc, QMap<QString, QString>* substitutionMap, bool addUndoCommands )
+{
+  deleteAndRemoveMultiFrames();
+
+  //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();
+
+  QDomDocument importDoc;
+  if ( substitutionMap )
+  {
+    QString xmlString = doc.toString();
+    QMap<QString, QString>::const_iterator sIt = substitutionMap->constBegin();
+    for ( ; sIt != substitutionMap->constEnd(); ++sIt )
+    {
+      xmlString = xmlString.replace( "[" + sIt.key() + "]", sIt.value() );
+    }
+    importDoc.setContent( xmlString );
+  }
+  else
+  {
+    importDoc = doc;
+  }
+
+  //read general settings
+  QDomElement compositionElem = importDoc.documentElement().firstChildElement( "Composition" );
+  if ( compositionElem.isNull() )
+  {
+    return false;
+  }
+
+  bool ok = readXML( compositionElem, importDoc );
+  if ( !ok )
+  {
+    return false;
+  }
+
+  //addItemsFromXML
+  addItemsFromXML( importDoc.documentElement(), importDoc, 0, addUndoCommands, 0 );
+  return true;
+}
+
 void QgsComposition::addItemsFromXML( const QDomElement& elem, const QDomDocument& doc, QMap< QgsComposerMap*, int >* mapsToRestore,
                                       bool addUndoCommands, QPointF* pos )
 {
@@ -1374,6 +1424,16 @@ void QgsComposition::removePaperItems()
   mPages.clear();
 }
 
+void QgsComposition::deleteAndRemoveMultiFrames()
+{
+  QSet<QgsComposerMultiFrame*>::iterator multiFrameIt = mMultiFrames.begin();
+  for ( ; multiFrameIt != mMultiFrames.end(); ++multiFrameIt )
+  {
+    delete *multiFrameIt;
+  }
+  mMultiFrames.clear();
+}
+
 void QgsComposition::exportAsPDF( const QString& file )
 {
   QPrinter printer;

src/core/composer/qgscomposition.h

@@ -153,6 +153,11 @@ class CORE_EXPORT QgsComposition: public QGraphicsScene
     /**Reads settings from xml file*/
     bool readXML( const QDomElement& compositionElem, const QDomDocument& doc );
 
+    /**Load a template document
+        @param doc template document
+        @param substitutionMap map with text to replace. Text needs to be enclosed by brackets (e.g. '[text]' )*/
+    bool loadFromTemplate( const QDomDocument& doc, QMap<QString, QString>* substitutionMap = 0, bool addUndoCommands = false );
+
     /**Add items from XML representation to the graphics scene (for project file reading, pasting items from clipboard)
       @param elem items parent element, e.g. \verbatim <Composer> \endverbatim or \verbatim <ComposerItemClipboard> \endverbatim
       @param doc xml document
@@ -308,6 +313,7 @@ class CORE_EXPORT QgsComposition: public QGraphicsScene
     void updatePaperItems();
     void addPaperItem();
     void removePaperItems();
+    void deleteAndRemoveMultiFrames();
 
   signals:
     void paperSizeChanged();