Merge branch 'main' into release_1.0b1

This commit is contained in:
Veronica K. Berglyd Olsen
2020-08-19 21:39:47 +02:00
committed by GitHub
+13 -1
View File
@@ -34,7 +34,7 @@ from PyQt5.QtWidgets import (
QListWidgetItem, QDialogButtonBox, QLabel QListWidgetItem, QDialogButtonBox, QLabel
) )
from nw.constants import nwAlert, nwItemType, nwItemClass, nwItemLayout from nw.constants import nwAlert, nwItemType, nwItemClass, nwItemLayout, nwConst
from nw.gui.custom import QHelpLabel from nw.gui.custom import QHelpLabel
from nw.core import NWDoc from nw.core import NWDoc
@@ -149,12 +149,24 @@ class GuiDocSplit(QDialog):
), nwAlert.ERROR) ), nwAlert.ERROR)
return return
# Check that another folder can be created
parTree = self.theProject.projTree.getItemPath(srcItem.parHandle)
if len(parTree) >= nwConst.maxDepth - 1:
self.theParent.makeAlert((
"Cannot add new folder for the document split. "
"Maximum folder depth has been reached. "
"Please move the file to another level in the project tree."
), nwAlert.ERROR)
return
# Create the folder
fHandle = self.theProject.newFolder( fHandle = self.theProject.newFolder(
srcItem.itemName, srcItem.itemClass, srcItem.parHandle srcItem.itemName, srcItem.itemClass, srcItem.parHandle
) )
self.theParent.treeView.revealTreeItem(fHandle) self.theParent.treeView.revealTreeItem(fHandle)
logger.verbose("Creating folder %s" % fHandle) logger.verbose("Creating folder %s" % fHandle)
# Loop through, and create the files
for wTitle, iStart, iEnd in finalOrder: for wTitle, iStart, iEnd in finalOrder:
itemLayout = nwItemLayout.NOTE itemLayout = nwItemLayout.NOTE