Fix converting folder to file (#1305)

2023-01-05 23:45:48 +01:00
parent 7e0e18787f
commit 748d76dca6
1 changed files with 14 additions and 2 deletions
@@ -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))