Clean up project tree code and add undo action to the menu

novelwriter/gui/mainmenu.py

@@ -174,12 +174,6 @@ class GuiMainMenu(QMenuBar):
         self.aDeleteItem.triggered.connect(lambda: self.theParent.treeView.deleteItem(None))
         self.projMenu.addAction(self.aDeleteItem)
 
-        # Project > Undo Last Action
-        self.aMoveUndo = QAction(self.tr("Undo Last Move"), self)
-        self.aMoveUndo.setShortcut("Ctrl+Shift+Z")
-        self.aMoveUndo.triggered.connect(lambda: self.theParent.treeView.undoLastMove())
-        self.projMenu.addAction(self.aMoveUndo)
-
         # Project > Empty Trash
         self.aEmptyTrash = QAction(self.tr("Empty Trash"), self)
         self.aEmptyTrash.triggered.connect(lambda: self.theParent.treeView.emptyTrash())

novelwriter/gui/projtree.py

@@ -70,8 +70,8 @@ class GuiProjectView(QWidget):
         self.theParent = theParent
 
         # Build GUI
-        self.projBar = GuiProjectToolBar(self)
         self.projTree = GuiProjectTree(self)
+        self.projBar = GuiProjectToolBar(self)
 
         # Assemble
         self.outerBox = QVBoxLayout()
@@ -83,20 +83,22 @@ class GuiProjectView(QWidget):
         self.setLayout(self.outerBox)
 
         # Keyboard Shortcuts
-        self.keyCtrlUp = QShortcut(self.projTree)
+        self.keyMoveUp = QShortcut(self.projTree)
-        self.keyCtrlUp.setKey("Ctrl+Up")
+        self.keyMoveUp.setKey("Ctrl+Up")
-        self.keyCtrlUp.setContext(Qt.WidgetShortcut)
+        self.keyMoveUp.setContext(Qt.WidgetShortcut)
-        self.keyCtrlUp.activated.connect(lambda: self.projTree.moveTreeItem(-1))
+        self.keyMoveUp.activated.connect(lambda: self.projTree.moveTreeItem(-1))
 
-        self.keyCtrlDown = QShortcut(self.projTree)
+        self.keyMoveDn = QShortcut(self.projTree)
-        self.keyCtrlDown.setKey("Ctrl+Down")
+        self.keyMoveDn.setKey("Ctrl+Down")
-        self.keyCtrlDown.setContext(Qt.WidgetShortcut)
+        self.keyMoveDn.setContext(Qt.WidgetShortcut)
-        self.keyCtrlDown.activated.connect(lambda: self.projTree.moveTreeItem(1))
+        self.keyMoveDn.activated.connect(lambda: self.projTree.moveTreeItem(1))
 
-        # Connect Signals
+        self.keyUndoMv = QShortcut(self.projTree)
+        self.keyUndoMv.setKey("Ctrl+Shift+Z")
+        self.keyUndoMv.setContext(Qt.WidgetShortcut)
+        self.keyUndoMv.activated.connect(lambda: self.projTree.undoLastMove())
 
         # Function Mappings
-        self.newTreeItem = self.projTree.newTreeItem
         self.revealNewTreeItem = self.projTree.revealNewTreeItem
         self.editTreeItem = self.projTree.editTreeItem
         self.getTreeFromHandle = self.projTree.getTreeFromHandle
@@ -104,7 +106,6 @@ class GuiProjectView(QWidget):
         self.deleteItem = self.projTree.deleteItem
         self.setTreeItemValues = self.projTree.setTreeItemValues
         self.propagateCount = self.projTree.propagateCount
-        self.undoLastMove = self.projTree.undoLastMove
         self.getSelectedHandle = self.projTree.getSelectedHandle
         self.setSelectedHandle = self.projTree.setSelectedHandle
         self.changedSince = self.projTree.changedSince
