init.2.diff
| src/app/qgisapp.h (working copy) | ||
|---|---|---|
| 359 | 359 |
//! returns pointer to map legend |
| 360 | 360 |
QgsLegend *legend(); |
| 361 | 361 | |
| 362 |
//! emit initializationCompleted signal |
|
| 363 |
void completeInitialization(); |
|
| 364 | ||
| 362 | 365 |
public slots: |
| 363 | 366 |
//! Zoom to full extent |
| 364 | 367 |
void zoomFull(); |
| ... | ... | |
| 742 | 745 |
@note added in version 1.4*/ |
| 743 | 746 |
void composerWillBeRemoved( QgsComposerView* v ); |
| 744 | 747 | |
| 748 |
/**This signal is emitted when QGIS' initialization is complete |
|
| 749 |
@note added in version 1.6*/ |
|
| 750 |
void initializationCompleted(); |
|
| 751 | ||
| 745 | 752 |
private: |
| 746 | 753 |
/** This method will open a dialog so the user can select the sublayers |
| 747 | 754 |
* to load |
| src/app/main.cpp (working copy) | ||
|---|---|---|
| 774 | 774 | |
| 775 | 775 |
mypSplash->finish( qgis ); |
| 776 | 776 |
delete mypSplash; |
| 777 | ||
| 778 |
qgis->completeInitialization(); |
|
| 779 | ||
| 777 | 780 |
return myApp.exec(); |
| 778 | 781 |
} |
| src/app/qgisapp.cpp (working copy) | ||
|---|---|---|
| 6771 | 6771 |
QgsNetworkAccessManager::instance()->setProxy( proxy ); |
| 6772 | 6772 |
#endif |
| 6773 | 6773 |
} |
| 6774 | ||
| 6775 |
void QgisApp::completeInitialization() |
|
| 6776 |
{
|
|
| 6777 |
emit initializationCompleted(); |
|
| 6778 |
} |
|
| src/app/qgisappinterface.cpp (working copy) | ||
|---|---|---|
| 39 | 39 |
this, SIGNAL( currentLayerChanged( QgsMapLayer * ) ) ); |
| 40 | 40 |
connect( qgis, SIGNAL( currentThemeChanged( QString ) ), |
| 41 | 41 |
this, SIGNAL( currentThemeChanged( QString ) ) ); |
| 42 |
connect( qgis, SIGNAL( composerAdded( QgsComposerView* ) ), this, SIGNAL( composerAdded( QgsComposerView* ) ) ); |
|
| 43 |
connect( qgis, SIGNAL( composerWillBeRemoved( QgsComposerView* ) ), this, SIGNAL( composerWillBeRemoved( QgsComposerView* ) ) ); |
|
| 42 |
connect( qgis, SIGNAL( composerAdded( QgsComposerView* ) ), |
|
| 43 |
this, SIGNAL( composerAdded( QgsComposerView* ) ) ); |
|
| 44 |
connect( qgis, SIGNAL( composerWillBeRemoved( QgsComposerView* ) ), |
|
| 45 |
this, SIGNAL( composerWillBeRemoved( QgsComposerView* ) ) ); |
|
| 46 |
connect( qgis, SIGNAL( initializationCompleted() ), |
|
| 47 |
this, SIGNAL( initializationCompleted() ) ); |
|
| 44 | 48 |
} |
| 45 | 49 | |
| 46 | 50 |
QgisAppInterface::~QgisAppInterface() |
| src/gui/qgisinterface.h (working copy) | ||
|---|---|---|
| 309 | 309 |
/**This signal is emitted before a new composer instance is going to be removed |
| 310 | 310 |
@note added in version 1.4*/ |
| 311 | 311 |
void composerWillBeRemoved( QgsComposerView* v ); |
| 312 |
/**This signal is emitted when the initialization is complete |
|
| 313 |
@note added in version 1.6*/ |
|
| 314 |
void initializationCompleted(); |
|
| 312 | 315 |
}; |
| 313 | 316 | |
| 314 | 317 |
// FIXME: also in core/qgis.h |
| python/gui/qgisinterface.sip (working copy) | ||
|---|---|---|
| 266 | 266 |
@note added in version 1.4*/ |
| 267 | 267 |
void composerWillBeRemoved( QgsComposerView* v ); |
| 268 | 268 | |
| 269 |
/**This signal is emitted when QGIS' initialization is complete |
|
| 270 |
@note added in version 1.6*/ |
|
| 271 |
void initializationCompleted(); |
|
| 269 | 272 |
}; |
| 270 | 273 | |