Move QgsGeoNodeSourceSelect to app

qgis · Sep 12, 2017 · b89c16e · b89c16e
1 parent 8769369
commit b89c16e
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 75 deletions.
diff --git a/python/gui/geonode/qgsgeonodesourceselect.sip b/python/gui/geonode/qgsgeonodesourceselect.sip
diff --git a/python/gui/gui_auto.sip b/python/gui/gui_auto.sip
@@ -42,8 +42,6 @@
 %Include auth/qgsauthtrustedcasdialog.sip
 %Include editorwidgets/core/qgseditorwidgetfactory.sip
 %Include editorwidgets/core/qgseditorwidgetautoconf.sip
-%Include geonode/qgsgeonodenewconnection.sip
-%Include geonode/qgsgeonodesourceselect.sip
 %Include layertree/qgslayertreeembeddedconfigwidget.sip
 %Include layertree/qgslayertreeembeddedwidgetregistry.sip
 %Include layout/qgslayoutviewmouseevent.sip
@@ -278,6 +276,7 @@
 %Include editorwidgets/qgsspinbox.sip
 %Include editorwidgets/qgsvaluemapsearchwidgetwrapper.sip
 %Include editorwidgets/qgsvaluerelationsearchwidgetwrapper.sip
+%Include geonode/qgsgeonodenewconnection.sip
 %Include layertree/qgscustomlayerorderwidget.sip
 %Include layertree/qgslayertreemapcanvasbridge.sip
 %Include layertree/qgslayertreeview.sip

diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
@@ -153,6 +153,8 @@ SET(QGIS_APP_SRCS
   composer/qgscompositionwidget.cpp
   composer/qgsatlascompositionwidget.cpp
 
+  geocms/geonode/qgsgeonodesourceselect.cpp
+
   layout/qgslayoutaddpagesdialog.cpp
   layout/qgslayoutdesignerdialog.cpp
   layout/qgslayoutguidewidget.cpp
@@ -333,6 +335,8 @@ SET (QGIS_APP_MOC_HDRS
   composer/qgscompositionwidget.h
   composer/qgsatlascompositionwidget.h
 
+  geocms/geonode/qgsgeonodesourceselect.h
+
   layout/qgslayoutaddpagesdialog.h
   layout/qgslayoutappmenuprovider.h
   layout/qgslayoutdesignerdialog.h
@@ -498,6 +502,7 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_SOURCE_DIR}/src/app/openstreetmap
   ${CMAKE_SOURCE_DIR}/src/app/dwg
   ${CMAKE_SOURCE_DIR}/src/app/dwg/libdxfrw
+  ${CMAKE_SOURCE_DIR}/src/app/geocms/geonode
   ${CMAKE_SOURCE_DIR}/src/app/locator
   ${CMAKE_SOURCE_DIR}/src/analysis/raster
   ${CMAKE_SOURCE_DIR}/src/analysis/openstreetmap
@@ -509,6 +514,7 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_SOURCE_DIR}/src/core/composer
   ${CMAKE_SOURCE_DIR}/src/core/dxf
   ${CMAKE_SOURCE_DIR}/src/core/geometry
+  ${CMAKE_SOURCE_DIR}/src/core/geonode
   ${CMAKE_SOURCE_DIR}/src/core/metadata
   ${CMAKE_SOURCE_DIR}/src/core/layertree
   ${CMAKE_SOURCE_DIR}/src/core/providers/memory
