Add activate slot

qgis · Apr 30, 2014 · a66893d · a66893d
1 parent 4821988
commit a66893d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/src/app/composer/qgscomposermanager.cpp b/src/app/composer/qgscomposermanager.cpp
@@ -133,6 +133,13 @@ void QgsComposerManager::refreshComposers()
   }
 }
 
+void QgsComposerManager::activate()
+{
+  raise();
+  setWindowState( windowState() & ~Qt::WindowMinimized );
+  activateWindow();
+}
+
 QMap<QString, QString> QgsComposerManager::defaultTemplates( bool fromUser ) const
 {
   QMap<QString, QString> templateMap;

diff --git a/src/app/composer/qgscomposermanager.h b/src/app/composer/qgscomposermanager.h
@@ -31,6 +31,10 @@ class QgsComposerManager: public QDialog, private Ui::QgsComposerManagerBase
     QgsComposerManager( QWidget * parent = 0, Qt::WindowFlags f = 0 );
     ~QgsComposerManager();
 
+  public slots:
+    /** Raise, unminimize and activate this window */
+    void activate();
+
   private:
     /**Stores the relation between items and composer pointers. A 0 pointer for the composer means that
       this composer needs to be created from a default template*/

diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -3929,8 +3929,7 @@ void QgisApp::showComposerManager()
     connect( mComposerManager, SIGNAL( finished( int ) ), this, SLOT( deleteComposerManager() ) );
   }
   mComposerManager->show();
-  mComposerManager->raise();
-  mComposerManager->activateWindow();
+  mComposerManager->activate();
 }
 
 void QgisApp::deleteComposerManager()