From b069aaf1c1fb9db53a3ca2462f018bab7453044c Mon Sep 17 00:00:00 2001
From: Alvaro Huarte <ahuarte47@yahoo.es>
Date: Thu, 28 Nov 2013 16:58:35 +0100
Subject: [PATCH] #9094: Other shortcut changes

---
 src/app/nodetool/qgsmaptoolnodetool.cpp |  2 +-
 src/app/qgisapp.cpp                     | 17 ++++++++++-------
 src/ui/qgsattributetabledialog.ui       |  4 ++--
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/app/nodetool/qgsmaptoolnodetool.cpp b/src/app/nodetool/qgsmaptoolnodetool.cpp
index 6df0de7bf6a5..a333c27e891f 100644
--- a/src/app/nodetool/qgsmaptoolnodetool.cpp
+++ b/src/app/nodetool/qgsmaptoolnodetool.cpp
@@ -711,7 +711,7 @@ void QgsMapToolNodeTool::keyReleaseEvent( QKeyEvent* e )
     return;
   }
 
-  if ( mSelectedFeature && e->key() == Qt::Key_Delete )
+  if ( mSelectedFeature && e->key() == Qt::Key_Backspace )
   {
     mSelectedFeature->deleteSelectedVertexes();
     mCanvas->refresh();
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
index 00f1571d2f66..eb4fd448476e 100644
--- a/src/app/qgisapp.cpp
+++ b/src/app/qgisapp.cpp
@@ -4845,13 +4845,6 @@ void QgisApp::deleteSelected( QgsMapLayer *layer, QWidget* parent )
     return;
   }
 
-  //display a warning
-  int numberOfDeletedFeatures = vlayer->selectedFeaturesIds().size();
-  if ( QMessageBox::warning( parent, tr( "Delete features" ), tr( "Delete %n feature(s)?", "number of features to delete", numberOfDeletedFeatures ), QMessageBox::Ok, QMessageBox::Cancel ) == QMessageBox::Cancel )
-  {
-    return;
-  }
-
   vlayer->beginEditCommand( tr( "Features deleted" ) );
   if ( !vlayer->deleteSelectedFeatures() )
   {
@@ -6479,6 +6472,8 @@ void QgisApp::removeAllLayers()
 
 void QgisApp::removeLayer()
 {
+  int numberOfRemovedLayers = 0;
+
   if ( mMapCanvas && mMapCanvas->isDrawing() )
   {
     return;
@@ -6494,6 +6489,14 @@ void QgisApp::removeLayer()
     QgsVectorLayer *vlayer = qobject_cast<QgsVectorLayer*>( layer );
     if ( vlayer && vlayer->isEditable() && !toggleEditing( vlayer, true ) )
       return;
+
+    numberOfRemovedLayers++;
+  }
+
+  //display a warning
+  if ( QMessageBox::warning( this, tr( "Remove layers" ), tr( "Remove %n layer(s)?", "number of layers to remove", numberOfRemovedLayers ), QMessageBox::Ok, QMessageBox::Cancel ) == QMessageBox::Cancel )
+  {
+    return;
   }
 
   mMapLegend->removeSelectedLayers();
diff --git a/src/ui/qgsattributetabledialog.ui b/src/ui/qgsattributetabledialog.ui
index 142a67548fa9..08282fa205c4 100644
--- a/src/ui/qgsattributetabledialog.ui
+++ b/src/ui/qgsattributetabledialog.ui
@@ -112,7 +112,7 @@
      <item>
       <widget class="QToolButton" name="mDeleteSelectedButton">
        <property name="toolTip">
-        <string>Delete selected features (Ctrl+D)</string>
+        <string>Delete selected features (DEL)</string>
        </property>
        <property name="text">
         <string>...</string>
@@ -128,7 +128,7 @@
         </size>
        </property>
        <property name="shortcut">
-        <string>Ctrl+D</string>
+        <string>Delete</string>
        </property>
       </widget>
      </item>