Moved the project tree into its own iterable class NWTree

nw/gui/dialogs/docmerge.py

@@ -115,7 +115,7 @@ class GuiDocMerge(QDialog):
             ), nwAlert.ERROR)
             return
 
-        srcItem = self.theProject.getItem(self.sourceItem)
+        srcItem = self.theProject.projTree[self.sourceItem]
         nHandle = self.theProject.newFile(srcItem.itemName, srcItem.itemClass, srcItem.parHandle)
         self.theParent.treeView.revealTreeItem(nHandle)
         theDoc.openDocument(nHandle, False)
@@ -149,7 +149,7 @@ class GuiDocMerge(QDialog):
         if tHandle is None:
             return
 
-        nwItem = self.theProject.getItem(tHandle)
+        nwItem = self.theProject.projTree[tHandle]
         if nwItem is None:
             return
         if nwItem.itemType is not nwItemType.FOLDER:
@@ -160,7 +160,7 @@ class GuiDocMerge(QDialog):
 
         for sHandle in self.theParent.treeView.getTreeFromHandle(tHandle):
             newItem = QListWidgetItem()
-            nwItem  = self.theProject.getItem(sHandle)
+            nwItem  = self.theProject.projTree[sHandle]
             if nwItem.itemType is not nwItemType.FILE:
                 continue
             newItem.setText(nwItem.itemName)

nw/gui/dialogs/docsplit.py

@@ -120,7 +120,7 @@ class GuiDocSplit(QDialog):
             ), nwAlert.ERROR)
             return
 
-        srcItem = self.theProject.getItem(self.sourceItem)
+        srcItem = self.theProject.projTree[self.sourceItem]
         if srcItem is None:
             self.theParent.makeAlert((
                 "Could not parse source document."
@@ -172,7 +172,7 @@ class GuiDocSplit(QDialog):
             wTitle = wTitle.strip()
 
             nHandle = self.theProject.newFile(wTitle, srcItem.itemClass, fHandle)
-            newItem = self.theProject.getItem(nHandle)
+            newItem = self.theProject.projTree[nHandle]
             newItem.setLayout(itemLayout)
             logger.verbose(
                 "Creating new document %s with text from line %d to %d" % (nHandle, iStart, iEnd-1)
@@ -213,7 +213,7 @@ class GuiDocSplit(QDialog):
         if self.sourceItem is None:
             return
 
-        nwItem = self.theProject.getItem(self.sourceItem)
+        nwItem = self.theProject.projTree[self.sourceItem]
         if nwItem is None:
             return
         if nwItem.itemType is not nwItemType.FILE:

nw/gui/dialogs/export.py

@@ -134,7 +134,7 @@ class GuiExport(QDialog):
             self.exportStatus.setText("Export failed ...")
             return False
 
-        nItems = len(self.theProject.treeOrder)
+        nItems = len(self.theProject.projTree)
         if eFormat == GuiExportMain.FMT_PDOC:
             nItems += int(0.2*nItems)
         self.exportProgress.setMinimum(0)
@@ -182,16 +182,14 @@ class GuiExport(QDialog):
         time.sleep(0.5)
 
         nDone = 0
-        for tHandle in self.theProject.treeOrder:
+        for tItem in self.theProject.projTree:
 
             self.exportProgress.setValue(nDone)
-            tItem = self.theProject.getItem(tHandle)
-
             self.exportStatus.setText("Exporting: %s" % tItem.itemName)
             logger.verbose("Exporting: %s" % tItem.itemName)
 
             if tItem is not None and tItem.itemType == nwItemType.FILE:
-                outFile.addText(tHandle)
+                outFile.addText(tItem.itemHandle)
 
             nDone += 1
 

nw/gui/dialogs/itemeditor.py

@@ -48,7 +48,7 @@ class GuiItemEditor(QDialog):
         self.mainConf   = nw.CONFIG
         self.theProject = theProject
         self.theParent  = theParent
-        self.theItem    = self.theProject.getItem(tHandle)
+        self.theItem    = self.theProject.projTree[tHandle]
 
         self.outerBox = QHBoxLayout()
         self.innerBox = QVBoxLayout()