Skip to content
Permalink
Browse files

Add activate slot

  • Loading branch information
manisandro committed Apr 30, 2014
1 parent 4821988 commit a66893d5daf5a8156bd3db8888e83f4c81a11f75
Showing with 12 additions and 2 deletions.
  1. +7 −0 src/app/composer/qgscomposermanager.cpp
  2. +4 −0 src/app/composer/qgscomposermanager.h
  3. +1 −2 src/app/qgisapp.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;
@@ -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*/
@@ -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()

0 comments on commit a66893d

Please sign in to comment.
You can’t perform that action at this time.