Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Move GeoNode browser/source select from app -> new 'geonode' provider
Instead of including these classes in app, we instead make a shell data provider which implements only the dataItemProviders() and sourceSelectProviders() methods. Helps keep GeoNode GUI related code partitioned
- Loading branch information
Showing
with
105 additions
and 83 deletions.
- +1 −0 debian/qgis-providers.install.in
- +1 −0 ms-windows/osgeo4w/package.cmd
- +0 −11 src/app/CMakeLists.txt
- +0 −49 src/app/geocms/qgsgeocmsproviderregistry.h
- +0 −4 src/app/qgisapp.cpp
- +0 −3 src/app/qgisapp.h
- +1 −0 src/providers/CMakeLists.txt
- +58 −0 src/providers/geonode/CMakeLists.txt
- +9 −0 src/{app/geocms → providers}/geonode/qgsgeonodedataitems.cpp
- 0 src/{app/geocms → providers}/geonode/qgsgeonodedataitems.h
- 0 src/{app/geocms → providers}/geonode/qgsgeonodenewconnection.cpp
- 0 src/{app/geocms → providers}/geonode/qgsgeonodenewconnection.h
- +25 −16 src/{app/geocms/qgsgeocmsproviderregistry.cpp → providers/geonode/qgsgeonodeprovider.cpp}
- +10 −0 src/{app/geocms → providers}/geonode/qgsgeonodesourceselect.cpp
- 0 src/{app/geocms → providers}/geonode/qgsgeonodesourceselect.h
@@ -0,0 +1,58 @@ | ||
|
||
SET (GEONODE_SRCS | ||
qgsgeonodedataitems.cpp | ||
qgsgeonodenewconnection.cpp | ||
qgsgeonodeprovider.cpp | ||
qgsgeonodesourceselect.cpp | ||
) | ||
|
||
SET(GEONODE_MOC_HDRS | ||
qgsgeonodedataitems.h | ||
qgsgeonodenewconnection.h | ||
qgsgeonodesourceselect.h | ||
) | ||
|
||
######################################################## | ||
# Build | ||
|
||
QT5_WRAP_CPP(GEONODE_MOC_SRCS ${GEONODE_MOC_HDRS}) | ||
|
||
INCLUDE_DIRECTORIES( | ||
${CMAKE_SOURCE_DIR}/src/core | ||
${CMAKE_SOURCE_DIR}/src/core/raster | ||
${CMAKE_SOURCE_DIR}/src/core/geocms/geonode | ||
${CMAKE_SOURCE_DIR}/src/core/geometry | ||
${CMAKE_SOURCE_DIR}/src/core/metadata | ||
${CMAKE_SOURCE_DIR}/src/core/symbology | ||
${CMAKE_SOURCE_DIR}/src/core/expression | ||
${CMAKE_SOURCE_DIR}/src/gui | ||
|
||
${CMAKE_BINARY_DIR}/src/core | ||
${CMAKE_BINARY_DIR}/src/gui | ||
${CMAKE_BINARY_DIR}/src/ui | ||
) | ||
|
||
ADD_LIBRARY(geonodeprovider MODULE ${GEONODE_SRCS} ${GEONODE_MOC_SRCS}) | ||
|
||
TARGET_LINK_LIBRARIES(geonodeprovider | ||
qgis_core | ||
) | ||
|
||
IF (WITH_GUI) | ||
TARGET_LINK_LIBRARIES (geonodeprovider | ||
qgis_gui | ||
) | ||
ENDIF () | ||
|
||
# clang-tidy | ||
IF(CLANG_TIDY_EXE) | ||
SET_TARGET_PROPERTIES( | ||
geonodeprovider PROPERTIES | ||
CXX_CLANG_TIDY "${DO_CLANG_TIDY}" | ||
) | ||
ENDIF(CLANG_TIDY_EXE) | ||
|
||
INSTALL (TARGETS geonodeprovider | ||
RUNTIME DESTINATION ${QGIS_PLUGIN_DIR} | ||
LIBRARY DESTINATION ${QGIS_PLUGIN_DIR}) | ||
|
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.