--- a/DebugView.st	Fri May 26 10:56:45 2017 +0100
+++ b/DebugView.st	Fri Oct 13 23:09:49 2017 +0100
@@ -1142,6 +1142,7 @@
             enabled: canReturn
             label: 'Return'
             itemValue: doReturn
+            shortcutKey: DebuggerReturn
           )
          (MenuItem
             enabled: canRestart
@@ -1450,6 +1451,7 @@
          (MenuItem
             label: 'Abort'
             itemValue: doAbort
+            shortcutKey: Abort
           )
          (MenuItem
             enabled: abortAllIsHandled
@@ -1473,6 +1475,7 @@
          (MenuItem
             label: 'Debug_Terminate'
             itemValue: doTerminate
+            shortcutKey: DebugTerminate
           )
          (MenuItem
             label: 'Hard Terminate (Danger)'
@@ -3321,7 +3324,6 @@
     LastOrigin notNil ifTrue:[
         self origin:LastOrigin.
     ].
-
     "
      Debugger newDebugger
     "
@@ -3331,7 +3333,7 @@
 
 initializeAbortButtonIn:bpanel
     abortButton := Button
-                label:(resources string:'Abort')
+                label:(resources string:'Abort'), (self shortKeyStringForAction: #Abort)
                 action:[
                     abortButton turnOffWithoutRedraw.
                     self doAbort
@@ -3342,6 +3344,7 @@
 
     "Created: / 17.11.2001 / 20:56:47 / cg"
     "Modified: / 17.11.2001 / 20:57:17 / cg"
+    "Modified: / 16-08-2017 / 08:48:50 / Patrik Svestka <patrik.svestka@gmail.com>"
 !
 
 initializeButtons1In:bpanel
@@ -3665,7 +3668,7 @@
 
 initializeGotoApplicationActionMethodButtonIn:bpanel
     gotoApplicationActionMethodButton := Button
-                label:(resources string:'Goto Responsible Application Method')
+                label:(resources string:'Goto Responsible Application Method') , (self shortKeyStringForAction: #GotoResponsibleApplicationMethod)
                 action:[
                     gotoApplicationActionMethodButton turnOffWithoutRedraw.
                     self doGotoApplicationActionMethod
@@ -3674,6 +3677,8 @@
 
     gotoApplicationActionMethodButton name:'gotoAppMethodButton'.
     gotoApplicationActionMethodButton beInvisible
+
+    "Modified: / 16-08-2017 / 09:07:00 / Patrik Svestka <patrik.svestka@gmail.com>"
 !
 
 initializeGotoDialogOpenerButtonIn:bpanel
@@ -3738,7 +3743,7 @@
 
 initializeResendButtonIn:bpanel
     resendButton := Button
-                label:(resources string:'Resend')
+                label:(resources string:'Resend') , (self shortKeyStringForAction: #Resend)
                 action:[
                     resendButton turnOff.
                     self doResend
@@ -3749,6 +3754,8 @@
 
     "/ if we have this, we do not need the restart button
     restartButton beInvisible.
+
+    "Modified: / 16-08-2017 / 09:05:00 / Patrik Svestka <patrik.svestka@gmail.com>"
 !
 
 initializeRestartButtonIn:bpanel
@@ -3761,13 +3768,13 @@
                 in:bpanel.
 
     restartButton name:'restartButton'
-    
+
     "Created: / 17.11.2001 / 20:58:52 / cg"
 !
 
 initializeReturnButtonIn:bpanel
     returnButton := Button
-                label:(resources string:'Return')
+                label:(resources string:'Return') , (self shortKeyStringForAction: #DebuggerReturn)
                 action:[
                     returnButton turnOff.
                     self doReturn
@@ -3777,6 +3784,7 @@
     returnButton name:'returnButton'.
 
     "Created: / 17.11.2001 / 20:58:22 / cg"
+    "Modified: / 16-08-2017 / 09:11:20 / Patrik Svestka <patrik.svestka@gmail.com>"
 !
 
 initializeSendButtonIn:bpanel
@@ -3796,7 +3804,7 @@
 
 initializeStepButtonIn:bpanel
     stepButton := Button
-                label:(resources string:'Debug_Step')
+                label:(resources string:'Debug_Step') , (self shortKeyStringForAction: #DebuggerStep)
                 action:[
                     stepButton turnOff.
                     self doStep
@@ -3804,13 +3812,13 @@
                 in:bpanel.
 
     stepButton name:'stepButton'.
-
     "Created: / 17.11.2001 / 21:00:13 / cg"
+    "Modified: / 02-08-2017 / 10:16:38 / Patrik Svestka <patrik.svestka@gmail.com>"
 !
 
 initializeTerminateButtonIn:bpanel
     terminateButton := Button
-                label:(resources string:'Debug_Terminate')
+                label:(resources string:'Debug_Terminate') , (self shortKeyStringForAction: #DebugTerminate)
                 action:[
                     terminateButton turnOffWithoutRedraw.
                     self doTerminate
@@ -3822,6 +3830,7 @@
     "/ terminateButton foregroundColor:Color red.
 
     "Created: / 17.11.2001 / 21:02:20 / cg"
+    "Modified: / 16-08-2017 / 09:17:10 / Patrik Svestka <patrik.svestka@gmail.com>"
 !
 
 postRealize