Revert previous change of keyboard shortcut for item delete in tree made in #1590

docs/source/usage_shortcuts.rst

@@ -59,7 +59,7 @@ Project Tree Shortcuts
    ":kbd:`Ctrl+R`",         "Open the selected document in the viewer"
    ":kbd:`Ctrl+Up`",        "Move selected item one step up in the tree"
    ":kbd:`Ctrl+Down`",      "Move selected item one step down in the tree"
-   ":kbd:`Ctrl+Del`",     "Move the selected item to Trash"
+   ":kbd:`Ctrl+Shift+Del`", "Move the selected item to Trash"
    ":kbd:`Ctrl+Shift+Z`",   "Undo the last move of a project item, if possible"
 
 

novelwriter/gui/mainmenu.py

@@ -171,7 +171,7 @@ class GuiMainMenu(QMenuBar):
 
         # Project > Delete
         self.aDeleteItem = self.projMenu.addAction(self.tr("Delete Item"))
-        self.aDeleteItem.setShortcuts(["Ctrl+Del", "Ctrl+Shift+Del"])  # Latter is deprecated
+        self.aDeleteItem.setShortcut("Ctrl+Shift+Del")  # Cannot be Ctrl+Del, see #629
         self.aDeleteItem.triggered.connect(lambda: self.mainGui.projView.requestDeleteItem(None))
 
         # Project > Empty Trash

novelwriter/guimain.py

@@ -1164,10 +1164,7 @@ class GuiMain(QMainWindow):
         """Capture the closing event of the GUI and call the close
         function to handle all the close process steps.
         """
-        if self.closeMain():
+        event.accept() if self.closeMain() else event.ignore()
-            event.accept()
-        else:
-            event.ignore()
         return
 
     ##