From cd64b3f91794673443427bc5cbd0c0f73d900e8d Mon Sep 17 00:00:00 2001
From: "Veronica K. B. Olsen" <code@vkbo.net>
Date: Sat, 27 Apr 2019 22:15:19 +0200
Subject: [PATCH] Morged edit and delete menu items for folders and files.

---
 nw/gui/mainmenu.py | 36 ++++++++++++------------------------
 1 file changed, 12 insertions(+), 24 deletions(-)

diff --git a/nw/gui/mainmenu.py b/nw/gui/mainmenu.py
index 2375b214..62877a91 100644
--- a/nw/gui/mainmenu.py
+++ b/nw/gui/mainmenu.py
@@ -131,16 +131,20 @@ class GuiMainMenu(QMenuBar):
         menuItem.triggered.connect(lambda : self._newTreeItem(nwItemType.FOLDER, None))
         self.projMenu.addAction(menuItem)
 
-        # Project > Rename Folder
-        menuItem = QAction(QIcon.fromTheme("folder-new"), "Rename Folder", self)
-        menuItem.setStatusTip("Rename Selected Folder")
-        menuItem.setShortcut("Ctrl+Shift+E")
+        # Project > Separator
+        self.projMenu.addSeparator()
+
+        # Project > Edit
+        menuItem = QAction(QIcon.fromTheme("document-properties"), "&Edit Item", self)
+        menuItem.setStatusTip("Change Item Settings")
+        menuItem.setShortcut("Ctrl+E")
+        menuItem.triggered.connect(self.theParent.editItem)
         self.projMenu.addAction(menuItem)
 
-        # Project > Delete Folder
-        menuItem = QAction(QIcon.fromTheme("edit-delete"), "Delete Folder", self)
-        menuItem.setStatusTip("Delete Selected Folder")
-        menuItem.setShortcut("Ctrl+Shift+Del")
+        # Project > Delete
+        menuItem = QAction(QIcon.fromTheme("edit-delete"), "&Delete Item", self)
+        menuItem.setStatusTip("Delete Selected Item")
+        menuItem.setShortcut("Ctrl+Del")
         self.projMenu.addAction(menuItem)
 
         # Project > Separator
@@ -184,22 +188,6 @@ class GuiMainMenu(QMenuBar):
         # Document > Separator
         self.docuMenu.addSeparator()
 
-        # Document > Edit
-        menuItem = QAction(QIcon.fromTheme("document-properties"), "&Edit Document", self)
-        menuItem.setStatusTip("Change Document Settings")
-        menuItem.setShortcut("Ctrl+E")
-        menuItem.triggered.connect(self.theParent.editItem)
-        self.docuMenu.addAction(menuItem)
-
-        # Document > Delete
-        menuItem = QAction(QIcon.fromTheme("edit-delete"), "&Delete Document", self)
-        menuItem.setStatusTip("Delete Selected Document")
-        menuItem.setShortcut("Ctrl+Del")
-        self.docuMenu.addAction(menuItem)
-
-        # Document > Separator
-        self.docuMenu.addSeparator()
-
         # Document > Split
         menuItem = QAction(QIcon.fromTheme("list-add"), "Split Document", self)
         menuItem.setStatusTip("Split Selected Document")