Skip to content
Permalink
Browse files

Move GeoNode data items from OWS provider to app

  • Loading branch information
nyalldawson committed Sep 6, 2017
1 parent 973ba7b commit b657c1ace69410b2b14325ab4f51c90c0ea6f39d
@@ -154,6 +154,7 @@ SET(QGIS_APP_SRCS
composer/qgsatlascompositionwidget.cpp

geocms/qgsgeocmsproviderregistry.cpp
geocms/geonode/qgsgeonodedataitems.cpp
geocms/geonode/qgsgeonodesourceselect.cpp

layout/qgslayoutaddpagesdialog.cpp
@@ -336,6 +337,7 @@ SET (QGIS_APP_MOC_HDRS
composer/qgscompositionwidget.h
composer/qgsatlascompositionwidget.h

geocms/geonode/qgsgeonodedataitems.h
geocms/geonode/qgsgeonodesourceselect.h

layout/qgslayoutaddpagesdialog.h
@@ -13,7 +13,6 @@
* *
***************************************************************************/

#include "qgsowsdataitems.h"
#include "qgslogger.h"
#include "qgsgeonodedataitems.h"
#include "qgsproviderregistry.h"
File renamed without changes.
@@ -14,9 +14,11 @@
***************************************************************************/

#include "qgsgeocmsproviderregistry.h"
#include "qgsdataitemproviderregistry.h"
#include "qgsgui.h"
#include "qgssourceselectproviderregistry.h"
#include "geocms/geonode/qgsgeonodesourceselect.h"
#include "geocms/geonode/qgsgeonodedataitems.h"

QgsGeoCmsProviderRegistry::QgsGeoCmsProviderRegistry()
{
@@ -25,5 +27,9 @@ QgsGeoCmsProviderRegistry::QgsGeoCmsProviderRegistry()

void QgsGeoCmsProviderRegistry::init()
{
// source select providers
QgsGui::sourceSelectProviderRegistry()->addProvider( new QgsGeoNodeSourceSelectProvider() );

// data item providers
QgsApplication::dataItemProviderRegistry()->addProvider( new QgsGeoNodeDataItemProvider() );
}
@@ -1081,6 +1081,10 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, bool skipVersionCh
QgsStyle::defaultStyle();
endProfile();

startProfile( QStringLiteral( "Loading GeoCMS providers" ) );
mGeoCmsProviderRegistry.reset( new QgsGeoCmsProviderRegistry() );
endProfile();

mSplash->showMessage( tr( "QGIS Ready!" ), Qt::AlignHCenter | Qt::AlignBottom );

QgsMessageLog::logMessage( QgsApplication::showSettings(), QString(), QgsMessageLog::INFO );
@@ -1166,8 +1170,6 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, bool skipVersionCh
connect( QgsApplication::taskManager(), &QgsTaskManager::allTasksFinished, taskProgress, &QWinTaskbarProgress::hide );
#endif

mGeoCmsProviderRegistry.reset( new QgsGeoCmsProviderRegistry() );

// supposedly all actions have been added, now register them to the shortcut manager
QgsGui::shortcutsManager()->registerAllChildren( this );

@@ -1,19 +1,16 @@
SET(OWS_SRCS
qgsowsprovider.cpp
qgsowsdataitems.cpp
qgsgeonodedataitems.cpp)
)
SET(OWS_MOC_HDRS
qgsowsprovider.h
qgsowsdataitems.h
qgsgeonodedataitems.h
)

INCLUDE_DIRECTORIES (
${CMAKE_SOURCE_DIR}/src/gui/geonode
${CMAKE_SOURCE_DIR}/src/core
${CMAKE_SOURCE_DIR}/src/core/expression
${CMAKE_SOURCE_DIR}/src/core/geometry
${CMAKE_SOURCE_DIR}/src/core/geocms/geonode
${CMAKE_SOURCE_DIR}/src/core/auth
${CMAKE_SOURCE_DIR}/src/core/metadata
${CMAKE_SOURCE_DIR}/src/gui
@@ -23,9 +23,6 @@
#include "qgsnewhttpconnection.h"
#include "qgsowssourceselect.h"
#endif
#include "qgsgeonodeconnection.h"
#include "qgsgeonodenewconnection.h"
#include "qgsgeonodedataitems.h"

#include "qgsapplication.h"

@@ -267,8 +264,7 @@ QGISEXTERN QList<QgsDataItemProvider *> *dataItemProviders()
QList<QgsDataItemProvider *> *providers = new QList<QgsDataItemProvider *>();

*providers
<< new QgsOwsDataItemProvider
<< new QgsGeoNodeDataItemProvider;
<< new QgsOwsDataItemProvider;

return providers;
}
@@ -19,7 +19,6 @@
#include "qgsdataitemprovider.h"
#include "qgsdataprovider.h"
#include "qgsdatasourceuri.h"
#include "qgsgeonodeconnection.h"

class QgsOWSConnectionItem : public QgsDataCollectionItem
{

0 comments on commit b657c1a

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