[addlayerbutton] Added embeddedMode to all providers

Also switched managerMode and embeddedMode arguments
for a more logical arg passing from the factory function.

Author: elpaso

python/core/qgsproviderregistry.sip

@@ -88,7 +88,7 @@ Set library directory where to search for plugins
 %End
 
     QWidget *createSelectionWidget( const QString &providerKey,
-                                    QWidget *parent = 0, Qt::WindowFlags fl = Qt::WindowFlags() );
+                                    QWidget *parent = 0, Qt::WindowFlags fl = Qt::WindowFlags(), bool embeddedMode = false );
 %Docstring
  Returns a new widget for selecting layers from a provider.
  Either the ``parent`` widget must be set or the caller becomes

src/app/qgisapp.cpp

@@ -1599,6 +1599,9 @@ void QgisApp::dataSourceManager()
              this, SLOT( addVectorLayer( QString const &, QString const &, QString const & ) ) );
     connect( mDataSourceManagerDialog, SIGNAL( addVectorLayers( QStringList const &, QString const &, QString const & ) ),
              this, SLOT( addVectorLayers( QStringList const &, QString const &, QString const & ) ) );
+    connect( mDataSourceManagerDialog, &QgsDataSourceManagerDialog::showProgress, this, &QgisApp::showProgress );
+    connect( mDataSourceManagerDialog, &QgsDataSourceManagerDialog::showStatusMessage, this, &QgisApp::showStatusMessage );
+    connect( mDataSourceManagerDialog, &QgsDataSourceManagerDialog::addDatabaseLayers, this, &QgisApp::addDatabaseLayers );
   }
   // TODO: handle docked
   mDataSourceManagerDialog->exec();

src/app/qgsdatasourcemanagerdialog.cpp

@@ -85,6 +85,21 @@ QgsDataSourceManagerDialog::QgsDataSourceManagerDialog( QWidget *parent ) :
     { this->vectorLayerAdded( vectorLayerPath, baseName, QStringLiteral( "WFS" ) ); } );
   }
 
+#ifdef HAVE_POSTGRESQL
+  /////////////////////////////////////////////////////////////////////////////
+  // POSTGIS
+  dlg = providerDialog( QStringLiteral( "postgres" ), tr( "PostgreSQL" ), QStringLiteral( "/mActionAddPostgisLayer.svg" ) );
+  if ( dlg )
+  {
+    connect( dlg, SIGNAL( addDatabaseLayers( QStringList const &, QString const & ) ),
+             this, SIGNAL( addDatabaseLayers( QStringList const &, QString const & ) ) );
+    connect( dlg, SIGNAL( progress( int, int ) ),
+             this, SIGNAL( showProgress( int, int ) ) );
+    connect( dlg, SIGNAL( progressMessage( QString ) ),
+             this, SIGNAL( showStatusMessage( QString ) ) );
+  }
+#endif
+
 }
 
 QgsDataSourceManagerDialog::~QgsDataSourceManagerDialog()
