Notify plugins about composer addition / deletion also when loading a composer template

mhugent · mhugent · commit 60fda2ab11f6 · 2010-12-14T15:22:57.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@14909 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp
@@ -959,6 +959,8 @@ void QgsComposer::on_mActionLoadFromTemplate_triggered()
     return;
   }
 
+  emit composerWillBeRemoved( mView );
+
   QDomDocument templateDocument;
   if ( !templateDocument.setContent( &templateFile, false ) )
   {
@@ -968,6 +970,7 @@ void QgsComposer::on_mActionLoadFromTemplate_triggered()
 
   deleteItems();
   readXML( templateDocument );
+  emit composerAdded( mView );
 }
 
 void QgsComposer::on_mActionMoveItemContent_triggered()
diff --git a/src/app/composer/qgscomposer.h b/src/app/composer/qgscomposer.h
@@ -103,6 +103,10 @@ class QgsComposer: public QMainWindow, private Ui::QgsComposerBase
     //! Is emitted every time the view zoom has changed
     void zoomLevelChanged();
 
+    void composerAdded( QgsComposerView* v );
+    //!Composer deletes the old composerview when loading a template
+    void composerWillBeRemoved( QgsComposerView* v );
+
 
   public slots:
     //! Zoom to full extent of the paper
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -903,7 +903,7 @@ void QgisApp::createActions()
   mActionSelect->setEnabled( false );
 
   QString selectOptionTip( tr( ", hold shift to select by containment" ) + singleSelectOptTip );
-  
+
   mActionSelectRectangle = new QAction( getThemeIcon( "mActionSelectRectangle.png" ), tr( "Select features by rectangle" ), this );
   shortcuts->registerAction( mActionSelectRectangle );
   mActionSelectRectangle->setStatusTip( tr( "Select features by rectangle" ) + selectOptionTip );
@@ -4220,12 +4220,15 @@ QgsComposer* QgisApp::createNewComposer()
   mLastComposerId++;
   //create new composer object
   QgsComposer* newComposerObject = new QgsComposer( this, tr( "Composer %1" ).arg( mLastComposerId ) );
+
   //add it to the map of existing print composers
   mPrintComposers.insert( newComposerObject );
   //and place action into print composers menu
   mPrintComposersMenu->addAction( newComposerObject->windowAction() );
   newComposerObject->open();
   emit composerAdded( newComposerObject->view() );
+  connect( newComposerObject, SIGNAL( composerAdded( QgsComposerView* ) ), this, SIGNAL( composerAdded( QgsComposerView* ) ) );
+  connect( newComposerObject, SIGNAL( composerWillBeRemoved( QgsComposerView* ) ), this, SIGNAL( composerWillBeRemoved( QgsComposerView* ) ) );
   return newComposerObject;
 }
 
@@ -4262,6 +4265,8 @@ bool QgisApp::loadComposersFromProject( const QDomDocument& doc )
       composer->close();
     }
     emit composerAdded( composer->view() );
+    connect( composer, SIGNAL( composerAdded( QgsComposerView* ) ), this, SIGNAL( composerAdded( QgsComposerView* ) ) );
+    connect( composer, SIGNAL( composerWillBeRemoved( QgsComposerView* ) ), this, SIGNAL( composerWillBeRemoved( QgsComposerView* ) ) );
   }
   return true;
 }

Original file line number	Diff line number	Diff line change
`@@ -959,6 +959,8 @@ void QgsComposer::on_mActionLoadFromTemplate_triggered()`
`959`	`959`	`return;`
`960`	`960`	`}`
`961`	`961`
	`962`	`+ emit composerWillBeRemoved( mView );`
	`963`	`+`
`962`	`964`	`QDomDocument templateDocument;`
`963`	`965`	`if ( !templateDocument.setContent( &templateFile, false ) )`
`964`	`966`	`{`
`@@ -968,6 +970,7 @@ void QgsComposer::on_mActionLoadFromTemplate_triggered()`
`968`	`970`
`969`	`971`	`deleteItems();`
`970`	`972`	`readXML( templateDocument );`
	`973`	`+ emit composerAdded( mView );`
`971`	`974`	`}`
`972`	`975`
`973`	`976`	`void QgsComposer::on_mActionMoveItemContent_triggered()`