Skip to content

Commit 129e00d

Browse files
elpasoelpaso
committedJun 2, 2017
[addlayerbutton] Added embeddedMode to all providers
Also switched managerMode and embeddedMode arguments for a more logical arg passing from the factory function.
·
ltr-3_40final-3_0_0
1 parent ff83bfe commit 129e00d

28 files changed

+71
-47
lines changed
 

‎python/core/qgsproviderregistry.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ Set library directory where to search for plugins
8888
%End
8989

9090
QWidget *createSelectionWidget( const QString &providerKey,
91-
QWidget *parent = 0, Qt::WindowFlags fl = Qt::WindowFlags() );
91+
QWidget *parent = 0, Qt::WindowFlags fl = Qt::WindowFlags(), bool embeddedMode = false );
9292
%Docstring
9393
Returns a new widget for selecting layers from a provider.
9494
Either the ``parent`` widget must be set or the caller becomes

‎src/app/qgisapp.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1599,6 +1599,9 @@ void QgisApp::dataSourceManager()
15991599
this, SLOT( addVectorLayer( QString const &, QString const &, QString const & ) ) );
16001600
connect( mDataSourceManagerDialog, SIGNAL( addVectorLayers( QStringList const &, QString const &, QString const & ) ),
16011601
this, SLOT( addVectorLayers( QStringList const &, QString const &, QString const & ) ) );
1602+
connect( mDataSourceManagerDialog, &QgsDataSourceManagerDialog::showProgress, this, &QgisApp::showProgress );
1603+
connect( mDataSourceManagerDialog, &QgsDataSourceManagerDialog::showStatusMessage, this, &QgisApp::showStatusMessage );
1604+
connect( mDataSourceManagerDialog, &QgsDataSourceManagerDialog::addDatabaseLayers, this, &QgisApp::addDatabaseLayers );
16021605
}
16031606
// TODO: handle docked
16041607
mDataSourceManagerDialog->exec();

‎src/app/qgsdatasourcemanagerdialog.cpp

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,21 @@ QgsDataSourceManagerDialog::QgsDataSourceManagerDialog( QWidget *parent ) :
8585
{ this->vectorLayerAdded( vectorLayerPath, baseName, QStringLiteral( "WFS" ) ); } );
8686
}
8787

88+
#ifdef HAVE_POSTGRESQL
89+
/////////////////////////////////////////////////////////////////////////////
90+
// POSTGIS
91+
dlg = providerDialog( QStringLiteral( "postgres" ), tr( "PostgreSQL" ), QStringLiteral( "/mActionAddPostgisLayer.svg" ) );
92+
if ( dlg )
93+
{
94+
connect( dlg, SIGNAL( addDatabaseLayers( QStringList const &, QString const & ) ),
95+
this, SIGNAL( addDatabaseLayers( QStringList const &, QString const & ) ) );
96+
connect( dlg, SIGNAL( progress( int, int ) ),
97+
this, SIGNAL( showProgress( int, int ) ) );
98+
connect( dlg, SIGNAL( progressMessage( QString ) ),
99+
this, SIGNAL( showStatusMessage( QString ) ) );
100+
}
101+
#endif
102+
88103
}
89104

