Skip to content
Permalink
Browse files

apply #2791

git-svn-id: http://svn.osgeo.org/qgis/trunk@13921 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef
jef committed Jul 17, 2010
1 parent d69a5c2 commit a299f693f7c1c08f5b6636607e253aabb65625c6
Showing with 28 additions and 2 deletions.
  1. +3 −0 python/gui/qgisinterface.sip
  2. +3 −0 src/app/main.cpp
  3. +5 −0 src/app/qgisapp.cpp
  4. +8 −0 src/app/qgisapp.h
  5. +6 −2 src/app/qgisappinterface.cpp
  6. +3 −0 src/gui/qgisinterface.h
@@ -266,5 +266,8 @@ class QgisInterface : QObject
@note added in version 1.4*/
void composerWillBeRemoved( QgsComposerView* v );

/**This signal is emitted when QGIS' initialization is complete
@note added in version 1.6*/
void initializationCompleted();
};

@@ -774,5 +774,8 @@ int main( int argc, char *argv[] )

mypSplash->finish( qgis );
delete mypSplash;

qgis->completeInitialization();

return myApp.exec();
}
@@ -6843,3 +6843,8 @@ void QgisApp::namUpdate()
QgsNetworkAccessManager::instance()->setProxy( proxy );
#endif
}

void QgisApp::completeInitialization()
{
emit initializationCompleted();
}
@@ -364,6 +364,10 @@ class QgisApp : public QMainWindow
void skipNextContextMenuEvent();
#endif

//! emit initializationCompleted signal
//! @note added in 1.6
void completeInitialization();

public slots:
//! Zoom to full extent
void zoomFull();
@@ -752,6 +756,10 @@ class QgisApp : public QMainWindow
@note added in version 1.4*/
void composerWillBeRemoved( QgsComposerView* v );

/**This signal is emitted when QGIS' initialization is complete
@note added in version 1.6*/
void initializationCompleted();

private:
/** This method will open a dialog so the user can select the sublayers
* to load
@@ -39,8 +39,12 @@ QgisAppInterface::QgisAppInterface( QgisApp * _qgis )
this, SIGNAL( currentLayerChanged( QgsMapLayer * ) ) );
connect( qgis, SIGNAL( currentThemeChanged( QString ) ),
this, SIGNAL( currentThemeChanged( QString ) ) );
connect( qgis, SIGNAL( composerAdded( QgsComposerView* ) ), this, SIGNAL( composerAdded( QgsComposerView* ) ) );
connect( qgis, SIGNAL( composerWillBeRemoved( QgsComposerView* ) ), this, SIGNAL( composerWillBeRemoved( QgsComposerView* ) ) );
connect( qgis, SIGNAL( composerAdded( QgsComposerView* ) ),
this, SIGNAL( composerAdded( QgsComposerView* ) ) );
connect( qgis, SIGNAL( composerWillBeRemoved( QgsComposerView* ) ),
this, SIGNAL( composerWillBeRemoved( QgsComposerView* ) ) );
connect( qgis, SIGNAL( initializationCompleted() ),
this, SIGNAL( initializationCompleted() ) );
}

QgisAppInterface::~QgisAppInterface()
@@ -309,6 +309,9 @@ class GUI_EXPORT QgisInterface : public QObject
/**This signal is emitted before a new composer instance is going to be removed
@note added in version 1.4*/
void composerWillBeRemoved( QgsComposerView* v );
/**This signal is emitted when the initialization is complete
@note added in version 1.6*/
void initializationCompleted();
};

// FIXME: also in core/qgis.h

0 comments on commit a299f69

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