Give main GUI elements more identifiable names

novelwriter/dialogs/docmerge.py

@@ -142,7 +142,7 @@ class GuiDocMerge(QDialog):
             ], nwAlert.ERROR)
             return False
 
-        self.mainGui.treeView.revealNewTreeItem(nHandle)
+        self.mainGui.projView.revealNewTreeItem(nHandle)
         self.mainGui.openDocument(nHandle, doScroll=True)
 
         self._doClose()
@@ -165,7 +165,7 @@ class GuiDocMerge(QDialog):
         are then added to the list view in order. The list itself can be
         reordered by the user.
         """
-        tHandle = self.mainGui.treeView.getSelectedHandle()
+        tHandle = self.mainGui.projView.getSelectedHandle()
         self.sourceItem = tHandle
         if tHandle is None:
             return False
@@ -180,7 +180,7 @@ class GuiDocMerge(QDialog):
             ), nwAlert.ERROR)
             return False
 
-        for sHandle in self.mainGui.treeView.getTreeFromHandle(tHandle):
+        for sHandle in self.mainGui.projView.getTreeFromHandle(tHandle):
             newItem = QListWidgetItem()
             nwItem  = self.theProject.tree[sHandle]
             if nwItem.itemType is not nwItemType.FILE:

novelwriter/dialogs/docsplit.py

@@ -175,7 +175,7 @@ class GuiDocSplit(QDialog):
 
         # Create the folder
         fHandle = self.theProject.newFolder(srcItem.itemName, srcItem.itemParent)
-        self.mainGui.treeView.revealNewTreeItem(fHandle)
+        self.mainGui.projView.revealNewTreeItem(fHandle)
         logger.verbose("Creating folder '%s'", fHandle)
 
         # Loop through, and create the files
@@ -201,7 +201,7 @@ class GuiDocSplit(QDialog):
                 ], nwAlert.ERROR)
                 return False
 
-            self.mainGui.treeView.revealNewTreeItem(nHandle)
+            self.mainGui.projView.revealNewTreeItem(nHandle)
 
         self._doClose()
 
@@ -226,7 +226,7 @@ class GuiDocSplit(QDialog):
         """
         self.listBox.clear()
         if self.sourceItem is None:
-            self.sourceItem = self.mainGui.treeView.getSelectedHandle()
+            self.sourceItem = self.mainGui.projView.getSelectedHandle()
 
         if self.sourceItem is None:
             return False

novelwriter/dialogs/preferences.py

@@ -107,7 +107,7 @@ class GuiPreferences(PagedDialog):
             ), nwAlert.INFO)
 
         if refreshTree:
-            self.mainGui.treeView.populateTree()
+            self.mainGui.projView.populateTree()
 
         self._saveWindowSize()
         self.accept()

novelwriter/gui/doceditor.py

@@ -517,8 +517,8 @@ class GuiDocEditor(QTextEdit):
             self.mainGui.novelView.updateWordCounts(tHandle)
 
         if oldHeader != newHeader:
-            self.mainGui.treeView.setTreeItemValues(tHandle)
+            self.mainGui.projView.setTreeItemValues(tHandle)
-            self.mainGui.treeMeta.updateViewBox(tHandle)
+            self.mainGui.itemDetails.updateViewBox(tHandle)
             self.docFooter.updateInfo()
 
         # Update the status bar
@@ -2779,7 +2779,7 @@ class GuiDocEditHeader(QWidget):
         """Capture a click on the title and ensure that the item is
         selected in the project tree.
         """
-        self.mainGui.treeView.setSelectedHandle(self._docHandle, doScroll=True)
+        self.mainGui.projView.setSelectedHandle(self._docHandle, doScroll=True)
         return
 
 # END Class GuiDocEditHeader

novelwriter/gui/docviewer.py

@@ -901,7 +901,7 @@ class GuiDocViewHeader(QWidget):
         """Capture a click on the title and ensure that the item is
         selected in the project tree.
         """
-        self.mainGui.treeView.setSelectedHandle(self._docHandle, doScroll=True)
+        self.mainGui.projView.setSelectedHandle(self._docHandle, doScroll=True)
         return
 
 # END Class GuiDocViewHeader

novelwriter/gui/mainmenu.py

@@ -171,12 +171,12 @@ class GuiMainMenu(QMenuBar):
         # Project > Delete
         self.aDeleteItem = QAction(self.tr("Delete Item"), self)
         self.aDeleteItem.setShortcut("Ctrl+Shift+Del")
-        self.aDeleteItem.triggered.connect(lambda: self.mainGui.treeView.deleteItem(None))
+        self.aDeleteItem.triggered.connect(lambda: self.mainGui.projView.deleteItem(None))
         self.projMenu.addAction(self.aDeleteItem)
 
         # Project > Empty Trash
         self.aEmptyTrash = QAction(self.tr("Empty Trash"), self)
-        self.aEmptyTrash.triggered.connect(lambda: self.mainGui.treeView.emptyTrash())
+        self.aEmptyTrash.triggered.connect(lambda: self.mainGui.projView.emptyTrash())
         self.projMenu.addAction(self.aEmptyTrash)
 
         # Project > Separator

novelwriter/gui/noveltree.py

@@ -135,7 +135,7 @@ class GuiNovelTree(QTreeWidget):
         """Called whenever the Novel tab is activated.
         """
         logger.verbose("Requesting refresh of the novel tree")
-        treeChanged = self.mainGui.treeView.changedSince(self._lastBuild)
+        treeChanged = self.mainGui.projView.changedSince(self._lastBuild)
         indexChanged = self.theProject.index.indexChangedSince(self._lastBuild)
         if not (treeChanged or indexChanged or overRide):
             logger.verbose("No changes have been made to the novel index")
