Skip to content

Commit 3bd2843

Browse files
committed
proper placing of message output
1 parent a16e5f2 commit 3bd2843

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

src/providers/ogr/qgsgeopackagedataitems.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -525,23 +525,23 @@ bool QgsGeoPackageAbstractLayerItem::deleteLayer()
525525
}
526526
else
527527
{
528-
if ( mParent )
528+
529+
QgsGeoPackageConnectionItem *connectionParentItem = qobject_cast<QgsGeoPackageConnectionItem *>( mParent );
530+
if ( connectionParentItem )
529531
{
530-
QgsGeoPackageConnectionItem *connectionParentItem = qobject_cast<QgsGeoPackageConnectionItem *>( mParent );
531-
if ( connectionParentItem )
532+
if ( QMessageBox::question( nullptr, QObject::tr( "Delete Layer" ), QObject::tr( "The layer <b>%1</b> has been deleted successfully."
533+
" Compact database (VACUUM) <b>%2</b> now?" ).arg( mName, connectionParentItem->name() ), QMessageBox::Yes | QMessageBox::No, QMessageBox::No ) == QMessageBox::Yes )
532534
{
533-
if ( QMessageBox::question( nullptr, QObject::tr( "Delete Layer" ), QObject::tr( "The layer <b>%1</b> deleted successfully."
534-
" Compact database (VACUUM) <b>%2</b> now?" ).arg( mName, connectionParentItem->name() ), QMessageBox::Yes | QMessageBox::No, QMessageBox::No ) == QMessageBox::Yes )
535-
{
536-
connectionParentItem->vacuumGeoPackageDbAction();
537-
}
535+
connectionParentItem->vacuumGeoPackageDbAction();
538536
}
539-
mParent->refreshConnections();
540537
}
541538
else
542539
{
543-
QMessageBox::information( nullptr, tr( "Delete Layer" ), tr( "Layer <b>%1</b> deleted successfully." ).arg( mName ) );
540+
QMessageBox::information( nullptr, tr( "Delete Layer" ), tr( "The Layer <b>%1</b> has been deleted successfully." ).arg( mName ) );
544541
}
542+
if ( mParent )
543+
mParent->refreshConnections();
544+
545545
}
546546
return true;
547547
}

0 commit comments

Comments
 (0)