[QGIS Commit] r13921 - in trunk/qgis: python/gui src/app src/gui

[svn_qgis at osgeo.org]

Author: jef
Date: 2010-07-17 11:19:04 +0000 (Sat, 17 Jul 2010)
New Revision: 13921

Modified:
   trunk/qgis/python/gui/qgisinterface.sip
   trunk/qgis/src/app/main.cpp
   trunk/qgis/src/app/qgisapp.cpp
   trunk/qgis/src/app/qgisapp.h
   trunk/qgis/src/app/qgisappinterface.cpp
   trunk/qgis/src/gui/qgisinterface.h
Log:
apply #2791

Modified: trunk/qgis/python/gui/qgisinterface.sip
===================================================================
--- trunk/qgis/python/gui/qgisinterface.sip	2010-07-17 11:18:54 UTC (rev 13920)
+++ trunk/qgis/python/gui/qgisinterface.sip	2010-07-17 11:19:04 UTC (rev 13921)
@@ -266,5 +266,8 @@
        @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(); 
 };
 

Modified: trunk/qgis/src/app/main.cpp
===================================================================
--- trunk/qgis/src/app/main.cpp	2010-07-17 11:18:54 UTC (rev 13920)
+++ trunk/qgis/src/app/main.cpp	2010-07-17 11:19:04 UTC (rev 13921)
@@ -774,5 +774,8 @@
 
   mypSplash->finish( qgis );
   delete mypSplash;
+
+  qgis->completeInitialization();
+
   return myApp.exec();
 }

Modified: trunk/qgis/src/app/qgisapp.cpp
===================================================================
--- trunk/qgis/src/app/qgisapp.cpp	2010-07-17 11:18:54 UTC (rev 13920)
+++ trunk/qgis/src/app/qgisapp.cpp	2010-07-17 11:19:04 UTC (rev 13921)
@@ -6843,3 +6843,8 @@
   QgsNetworkAccessManager::instance()->setProxy( proxy );
 #endif
 }
+
+void QgisApp::completeInitialization()
+{
+  emit initializationCompleted();
+}

Modified: trunk/qgis/src/app/qgisapp.h
===================================================================
--- trunk/qgis/src/app/qgisapp.h	2010-07-17 11:18:54 UTC (rev 13920)
+++ trunk/qgis/src/app/qgisapp.h	2010-07-17 11:19:04 UTC (rev 13921)
@@ -364,6 +364,10 @@
     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 @@
       @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

Modified: trunk/qgis/src/app/qgisappinterface.cpp
===================================================================
--- trunk/qgis/src/app/qgisappinterface.cpp	2010-07-17 11:18:54 UTC (rev 13920)
+++ trunk/qgis/src/app/qgisappinterface.cpp	2010-07-17 11:19:04 UTC (rev 13921)
@@ -39,8 +39,12 @@
            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()

Modified: trunk/qgis/src/gui/qgisinterface.h
===================================================================
--- trunk/qgis/src/gui/qgisinterface.h	2010-07-17 11:18:54 UTC (rev 13920)
+++ trunk/qgis/src/gui/qgisinterface.h	2010-07-17 11:19:04 UTC (rev 13921)
@@ -309,6 +309,9 @@
     /**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