Clean up a few things in project classes

novelwriter/core/project.py

@@ -31,7 +31,7 @@ from typing import TYPE_CHECKING, Iterator
 from pathlib import Path
 from functools import partial
 
-from PyQt5.QtCore import QCoreApplication, QObject, pyqtSignal
+from PyQt5.QtCore import QCoreApplication
 
 from novelwriter import CONFIG, SHARED, __version__, __hexversion__
 from novelwriter.enum import nwItemType, nwItemClass, nwItemLayout
@@ -55,13 +55,9 @@ if TYPE_CHECKING:  # pragma: no cover
 logger = logging.getLogger(__name__)
 
 
-class NWProject(QObject):
+class NWProject:
 
-    statusChanged = pyqtSignal(bool)
-    statusMessage = pyqtSignal(str)
-
-    def __init__(self, parent: QObject | None = None) -> None:
-        super().__init__(parent=parent)
+    def __init__(self) -> None:
 
         # Core Elements
         self._options = OptionState(self)    # Project-specific GUI options
@@ -206,7 +202,7 @@ class NWProject(QObject):
 
     def trashFolder(self) -> str:
         """Add the special trash root folder to the project."""
-        trashHandle = self._tree.trashRoot()
+        trashHandle = self._tree.trashRoot
         if trashHandle is None:
             label = trConst(nwLabels.CLASS_NAME[nwItemClass.TRASH])
             return self._tree.create(label, None, nwItemType.ROOT, nwItemClass.TRASH)
@@ -331,7 +327,7 @@ class NWProject(QObject):
         self.setProjectChanged(False)
         self._valid = True
 
-        self.statusMessage.emit(self.tr("Opened Project: {0}").format(self._data.name))
+        SHARED.newStatusMessage(self.tr("Opened Project: {0}").format(self._data.name))
 
         return True
 
@@ -381,7 +377,7 @@ class NWProject(QObject):
             )
 
         self._storage.writeLockFile()
-        self.statusMessage.emit(self.tr("Saved Project: {0}").format(self._data.name))
+        SHARED.newStatusMessage(self.tr("Saved Project: {0}").format(self._data.name))
         self.setProjectChanged(False)
 
         return True
@@ -403,7 +399,7 @@ class NWProject(QObject):
             return False
 
         logger.info("Backing up project")
-        self.statusMessage.emit(self.tr("Backing up project ..."))
+        SHARED.newStatusMessage(self.tr("Backing up project ..."))
 
         if not self._data.name:
             SHARED.error(self.tr(
@@ -434,7 +430,7 @@ class NWProject(QObject):
             SHARED.error(self.tr("Could not write backup archive."))
             return False
 
-        self.statusMessage.emit(self.tr("Project backed up to '{0}'").format(str(archName)))
+        SHARED.newStatusMessage(self.tr("Project backed up to '{0}'").format(str(archName)))
 
         return True
 
@@ -488,7 +484,7 @@ class NWProject(QObject):
         """
         if isinstance(status, bool):
             self._changed = status
-            self.statusChanged.emit(self._changed)
+            SHARED.setGlobalProjectState(self._changed)
         return self._changed
 
     ##

novelwriter/core/tree.py

@@ -40,6 +40,8 @@ if TYPE_CHECKING:  # pragma: no cover
 
 logger = logging.getLogger(__name__)
 
+MAX_DEPTH = 1000  # Cap of tree traversing for loops (recursion limit)
+
 
 class NWTree:
     """Core: Project Tree Data Class
@@ -59,7 +61,7 @@ class NWTree:
     also used for file names.
     """
 
-    MAX_DEPTH = 1000  # Cap of tree traversing for loops
+    __slots__ = ("_project", "_tree", "_order", "_roots", "_trash", "_changed")
 
     def __init__(self, project: NWProject) -> None:
 
@@ -74,6 +76,15 @@ class NWTree:
 
         return
 
+    ##
+    #  Properties
+    ##
+
+    @property
+    def trashRoot(self) -> str | None:
+        """Return the handle of the trash folder, or None."""
+        return self._trash
+
     ##
     #  Class Methods
     ##
@@ -320,7 +331,7 @@ class NWTree:
             return False
 
         iItem = tItem
-        for _ in range(self.MAX_DEPTH):
+        for _ in range(MAX_DEPTH):
             if iItem.itemParent is None:
                 tItem.setRoot(iItem.itemHandle)
                 tItem.setClassDefaults(iItem.itemClass)
@@ -349,7 +360,7 @@ class NWTree:
         tItem = self.__getitem__(tHandle)
         if tItem is not None:
             tTree.append(tHandle)
-            for _ in range(self.MAX_DEPTH):
+            for _ in range(MAX_DEPTH):
                 if tItem.itemParent is None:
                     return tTree
                 else:
@@ -400,14 +411,6 @@ class NWTree:
                 return True
         return False
 
-    def trashRoot(self) -> str | None:
-        """Returns the handle of the trash folder, or None if there
-        isn't one.
-        """
-        if self._trash:
-            return self._trash
-        return None
-
     def findRoot(self, itemClass: nwItemClass | None) -> str | None:
         """Find the first root item for a given class."""
         for aRoot in self._roots: