Reproog/novelWriter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove the showStatus flag from document handling

Browse Source
This commit is contained in:
Veronica K. B. Olsen
2021-04-25 17:16:57 +02:00
parent d473615ccf
commit 45f726669e
7 changed files with 29 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nw/dialogs/docmerge.py
+2 -2
View File
@@ -110,7 +110,7 @@ class GuiDocMerge(QDialog):
theDoc = NWDoc(self.theProject, self.theParent)
theText = ""
for tHandle in finalOrder:
docText = theDoc.readDocument(tHandle, False).rstrip("\n")
docText = theDoc.readDocument(tHandle).rstrip("\n")
if docText:
theText += docText+"\n\n"
@@ -131,7 +131,7 @@ class GuiDocMerge(QDialog):
newItem = self.theProject.projTree[nHandle]
newItem.setStatus(srcItem.itemStatus)
theDoc.readDocument(nHandle, False)
theDoc.readDocument(nHandle)
theDoc.writeDocument(theText)
self.theParent.treeView.revealNewTreeItem(nHandle)
self.theParent.openDocument(nHandle, doScroll=True)