@@ -233,7 +233,7 @@ class GuiNovelTree(QTreeWidget):
         selItems = self.selectedItems()
         if selItems:
             tHandle = selItems[0].data(self.C_TITLE, Qt.UserRole)[0]
-            self.mainGui.treeMeta.updateViewBox(tHandle)
+            self.mainGui.itemDetails.updateViewBox(tHandle)
 
         return
 

novelwriter/guimain.py

@@ -104,20 +104,20 @@ class GuiMain(QMainWindow):
         hWd = self.mainConf.pxInt(4)
 
         # Main GUI Elements
-        self.statusBar = GuiMainStatus(self)
+        self.statusBar   = GuiMainStatus(self)
-        self.treeView  = GuiProjectView(self)
+        self.projView    = GuiProjectView(self)
-        self.novelView = GuiNovelTree(self)
+        self.novelView   = GuiNovelTree(self)
-        self.docEditor = GuiDocEditor(self)
+        self.docEditor   = GuiDocEditor(self)
-        self.viewMeta  = GuiDocViewDetails(self)
+        self.viewMeta    = GuiDocViewDetails(self)
-        self.docViewer = GuiDocViewer(self)
+        self.docViewer   = GuiDocViewer(self)
-        self.treeMeta  = GuiItemDetails(self)
+        self.itemDetails = GuiItemDetails(self)
-        self.projView  = GuiOutline(self)
+        self.outlineView = GuiOutline(self)
-        self.mainMenu  = GuiMainMenu(self)
+        self.mainMenu    = GuiMainMenu(self)
-        self.viewsBar  = GuiViewsBar(self)
+        self.viewsBar    = GuiViewsBar(self)
 
         # Project Tree Stack
         self.projStack = QStackedWidget()
-        self.projStack.addWidget(self.treeView)
+        self.projStack.addWidget(self.projView)
         self.projStack.addWidget(self.novelView)
         self.projStack.currentChanged.connect(self._projStackChanged)
 
@@ -127,7 +127,7 @@ class GuiMain(QMainWindow):
         self.treeBox.setContentsMargins(0, 0, 0, 0)
         self.treeBox.setSpacing(mPx)
         self.treeBox.addWidget(self.projStack)
-        self.treeBox.addWidget(self.treeMeta)
+        self.treeBox.addWidget(self.itemDetails)
         self.treePane.setLayout(self.treeBox)
 
         # Splitter : Document Viewer / Document Meta
@@ -154,7 +154,7 @@ class GuiMain(QMainWindow):
         # Main Stack : Editor / Outline
         self.mainStack = QStackedWidget()
         self.mainStack.addWidget(self.splitMain)
-        self.mainStack.addWidget(self.projView)
+        self.mainStack.addWidget(self.outlineView)
         self.mainStack.currentChanged.connect(self._mainStackChanged)
 
         # Indices of Splitter Widgets
@@ -167,8 +167,8 @@ class GuiMain(QMainWindow):
 
         # Indices of Tab Widgets
         self.idxEditorView  = self.mainStack.indexOf(self.splitMain)
-        self.idxOutlineView = self.mainStack.indexOf(self.projView)
+        self.idxOutlineView = self.mainStack.indexOf(self.outlineView)
-        self.idxTreeView    = self.projStack.indexOf(self.treeView)
+        self.idxProjView    = self.projStack.indexOf(self.projView)
         self.idxNovelView   = self.projStack.indexOf(self.novelView)
 
         # Splitter Behaviour
@@ -197,24 +197,24 @@ class GuiMain(QMainWindow):
 
         self.viewsBar.viewChangeRequested.connect(self._changeView)
 
-        self.treeView.selectedItemChanged.connect(self.treeMeta.updateViewBox)
+        self.projView.selectedItemChanged.connect(self.itemDetails.updateViewBox)
-        self.treeView.openDocumentRequest.connect(self._openDocument)
+        self.projView.openDocumentRequest.connect(self._openDocument)
-        self.treeView.novelItemChanged.connect(self._treeNovelItemChanged)
+        self.projView.novelItemChanged.connect(self._treeNovelItemChanged)
-        self.treeView.wordCountsChanged.connect(self._updateStatusWordCount)
+        self.projView.wordCountsChanged.connect(self._updateStatusWordCount)
-        self.treeView.treeItemChanged.connect(self.docEditor.updateDocInfo)
+        self.projView.treeItemChanged.connect(self.docEditor.updateDocInfo)
-        self.treeView.treeItemChanged.connect(self.docViewer.updateDocInfo)
+        self.projView.treeItemChanged.connect(self.docViewer.updateDocInfo)
-        self.treeView.treeItemChanged.connect(self.treeMeta.updateViewBox)
+        self.projView.treeItemChanged.connect(self.itemDetails.updateViewBox)
-        self.treeView.rootFolderChanged.connect(self.projView.updateRootItem)
+        self.projView.rootFolderChanged.connect(self.outlineView.updateRootItem)
 
         self.docEditor.spellDictionaryChanged.connect(self.statusBar.setLanguage)
         self.docEditor.docEditedStatusChanged.connect(self.statusBar.doUpdateDocumentStatus)
-        self.docEditor.docCountsChanged.connect(self.treeMeta.updateCounts)
+        self.docEditor.docCountsChanged.connect(self.itemDetails.updateCounts)
-        self.docEditor.docCountsChanged.connect(self.treeView.updateCounts)
+        self.docEditor.docCountsChanged.connect(self.projView.updateCounts)
         self.docEditor.loadDocumentTagRequest.connect(self._followTag)
 
         self.docViewer.loadDocumentTagRequest.connect(self._followTag)
 
-        self.projView.loadDocumentTagRequest.connect(self._followTag)
+        self.outlineView.loadDocumentTagRequest.connect(self._followTag)
 
         # Finalise Initialisation
         # =======================
