Skip to content

Commit 205b705

Browse files
jef-njef-n
committedJul 17, 2017
don't close database selection dialogs
·
ltr-3_40final-3_0_0
1 parent bae6d56 commit 205b705

File tree

7 files changed

+17
-14
lines changed

7 files changed

+17
-14
lines changed
 

‎src/gui/qgsmapcanvas.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -729,6 +729,7 @@ class GUI_EXPORT QgsMapCanvas : public QGraphicsView
729729
*/
730730
void connectNotify( const char *signal ) override;
731731
#endif
732+
732733
//! Make sure the datum transform store is properly populated
733734
void updateDatumTransformEntries();
734735

‎src/providers/db2/qgsdb2sourceselect.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,7 @@ void QgsDb2SourceSelect::addTables()
454454
else
455455
{
456456
emit addDatabaseLayers( mSelectedTables, QStringLiteral( "DB2" ) );
457-
if ( !mHoldDialogOpen->isChecked() )
457+
if ( !mHoldDialogOpen->isChecked() && mWidgetMode == QgsProviderRegistry::WidgetMode::None )
458458
{
459459
accept();
460460
}

‎src/providers/mssql/qgsmssqlsourceselect.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,7 @@ void QgsMssqlSourceSelect::addTables()
454454
else
455455
{
456456
emit addDatabaseLayers( mSelectedTables, QStringLiteral( "mssql" ) );
457-
if ( !mHoldDialogOpen->isChecked() )
457+
if ( !mHoldDialogOpen->isChecked() && mWidgetMode == QgsProviderRegistry::WidgetMode::None )
458458
{
459459
accept();
460460
}

‎src/providers/oracle/qgsoraclesourceselect.cpp

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -174,9 +174,10 @@ QgsOracleSourceSelect::QgsOracleSourceSelect( QWidget *parent, Qt::WindowFlags f
174174
{
175175
setupUi( this );
176176

177-
if ( mWidgetMode == QgsProviderRegistry::WidgetMode::Embedded )
177+
if ( mWidgetMode != QgsProviderRegistry::WidgetMode::None )
178178
{
179-
buttonBox->button( QDialogButtonBox::Close )->hide();
179+
buttonBox->removeButton( buttonBox->button( QDialogButtonBox::Close ) );
180+
mHoldDialogOpen->hide();
180181
}
181182
else
182183
{
@@ -190,11 +191,14 @@ QgsOracleSourceSelect::QgsOracleSourceSelect( QWidget *parent, Qt::WindowFlags f
190191
mBuildQueryButton->setToolTip( tr( "Set Filter" ) );
191192
mBuildQueryButton->setDisabled( true );
192193

193-
buttonBox->addButton( mAddButton, QDialogButtonBox::ActionRole );
194-
connect( mAddButton, SIGNAL( clicked() ), this, SLOT( addTables() ) );
194+
if ( mWidgetMode != QgsProviderRegistry::WidgetMode::Manager )
195+
{
196+
buttonBox->addButton( mAddButton, QDialogButtonBox::ActionRole );
197+
connect( mAddButton, &QAbstractButton::clicked, this, &QgsOracleSourceSelect::addTables );
195198

196-
buttonBox->addButton( mBuildQueryButton, QDialogButtonBox::ActionRole );
197-
connect( mBuildQueryButton, SIGNAL( clicked() ), this, SLOT( buildQuery() ) );
199+
buttonBox->addButton( mBuildQueryButton, QDialogButtonBox::ActionRole );
200+
connect( mBuildQueryButton, &QAbstractButton::clicked, this, &QgsOracleSourceSelect::buildQuery );
201+
}
198202

199203
mSearchModeComboBox->addItem( tr( "Wildcard" ) );
200204
mSearchModeComboBox->addItem( tr( "RegExp" ) );
@@ -220,7 +224,7 @@ QgsOracleSourceSelect::QgsOracleSourceSelect( QWidget *parent, Qt::WindowFlags f
220224
mTablesTreeView->setEditTriggers( QAbstractItemView::CurrentChanged );
221225
mTablesTreeView->setItemDelegate( mTablesTreeDelegate );
222226

223-
connect( mTablesTreeView->selectionModel(), SIGNAL( selectionChanged( const QItemSelection &, const QItemSelection & ) ), this, SLOT( treeWidgetSelectionChanged( const QItemSelection &, const QItemSelection & ) ) );
227+
connect( mTablesTreeView->selectionModel(), &QItemSelectionModel::selectionChanged, this, &QgsOracleSourceSelect::treeWidgetSelectionChanged );
224228

225229
QgsSettings settings;
226230
mTablesTreeView->setSelectionMode( settings.value( "qgis/addOracleDC", false ).toBool() ?
@@ -490,7 +494,7 @@ void QgsOracleSourceSelect::addTables()
490494
else
491495
{
492496
emit addDatabaseLayers( mSelectedTables, "oracle" );
493-
if ( !mHoldDialogOpen->isChecked() )
497+
if ( !mHoldDialogOpen->isChecked() && mWidgetMode == QgsProviderRegistry::WidgetMode::None )
494498
{
495499
accept();
496500
}

‎src/providers/postgres/qgspgsourceselect.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,6 @@ QgsPgSourceSelect::QgsPgSourceSelect( QWidget *parent, Qt::WindowFlags fl, QgsPr
204204
if ( mWidgetMode != QgsProviderRegistry::WidgetMode::None )
205205
{
206206
buttonBox->removeButton( buttonBox->button( QDialogButtonBox::Close ) );
207-
mHoldDialogOpen->setHidden( true );
208207
mHoldDialogOpen->hide();
209208
}
210209
else

‎src/providers/spatialite/qgsspatialitesourceselect.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@ void QgsSpatiaLiteSourceSelect::addTables()
418418
else
419419
{
420420
emit addDatabaseLayers( m_selectedTables, QStringLiteral( "spatialite" ) );
421-
if ( mWidgetMode == QgsProviderRegistry::WidgetMode::None && ! mHoldDialogOpen->isChecked() )
421+
if ( !mHoldDialogOpen->isChecked() && mWidgetMode == QgsProviderRegistry::WidgetMode::None )
422422
{
423423
accept();
424424
}

‎src/providers/wfs/qgswfssourceselect.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ QgsWFSSourceSelect::QgsWFSSourceSelect( QWidget *parent, Qt::WindowFlags fl, Qgs
6161
// For some obscure reason hiding does not work!
6262
// buttonBox->button( QDialogButtonBox::Close )->hide();
6363
buttonBox->removeButton( buttonBox->button( QDialogButtonBox::Close ) );
64-
mHoldDialogOpen->setHidden( true );
6564
mHoldDialogOpen->hide();
6665
}
6766

@@ -405,7 +404,7 @@ void QgsWFSSourceSelect::addLayer()
405404
emit addWfsLayer( mUri, layerName );
406405
}
407406

408-
if ( ! mHoldDialogOpen->isChecked() && mWidgetMode == QgsProviderRegistry::WidgetMode::None )
407+
if ( !mHoldDialogOpen->isChecked() && mWidgetMode == QgsProviderRegistry::WidgetMode::None )
409408
{
410409
accept();
411410
}

0 commit comments

Comments
 (0)
Please sign in to comment.