Skip to content
Permalink
Browse files
Fix main window rearranging itself to front when opening composer man…
…ager or new composer dialog from a composition
  • Loading branch information
nyalldawson committed May 20, 2014
1 parent 72ee2e6 commit a94483e2fac3dc8cb467272c6638087131d1762c
Showing with 7 additions and 2 deletions.
  1. +6 −1 src/app/composer/qgscomposer.cpp
  2. +1 −1 src/app/qgisapp.cpp
7 src/app/composer/qgscomposer.cpp 100644 → 100755
@@ -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()
2 src/app/qgisapp.cpp 100644 → 100755
@@ -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();

0 comments on commit a94483e

Please sign in to comment.