Skip to content

Commit a66893d

Browse files
committed
Add activate slot
1 parent 4821988 commit a66893d

File tree

3 files changed

+12
-2
lines changed

3 files changed

+12
-2
lines changed

src/app/composer/qgscomposermanager.cpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,13 @@ void QgsComposerManager::refreshComposers()
133133
}
134134
}
135135

136+
void QgsComposerManager::activate()
137+
{
138+
raise();
139+
setWindowState( windowState() & ~Qt::WindowMinimized );
140+
activateWindow();
141+
}
142+
136143
QMap<QString, QString> QgsComposerManager::defaultTemplates( bool fromUser ) const
137144
{
138145
QMap<QString, QString> templateMap;

src/app/composer/qgscomposermanager.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ class QgsComposerManager: public QDialog, private Ui::QgsComposerManagerBase
3131
QgsComposerManager( QWidget * parent = 0, Qt::WindowFlags f = 0 );
3232
~QgsComposerManager();
3333

34+
public slots:
35+
/** Raise, unminimize and activate this window */
36+
void activate();
37+
3438
private:
3539
/**Stores the relation between items and composer pointers. A 0 pointer for the composer means that
3640
this composer needs to be created from a default template*/

src/app/qgisapp.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3929,8 +3929,7 @@ void QgisApp::showComposerManager()
39293929
connect( mComposerManager, SIGNAL( finished( int ) ), this, SLOT( deleteComposerManager() ) );
39303930
}
39313931
mComposerManager->show();
3932-
mComposerManager->raise();
3933-
mComposerManager->activateWindow();
3932+
mComposerManager->activate();
39343933
}
39353934

39363935
void QgisApp::deleteComposerManager()

0 commit comments

Comments
 (0)