@@ -115,7 +130,7 @@ void QgsDataSourceManagerDialog::vectorLayersAdded( const QStringList &layerQStr
 
 QDialog *QgsDataSourceManagerDialog::providerDialog( const QString providerKey, const QString providerName, const QString icon )
 {
-  QDialog *dlg = dynamic_cast<QDialog *>( QgsProviderRegistry::instance()->createSelectionWidget( providerKey, this, Qt::Widget ) );
+  QDialog *dlg = dynamic_cast<QDialog *>( QgsProviderRegistry::instance()->createSelectionWidget( providerKey, this, Qt::Widget, true ) );
   if ( !dlg )
   {
     QMessageBox::warning( this, providerName, tr( "Cannot get %1 select dialog from provider %2." ).arg( providerName, providerKey ) );

src/app/qgsdatasourcemanagerdialog.h

@@ -52,6 +52,9 @@ class QgsDataSourceManagerDialog : public QDialog
     void addVectorLayer( const QString &vectorLayerPath, const QString &baseName, const QString &providerKey );
     void addWfsLayer( const QString &uri, const QString &typeName );
     void addVectorLayers( const QStringList &layerQStringList, const QString &enc, const QString &dataSourceType );
+    void showProgress( int progress, int totalSteps );
+    void showStatusMessage( const QString &message );
+    void addDatabaseLayers( QStringList const &layerPathList, QString const &providerKey );
 
   private:
     //! Return the dialog from the provider

src/core/qgsproviderregistry.cpp

@@ -438,18 +438,18 @@ int QgsProviderRegistry::providerCapabilities( const QString &providerKey ) cons
 }
 
 // This should be QWidget, not QDialog
-typedef QWidget *selectFactoryFunction_t( QWidget *parent, Qt::WindowFlags fl );
+typedef QWidget *selectFactoryFunction_t( QWidget *parent, Qt::WindowFlags fl, bool embeddedMode );
 
 QWidget *QgsProviderRegistry::createSelectionWidget( const QString &providerKey,
-    QWidget *parent, Qt::WindowFlags fl )
+    QWidget *parent, Qt::WindowFlags fl, bool embeddedMode )
 {
   selectFactoryFunction_t *selectFactory =
     reinterpret_cast< selectFactoryFunction_t * >( cast_to_fptr( function( providerKey, "selectWidget" ) ) );
 
   if ( !selectFactory )
     return nullptr;
 
-  return selectFactory( parent, fl );
+  return selectFactory( parent, fl, embeddedMode );
 }
 
 QFunctionPointer QgsProviderRegistry::function( QString const &providerKey,

src/core/qgsproviderregistry.h

@@ -98,7 +98,7 @@ class CORE_EXPORT QgsProviderRegistry
      * responsible for deleting the returned widget.
      */
     QWidget *createSelectionWidget( const QString &providerKey,
-                                    QWidget *parent = nullptr, Qt::WindowFlags fl = Qt::WindowFlags() );
+                                    QWidget *parent = nullptr, Qt::WindowFlags fl = Qt::WindowFlags(), bool embeddedMode = false );
 
     /**
      * Get pointer to provider function

src/providers/arcgisrest/qgsafsproviderextern.cpp

@@ -45,9 +45,9 @@ QGISEXTERN bool isProvider()
   return true;
 }
 
-QGISEXTERN QgsAfsSourceSelect *selectWidget( QWidget *parent, Qt::WindowFlags fl )
+QGISEXTERN QgsAfsSourceSelect *selectWidget( QWidget *parent, Qt::WindowFlags fl, bool embeddedMode )
 {
-  return new QgsAfsSourceSelect( parent, fl );
+  return new QgsAfsSourceSelect( parent, fl, embeddedMode );
 }
 
 QGISEXTERN int dataCapabilities()

src/providers/arcgisrest/qgsamsproviderextern.cpp

@@ -45,9 +45,9 @@ QGISEXTERN bool isProvider()
   return true;
 }
 
-QGISEXTERN QgsAmsSourceSelect *selectWidget( QWidget *parent, Qt::WindowFlags fl )
+QGISEXTERN QgsAmsSourceSelect *selectWidget( QWidget *parent, Qt::WindowFlags fl, bool embeddedMode )
 {
-  return new QgsAmsSourceSelect( parent, fl );
+  return new QgsAmsSourceSelect( parent, fl, embeddedMode );
 }
 
 QGISEXTERN int dataCapabilities()

src/providers/db2/qgsdb2provider.cpp

@@ -1711,9 +1711,9 @@ QGISEXTERN int dataCapabilities()
   return QgsDataProvider::Database;
 }
 
-QGISEXTERN void *selectWidget( QWidget *parent, Qt::WindowFlags fl )
+QGISEXTERN void *selectWidget( QWidget *parent, Qt::WindowFlags fl, bool embeddedMode )
 {
-  return new QgsDb2SourceSelect( parent, fl );
+  return new QgsDb2SourceSelect( parent, fl, embeddedMode );
 }
 
 QGISEXTERN QgsDataItem *dataItem( QString path, QgsDataItem *parentItem )

src/providers/db2/qgsdb2sourceselect.cpp

@@ -116,7 +116,7 @@ void QgsDb2SourceSelectDelegate::setModelData( QWidget *editor, QAbstractItemMod
     model->setData( index, le->text() );
 }
 
-QgsDb2SourceSelect::QgsDb2SourceSelect( QWidget *parent, Qt::WindowFlags fl, bool managerMode, bool embeddedMode )
+QgsDb2SourceSelect::QgsDb2SourceSelect( QWidget *parent, Qt::WindowFlags fl, bool embeddedMode, bool managerMode )
   : QDialog( parent, fl )
   , mManagerMode( managerMode )
   , mEmbeddedMode( embeddedMode )