@@ -555,6 +561,7 @@ INCLUDE_DIRECTORIES(
   ../core/composer
   ../core/dxf
   ../core/geometry
+  ../core/geonode
   ../core/layout
   ../core/metadata
   ../core/layertree

diff --git a/src/gui/geonode/qgsgeonodesourceselect.cpp → ...geocms/geonode/qgsgeonodesourceselect.cpp b/src/gui/geonode/qgsgeonodesourceselect.cpp → ...geocms/geonode/qgsgeonodesourceselect.cpp
diff --git a/src/gui/geonode/qgsgeonodesourceselect.h → ...p/geocms/geonode/qgsgeonodesourceselect.h b/src/gui/geonode/qgsgeonodesourceselect.h → ...p/geocms/geonode/qgsgeonodesourceselect.h
@@ -25,15 +25,15 @@
 #include "ui_qgsgeonodesourceselectbase.h"
 #include "qgis_gui.h"
 
-class GUI_EXPORT QgsGeonodeItemDelegate : public QItemDelegate
+class QgsGeonodeItemDelegate : public QItemDelegate
 {
     Q_OBJECT
 
   public:
     explicit QgsGeonodeItemDelegate( QObject *parent = nullptr ) : QItemDelegate( parent ) { }
 };
 
-class GUI_EXPORT QgsGeoNodeSourceSelect: public QgsAbstractDataSourceWidget, private Ui::QgsGeonodeSourceSelectBase
+class QgsGeoNodeSourceSelect: public QgsAbstractDataSourceWidget, private Ui::QgsGeonodeSourceSelectBase
 {
     Q_OBJECT
 

diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
@@ -151,7 +151,6 @@ SET(QGIS_GUI_SRCS
   editorwidgets/qgsvaluerelationwidgetfactory.cpp
 
   geonode/qgsgeonodenewconnection.cpp
-  geonode/qgsgeonodesourceselect.cpp
 
   layertree/qgscustomlayerorderwidget.cpp
   layertree/qgslayertreeembeddedconfigwidget.cpp
@@ -648,7 +647,6 @@ SET(QGIS_GUI_MOC_HDRS
   editorwidgets/qgsvaluerelationwidgetwrapper.h
 
   geonode/qgsgeonodenewconnection.h
-  geonode/qgsgeonodesourceselect.h
 
   layertree/qgscustomlayerorderwidget.h
   layertree/qgslayertreeembeddedconfigwidget.h
@@ -769,9 +767,6 @@ SET(QGIS_GUI_HDRS
   editorwidgets/qgsvaluemapwidgetfactory.h
   editorwidgets/qgsvaluerelationwidgetfactory.h
 
-  geonode/qgsgeonodenewconnection.h
-  geonode/qgsgeonodesourceselect.h
-
   layertree/qgslayertreeembeddedconfigwidget.h
   layertree/qgslayertreeembeddedwidgetregistry.h
 
@@ -822,7 +817,6 @@ SET(QGIS_GUI_UI_HDRS
   ${CMAKE_CURRENT_BINARY_DIR}/../ui/ui_qgssqlcomposerdialogbase.h
   ${CMAKE_CURRENT_BINARY_DIR}/../ui/ui_qgssublayersdialogbase.h
   ${CMAKE_CURRENT_BINARY_DIR}/../ui/ui_qgstablewidgetuibase.h
-  ${CMAKE_CURRENT_BINARY_DIR}/../ui/ui_qgsgeonodesourceselectbase.h
 )
 
 IF(ENABLE_MODELTEST)

diff --git a/src/gui/qgsdatasourcemanagerdialog.cpp b/src/gui/qgsdatasourcemanagerdialog.cpp
@@ -27,7 +27,7 @@
 #include "qgsmapcanvas.h"
 #include "qgsmessagelog.h"
 #include "qgsgui.h"
-#include "qgsgeonodesourceselect.h"
+//#include "qgsgeonodesourceselect.h"
 
 QgsDataSourceManagerDialog::QgsDataSourceManagerDialog( QgsBrowserModel *browserModel, QWidget *parent, QgsMapCanvas *canvas, Qt::WindowFlags fl ) :
   QgsOptionsDialogBase( QStringLiteral( "Data Source Manager" ), parent, fl ),
@@ -72,15 +72,15 @@ QgsDataSourceManagerDialog::QgsDataSourceManagerDialog( QgsBrowserModel *browser
     addProviderDialog( dlg, provider->providerKey(), provider->text(), provider->icon( ), provider->toolTip( ) );
   }
 
+  /*
+    QDialog *geonodeDialog = new QgsGeoNodeSourceSelect( this, Qt::Widget, QgsProviderRegistry::WidgetMode::Embedded );
+    QDialog *dlg = addDialog( geonodeDialog, QStringLiteral( "geonode" ), tr( "GeoNode" ), QStringLiteral( "/mActionAddGeonodeLayer.svg" ) );
 
-  QDialog *geonodeDialog = new QgsGeoNodeSourceSelect( this, Qt::Widget, QgsProviderRegistry::WidgetMode::Embedded );
-  QDialog *dlg = addDialog( geonodeDialog, QStringLiteral( "geonode" ), tr( "GeoNode" ), QStringLiteral( "/mActionAddGeonodeLayer.svg" ) );
-
-  if ( dlg )
-  {
-    connect( dlg, SIGNAL( addRasterLayer( QString, QString, QString ) ), this, SLOT( rasterLayerAdded( QString, QString, QString ) ) );
-    connect( dlg, SIGNAL( addWfsLayer( QString, QString, QString ) ), this, SLOT( vectorLayerAdded( QString, QString, QString ) ) );
-  }
+    if ( dlg )
+    {
+      connect( dlg, SIGNAL( addRasterLayer( QString, QString, QString ) ), this, SLOT( rasterLayerAdded( QString, QString, QString ) ) );
+      connect( dlg, SIGNAL( addWfsLayer( QString, QString, QString ) ), this, SLOT( vectorLayerAdded( QString, QString, QString ) ) );
+    }*/
 }
 
 QgsDataSourceManagerDialog::~QgsDataSourceManagerDialog()