@@ -152,7 +153,7 @@ class GuiProjectView(QWidget):
         return False
 
     ##
-    #  Public Solts
+    #  Public Slots
     ##
 
     @pyqtSlot(str, int, int, int)
@@ -168,12 +169,6 @@ class GuiProjectView(QWidget):
 
 class GuiProjectToolBar(QWidget):
 
-    ADD_PLAIN  = 0
-    ADD_CHAP   = 1
-    ADD_SCENE  = 2
-    ADD_NOTE   = 3
-    ADD_FOLDER = 4
-
     def __init__(self, projView):
         QTreeWidget.__init__(self, projView)
 
@@ -181,6 +176,7 @@ class GuiProjectToolBar(QWidget):
 
         self.mainConf   = novelwriter.CONFIG
         self.projView   = projView
+        self.projTree   = projView.projTree
         self.theParent  = projView.theParent
         self.theProject = projView.theParent.theProject
         self.theTheme   = projView.theParent.theTheme
@@ -197,9 +193,9 @@ class GuiProjectToolBar(QWidget):
 
         fadeCol = qPalette.text().color()
         buttonStyle = (
-            "QToolButton {{border: none; background: transparent;}} "
+            "QToolButton {{padding: {0}px; border: none; background: transparent;}} "
-            "QToolButton:hover {{border: none; background: rgba({0},{1},{2},0.2);}}"
+            "QToolButton:hover {{border: none; background: rgba({1},{2},{3},0.2);}}"
-        ).format(fadeCol.red(), fadeCol.green(), fadeCol.blue())
+        ).format(mPx, fadeCol.red(), fadeCol.green(), fadeCol.blue())
 
         # Tree Label
         self.projLabel = QLabel("<b>%s</b>" % self.tr("Project Content"))
@@ -212,39 +208,49 @@ class GuiProjectToolBar(QWidget):
         self.tbMoveU.setIcon(self.theTheme.getIcon("up"))
         self.tbMoveU.setIconSize(QSize(iPx, iPx))
         self.tbMoveU.setStyleSheet(buttonStyle)
-        self.tbMoveU.clicked.connect(lambda: self.projView.projTree.moveTreeItem(-1))
+        self.tbMoveU.clicked.connect(lambda: self.projTree.moveTreeItem(-1))
 
         self.tbMoveD = QToolButton(self)
         self.tbMoveD.setToolTip("%s [Ctrl+Down]" % self.tr("Move Down"))
         self.tbMoveD.setIcon(self.theTheme.getIcon("down"))
         self.tbMoveD.setIconSize(QSize(iPx, iPx))
         self.tbMoveD.setStyleSheet(buttonStyle)
-        self.tbMoveD.clicked.connect(lambda: self.projView.projTree.moveTreeItem(1))
+        self.tbMoveD.clicked.connect(lambda: self.projTree.moveTreeItem(1))
 
-        # Items Menu
+        # Add Item Menu
-        self.mItems = QMenu()
+        self.mAdd = QMenu()
 
-        self.aAddEmpty = self.mItems.addAction(self.tr("Plain Document"))
+        self.aAddEmpty = self.mAdd.addAction(self.tr("Plain Document"))
         self.aAddEmpty.setIcon(self.theTheme.getIcon("proj_document"))
-        self.aAddEmpty.triggered.connect(lambda: self._forwardNewItem(self.ADD_PLAIN))
+        self.aAddEmpty.triggered.connect(
+            lambda: self.projTree.newTreeItem(nwItemType.FILE, hLevel=0, isNote=False)
+        )
 
-        self.aAddChap = self.mItems.addAction(self.tr("Chapter Document"))
+        self.aAddChap = self.mAdd.addAction(self.tr("Chapter Document"))
         self.aAddChap.setIcon(self.theTheme.getIcon("proj_chapter"))
