Skip to content
Permalink
Browse files

Merge pull request #6863 from m-kuhn/selectedfeaturedeletecount

Show feature count and layer when asking for delete confirmation
  • Loading branch information
m-kuhn committed May 1, 2018
2 parents 9ff366f + 41bf860 commit f1aaa144ffa2d2fb51f3f9f290616008c1408d26
Showing with 3 additions and 3 deletions.
  1. +3 −3 src/app/qgisapp.cpp
@@ -7326,7 +7326,7 @@ void QgisApp::deleteSelected( QgsMapLayer *layer, QWidget *parent, bool checkFea
}

//validate selection
int numberOfSelectedFeatures = vlayer->selectedFeatureIds().size();
const int numberOfSelectedFeatures = vlayer->selectedFeatureCount();
if ( numberOfSelectedFeatures == 0 )
{
messageBar()->pushMessage( tr( "No Features Selected" ),
@@ -7354,7 +7354,7 @@ void QgisApp::deleteSelected( QgsMapLayer *layer, QWidget *parent, bool checkFea
if ( !allFeaturesInView )
{
// for extra safety to make sure we are not removing geometries by accident
int res = QMessageBox::warning( mMapCanvas, tr( "Delete features" ),
int res = QMessageBox::warning( mMapCanvas, tr( "Delete %n feature(s) from layer \"%1\"", nullptr, numberOfSelectedFeatures ).arg( vlayer->name() ),
tr( "Some of the selected features are outside of the current map view. Would you still like to continue?" ),
QMessageBox::Yes | QMessageBox::No );
if ( res != QMessageBox::Yes )
@@ -7367,7 +7367,7 @@ void QgisApp::deleteSelected( QgsMapLayer *layer, QWidget *parent, bool checkFea
if ( !vlayer->deleteSelectedFeatures( &deletedCount ) )
{
messageBar()->pushMessage( tr( "Problem deleting features" ),
tr( "A problem occurred during deletion of %1 feature(s)" ).arg( numberOfSelectedFeatures - deletedCount ),
tr( "A problem occurred during deletion from layer \"%1\". %n feature(s) not deleted.", nullptr, numberOfSelectedFeatures - deletedCount ).arg( vlayer->name() ),
Qgis::Warning );
}
else

0 comments on commit f1aaa14

Please sign in to comment.
You can’t perform that action at this time.