@@ -291,15 +291,15 @@ class GuiMain(QMainWindow):
         """Wrapper function to clear all sub-elements of the main GUI.
         """
         # Project Area
-        self.treeView.clearProject()
+        self.projView.clearProject()
         self.novelView.clearTree()
-        self.treeMeta.clearDetails()
+        self.itemDetails.clearDetails()
 
         # Work Area
         self.docEditor.clearEditor()
         self.docEditor.setDictionaries()
         self.closeDocViewer()
-        self.projView.clearOutline()
+        self.outlineView.clearOutline()
 
         # General
         self.statusBar.clearStatus()
@@ -361,7 +361,7 @@ class GuiMain(QMainWindow):
             self.rebuildTrees()
             self.saveProject()
             self.docEditor.setDictionaries()
-            self.projView.updateRootItem(None)
+            self.outlineView.updateRootItem(None)
             self.rebuildIndex(beQuiet=True)
             self.statusBar.setRefTime(self.theProject.projOpened)
             self.statusBar.setProjectStatus(nwState.GOOD)
@@ -417,7 +417,7 @@ class GuiMain(QMainWindow):
         if saveOK:
             self.closeDocument()
             self.docViewer.clearNavHistory()
-            self.projView.closeOutline()
+            self.outlineView.closeOutline()
 
             self.theProject.closeProject(self.idleTime)
             self.idleRefTime = time()
@@ -508,7 +508,7 @@ class GuiMain(QMainWindow):
         self.docEditor.setDictionaries()
         self.docEditor.toggleSpellCheck(self.theProject.spellCheck)
         self.statusBar.setRefTime(self.theProject.projOpened)
-        self.projView.updateRootItem(None)
+        self.outlineView.updateRootItem(None)
         self._updateStatusWordCount()
 
         # Restore previously open documents, if any
@@ -541,7 +541,7 @@ class GuiMain(QMainWindow):
             logger.error("No project open")
             return False
 
-        self.treeView.saveProjectTree()
+        self.projView.saveProjectTree()
         if self.theProject.saveProject(autoSave=autoSave):
             self.theProject.index.saveIndex()
 
@@ -586,7 +586,7 @@ class GuiMain(QMainWindow):
             if changeFocus:
                 self.docEditor.setFocus()
             self.theProject.setLastEdited(tHandle)
-            self.treeView.setSelectedHandle(tHandle, doScroll=doScroll)
+            self.projView.setSelectedHandle(tHandle, doScroll=doScroll)
         else:
             return False
 
@@ -652,7 +652,7 @@ class GuiMain(QMainWindow):
                 self.saveDocument()
             else:
                 logger.verbose("Trying selected document")
-                tHandle = self.treeView.getSelectedHandle()
+                tHandle = self.projView.getSelectedHandle()
 
             if tHandle is None:
                 logger.verbose("Trying last viewed document")
@@ -789,12 +789,12 @@ class GuiMain(QMainWindow):
 
         tHandle = None
         tLine = None
-        if self.treeView.treeFocus():
+        if self.projView.treeFocus():
-            tHandle = self.treeView.getSelectedHandle()
+            tHandle = self.projView.getSelectedHandle()
         elif self.novelView.hasFocus():
             tHandle, tLine = self.novelView.getSelectedHandle()
-        elif self.projView.treeFocus():
+        elif self.outlineView.treeFocus():
-            tHandle, tLine = self.projView.getSelectedHandle()
+            tHandle, tLine = self.outlineView.getSelectedHandle()
         else:
             logger.warning("No item selected")
             return False
@@ -815,16 +815,16 @@ class GuiMain(QMainWindow):
             if self.docEditor.anyFocus() or self.isFocusMode:
                 tHandle = self.docEditor.docHandle()
             else:
-                tHandle = self.treeView.getSelectedHandle()
+                tHandle = self.projView.getSelectedHandle()
         if tHandle:
-            return self.treeView.editTreeItem(tHandle)
+            return self.projView.editTreeItem(tHandle)
 
         return False
 
     def rebuildTrees(self):
         """Rebuild the project tree.
         """
-        self.treeView.populateTree()
+        self.projView.populateTree()
         self.novelView.refreshTree()
         return
 
@@ -847,7 +847,7 @@ class GuiMain(QMainWindow):
         qApp.setOverrideCursor(QCursor(Qt.WaitCursor))
         tStart = time()
 
-        self.treeView.saveProjectTree()
+        self.projView.saveProjectTree()
         self.theProject.index.clearIndex()
 
         for tItem in self.theProject.tree:
@@ -857,8 +857,8 @@ class GuiMain(QMainWindow):
             logger.verbose("Indexing '%s'", tItem.itemName)
             if self.theProject.index.reIndexHandle(tItem.itemHandle):
                 # Update Word Counts
