Allow QgsAbstractDataSourceWidget subclasses to add vector layers

with a specific provider key
qgis · Sep 12, 2017 · 239e353 · 239e353
1 parent e51a0d4
commit 239e353
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 23 deletions.
diff --git a/python/gui/geonode/qgsgeonodesourceselect.sip b/python/gui/geonode/qgsgeonodesourceselect.sip
@@ -44,13 +44,6 @@ class QgsGeoNodeSourceSelect: QgsAbstractDataSourceWidget
     virtual void addButtonClicked();
 
 
-  signals:
-
-    void addWfsLayer(
-      const QString &uri,
-      const QString &layerName,
-      const QString &providerKey );
-
 };
 
 

diff --git a/python/gui/qgsabstractdatasourcewidget.sip b/python/gui/qgsabstractdatasourcewidget.sip
@@ -77,9 +77,12 @@ Emitted when a DB layer has been selected for addition
 Emitted when a raster layer has been selected for addition
 %End
 
-    void addVectorLayer( const QString &uri, const QString &layerName );
+    void addVectorLayer( const QString &uri, const QString &layerName, const QString &providerKey = QString() );
 %Docstring
-Emitted when a vector layer has been selected for addition
+ Emitted when a vector layer has been selected for addition.
+
+ If ``providerKey`` is not specified, the default provider key associated with the source
+ will be used.
 %End
 
     void addVectorLayers( const QStringList &layerList, const QString &encoding, const QString &dataSourceType );

diff --git a/src/gui/geonode/qgsgeonodesourceselect.cpp b/src/gui/geonode/qgsgeonodesourceselect.cpp
@@ -72,8 +72,6 @@ QgsGeoNodeSourceSelect::QgsGeoNodeSourceSelect( QWidget *parent, Qt::WindowFlags
   treeView->setModel( mModelProxy );
 }
 
-QgsGeoNodeSourceSelect::~QgsGeoNodeSourceSelect() {}
-
 void QgsGeoNodeSourceSelect::addConnectionsEntryList()
 {
   QgsGeoNodeNewConnection *nc = new QgsGeoNodeNewConnection( this );
@@ -474,7 +472,7 @@ void QgsGeoNodeSourceSelect::addButtonClicked()
       uri += QStringLiteral( " sql=" );
 
       QgsDebugMsg( "Add WFS from GeoNode : " + uri + " and typename: " + typeName );
-      emit addWfsLayer( uri, typeName, "WFS" );
+      emit addVectorLayer( uri, typeName, QStringLiteral( "WFS" ) );
     }
     else if ( webServiceType == "XYZ" )
     {

diff --git a/src/gui/geonode/qgsgeonodesourceselect.h b/src/gui/geonode/qgsgeonodesourceselect.h
@@ -45,13 +45,6 @@ class GUI_EXPORT QgsGeoNodeSourceSelect: public QgsAbstractDataSourceWidget, pri
 
     void addButtonClicked() override;
 
-  signals:
-
-    void addWfsLayer(
-      const QString &uri,
-      const QString &layerName,
-      const QString &providerKey );
-
   private:
 
     /** Stores the available CRS for a server connections.

diff --git a/src/gui/qgsabstractdatasourcewidget.h b/src/gui/qgsabstractdatasourcewidget.h
@@ -83,8 +83,13 @@ class GUI_EXPORT QgsAbstractDataSourceWidget : public QDialog
     //! Emitted when a raster layer has been selected for addition
     void addRasterLayer( const QString &rasterLayerPath, const QString &baseName, const QString &providerKey );
 
-    //! Emitted when a vector layer has been selected for addition
-    void addVectorLayer( const QString &uri, const QString &layerName );
+    /**
+     * Emitted when a vector layer has been selected for addition.
+     *
+     * If \a providerKey is not specified, the default provider key associated with the source
+     * will be used.
+     */
+    void addVectorLayer( const QString &uri, const QString &layerName, const QString &providerKey = QString() );
 
     /** Emitted when one or more OGR supported layers are selected for addition
      * \param layerList list of layers protocol URIs

diff --git a/src/gui/qgsdatasourcemanagerdialog.cpp b/src/gui/qgsdatasourcemanagerdialog.cpp
@@ -168,9 +168,10 @@ void QgsDataSourceManagerDialog::makeConnections( QgsAbstractDataSourceWidget *d
   connect( dlg, SIGNAL( progressMessage( QString ) ),
            this, SIGNAL( showStatusMessage( QString ) ) );
   // Vector
-  connect( dlg, &QgsAbstractDataSourceWidget::addVectorLayer, this, [ = ]( const QString & vectorLayerPath, const QString & baseName )
+  connect( dlg, &QgsAbstractDataSourceWidget::addVectorLayer, this, [ = ]( const QString & vectorLayerPath, const QString & baseName, const QString & specifiedProvider )
   {
-    this->vectorLayerAdded( vectorLayerPath, baseName, providerKey );
+    QString key = specifiedProvider.isEmpty() ? providerKey : specifiedProvider;
+    this->vectorLayerAdded( vectorLayerPath, baseName, key );
   }
          );
   connect( dlg, &QgsAbstractDataSourceWidget::addVectorLayers,