Delete without confirmation using Shift instead of Ctrl

repository/OpenPonk-Spec/OPDiagramRemoveFigureCommand.class.st

@@ -23,15 +23,15 @@ OPDiagramRemoveFigureCommand class >> canvasShortcutActivation [
 						    (KeyboardKey new withValue: 16rffff andName: #delete)).
 					   ((KMSingleKeyCombination new key:
 						     (KeyboardKey new withValue: 16rffff andName: #delete))
-						    modifiedBy: KMModifier meta) })
+						    modifiedBy: self skipConfirmationModifier) })
 		  for: OPCanvasPresenter
 ]
 
 { #category : 'accessing' }
 OPDiagramRemoveFigureCommand class >> lastEvent [
 
 	self flag:
-		'Part of ugly hack to find out if ctrl is currently pressed'.
+		'Part of ugly hack to find out if the modifier key was pressed'.
 
 	^ lastEvent
 ]
@@ -40,11 +40,17 @@ OPDiagramRemoveFigureCommand class >> lastEvent [
 OPDiagramRemoveFigureCommand class >> lastEvent: anEvent [
 
 	self flag:
-		'Part of ugly hack to find out if ctrl is currently pressed'.
+		'Part of ugly hack to find out if the modifier key was pressed'.
 
 	lastEvent := anEvent
 ]
 
+{ #category : 'constants' }
+OPDiagramRemoveFigureCommand class >> skipConfirmationModifier [
+
+	^ KMModifier shift
+]
+
 { #category : 'accessing' }
 OPDiagramRemoveFigureCommand >> defaultMenuIcon [
 	^ self iconNamed: #glamorousTrash
@@ -72,32 +78,30 @@ OPDiagramRemoveFigureCommand >> doAndReturnFocus: aBlock [
 { #category : 'execution' }
 OPDiagramRemoveFigureCommand >> execute [
 
-	| lastEvent |
-	lastEvent := self class lastEvent.
-	(lastEvent isNotNil and: [
-		 lastEvent controlKeyPressed or: [ lastEvent commandKeyPressed ] ])
-		ifTrue: [ self unsafeExecute ]
-		ifFalse: [ self safeExecute ]
+	self class lastEvent ifNotNil: [ :lastEvent |
+		(self class skipConfirmationModifier matchesEvent: lastEvent)
+			ifTrue: [ ^ self executeWithoutConfirmation ] ].
+	self executeWithConfirmation
 ]
 
 { #category : 'execution' }
-OPDiagramRemoveFigureCommand >> safeExecute [
+OPDiagramRemoveFigureCommand >> executeWithConfirmation [
 
 	| result |
 	result := self doAndReturnFocus: [
 		          UIManager default
 			          proceed:
 				          'Permanently remove from model? (to skip this confirmation, hold '
-				          , OSPlatform current defaultModifier name
+				          , self class skipConfirmationModifier name
 				          , ' next time)'
 			          title: 'Remove?' ].
 	result ifNil: [ ^ self ].
 	result ifFalse: [ ^ self ].
-	self unsafeExecute
+	self executeWithoutConfirmation
 ]
 
 { #category : 'execution' }
-OPDiagramRemoveFigureCommand >> unsafeExecute [
+OPDiagramRemoveFigureCommand >> executeWithoutConfirmation [
 
 	diagramController deselectAll.
 	figures do: [ :each |