From 748d76dca67975895723a9d48d3e4c2816cc7c87 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Thu, 5 Jan 2023 23:45:48 +0100 Subject: [PATCH] Fix converting folder to file (#1305) --- novelwriter/gui/projtree.py | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/novelwriter/gui/projtree.py b/novelwriter/gui/projtree.py index 434c5852..5faa85b2 100644 --- a/novelwriter/gui/projtree.py +++ b/novelwriter/gui/projtree.py @@ -1251,18 +1251,30 @@ class GuiProjectTree(QTreeWidget): isDocFile = isFile and tItem.isDocumentLayout() isNoteFile = isFile and tItem.isNoteLayout() - if (isNoteFile or isFolder) and tItem.documentAllowed(): + if isNoteFile and tItem.documentAllowed(): aConvert1 = mTrans.addAction(self.tr("Convert to {0}").format(trDoc)) aConvert1.triggered.connect( lambda: self._changeItemLayout(tHandle, nwItemLayout.DOCUMENT) ) - if isDocFile or isFolder: + if isDocFile: aConvert2 = mTrans.addAction(self.tr("Convert to {0}").format(trNote)) aConvert2.triggered.connect( lambda: self._changeItemLayout(tHandle, nwItemLayout.NOTE) ) + if isFolder and tItem.documentAllowed(): + aConvert3 = mTrans.addAction(self.tr("Convert to {0}").format(trDoc)) + aConvert3.triggered.connect( + lambda: self._covertFolderToFile(tHandle, nwItemLayout.DOCUMENT) + ) + + if isFolder: + aConvert4 = mTrans.addAction(self.tr("Convert to {0}").format(trNote)) + aConvert4.triggered.connect( + lambda: self._covertFolderToFile(tHandle, nwItemLayout.NOTE) + ) + if hasChild and isFile: aMerge1 = mTrans.addAction(self.tr("Merge Child Items into Self")) aMerge1.triggered.connect(lambda: self._mergeDocuments(tHandle, False))