-        self.aAddChap.triggered.connect(lambda: self._forwardNewItem(self.ADD_CHAP))
+        self.aAddChap.triggered.connect(
+            lambda: self.projTree.newTreeItem(nwItemType.FILE, hLevel=2, isNote=False)
+        )
 
-        self.aAddScene = self.mItems.addAction(self.tr("Scene Document"))
+        self.aAddScene = self.mAdd.addAction(self.tr("Scene Document"))
         self.aAddScene.setIcon(self.theTheme.getIcon("proj_scene"))
-        self.aAddScene.triggered.connect(lambda: self._forwardNewItem(self.ADD_SCENE))
+        self.aAddScene.triggered.connect(
+            lambda: self.projTree.newTreeItem(nwItemType.FILE, hLevel=3, isNote=False)
+        )
 
-        self.aAddNote = self.mItems.addAction(self.tr("Project Note"))
+        self.aAddNote = self.mAdd.addAction(self.tr("Project Note"))
         self.aAddNote.setIcon(self.theTheme.getIcon("proj_note"))
-        self.aAddNote.triggered.connect(lambda: self._forwardNewItem(self.ADD_NOTE))
+        self.aAddNote.triggered.connect(
+            lambda: self.projTree.newTreeItem(nwItemType.FILE, hLevel=1, isNote=True)
+        )
 
-        self.aAddFolder = self.mItems.addAction(self.tr("Folder"))
+        self.aAddFolder = self.mAdd.addAction(self.tr("Folder"))
         self.aAddFolder.setIcon(self.theTheme.getIcon("proj_folder"))
-        self.aAddFolder.triggered.connect(lambda: self._forwardNewItem(self.ADD_FOLDER))
+        self.aAddFolder.triggered.connect(
+            lambda: self.projTree.newTreeItem(nwItemType.FOLDER)
+        )
 
-        self.mAddRoot = self.mItems.addMenu(self.tr("Root Folder"))
+        self.mAddRoot = self.mAdd.addMenu(self.tr("Root Folder"))
         self._addRootFolderEntry(nwItemClass.NOVEL)
         self._addRootFolderEntry(nwItemClass.ARCHIVE)
         self.mAddRoot.addSeparator()
@@ -256,31 +262,38 @@ class GuiProjectToolBar(QWidget):
         self._addRootFolderEntry(nwItemClass.ENTITY)
         self._addRootFolderEntry(nwItemClass.CUSTOM)
 
-        self.tbItems = QToolButton(self)
+        self.tbAdd = QToolButton(self)
-        self.tbItems.setToolTip("%s [Ctrl+N]" % self.tr("Add Item"))
+        self.tbAdd.setToolTip("%s [Ctrl+N]" % self.tr("Add Item"))
-        self.tbItems.setShortcut("Ctrl+N")
+        self.tbAdd.setShortcut("Ctrl+N")
-        self.tbItems.setIcon(self.theTheme.getIcon("add"))
+        self.tbAdd.setIcon(self.theTheme.getIcon("add"))
-        self.tbItems.setIconSize(QSize(iPx, iPx))
+        self.tbAdd.setIconSize(QSize(iPx, iPx))
-        self.tbItems.setStyleSheet(buttonStyle)
+        self.tbAdd.setStyleSheet(buttonStyle)
-        self.tbItems.setMenu(self.mItems)
+        self.tbAdd.setMenu(self.mAdd)
-        self.tbItems.setPopupMode(QToolButton.InstantPopup)
+        self.tbAdd.setPopupMode(QToolButton.InstantPopup)
 
