Skip to content

Commit

Permalink
Revert "[FEATURE] QGIS - GeoNode Integration: Integrate with QGIS Bro…
Browse files Browse the repository at this point in the history
…wser Panel (#4816)"

This reverts commit 5f66f36.

Some outstanding issues need to be addressed before this can be merged
  • Loading branch information
nyalldawson committed Aug 6, 2017
1 parent b5c2253 commit 88e00d6
Show file tree
Hide file tree
Showing 51 changed files with 18 additions and 3,894 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Expand Up @@ -23,7 +23,7 @@
/CMakeLists.txt.user /CMakeLists.txt.user
/CMakeLists.txt.user.* /CMakeLists.txt.user.*
api_doc api_doc
*build* build*
debian/*.debhelper debian/*.debhelper
debian/*.substvars debian/*.substvars
desktop.ini desktop.ini
Expand Down
2 changes: 0 additions & 2 deletions images/images.qrc
Expand Up @@ -135,7 +135,6 @@
<file>themes/default/mActionAddWcsLayer.svg</file> <file>themes/default/mActionAddWcsLayer.svg</file>
<file>themes/default/mActionAddWfsLayer.svg</file> <file>themes/default/mActionAddWfsLayer.svg</file>
<file>themes/default/mActionAddWmsLayer.svg</file> <file>themes/default/mActionAddWmsLayer.svg</file>
<file>themes/default/mActionAddGeonodeLayer.svg</file>
<file>themes/default/mActionAddDelimitedTextLayer.svg</file> <file>themes/default/mActionAddDelimitedTextLayer.svg</file>
<file>themes/default/mActionAddVirtualLayer.svg</file> <file>themes/default/mActionAddVirtualLayer.svg</file>
<file>themes/default/mActionAlignBottom.svg</file> <file>themes/default/mActionAlignBottom.svg</file>
Expand Down Expand Up @@ -357,7 +356,6 @@
<file>themes/default/mIconFieldInteger.svg</file> <file>themes/default/mIconFieldInteger.svg</file>
<file>themes/default/mIconFieldText.svg</file> <file>themes/default/mIconFieldText.svg</file>
<file>themes/default/mIconFieldTime.svg</file> <file>themes/default/mIconFieldTime.svg</file>
<file>themes/default/mIconGeonode.svg</file>
<file>themes/default/mIconInfo.svg</file> <file>themes/default/mIconInfo.svg</file>
<file>themes/default/mIconImport.gif</file> <file>themes/default/mIconImport.gif</file>
<file>themes/default/mIconLabelQuadrantCenter.svg</file> <file>themes/default/mIconLabelQuadrantCenter.svg</file>
Expand Down
407 changes: 0 additions & 407 deletions images/themes/default/mActionAddGeonodeLayer.svg

This file was deleted.

13 changes: 0 additions & 13 deletions images/themes/default/mIconGeonode.svg

This file was deleted.

2 changes: 0 additions & 2 deletions python/CMakeLists.txt
Expand Up @@ -112,7 +112,6 @@ INCLUDE_DIRECTORIES(
${CMAKE_SOURCE_DIR}/src/core/fieldformatter ${CMAKE_SOURCE_DIR}/src/core/fieldformatter
${CMAKE_SOURCE_DIR}/src/core/dxf ${CMAKE_SOURCE_DIR}/src/core/dxf
${CMAKE_SOURCE_DIR}/src/core/geometry ${CMAKE_SOURCE_DIR}/src/core/geometry
${CMAKE_SOURCE_DIR}/src/core/geonode
${CMAKE_SOURCE_DIR}/src/core/gps ${CMAKE_SOURCE_DIR}/src/core/gps
${CMAKE_SOURCE_DIR}/src/core/layertree ${CMAKE_SOURCE_DIR}/src/core/layertree
${CMAKE_SOURCE_DIR}/src/core/layout ${CMAKE_SOURCE_DIR}/src/core/layout
Expand Down Expand Up @@ -142,7 +141,6 @@ IF (WITH_GUI)
${CMAKE_SOURCE_DIR}/src/gui/editorwidgets ${CMAKE_SOURCE_DIR}/src/gui/editorwidgets
${CMAKE_SOURCE_DIR}/src/gui/editorwidgets/core ${CMAKE_SOURCE_DIR}/src/gui/editorwidgets/core
${CMAKE_SOURCE_DIR}/src/gui/effects ${CMAKE_SOURCE_DIR}/src/gui/effects
${CMAKE_SOURCE_DIR}/src/gui/geonode
${CMAKE_SOURCE_DIR}/src/gui/layertree ${CMAKE_SOURCE_DIR}/src/gui/layertree
${CMAKE_SOURCE_DIR}/src/gui/layout ${CMAKE_SOURCE_DIR}/src/gui/layout
${CMAKE_SOURCE_DIR}/src/gui/locator ${CMAKE_SOURCE_DIR}/src/gui/locator
Expand Down
2 changes: 0 additions & 2 deletions python/core/core_auto.sip
Expand Up @@ -280,8 +280,6 @@
%Include fieldformatter/qgsrelationreferencefieldformatter.sip %Include fieldformatter/qgsrelationreferencefieldformatter.sip
%Include fieldformatter/qgsvaluemapfieldformatter.sip %Include fieldformatter/qgsvaluemapfieldformatter.sip
%Include fieldformatter/qgsvaluerelationfieldformatter.sip %Include fieldformatter/qgsvaluerelationfieldformatter.sip
%Include geonode/qgsgeonodeconnection.sip
%Include geonode/qgsgeonoderequest.sip
%Include gps/qgsqtlocationconnection.sip %Include gps/qgsqtlocationconnection.sip
%Include gps/qgsgpsconnectionregistry.sip %Include gps/qgsgpsconnectionregistry.sip
%Include qgsapplication.sip %Include qgsapplication.sip
Expand Down
Empty file.
86 changes: 0 additions & 86 deletions python/core/geonode/qgsgeonodeconnection.sip

This file was deleted.

121 changes: 0 additions & 121 deletions python/core/geonode/qgsgeonoderequest.sip

This file was deleted.

5 changes: 0 additions & 5 deletions python/core/qgsdataitemprovider.sip
Expand Up @@ -49,11 +49,6 @@ Caller takes responsibility of deleting created items.
:rtype: QgsDataItem :rtype: QgsDataItem
%End %End


virtual QVector<QgsDataItem *> createDataItems( const QString &path, QgsDataItem *parentItem );
%Docstring
Caller takes responsibility of deleting created items.
:rtype: list of QgsDataItem
%End
}; };


/************************************************************************ /************************************************************************
Expand Down
51 changes: 0 additions & 51 deletions python/gui/geonode/qgsgeonodenewconnection.sip

This file was deleted.

0 comments on commit 88e00d6

Please sign in to comment.