-                self.treeView.propagateCount(tItem.itemHandle, tItem.wordCount, countChildren=True)
+                self.projView.propagateCount(tItem.itemHandle, tItem.wordCount, countChildren=True)
-                self.treeView.setTreeItemValues(tItem.itemHandle)
+                self.projView.setTreeItemValues(tItem.itemHandle)
 
         tEnd = time()
         self.setStatus(
@@ -919,9 +919,9 @@ class GuiMain(QMainWindow):
             self.saveDocument()
             self.docEditor.initEditor()
             self.docViewer.initViewer()
-            self.treeView.initSettings()
+            self.projView.initSettings()
             self.novelView.initTree()
-            self.projView.initOutline()
+            self.outlineView.initOutline()
             self._updateStatusWordCount()
 
         return
@@ -940,7 +940,7 @@ class GuiMain(QMainWindow):
             logger.debug("Applying new project settings")
             if dlgProj.spellChanged:
                 self.docEditor.setDictionaries()
-            self.treeMeta.refreshDetails()
+            self.itemDetails.refreshDetails()
             self._updateWindowTitle(self.theProject.projName)
 
         return True
@@ -1156,7 +1156,7 @@ class GuiMain(QMainWindow):
         if not self.isFocusMode:
             self.mainConf.setMainPanePos(self.splitMain.sizes())
             self.mainConf.setDocPanePos(self.splitDocs.sizes())
-            self.mainConf.setOutlinePanePos(self.projView.splitSizes())
+            self.mainConf.setOutlinePanePos(self.outlineView.splitSizes())
             if self.viewMeta.isVisible():
                 self.mainConf.setViewPanePos(self.splitView.sizes())
 
@@ -1180,8 +1180,8 @@ class GuiMain(QMainWindow):
         """
         if paneNo == nwWidget.TREE:
             tabIdx = self.projStack.currentIndex()
-            if tabIdx == self.idxTreeView:
+            if tabIdx == self.idxProjView:
-                self.treeView.setFocus()
+                self.projView.setFocus()
             elif tabIdx == self.idxNovelView:
                 self.novelView.setFocus()
         elif paneNo == nwWidget.EDITOR:
@@ -1192,7 +1192,7 @@ class GuiMain(QMainWindow):
             self.docViewer.setFocus()
         elif paneNo == nwWidget.OUTLINE:
             self._changeView(nwView.OUTLINE)
-            self.projView.setTreeFocus()
+            self.outlineView.setTreeFocus()
         return
 
     def closeDocEditor(self):
@@ -1490,14 +1490,14 @@ class GuiMain(QMainWindow):
 
         elif view == nwView.PROJECT:
             self.mainStack.setCurrentWidget(self.splitMain)
-            self.projStack.setCurrentWidget(self.treeView)
+            self.projStack.setCurrentWidget(self.projView)
 
         elif view == nwView.NOVEL:
             self.mainStack.setCurrentWidget(self.splitMain)
             self.projStack.setCurrentWidget(self.novelView)
 
         elif view == nwView.OUTLINE:
-            self.mainStack.setCurrentWidget(self.projView)
+            self.mainStack.setCurrentWidget(self.outlineView)
 
         return
 
@@ -1551,7 +1551,7 @@ class GuiMain(QMainWindow):
         if self.mainStack.currentIndex() == self.idxOutlineView:
             logger.verbose("Novel tree changed while Outline tab active")
             if self.hasProject:
-                self.projView.refreshView(novelChanged=True)
+                self.outlineView.refreshView(novelChanged=True)
 
         return
 
@@ -1584,7 +1584,7 @@ class GuiMain(QMainWindow):
         elif tabIndex == self.idxOutlineView:
             logger.verbose("Project outline tab activated")
             if self.hasProject:
-                self.projView.refreshView()
+                self.outlineView.refreshView()
 
         return
 
@@ -1594,9 +1594,9 @@ class GuiMain(QMainWindow):
         """
         sHandle = None
 
-        if tabIndex == self.idxTreeView:
+        if tabIndex == self.idxProjView:
             logger.verbose("Project tree tab activated")
-            sHandle = self.treeView.getSelectedHandle()
+            sHandle = self.projView.getSelectedHandle()
 
         elif tabIndex == self.idxNovelView:
             logger.verbose("Novel tree tab activated")
@@ -1604,7 +1604,7 @@ class GuiMain(QMainWindow):
                 self.novelView.refreshTree()
                 sHandle, _ = self.novelView.getSelectedHandle()
 
-        self.treeMeta.updateViewBox(sHandle)
+        self.itemDetails.updateViewBox(sHandle)
 
         return
 

tests/test_dialogs/test_dlg_docmerge.py

@@ -57,11 +57,11 @@ def testDlgMerge_Main(qtbot, monkeypatch, nwGUI, fncProj, mockRnd):
     # Add Project Content
     monkeypatch.setattr(GuiItemEditor, "exec_", lambda *a: QDialog.Accepted)
     nwGUI.switchFocus(nwWidget.TREE)
-    nwGUI.treeView.projTree.clearSelection()
+    nwGUI.projView.projTree.clearSelection()
-    nwGUI.treeView.projTree._getTreeItem(hChapterDir).setSelected(True)
+    nwGUI.projView.projTree._getTreeItem(hChapterDir).setSelected(True)
-    nwGUI.treeView.projTree.newTreeItem(nwItemType.FILE)
+    nwGUI.projView.projTree.newTreeItem(nwItemType.FILE)
-    nwGUI.treeView.projTree.newTreeItem(nwItemType.FILE)
+    nwGUI.projView.projTree.newTreeItem(nwItemType.FILE)
-    nwGUI.treeView.projTree.newTreeItem(nwItemType.FILE)
+    nwGUI.projView.projTree.newTreeItem(nwItemType.FILE)
 
     assert nwGUI.saveProject() is True
     assert nwGUI.closeProject() is True
@@ -83,8 +83,8 @@ def testDlgMerge_Main(qtbot, monkeypatch, nwGUI, fncProj, mockRnd):
 
     # Open the Merge tool
     nwGUI.switchFocus(nwWidget.TREE)
-    nwGUI.treeView.projTree.clearSelection()
+    nwGUI.projView.projTree.clearSelection()
-    nwGUI.treeView.projTree._getTreeItem(hChapterDir).setSelected(True)
+    nwGUI.projView.projTree._getTreeItem(hChapterDir).setSelected(True)
 
     monkeypatch.setattr(GuiDocMerge, "exec_", lambda *a: None)
     nwGUI.mainMenu.aMergeDocs.activate(QAction.Trigger)
@@ -102,27 +102,27 @@ def testDlgMerge_Main(qtbot, monkeypatch, nwGUI, fncProj, mockRnd):
     assert nwMerge.listBox.count() == 0
 
     # No item selected
-    nwGUI.treeView.projTree.clearSelection()
+    nwGUI.projView.projTree.clearSelection()
     assert nwMerge._populateList() is False
     assert nwMerge.listBox.count() == 0
 
     # Non-existing item
     with monkeypatch.context() as mp:
         mp.setattr(NWTree, "__getitem__", lambda *a: None)
-        nwGUI.treeView.projTree.clearSelection()
+        nwGUI.projView.projTree.clearSelection()
-        nwGUI.treeView.projTree._getTreeItem(hChapterDir).setSelected(True)
+        nwGUI.projView.projTree._getTreeItem(hChapterDir).setSelected(True)
         assert nwMerge._populateList() is False
         assert nwMerge.listBox.count() == 0
 
     # Select a non-folder
-    nwGUI.treeView.projTree.clearSelection()
+    nwGUI.projView.projTree.clearSelection()
-    nwGUI.treeView.projTree._getTreeItem(hChapterOne).setSelected(True)
+    nwGUI.projView.projTree._getTreeItem(hChapterOne).setSelected(True)
     assert nwMerge._populateList() is False
     assert nwMerge.listBox.count() == 0
 
     # Select the chapter folder
-    nwGUI.treeView.projTree.clearSelection()
+    nwGUI.projView.projTree.clearSelection()
-    nwGUI.treeView.projTree._getTreeItem(hChapterDir).setSelected(True)
+    nwGUI.projView.projTree._getTreeItem(hChapterDir).setSelected(True)
     assert nwMerge._populateList() is True
     assert nwMerge.listBox.count() == 5
 

tests/test_dialogs/test_dlg_docsplit.py

@@ -61,9 +61,9 @@ def testDlgSplit_Main(qtbot, monkeypatch, nwGUI, fncProj, mockRnd):
     # Add Project Content
     monkeypatch.setattr(GuiItemEditor, "exec_", lambda *a: QDialog.Accepted)
     nwGUI.switchFocus(nwWidget.TREE)
-    nwGUI.treeView.projTree.clearSelection()
+    nwGUI.projView.projTree.clearSelection()
-    nwGUI.treeView.projTree._getTreeItem(hNovelRoot).setSelected(True)
+    nwGUI.projView.projTree._getTreeItem(hNovelRoot).setSelected(True)
-    nwGUI.treeView.projTree.newTreeItem(nwItemType.FILE)
+    nwGUI.projView.projTree.newTreeItem(nwItemType.FILE)
 
     assert nwGUI.saveProject() is True
     assert nwGUI.closeProject() is True
@@ -90,8 +90,8 @@ def testDlgSplit_Main(qtbot, monkeypatch, nwGUI, fncProj, mockRnd):
 
     # Open the Split tool
     nwGUI.switchFocus(nwWidget.TREE)
-    nwGUI.treeView.projTree.clearSelection()
+    nwGUI.projView.projTree.clearSelection()
-    nwGUI.treeView.projTree._getTreeItem(hToSplit).setSelected(True)
+    nwGUI.projView.projTree._getTreeItem(hToSplit).setSelected(True)
 
     monkeypatch.setattr(GuiDocSplit, "exec_", lambda *a: None)
     nwGUI.mainMenu.aSplitDoc.activate(QAction.Trigger)
@@ -110,7 +110,7 @@ def testDlgSplit_Main(qtbot, monkeypatch, nwGUI, fncProj, mockRnd):
 
     # No item selected
     nwSplit.sourceItem = None
-    nwGUI.treeView.projTree.clearSelection()
+    nwGUI.projView.projTree.clearSelection()
     assert nwSplit._populateList() is False
     assert nwSplit.listBox.count() == 0
 
@@ -118,15 +118,15 @@ def testDlgSplit_Main(qtbot, monkeypatch, nwGUI, fncProj, mockRnd):
     with monkeypatch.context() as mp:
         mp.setattr(NWTree, "__getitem__", lambda *a: None)
         nwSplit.sourceItem = None
-        nwGUI.treeView.projTree.clearSelection()
+        nwGUI.projView.projTree.clearSelection()
-        nwGUI.treeView.projTree._getTreeItem(hToSplit).setSelected(True)
+        nwGUI.projView.projTree._getTreeItem(hToSplit).setSelected(True)
         assert nwSplit._populateList() is False
         assert nwSplit.listBox.count() == 0
 
     # Select a non-file
     nwSplit.sourceItem = None
-    nwGUI.treeView.projTree.clearSelection()
+    nwGUI.projView.projTree.clearSelection()
-    nwGUI.treeView.projTree._getTreeItem(hChapterDir).setSelected(True)
+    nwGUI.projView.projTree._getTreeItem(hChapterDir).setSelected(True)
     assert nwSplit._populateList() is False
     assert nwSplit.listBox.count() == 0
 

tests/test_dialogs/test_dlg_itemeditor.py

@@ -52,7 +52,7 @@ def testDlgItemEditor_Dialog(qtbot, monkeypatch, nwGUI, fncProj, mockRnd):
     tHandle = "000000000000f"
 
     # No Selection
-    nwGUI.treeView.projTree.clearSelection()
+    nwGUI.projView.projTree.clearSelection()
     assert nwGUI.editItem() is False
 
     # Force opening from editor
@@ -164,9 +164,9 @@ def testDlgItemEditor_Note(qtbot, monkeypatch, nwGUI, fncProj, mockRnd):
     assert nwGUI.theProject.importItems.name(importKeys[1]) == "Minor"
 
     # Create Note
-    nwGUI.treeView.projTree.clearSelection()
+    nwGUI.projView.projTree.clearSelection()
-    nwGUI.treeView.projTree._getTreeItem("000000000000a").setSelected(True)
+    nwGUI.projView.projTree._getTreeItem("000000000000a").setSelected(True)
-    nwGUI.treeView.projTree.newTreeItem(nwItemType.FILE, None, isNote=True)
+    nwGUI.projView.projTree.newTreeItem(nwItemType.FILE, None, isNote=True)
 
     # Open Note
     assert nwGUI.openDocument("0000000000010")

tests/test_gui/test_gui_doceditor.py

@@ -1147,7 +1147,7 @@ def testGuiEditor_Tags(qtbot, monkeypatch, nwGUI, nwMinimal, ipsumText):
     assert nwGUI.openDocument(cHandle) is True
     assert nwGUI.docEditor.replaceText(theText) is True
     assert nwGUI.saveDocument() is True
-    assert nwGUI.treeView.revealNewTreeItem(cHandle)
+    assert nwGUI.projView.revealNewTreeItem(cHandle)
     nwGUI.docEditor.updateTagHighLighting()
 
     # Follow Tag

tests/test_gui/test_gui_docviewer.py

@@ -51,12 +51,12 @@ def testGuiViewer_Main(qtbot, monkeypatch, nwGUI, nwLipsum):
     assert nwGUI.theProject.index._itemIndex._items != {}
 
     # Select a document in the project tree
-    nwGUI.treeView.setSelectedHandle("88243afbe5ed8")
+    nwGUI.projView.setSelectedHandle("88243afbe5ed8")
 
     # Middle-click the selected item
-    theItem = nwGUI.treeView.projTree._getTreeItem("88243afbe5ed8")
+    theItem = nwGUI.projView.projTree._getTreeItem("88243afbe5ed8")
-    theRect = nwGUI.treeView.projTree.visualItemRect(theItem)
+    theRect = nwGUI.projView.projTree.visualItemRect(theItem)
-    qtbot.mouseClick(nwGUI.treeView.projTree.viewport(), Qt.MidButton, pos=theRect.center())
+    qtbot.mouseClick(nwGUI.projView.projTree.viewport(), Qt.MidButton, pos=theRect.center())
     assert nwGUI.docViewer.docHandle() == "88243afbe5ed8"
 
     # Reload the text
@@ -117,7 +117,7 @@ def testGuiViewer_Main(qtbot, monkeypatch, nwGUI, nwLipsum):
     assert nwGUI.docViewer.docAction(nwDocAction.COPY) is False
 
     # Open again via menu
-    assert nwGUI.treeView.setSelectedHandle("88243afbe5ed8")
+    assert nwGUI.projView.setSelectedHandle("88243afbe5ed8")
     nwGUI.mainMenu.aViewDoc.activate(QAction.Trigger)
 
     # Select "Bod" link

tests/test_gui/test_gui_guimain.py

@@ -125,7 +125,7 @@ def testGuiMain_ProjectTreeItems(qtbot, monkeypatch, nwGUI, fncProj, mockRnd):
     with monkeypatch.context() as mp:
         mp.setattr(GuiProjectTree, "hasFocus", lambda *a: True)
         assert nwGUI.docEditor.docHandle() is None
-        nwGUI.treeView.projTree._getTreeItem(sHandle).setSelected(True)
+        nwGUI.projView.projTree._getTreeItem(sHandle).setSelected(True)
         nwGUI._keyPressReturn()
         assert nwGUI.docEditor.docHandle() == sHandle
         assert nwGUI.closeDocument() is True
@@ -149,10 +149,10 @@ def testGuiMain_ProjectTreeItems(qtbot, monkeypatch, nwGUI, fncProj, mockRnd):
     with monkeypatch.context() as mp:
         mp.setattr(GuiOutline, "treeFocus", lambda *a: True)
         assert nwGUI.docEditor.docHandle() is None
-        actItem = nwGUI.projView.outlineView.topLevelItem(0)
+        actItem = nwGUI.outlineView.outlineView.topLevelItem(0)
         chpItem = actItem.child(0)
         selItem = chpItem.child(0)
-        nwGUI.projView.outlineView.setCurrentItem(selItem)
+        nwGUI.outlineView.outlineView.setCurrentItem(selItem)
         nwGUI._keyPressReturn()
         assert nwGUI.docEditor.docHandle() == sHandle
         assert nwGUI.closeDocument() is True
@@ -220,14 +220,14 @@ def testGuiMain_Editing(qtbot, monkeypatch, nwGUI, fncProj, refDir, outDir, mock
     assert nwGUI.theProject.spellCheck is False
 
     # Check that tree items have been created
-    assert nwGUI.treeView.projTree._getTreeItem("0000000000008") is not None
+    assert nwGUI.projView.projTree._getTreeItem("0000000000008") is not None
-    assert nwGUI.treeView.projTree._getTreeItem("0000000000009") is not None
+    assert nwGUI.projView.projTree._getTreeItem("0000000000009") is not None
-    assert nwGUI.treeView.projTree._getTreeItem("000000000000a") is not None
+    assert nwGUI.projView.projTree._getTreeItem("000000000000a") is not None
-    assert nwGUI.treeView.projTree._getTreeItem("000000000000b") is not None
+    assert nwGUI.projView.projTree._getTreeItem("000000000000b") is not None
-    assert nwGUI.treeView.projTree._getTreeItem("000000000000c") is not None
+    assert nwGUI.projView.projTree._getTreeItem("000000000000c") is not None
-    assert nwGUI.treeView.projTree._getTreeItem("000000000000d") is not None
+    assert nwGUI.projView.projTree._getTreeItem("000000000000d") is not None
-    assert nwGUI.treeView.projTree._getTreeItem("000000000000e") is not None
+    assert nwGUI.projView.projTree._getTreeItem("000000000000e") is not None
-    assert nwGUI.treeView.projTree._getTreeItem("000000000000f") is not None
+    assert nwGUI.projView.projTree._getTreeItem("000000000000f") is not None
 
     nwGUI.mainMenu.aSpellCheck.setChecked(True)
     assert nwGUI.mainMenu._toggleSpellCheck()
@@ -240,9 +240,9 @@ def testGuiMain_Editing(qtbot, monkeypatch, nwGUI, fncProj, refDir, outDir, mock
 
     # Add a Character File
     nwGUI.switchFocus(nwWidget.TREE)
-    nwGUI.treeView.projTree.clearSelection()
+    nwGUI.projView.projTree.clearSelection()
-    nwGUI.treeView.projTree._getTreeItem("000000000000a").setSelected(True)
+    nwGUI.projView.projTree._getTreeItem("000000000000a").setSelected(True)
-    nwGUI.treeView.projTree.newTreeItem(nwItemType.FILE, None, isNote=True)
+    nwGUI.projView.projTree.newTreeItem(nwItemType.FILE, None, isNote=True)
     assert nwGUI.openSelectedItem()
 
     # Type something into the document
@@ -262,9 +262,9 @@ def testGuiMain_Editing(qtbot, monkeypatch, nwGUI, fncProj, refDir, outDir, mock
 
     # Add a Plot File
     nwGUI.switchFocus(nwWidget.TREE)
-    nwGUI.treeView.projTree.clearSelection()
+    nwGUI.projView.projTree.clearSelection()
-    nwGUI.treeView.projTree._getTreeItem("0000000000009").setSelected(True)
+    nwGUI.projView.projTree._getTreeItem("0000000000009").setSelected(True)
-    nwGUI.treeView.projTree.newTreeItem(nwItemType.FILE, None, isNote=True)
+    nwGUI.projView.projTree.newTreeItem(nwItemType.FILE, None, isNote=True)
     assert nwGUI.openSelectedItem()
 
     # Type something into the document
@@ -284,9 +284,9 @@ def testGuiMain_Editing(qtbot, monkeypatch, nwGUI, fncProj, refDir, outDir, mock
 
     # Add a World File
     nwGUI.switchFocus(nwWidget.TREE)
-    nwGUI.treeView.projTree.clearSelection()
+    nwGUI.projView.projTree.clearSelection()
-    nwGUI.treeView.projTree._getTreeItem("000000000000b").setSelected(True)
+    nwGUI.projView.projTree._getTreeItem("000000000000b").setSelected(True)
-    nwGUI.treeView.projTree.newTreeItem(nwItemType.FILE, None, isNote=True)
+    nwGUI.projView.projTree.newTreeItem(nwItemType.FILE, None, isNote=True)
     assert nwGUI.openSelectedItem()
 
     # Add Some Text
@@ -315,10 +315,10 @@ def testGuiMain_Editing(qtbot, monkeypatch, nwGUI, fncProj, refDir, outDir, mock
 
     # Select the 'New Scene' file
     nwGUI.switchFocus(nwWidget.TREE)
-    nwGUI.treeView.projTree.clearSelection()
+    nwGUI.projView.projTree.clearSelection()
-    nwGUI.treeView.projTree._getTreeItem("0000000000008").setExpanded(True)
+    nwGUI.projView.projTree._getTreeItem("0000000000008").setExpanded(True)
-    nwGUI.treeView.projTree._getTreeItem("000000000000d").setExpanded(True)
+    nwGUI.projView.projTree._getTreeItem("000000000000d").setExpanded(True)
-    nwGUI.treeView.projTree._getTreeItem("000000000000f").setSelected(True)
+    nwGUI.projView.projTree._getTreeItem("000000000000f").setSelected(True)
     assert nwGUI.openSelectedItem()
 
     # Type something into the document
@@ -461,12 +461,12 @@ def testGuiMain_Editing(qtbot, monkeypatch, nwGUI, fncProj, refDir, outDir, mock
     qtbot.wait(stepDelay)
 
     # Check a Quick Create and Delete
-    assert nwGUI.treeView.projTree.newTreeItem(nwItemType.FILE, None)
+    assert nwGUI.projView.projTree.newTreeItem(nwItemType.FILE, None)
-    newHandle = nwGUI.treeView.getSelectedHandle()
+    newHandle = nwGUI.projView.getSelectedHandle()
     assert nwGUI.theProject.tree["0000000000020"] is not None
-    assert nwGUI.treeView.deleteItem()
+    assert nwGUI.projView.deleteItem()
-    assert nwGUI.treeView.setSelectedHandle(newHandle)
+    assert nwGUI.projView.setSelectedHandle(newHandle)
-    assert nwGUI.treeView.deleteItem()
+    assert nwGUI.projView.deleteItem()
     assert nwGUI.theProject.tree["0000000000024"] is not None  # Trash
     assert nwGUI.saveProject()
 

tests/test_gui/test_gui_mainmenu.py

@@ -467,7 +467,7 @@ def testGuiMenu_Insert(qtbot, monkeypatch, nwGUI, fncDir, fncProj, mockRnd):
 
     buildTestProject(nwGUI, fncProj)
 
-    assert nwGUI.treeView.projTree._getTreeItem("000000000000f") is not None
+    assert nwGUI.projView.projTree._getTreeItem("000000000000f") is not None
     assert nwGUI.openDocument("000000000000f") is True
     nwGUI.docEditor.clear()
 

tests/test_gui/test_gui_outline.py

@@ -46,7 +46,7 @@ def testGuiOutline_Main(qtbot, monkeypatch, nwGUI, fncDir):
     nwGUI.rebuildIndex()
     nwGUI._changeView(nwView.OUTLINE)
 
-    outlineMain = nwGUI.projView
+    outlineMain = nwGUI.outlineView
     outlineView = outlineMain.outlineView
     outlineData = outlineMain.outlineData
     outlineMenu = outlineMain.outlineBar.mColumns
@@ -54,7 +54,7 @@ def testGuiOutline_Main(qtbot, monkeypatch, nwGUI, fncDir):
     # Toggle scrollbars
     nwGUI.mainConf.hideVScroll = True
     nwGUI.mainConf.hideHScroll = True
-    nwGUI.projView.initOutline()
+    outlineMain.initOutline()
     assert outlineView.verticalScrollBarPolicy() == Qt.ScrollBarAlwaysOff
     assert outlineView.horizontalScrollBarPolicy() == Qt.ScrollBarAlwaysOff
     assert outlineData.verticalScrollBarPolicy() == Qt.ScrollBarAlwaysOff
@@ -62,7 +62,7 @@ def testGuiOutline_Main(qtbot, monkeypatch, nwGUI, fncDir):
 
     nwGUI.mainConf.hideVScroll = False
     nwGUI.mainConf.hideHScroll = False
-    nwGUI.projView.initOutline()
+    outlineMain.initOutline()
     assert outlineView.verticalScrollBarPolicy() == Qt.ScrollBarAsNeeded
     assert outlineView.horizontalScrollBarPolicy() == Qt.ScrollBarAsNeeded
     assert outlineData.verticalScrollBarPolicy() == Qt.ScrollBarAsNeeded
@@ -169,8 +169,8 @@ def testGuiOutline_Content(qtbot, monkeypatch, nwGUI, nwLipsum):
     nwGUI.rebuildIndex()
     nwGUI._changeView(nwView.OUTLINE)
 
-    outlineMain = nwGUI.projView
+    outlineMain = nwGUI.outlineView
-    outlineBar = outlineMain.outlineBar
+    outlineBar  = outlineMain.outlineBar
     outlineView = outlineMain.outlineView
     outlineData = outlineMain.outlineData
 
@@ -183,7 +183,7 @@ def testGuiOutline_Content(qtbot, monkeypatch, nwGUI, nwLipsum):
 
     # Add a second novel folder
     newHandle = nwGUI.theProject.newRoot(nwItemClass.NOVEL)
-    nwGUI.treeView.revealNewTreeItem(newHandle)
+    nwGUI.projView.revealNewTreeItem(newHandle)
 
     # Check new values in dropdown list
     assert outlineBar.novelValue.itemData(0) == lipHandle
@@ -202,7 +202,7 @@ def testGuiOutline_Content(qtbot, monkeypatch, nwGUI, nwLipsum):
         aHandle = nwGUI.theProject.newFile(dTitle, newHandle)
         hHash = "#"*hLevel
         writeFile(os.path.join(nwLipsum, "content", f"{aHandle}.nwd"), f"{hHash} {dTitle}\n\n")
-        nwGUI.treeView.revealNewTreeItem(aHandle)
+        nwGUI.projView.revealNewTreeItem(aHandle)
 
     nwGUI.rebuildIndex()
 
@@ -248,7 +248,7 @@ def testGuiOutline_Content(qtbot, monkeypatch, nwGUI, nwLipsum):
 
     # Click POV Link
     assert outlineData.povKeyValue.text() == "<a href='Bod'>Bod</a>"
-    nwGUI.projView._tagClicked("Bod")
+    outlineMain._tagClicked("Bod")
     assert nwGUI.docViewer.docHandle() == "4c4f28287af27"
 
     # Scene One, Section Two

tests/test_gui/test_gui_projtree.py

@@ -41,7 +41,7 @@ def testGuiProjTree_NewItems(qtbot, caplog, monkeypatch, nwGUI, fncDir, mockRnd)
     monkeypatch.setattr(QMessageBox, "information", lambda *a: QMessageBox.Yes)
     monkeypatch.setattr(QInputDialog, "getText", lambda *a, text: (text, True))
 
-    nwTree = nwGUI.treeView
+    nwTree = nwGUI.projView
 
     # Try to add item with no project
     assert nwTree.projTree.newTreeItem(nwItemType.FILE) is False
@@ -164,7 +164,7 @@ def testGuiProjTree_MoveItems(qtbot, monkeypatch, nwGUI, fncDir, mockRnd):
     monkeypatch.setattr(QMessageBox, "information", lambda *a: QMessageBox.Yes)
     monkeypatch.setattr(QInputDialog, "getText", lambda *a, text: (text, True))
 
-    nwTree = nwGUI.treeView
+    nwTree = nwGUI.projView
 
     # Try to move item with no project
     assert nwTree.projTree.moveTreeItem(1) is False
@@ -279,7 +279,7 @@ def testGuiProjTree_DeleteItems(qtbot, caplog, monkeypatch, nwGUI, fncDir, mockR
     monkeypatch.setattr(QMessageBox, "information", lambda *a: QMessageBox.Yes)
     monkeypatch.setattr(QInputDialog, "getText", lambda *a, text: (text, True))
 
-    nwTree = nwGUI.treeView
+    nwTree = nwGUI.projView
 
     # Try to run with no project
     assert nwTree.emptyTrash() is False
@@ -482,7 +482,7 @@ def testGuiProjTree_ContextMenu(qtbot, caplog, monkeypatch, nwGUI, fncDir, mockR
     hCharNote    = "0000000000011"
     hNovelNote   = "0000000000012"
 
-    projTree = nwGUI.treeView.projTree
+    projTree = nwGUI.projView.projTree
     projTree._getTreeItem(hNovelRoot).setExpanded(True)
     projTree._getTreeItem(hChapterDir).setExpanded(True)
 

tests/test_gui/test_gui_statusbar.py

@@ -40,7 +40,7 @@ def testGuiStatusBar_Main(qtbot, monkeypatch, nwGUI, fncProj, mockRnd):
     cHandle = nwGUI.theProject.newFile("A Note", "000000000000a")
     newDoc = NWDoc(nwGUI.theProject, cHandle)
     newDoc.writeDocument("# A Note\n\n")
-    nwGUI.treeView.revealNewTreeItem(cHandle)
+    nwGUI.projView.revealNewTreeItem(cHandle)
     nwGUI.rebuildIndex(beQuiet=True)
 
     # Reference Time