Ignore remove legend entries dialog with shift help

qgis · Mar 29, 2016 · d732d845f1303dc6374efe0facfe4bea0d528d91 · d732d84
1 parent 631a7fd
commit d732d845f1303dc6374efe0facfe4bea0d528d91
Unified Split

Showing with 2 additions and 1 deletion.

+2 −1 src/app/qgisapp.cpp
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -7746,8 +7746,9 @@ void QgisApp::removeLayer()
   }
 
   bool promptConfirmation = QSettings().value( "qgis/askToDeleteLayers", true ).toBool();
+  bool shiftHeld = QApplication::queryKeyboardModifiers().testFlag(Qt::ShiftModifier);
   //display a warning
-  if ( promptConfirmation && QMessageBox::warning( this, tr( "Remove layers and groups" ), tr( "Remove %n legend entries?", "number of legend items to remove", selectedNodes.count() ), QMessageBox::Ok | QMessageBox::Cancel ) == QMessageBox::Cancel )
+  if ( !shiftHeld && promptConfirmation && QMessageBox::warning( this, tr( "Remove layers and groups" ), tr( "Remove %n legend entries?", "number of legend items to remove", selectedNodes.count() ), QMessageBox::Ok | QMessageBox::Cancel ) == QMessageBox::Cancel )
   {
     return;
   }