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

This commit is contained in:
Veronica Berglyd Olsen
2023-11-25 16:27:40 +01:00
parent 74c5a66a4c
commit e216f80d64
3 changed files with 17 additions and 20 deletions
+1 -1
View File
@@ -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
+1 -4
View File
@@ -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()
else:
event.ignore()
event.accept() if self.closeMain() else event.ignore()
return
##