-        # Settings Menu
+        # More Options Menu
-        self.tbSettings = QToolButton(self)
+        self.mMore = QMenu()
-        self.tbSettings.setIcon(self.theTheme.getIcon("menu"))
+
-        self.tbSettings.setIconSize(QSize(iPx, iPx))
+        self.aMoreUndo = self.mMore.addAction(self.tr("Undo Move"))
-        self.tbSettings.setStyleSheet(buttonStyle)
+        self.aMoreUndo.triggered.connect(lambda: self.projTree.undoLastMove())
-        self.tbSettings.setPopupMode(QToolButton.InstantPopup)
+
+        self.tbMore = QToolButton(self)
+        self.tbMore.setToolTip(self.tr("More Options"))
+        self.tbMore.setIcon(self.theTheme.getIcon("menu"))
+        self.tbMore.setIconSize(QSize(iPx, iPx))
+        self.tbMore.setStyleSheet(buttonStyle)
+        self.tbMore.setMenu(self.mMore)
+        self.tbMore.setPopupMode(QToolButton.InstantPopup)
 
         # Assemble
         self.outerBox = QHBoxLayout()
         self.outerBox.addWidget(self.projLabel)
         self.outerBox.addWidget(self.tbMoveU)
         self.outerBox.addWidget(self.tbMoveD)
-        self.outerBox.addWidget(self.tbItems)
+        self.outerBox.addWidget(self.tbAdd)
-        self.outerBox.addWidget(self.tbSettings)
+        self.outerBox.addWidget(self.tbMore)
         self.outerBox.setContentsMargins(mPx, mPx, 0, mPx)
-        self.outerBox.setSpacing(mPx)
+        self.outerBox.setSpacing(0)
 
         self.setLayout(self.outerBox)
 
@@ -288,33 +301,6 @@ class GuiProjectToolBar(QWidget):
 
         return
 
-    ##
-    #  Private Slots
-    ##
-
-    @pyqtSlot(Enum)
-    def _forwardNewRootFolder(self, itemClass):
-        """Forward the request for a new root folder to the tree.
-        """
-        self.projView.projTree.newTreeItem(nwItemType.ROOT, itemClass)
-        return
-
-    @pyqtSlot(int)
-    def _forwardNewItem(self, type):
-        """Forward the request for a new item of a given type.
-        """
-        if type == self.ADD_PLAIN:
-            self.projView.projTree.newTreeItem(nwItemType.FILE, hLevel=0, isNote=False)
-        elif type == self.ADD_CHAP:
-            self.projView.projTree.newTreeItem(nwItemType.FILE, hLevel=2, isNote=False)
-        elif type == self.ADD_SCENE:
-            self.projView.projTree.newTreeItem(nwItemType.FILE, hLevel=3, isNote=False)
-        elif type == self.ADD_NOTE:
-            self.projView.projTree.newTreeItem(nwItemType.FILE, hLevel=1, isNote=True)
-        elif type == self.ADD_FOLDER:
-            self.projView.projTree.newTreeItem(nwItemType.FOLDER)
-        return
-
     ##
     #  Internal Functions
     ##
