apply #2791

git-svn-id: http://svn.osgeo.org/qgis/trunk@13921 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Jul 17, 2010 · a299f693f7c1c08f5b6636607e253aabb65625c6 · a299f69
1 parent d69a5c2
commit a299f693f7c1c08f5b6636607e253aabb65625c6
Showing with 28 additions and 2 deletions.

+3 −0 python/gui/qgisinterface.sip

+3 −0 src/app/main.cpp

+5 −0 src/app/qgisapp.cpp

+8 −0 src/app/qgisapp.h

+6 −2 src/app/qgisappinterface.cpp

+3 −0 src/gui/qgisinterface.h
diff --git a/python/gui/qgisinterface.sip b/python/gui/qgisinterface.sip
@@ -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(); 
 };
 
diff --git a/src/app/main.cpp b/src/app/main.cpp
@@ -774,5 +774,8 @@ int main( int argc, char *argv[] )
 
   mypSplash->finish( qgis );
   delete mypSplash;
+
+  qgis->completeInitialization();
+
   return myApp.exec();
 }
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -6843,3 +6843,8 @@ void QgisApp::namUpdate()
   QgsNetworkAccessManager::instance()->setProxy( proxy );
 #endif
 }
+
+void QgisApp::completeInitialization()
+{
+  emit initializationCompleted();
+}
diff --git a/src/app/qgisapp.h b/src/app/qgisapp.h
@@ -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

diff --git a/src/app/qgisappinterface.cpp b/src/app/qgisappinterface.cpp
@@ -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()

diff --git a/src/gui/qgisinterface.h b/src/gui/qgisinterface.h
@@ -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