Fix main window rearranging itself to front when opening composer man…

…ager or new composer dialog from a composition
qgis · May 20, 2014 · a94483e · a94483e
1 parent 72ee2e6
commit a94483e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp
@@ -2310,7 +2310,12 @@ void QgsComposer::on_mActionSaveProject_triggered()
 
 void QgsComposer::on_mActionNewComposer_triggered()
 {
-  mQgis->actionNewPrintComposer()->trigger();
+  QString title = mQgis->uniqueComposerTitle( this, true );
+  if ( title.isNull() )
+  {
+    return;
+  }
+  mQgis->createNewComposer( title );
 }
 
 void QgsComposer::on_mActionDuplicateComposer_triggered()

diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -3946,7 +3946,7 @@ void QgisApp::showComposerManager()
 {
   if ( !mComposerManager )
   {
-    mComposerManager = new QgsComposerManager( this, Qt::Window );
+    mComposerManager = new QgsComposerManager( 0, Qt::Window );
     connect( mComposerManager, SIGNAL( finished( int ) ), this, SLOT( deleteComposerManager() ) );
   }
   mComposerManager->show();