Give main GUI elements more identifiable names

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")
-    theRect = nwGUI.treeView.projTree.visualItemRect(theItem)
-    qtbot.mouseClick(nwGUI.treeView.projTree.viewport(), Qt.MidButton, pos=theRect.center())
+    theItem = nwGUI.projView.projTree._getTreeItem("88243afbe5ed8")
+    theRect = nwGUI.projView.projTree.visualItemRect(theItem)
+    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.treeView.projTree._getTreeItem("0000000000009") is not None
-    assert nwGUI.treeView.projTree._getTreeItem("000000000000a") is not None
-    assert nwGUI.treeView.projTree._getTreeItem("000000000000b") is not None
-    assert nwGUI.treeView.projTree._getTreeItem("000000000000c") is not None
-    assert nwGUI.treeView.projTree._getTreeItem("000000000000d") is not None
-    assert nwGUI.treeView.projTree._getTreeItem("000000000000e") is not None
-    assert nwGUI.treeView.projTree._getTreeItem("000000000000f") is not None
+    assert nwGUI.projView.projTree._getTreeItem("0000000000008") is not None
+    assert nwGUI.projView.projTree._getTreeItem("0000000000009") is not None
+    assert nwGUI.projView.projTree._getTreeItem("000000000000a") is not None
+    assert nwGUI.projView.projTree._getTreeItem("000000000000b") is not None
+    assert nwGUI.projView.projTree._getTreeItem("000000000000c") is not None
+    assert nwGUI.projView.projTree._getTreeItem("000000000000d") is not None
+    assert nwGUI.projView.projTree._getTreeItem("000000000000e") 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.treeView.projTree._getTreeItem("000000000000a").setSelected(True)
-    nwGUI.treeView.projTree.newTreeItem(nwItemType.FILE, None, isNote=True)
+    nwGUI.projView.projTree.clearSelection()
+    nwGUI.projView.projTree._getTreeItem("000000000000a").setSelected(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.treeView.projTree._getTreeItem("0000000000009").setSelected(True)
-    nwGUI.treeView.projTree.newTreeItem(nwItemType.FILE, None, isNote=True)
+    nwGUI.projView.projTree.clearSelection()
+    nwGUI.projView.projTree._getTreeItem("0000000000009").setSelected(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.treeView.projTree._getTreeItem("000000000000b").setSelected(True)
-    nwGUI.treeView.projTree.newTreeItem(nwItemType.FILE, None, isNote=True)
+    nwGUI.projView.projTree.clearSelection()
+    nwGUI.projView.projTree._getTreeItem("000000000000b").setSelected(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.treeView.projTree._getTreeItem("0000000000008").setExpanded(True)
-    nwGUI.treeView.projTree._getTreeItem("000000000000d").setExpanded(True)
-    nwGUI.treeView.projTree._getTreeItem("000000000000f").setSelected(True)
+    nwGUI.projView.projTree.clearSelection()
+    nwGUI.projView.projTree._getTreeItem("0000000000008").setExpanded(True)
+    nwGUI.projView.projTree._getTreeItem("000000000000d").setExpanded(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)
-    newHandle = nwGUI.treeView.getSelectedHandle()
+    assert nwGUI.projView.projTree.newTreeItem(nwItemType.FILE, None)
+    newHandle = nwGUI.projView.getSelectedHandle()
     assert nwGUI.theProject.tree["0000000000020"] is not None
-    assert nwGUI.treeView.deleteItem()
-    assert nwGUI.treeView.setSelectedHandle(newHandle)
-    assert nwGUI.treeView.deleteItem()
+    assert nwGUI.projView.deleteItem()
+    assert nwGUI.projView.setSelectedHandle(newHandle)
+    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
-    outlineBar = outlineMain.outlineBar
+    outlineMain = nwGUI.outlineView
+    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