@@ -324,7 +310,7 @@ class GuiProjectToolBar(QWidget):
         """
         aNew = self.mAddRoot.addAction(trConst(nwLabels.CLASS_NAME[itemClass]))
         aNew.setIcon(self.theTheme.getIcon(nwLabels.CLASS_ICON[itemClass]))
-        aNew.triggered.connect(lambda: self._forwardNewRootFolder(itemClass))
+        aNew.triggered.connect(lambda: self.projTree.newTreeItem(nwItemType.ROOT, itemClass))
         self.mAddRoot.addAction(aNew)
 
 # END Class GuiProjectToolBar
@@ -886,9 +872,6 @@ class GuiProjectTree(QTreeWidget):
         dstItem = self._lastMove.get("parent", None)
         dstIndex = self._lastMove.get("index", None)
 
-        if not self.projView.anyFocus():
-            return False
-
         if srcItem is None or dstItem is None or dstIndex is None:
             logger.verbose("No tree move to undo")
             return False

tests/test_gui/test_gui_guimain.py

@@ -461,7 +461,7 @@ def testGuiMain_Editing(qtbot, monkeypatch, nwGUI, fncProj, refDir, outDir, mock
     qtbot.wait(stepDelay)
 
     # Check a Quick Create and Delete
-    assert nwGUI.treeView.newTreeItem(nwItemType.FILE, None)
+    assert nwGUI.treeView.projTree.newTreeItem(nwItemType.FILE, None)
     newHandle = nwGUI.treeView.getSelectedHandle()
     assert nwGUI.theProject.tree["0000000000020"] is not None
     assert nwGUI.treeView.deleteItem()

tests/test_gui/test_gui_projtree.py

@@ -24,7 +24,7 @@ import os
 
 from tools import buildTestProject
 
-from PyQt5.QtWidgets import QAction, QMessageBox, QInputDialog
+from PyQt5.QtWidgets import QMessageBox, QInputDialog
 
 from novelwriter.gui.projtree import GuiProjectView, GuiProjectTree
 from novelwriter.enum import nwItemType, nwItemClass
@@ -44,7 +44,7 @@ def testGuiProjTree_NewItems(qtbot, caplog, monkeypatch, nwGUI, fncDir, mockRnd)
     nwTree = nwGUI.treeView
 
     # Try to add item with no project
-    assert nwTree.newTreeItem(nwItemType.FILE) is False
+    assert nwTree.projTree.newTreeItem(nwItemType.FILE) is False
 
     # Create a project
     prjDir = os.path.join(fncDir, "project")
@@ -52,16 +52,16 @@ def testGuiProjTree_NewItems(qtbot, caplog, monkeypatch, nwGUI, fncDir, mockRnd)
 
     # No itemType set
     nwTree.projTree.clearSelection()
-    assert nwTree.newTreeItem(None) is False
+    assert nwTree.projTree.newTreeItem(None) is False
 
     # Root Items
     # ==========
 
     # No class set
-    assert nwTree.newTreeItem(nwItemType.ROOT) is False
+    assert nwTree.projTree.newTreeItem(nwItemType.ROOT) is False
 
     # Create root item
-    assert nwTree.newTreeItem(nwItemType.ROOT, nwItemClass.WORLD) is True
+    assert nwTree.projTree.newTreeItem(nwItemType.ROOT, nwItemClass.WORLD) is True
     assert "0000000000010" in nwGUI.theProject.tree
 
     # File/Folder Items
@@ -70,27 +70,27 @@ def testGuiProjTree_NewItems(qtbot, caplog, monkeypatch, nwGUI, fncDir, mockRnd)
     # No location selected for new item
     nwTree.projTree.clearSelection()
     caplog.clear()
-    assert nwTree.newTreeItem(nwItemType.FILE) is False
+    assert nwTree.projTree.newTreeItem(nwItemType.FILE) is False
-    assert nwTree.newTreeItem(nwItemType.FOLDER) is False
+    assert nwTree.projTree.newTreeItem(nwItemType.FOLDER) is False
     assert "Did not find anywhere" in caplog.text
 
     # Create new folder as child of Novel folder
     nwTree.setSelectedHandle("0000000000008")
-    assert nwTree.newTreeItem(nwItemType.FOLDER) is True
+    assert nwTree.projTree.newTreeItem(nwItemType.FOLDER) is True
     assert nwGUI.theProject.tree["0000000000011"].itemParent == "0000000000008"
     assert nwGUI.theProject.tree["0000000000011"].itemRoot == "0000000000008"
     assert nwGUI.theProject.tree["0000000000011"].itemClass == nwItemClass.NOVEL
 
     # Add a new file in the new folder
     nwTree.setSelectedHandle("0000000000011")
-    assert nwTree.newTreeItem(nwItemType.FILE) is True
+    assert nwTree.projTree.newTreeItem(nwItemType.FILE) is True
     assert nwGUI.theProject.tree["0000000000012"].itemParent == "0000000000011"
     assert nwGUI.theProject.tree["0000000000012"].itemRoot == "0000000000008"
     assert nwGUI.theProject.tree["0000000000012"].itemClass == nwItemClass.NOVEL
 
     # Add a new chapter next to the other new file
     nwTree.setSelectedHandle("0000000000012")
-    assert nwTree.newTreeItem(nwItemType.FILE, hLevel=2) is True
+    assert nwTree.projTree.newTreeItem(nwItemType.FILE, hLevel=2) is True
     assert nwGUI.theProject.tree["0000000000013"].itemParent == "0000000000011"
     assert nwGUI.theProject.tree["0000000000013"].itemRoot == "0000000000008"
     assert nwGUI.theProject.tree["0000000000013"].itemClass == nwItemClass.NOVEL
@@ -99,7 +99,7 @@ def testGuiProjTree_NewItems(qtbot, caplog, monkeypatch, nwGUI, fncDir, mockRnd)
 
     # Add a new scene next to the other new file
     nwTree.setSelectedHandle("0000000000012")
-    assert nwTree.newTreeItem(nwItemType.FILE, hLevel=3) is True
+    assert nwTree.projTree.newTreeItem(nwItemType.FILE, hLevel=3) is True
     assert nwGUI.theProject.tree["0000000000014"].itemParent == "0000000000011"
     assert nwGUI.theProject.tree["0000000000014"].itemRoot == "0000000000008"
     assert nwGUI.theProject.tree["0000000000014"].itemClass == nwItemClass.NOVEL
@@ -108,7 +108,7 @@ def testGuiProjTree_NewItems(qtbot, caplog, monkeypatch, nwGUI, fncDir, mockRnd)
 
     # Add a new file to the characters folder
     nwTree.setSelectedHandle("000000000000a")
-    assert nwTree.newTreeItem(nwItemType.FILE, hLevel=1, isNote=True) is True
+    assert nwTree.projTree.newTreeItem(nwItemType.FILE, hLevel=1, isNote=True) is True
     assert nwGUI.theProject.tree["0000000000015"].itemParent == "000000000000a"
     assert nwGUI.theProject.tree["0000000000015"].itemRoot == "000000000000a"
     assert nwGUI.theProject.tree["0000000000015"].itemClass == nwItemClass.CHARACTER
@@ -119,7 +119,7 @@ def testGuiProjTree_NewItems(qtbot, caplog, monkeypatch, nwGUI, fncDir, mockRnd)
     nwTree.setSelectedHandle("0000000000013")
     nwGUI.theProject.tree["0000000000013"].setParent(None)  # This should not happen
     caplog.clear()
-    assert nwTree.newTreeItem(nwItemType.FILE) is False
+    assert nwTree.projTree.newTreeItem(nwItemType.FILE) is False
     assert "Internal error" in caplog.text
     nwGUI.theProject.tree["0000000000013"].setParent("0000000000011")
 
@@ -127,13 +127,13 @@ def testGuiProjTree_NewItems(qtbot, caplog, monkeypatch, nwGUI, fncDir, mockRnd)
     with monkeypatch.context() as mp:
         mp.setattr(QInputDialog, "getText", lambda *a, **k: ("", False))
         nwTree.setSelectedHandle("0000000000013")
-        assert nwTree.newTreeItem(nwItemType.FILE) is False
+        assert nwTree.projTree.newTreeItem(nwItemType.FILE) is False
 
     # Get the trash folder
     nwTree.projTree._addTrashRoot()
     trashHandle = nwGUI.theProject.trashFolder()
     nwTree.setSelectedHandle(trashHandle)
-    assert nwTree.newTreeItem(nwItemType.FILE) is False
+    assert nwTree.projTree.newTreeItem(nwItemType.FILE) is False
     assert "Cannot add new files or folders to the Trash folder" in caplog.text
 
     # Other Checks
@@ -179,9 +179,9 @@ def testGuiProjTree_MoveItems(qtbot, monkeypatch, nwGUI, fncDir, mockRnd):
 
     # Add some files
     nwTree.setSelectedHandle("000000000000d")
-    assert nwTree.newTreeItem(nwItemType.FILE) is True
+    assert nwTree.projTree.newTreeItem(nwItemType.FILE) is True
-    assert nwTree.newTreeItem(nwItemType.FILE) is True
+    assert nwTree.projTree.newTreeItem(nwItemType.FILE) is True
-    assert nwTree.newTreeItem(nwItemType.FILE) is True
+    assert nwTree.projTree.newTreeItem(nwItemType.FILE) is True
     assert nwTree.getTreeFromHandle("000000000000d") == [
         "000000000000d", "000000000000e", "000000000000f",
         "0000000000010", "0000000000011", "0000000000012",
@@ -238,7 +238,7 @@ def testGuiProjTree_MoveItems(qtbot, monkeypatch, nwGUI, fncDir, mockRnd):
         "000000000000d", "000000000000e", "000000000000f",
         "0000000000010", "0000000000012", "0000000000011",
     ]
-    nwGUI.mainMenu.aMoveUndo.activate(QAction.Trigger)
+    assert nwTree.projTree.undoLastMove() is True
     assert nwTree.getTreeFromHandle("000000000000d") == [
         "000000000000d", "000000000000e", "000000000000f",
         "0000000000010", "0000000000011", "0000000000012",
@@ -295,9 +295,9 @@ def testGuiProjTree_DeleteItems(qtbot, caplog, monkeypatch, nwGUI, fncDir, mockR
 
     # Add some files
     nwTree.setSelectedHandle("000000000000d")
-    assert nwTree.newTreeItem(nwItemType.FILE) is True
+    assert nwTree.projTree.newTreeItem(nwItemType.FILE) is True
-    assert nwTree.newTreeItem(nwItemType.FILE) is True
+    assert nwTree.projTree.newTreeItem(nwItemType.FILE) is True
-    assert nwTree.newTreeItem(nwItemType.FILE) is True
+    assert nwTree.projTree.newTreeItem(nwItemType.FILE) is True
     assert nwTree.getTreeFromHandle("000000000000d") == [
         "000000000000d", "000000000000e", "000000000000f",
         "0000000000010", "0000000000011", "0000000000012",
@@ -379,10 +379,10 @@ def testGuiProjTree_DeleteItems(qtbot, caplog, monkeypatch, nwGUI, fncDir, mockR
 
     # Add a folder with two files
     nwTree.setSelectedHandle("0000000000009")
-    assert nwTree.newTreeItem(nwItemType.FOLDER) is True
+    assert nwTree.projTree.newTreeItem(nwItemType.FOLDER) is True
     nwTree.setSelectedHandle("0000000000014")
-    assert nwTree.newTreeItem(nwItemType.FILE) is True
+    assert nwTree.projTree.newTreeItem(nwItemType.FILE) is True
-    assert nwTree.newTreeItem(nwItemType.FILE) is True
+    assert nwTree.projTree.newTreeItem(nwItemType.FILE) is True
     assert os.path.isfile(os.path.join(fncDir, "project", "content", "0000000000015.nwd"))
     assert os.path.isfile(os.path.join(fncDir, "project", "content", "0000000000016.nwd"))
 
@@ -405,7 +405,7 @@ def testGuiProjTree_DeleteItems(qtbot, caplog, monkeypatch, nwGUI, fncDir, mockR
 
     # Add an empty folder, which can be deleted with no further restrictions
     nwTree.setSelectedHandle("0000000000009")
-    assert nwTree.newTreeItem(nwItemType.FOLDER) is True
+    assert nwTree.projTree.newTreeItem(nwItemType.FOLDER) is True
     assert nwTree.getTreeFromHandle("0000000000009") == ["0000000000009", "0000000000017"]
 
     nwTree.setSelectedHandle("0000000000017")