90105
QgsDataSourceManagerDialog::~QgsDataSourceManagerDialog()
@@ -115,7 +130,7 @@ void QgsDataSourceManagerDialog::vectorLayersAdded( const QStringList &layerQStr
115130

116131
QDialog *QgsDataSourceManagerDialog::providerDialog( const QString providerKey, const QString providerName, const QString icon )
117132
{
118-
QDialog *dlg = dynamic_cast<QDialog *>( QgsProviderRegistry::instance()->createSelectionWidget( providerKey, this, Qt::Widget ) );
133+
QDialog *dlg = dynamic_cast<QDialog *>( QgsProviderRegistry::instance()->createSelectionWidget( providerKey, this, Qt::Widget, true ) );
119134
if ( !dlg )
120135
{
121136
QMessageBox::warning( this, providerName, tr( "Cannot get %1 select dialog from provider %2." ).arg( providerName, providerKey ) );

‎src/app/qgsdatasourcemanagerdialog.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,9 @@ class QgsDataSourceManagerDialog : public QDialog
5252
void addVectorLayer( const QString &vectorLayerPath, const QString &baseName, const QString &providerKey );
5353
void addWfsLayer( const QString &uri, const QString &typeName );
5454
void addVectorLayers( const QStringList &layerQStringList, const QString &enc, const QString &dataSourceType );
55+
void showProgress( int progress, int totalSteps );
56+
void showStatusMessage( const QString &message );
57+
void addDatabaseLayers( QStringList const &layerPathList, QString const &providerKey );
5558

5659
private:
5760
//! Return the dialog from the provider

‎src/core/qgsproviderregistry.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -438,18 +438,18 @@ int QgsProviderRegistry::providerCapabilities( const QString &providerKey ) cons
438438
}
439439

440440
// This should be QWidget, not QDialog
441-
typedef QWidget *selectFactoryFunction_t( QWidget *parent, Qt::WindowFlags fl );
441+
typedef QWidget *selectFactoryFunction_t( QWidget *parent, Qt::WindowFlags fl, bool embeddedMode );
442442

443443
QWidget *QgsProviderRegistry::createSelectionWidget( const QString &providerKey,
444-
QWidget *parent, Qt::WindowFlags fl )
444+
QWidget *parent, Qt::WindowFlags fl, bool embeddedMode )
445445
{
446446
selectFactoryFunction_t *selectFactory =
447447
reinterpret_cast< selectFactoryFunction_t * >( cast_to_fptr( function( providerKey, "selectWidget" ) ) );
448448

449449
if ( !selectFactory )
450450
return nullptr;
451451

452-
return selectFactory( parent, fl );
452+
return selectFactory( parent, fl, embeddedMode );
453453
}
454454

455455
QFunctionPointer QgsProviderRegistry::function( QString const &providerKey,

‎src/core/qgsproviderregistry.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ class CORE_EXPORT QgsProviderRegistry
9898
* responsible for deleting the returned widget.
9999
*/
100100
QWidget *createSelectionWidget( const QString &providerKey,
101-
QWidget *parent = nullptr, Qt::WindowFlags fl = Qt::WindowFlags() );
101+
QWidget *parent = nullptr, Qt::WindowFlags fl = Qt::WindowFlags(), bool embeddedMode = false );
102102

103103
/**
104104
* Get pointer to provider function

‎src/providers/arcgisrest/qgsafsproviderextern.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ QGISEXTERN bool isProvider()
4545
return true;
4646
}
4747

48-
QGISEXTERN QgsAfsSourceSelect *selectWidget( QWidget *parent, Qt::WindowFlags fl )
48+
QGISEXTERN QgsAfsSourceSelect *selectWidget( QWidget *parent, Qt::WindowFlags fl, bool embeddedMode )
4949
{
50-
return new QgsAfsSourceSelect( parent, fl );
50+
return new QgsAfsSourceSelect( parent, fl, embeddedMode );
5151
}
5252

5353
QGISEXTERN int dataCapabilities()

‎src/providers/arcgisrest/qgsamsproviderextern.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ QGISEXTERN bool isProvider()
4545
return true;
4646
}
4747

48-
QGISEXTERN QgsAmsSourceSelect *selectWidget( QWidget *parent, Qt::WindowFlags fl )
48+
QGISEXTERN QgsAmsSourceSelect *selectWidget( QWidget *parent, Qt::WindowFlags fl, bool embeddedMode )
4949
{
50-
return new QgsAmsSourceSelect( parent, fl );
50+
return new QgsAmsSourceSelect( parent, fl, embeddedMode );
5151
}
5252

5353
QGISEXTERN int dataCapabilities()

‎src/providers/db2/qgsdb2provider.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1711,9 +1711,9 @@ QGISEXTERN int dataCapabilities()
17111711
return QgsDataProvider::Database;
17121712
}
17131713

1714-
QGISEXTERN void *selectWidget( QWidget *parent, Qt::WindowFlags fl )
1714+
QGISEXTERN void *selectWidget( QWidget *parent, Qt::WindowFlags fl, bool embeddedMode )
17151715
{
1716-
return new QgsDb2SourceSelect( parent, fl );
1716+
return new QgsDb2SourceSelect( parent, fl, embeddedMode );
17171717
}
17181718

17191719
QGISEXTERN QgsDataItem *dataItem( QString path, QgsDataItem *parentItem )

‎src/providers/db2/qgsdb2sourceselect.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ void QgsDb2SourceSelectDelegate::setModelData( QWidget *editor, QAbstractItemMod
116116
model->setData( index, le->text() );
117117
}
118118

119-
QgsDb2SourceSelect::QgsDb2SourceSelect( QWidget *parent, Qt::WindowFlags fl, bool managerMode, bool embeddedMode )
119+
QgsDb2SourceSelect::QgsDb2SourceSelect( QWidget *parent, Qt::WindowFlags fl, bool embeddedMode, bool managerMode )
120120
: QDialog( parent, fl )
121121
, mManagerMode( managerMode )
122122
, mEmbeddedMode( embeddedMode )

‎src/providers/delimitedtext/qgsdelimitedtextprovider.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1187,7 +1187,7 @@ QGISEXTERN bool isProvider()
11871187
return true;
11881188
}
11891189

1190-
QGISEXTERN QgsDelimitedTextSourceSelect *selectWidget( QWidget *parent, Qt::WindowFlags fl )
1190+
QGISEXTERN QgsDelimitedTextSourceSelect *selectWidget( QWidget *parent, Qt::WindowFlags fl, bool embeddedMode )
11911191
{
1192-
return new QgsDelimitedTextSourceSelect( parent, fl );
1192+
return new QgsDelimitedTextSourceSelect( parent, fl, embeddedMode );
11931193
}

‎src/providers/mssql/qgsmssqlprovider.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1972,9 +1972,9 @@ QGISEXTERN bool isProvider()
19721972
return true;
19731973
}
19741974

1975-
QGISEXTERN void *selectWidget( QWidget *parent, Qt::WindowFlags fl )
1975+
QGISEXTERN void *selectWidget( QWidget *parent, Qt::WindowFlags fl, bool embeddedMode )
19761976
{
1977-
return new QgsMssqlSourceSelect( parent, fl );
1977+
return new QgsMssqlSourceSelect( parent, fl, embeddedMode );
19781978
}
19791979

19801980
QGISEXTERN int dataCapabilities()

‎src/providers/mssql/qgsmssqlsourceselect.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ void QgsMssqlSourceSelectDelegate::setModelData( QWidget *editor, QAbstractItemM
117117
model->setData( index, le->text() );
118118
}
119119

120-
QgsMssqlSourceSelect::QgsMssqlSourceSelect( QWidget *parent, Qt::WindowFlags fl, bool managerMode, bool embeddedMode )
120+
QgsMssqlSourceSelect::QgsMssqlSourceSelect( QWidget *parent, Qt::WindowFlags fl, bool embeddedMode, bool managerMode )
121121
: QDialog( parent, fl )
122122
, mManagerMode( managerMode )
123123
, mEmbeddedMode( embeddedMode )

‎src/providers/oracle/qgsoracleprovider.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3031,9 +3031,9 @@ QGISEXTERN bool isProvider()
30313031
return true;
30323032
}
30333033

3034-
QGISEXTERN QgsOracleSourceSelect *selectWidget( QWidget *parent, Qt::WindowFlags fl )
3034+
QGISEXTERN QgsOracleSourceSelect *selectWidget( QWidget *parent, Qt::WindowFlags fl, bool embeddedMode )
30353035
{
3036-
return new QgsOracleSourceSelect( parent, fl );
3036+
return new QgsOracleSourceSelect( parent, fl, embeddedMode );
30373037
}
30383038

30393039
QGISEXTERN int dataCapabilities()

‎src/providers/oracle/qgsoraclesourceselect.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ void QgsOracleSourceSelectDelegate::setModelData( QWidget *editor, QAbstractItem
166166
}
167167
}
168168

169-
QgsOracleSourceSelect::QgsOracleSourceSelect( QWidget *parent, Qt::WindowFlags fl, bool managerMode, bool embeddedMode )
169+
QgsOracleSourceSelect::QgsOracleSourceSelect( QWidget *parent, Qt::WindowFlags fl, bool embeddedMode, bool managerMode )
170170
: QDialog( parent, fl )
171171
, mManagerMode( managerMode )
172172
, mEmbeddedMode( embeddedMode )

‎src/providers/ows/qgsowsdataitems.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -265,10 +265,11 @@ QGISEXTERN QgsDataItem *dataItem( QString path, QgsDataItem *parentItem )
265265
}
266266

267267
//QGISEXTERN QgsOWSSourceSelect * selectWidget( QWidget * parent, Qt::WindowFlags fl )
268-
QGISEXTERN QDialog *selectWidget( QWidget *parent, Qt::WindowFlags fl )
268+
QGISEXTERN QDialog *selectWidget( QWidget *parent, Qt::WindowFlags fl, bool embeddedMode )
269269
{
270270
Q_UNUSED( parent );
271271
Q_UNUSED( fl );
272-
//return new QgsOWSSourceSelect( parent, fl );
272+
Q_UNUSED( embeddedMode );
273+
//return new QgsOWSSourceSelect( parent, fl, embeddedMode );
273274
return nullptr;
274275
}

‎src/providers/postgres/qgspgsourceselect.cpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ void QgsPgSourceSelectDelegate::setModelData( QWidget *editor, QAbstractItemMode
193193
}
194194
}
195195

196-
QgsPgSourceSelect::QgsPgSourceSelect( QWidget *parent, Qt::WindowFlags fl, bool managerMode, bool embeddedMode )
196+
QgsPgSourceSelect::QgsPgSourceSelect( QWidget *parent, Qt::WindowFlags fl, bool embeddedMode, bool managerMode )
197197
: QDialog( parent, fl )
198198
, mManagerMode( managerMode )
199199
, mEmbeddedMode( embeddedMode )
@@ -204,7 +204,9 @@ QgsPgSourceSelect::QgsPgSourceSelect( QWidget *parent, Qt::WindowFlags fl, bool
204204

205205
if ( mEmbeddedMode )
206206
{
207-
buttonBox->button( QDialogButtonBox::Close )->hide();
207+
buttonBox->removeButton( buttonBox->button( QDialogButtonBox::Close ) );
208+
mHoldDialogOpen->setHidden( true );
209+
mHoldDialogOpen->hide();
208210
}
209211
else
210212
{
@@ -509,7 +511,7 @@ void QgsPgSourceSelect::addTables()
509511
else
510512
{
511513
emit addDatabaseLayers( mSelectedTables, QStringLiteral( "postgres" ) );
512-
if ( !mHoldDialogOpen->isChecked() )
514+
if ( !( mHoldDialogOpen->isChecked() || mEmbeddedMode ) )
513515
{
514516
accept();
515517
}

‎src/providers/postgres/qgspostgresprovider.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4255,9 +4255,9 @@ QGISEXTERN bool isProvider()
42554255
return true;
42564256
}
42574257

4258-
QGISEXTERN QgsPgSourceSelect *selectWidget( QWidget *parent, Qt::WindowFlags fl )
4258+
QGISEXTERN QgsPgSourceSelect *selectWidget( QWidget *parent, Qt::WindowFlags fl, bool embeddedMode )
42594259
{
4260-
return new QgsPgSourceSelect( parent, fl );
4260+
return new QgsPgSourceSelect( parent, fl, embeddedMode );
42614261
}
42624262

42634263
QGISEXTERN int dataCapabilities()

‎src/providers/spatialite/qgsspatialitedataitems.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ void QgsSLRootItem::createDatabase()
348348

349349
// ---------------------------------------------------------------------------
350350

351-
QGISEXTERN QgsSpatiaLiteSourceSelect *selectWidget( QWidget *parent, Qt::WindowFlags fl )
351+
QGISEXTERN QgsSpatiaLiteSourceSelect *selectWidget( QWidget *parent, Qt::WindowFlags fl, bool embeddedMode )
352352
{
353353
// TODO: this should be somewhere else
354354
return new QgsSpatiaLiteSourceSelect( parent, fl, false );

‎src/providers/virtual/qgsvirtuallayersourceselect.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,10 @@ email : hugo dot mercier at oslandia dot com
3636
#include <QMessageBox>
3737
#include <QTextStream>
3838

39-
QgsVirtualLayerSourceSelect::QgsVirtualLayerSourceSelect( QWidget *parent, Qt::WindowFlags fl )
39+
QgsVirtualLayerSourceSelect::QgsVirtualLayerSourceSelect( QWidget *parent, Qt::WindowFlags fl, bool embeddedMode )
4040
: QDialog( parent, fl )
4141
, mSrid( 0 )
42+
, mEmbeddedMode( embeddedMode )
4243
{
4344
setupUi( this );
4445

@@ -329,8 +330,8 @@ void QgsVirtualLayerSourceSelect::on_buttonBox_accepted()
329330
emit addVectorLayer( def.toString(), layerName, QStringLiteral( "virtual" ) );
330331
}
331332

332-
QGISEXTERN QgsVirtualLayerSourceSelect *selectWidget( QWidget *parent, Qt::WindowFlags fl )
333+
QGISEXTERN QgsVirtualLayerSourceSelect *selectWidget( QWidget *parent, Qt::WindowFlags fl, bool embeddedMode )
333334
{
334-
return new QgsVirtualLayerSourceSelect( parent, fl );
335+
return new QgsVirtualLayerSourceSelect( parent, fl, embeddedMode );
335336
}
336337

‎src/providers/virtual/qgsvirtuallayersourceselect.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class QgsVirtualLayerSourceSelect : public QDialog, private Ui::QgsVirtualLayerS
3333
Q_OBJECT
3434

3535
public:
36-
QgsVirtualLayerSourceSelect( QWidget *parent, Qt::WindowFlags fl = QgsGuiUtils::ModalDialogFlags );
36+
QgsVirtualLayerSourceSelect( QWidget *parent, Qt::WindowFlags fl = QgsGuiUtils::ModalDialogFlags, bool embeddedMode = false );
3737

3838
private slots:
3939
void on_buttonBox_accepted();
@@ -56,6 +56,7 @@ class QgsVirtualLayerSourceSelect : public QDialog, private Ui::QgsVirtualLayerS
5656
long mSrid;
5757
QStringList mProviderList;
5858
QgsEmbeddedLayerSelectDialog *mEmbeddedSelectionDialog = nullptr;
59+
bool mEmbeddedMode;
5960
void addEmbeddedLayer( const QString &name, const QString &provider, const QString &encoding, const QString &source );
6061
};
6162

‎src/providers/wcs/qgswcsdataitems.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -303,8 +303,8 @@ QGISEXTERN QgsDataItem *dataItem( QString path, QgsDataItem *parentItem )
303303
return nullptr;
304304
}
305305

306-
QGISEXTERN QgsWCSSourceSelect *selectWidget( QWidget *parent, Qt::WindowFlags fl )
306+
QGISEXTERN QgsWCSSourceSelect *selectWidget( QWidget *parent, Qt::WindowFlags fl, bool embeddedMode )
307307
{
308-
return new QgsWCSSourceSelect( parent, fl );
308+
return new QgsWCSSourceSelect( parent, fl, embeddedMode );
309309
}
310310

‎src/providers/wcs/qgswcssourceselect.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727

2828
#include <QWidget>
2929

30-
QgsWCSSourceSelect::QgsWCSSourceSelect( QWidget *parent, Qt::WindowFlags fl, bool managerMode, bool embeddedMode )
31-
: QgsOWSSourceSelect( QStringLiteral( "WCS" ), parent, fl, managerMode, embeddedMode )
30+
QgsWCSSourceSelect::QgsWCSSourceSelect( QWidget *parent, Qt::WindowFlags fl, bool embeddedMode, bool managerMode )
31+
: QgsOWSSourceSelect( QStringLiteral( "WCS" ), parent, fl, embeddedMode, managerMode )
3232
{
3333
// Hide irrelevant widgets
3434
mWMSGroupBox->hide();

‎src/providers/wfs/qgswfsdataitems.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,9 +187,9 @@ void QgsWfsRootItem::newConnection()
187187

188188
// ---------------------------------------------------------------------------
189189

190-
QGISEXTERN QgsWFSSourceSelect *selectWidget( QWidget *parent, Qt::WindowFlags fl )
190+
QGISEXTERN QgsWFSSourceSelect *selectWidget( QWidget *parent, Qt::WindowFlags fl, bool embeddedMode )
191191
{
192-
return new QgsWFSSourceSelect( parent, fl );
192+
return new QgsWFSSourceSelect( parent, fl, embeddedMode );
193193
}
194194

195195
QGISEXTERN int dataCapabilities()

‎src/providers/wfs/qgswfssourceselect.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,13 @@ QgsWFSSourceSelect::QgsWFSSourceSelect( QWidget *parent, Qt::WindowFlags fl, boo
5656
{
5757
setupUi( this );
5858

59-
if ( mEmbeddedMode || ( Qt::Widget == fl ) )
59+
if ( mEmbeddedMode )
6060
{
6161
// For some osbscure reson hiding does not work!
6262
// buttonBox->button( QDialogButtonBox::Close )->hide();
6363
buttonBox->removeButton( buttonBox->button( QDialogButtonBox::Close ) );
6464
mHoldDialogOpen->setHidden( true );
6565
mHoldDialogOpen->hide();
66-
// Set this in any event, to prevent auto-close
67-
mEmbeddedMode = true;
6866
}
6967

7068
mAddButton = new QPushButton( tr( "&Add" ) );

‎src/providers/wms/qgswmsdataitems.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -438,9 +438,9 @@ QGISEXTERN void registerGui( QMainWindow *mainWindow )
438438
QgsTileScaleWidget::showTileScale( mainWindow );
439439
}
440440

441-
QGISEXTERN QgsWMSSourceSelect *selectWidget( QWidget *parent, Qt::WindowFlags fl )
441+
QGISEXTERN QgsWMSSourceSelect *selectWidget( QWidget *parent, Qt::WindowFlags fl, bool embeddedMode )
442442
{
443-
return new QgsWMSSourceSelect( parent, fl );
443+
return new QgsWMSSourceSelect( parent, fl, embeddedMode );
444444
}
445445

446446

‎src/providers/wms/qgswmssourceselect.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
#include <QNetworkRequest>
5555
#include <QNetworkReply>
5656

57-
QgsWMSSourceSelect::QgsWMSSourceSelect( QWidget *parent, Qt::WindowFlags fl, bool managerMode, bool embeddedMode )
57+
QgsWMSSourceSelect::QgsWMSSourceSelect( QWidget *parent, Qt::WindowFlags fl, bool embeddedMode, bool managerMode )
5858
: QDialog( parent, fl )
5959
, mManagerMode( managerMode )
6060
, mEmbeddedMode( embeddedMode )
@@ -63,7 +63,7 @@ QgsWMSSourceSelect::QgsWMSSourceSelect( QWidget *parent, Qt::WindowFlags fl, boo
6363
{
6464
setupUi( this );
6565

66-
if ( mEmbeddedMode || ( Qt::Widget == fl ) )
66+
if ( mEmbeddedMode )
6767
{
6868
// For some osbscure reson hiding does not work!
6969
// buttonBox->button( QDialogButtonBox::Close )->hide();

‎src/providers/wms/qgswmssourceselect.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class QgsWMSSourceSelect : public QDialog, private Ui::QgsWMSSourceSelectBase
4848

4949
public:
5050
//! Constructor
51-
QgsWMSSourceSelect( QWidget *parent = nullptr, Qt::WindowFlags fl = QgsGuiUtils::ModalDialogFlags, bool managerMode = false, bool embeddedMode = false );
51+
QgsWMSSourceSelect( QWidget *parent = nullptr, Qt::WindowFlags fl = QgsGuiUtils::ModalDialogFlags, bool embeddedMode = false, bool managerMode = false );
5252

5353
~QgsWMSSourceSelect();
5454

0 commit comments

Comments
 (0)
Please sign in to comment.