From 19c583f615ce732c274b1dda41158285bd4f60a2 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Sun, 11 Sep 2022 18:48:15 +0200 Subject: [PATCH 1/2] Fix misleading deletion label in context menu for empty folders --- novelwriter/gui/projtree.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/novelwriter/gui/projtree.py b/novelwriter/gui/projtree.py index b8e4dfbf..9c2bf9fc 100644 --- a/novelwriter/gui/projtree.py +++ b/novelwriter/gui/projtree.py @@ -1019,7 +1019,11 @@ class GuiProjectTree(QTreeWidget): # Document Actions # ================ + isRoot = tItem.isRootType() + isFolder = tItem.isFolderType() isFile = tItem.isFileType() + isEmpty = selItem.childCount() == 0 + if isFile: ctxMenu.addAction( self.tr("Open Document"), @@ -1079,7 +1083,7 @@ class GuiProjectTree(QTreeWidget): # Delete Item # =========== - if tItem.itemClass == nwItemClass.TRASH or tItem.isRootType(): + if tItem.itemClass == nwItemClass.TRASH or isRoot or (isFolder and isEmpty): ctxMenu.addAction( self.tr("Delete Permanently"), lambda: self.deleteItem(tHandle) ) From 874f4f7198507438456aa67ebd0402409202c02d Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Sun, 11 Sep 2022 18:51:18 +0200 Subject: [PATCH 2/2] Change a few other project tree context menu labels --- novelwriter/gui/projtree.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/novelwriter/gui/projtree.py b/novelwriter/gui/projtree.py index 9c2bf9fc..e6acd81d 100644 --- a/novelwriter/gui/projtree.py +++ b/novelwriter/gui/projtree.py @@ -1048,14 +1048,14 @@ class GuiProjectTree(QTreeWidget): ) if tItem.isNovelLike(): - mStatus = ctxMenu.addMenu(self.tr("Change Status")) + mStatus = ctxMenu.addMenu(self.tr("Set Status to ...")) for n, (key, entry) in enumerate(self.theProject.statusItems.items()): aStatus = mStatus.addAction(entry["icon"], entry["name"]) aStatus.triggered.connect( lambda n, key=key: self._changeItemStatus(tHandle, key) ) else: - mImport = ctxMenu.addMenu(self.tr("Change Importance")) + mImport = ctxMenu.addMenu(self.tr("Set Importance to ...")) for n, (key, entry) in enumerate(self.theProject.importItems.items()): aImport = mImport.addAction(entry["icon"], entry["name"]) aImport.triggered.connect( @@ -1065,14 +1065,14 @@ class GuiProjectTree(QTreeWidget): if isFile and tItem.documentAllowed(): if tItem.isNoteLayout(): ctxMenu.addAction( - self.tr("Change to {0}").format( + self.tr("Convert to {0}").format( trConst(nwLabels.LAYOUT_NAME[nwItemLayout.DOCUMENT]) ), lambda: self._changeItemLayout(tHandle, nwItemLayout.DOCUMENT) ) else: ctxMenu.addAction( - self.tr("Change to {0}").format( + self.tr("Convert to {0}").format( trConst(nwLabels.LAYOUT_NAME[nwItemLayout.NOTE]) ), lambda: self._changeItemLayout(tHandle, nwItemLayout.NOTE)