Update tests other than tree-related

novelwriter/core/itemmodel.py

@@ -91,6 +91,10 @@ class ProjectNode:
             f"children={len(self._children)}>"
         )
 
+    def __bool__(self) -> bool:
+        """A node should always evaluate to True."""
+        return True
+
     ##
     #  Properties
     ##
@@ -190,10 +194,10 @@ class ProjectNode:
         self._updateRelationships(child)
         if 0 <= pos < len(self._children):
             self._children.insert(pos, child)
-            self._refreshChildrenPos()
         else:
             child._row = len(self._children)
             self._children.append(child)
+        self._refreshChildrenPos()
         return
 
     def takeChild(self, pos: int) -> ProjectNode | None:
@@ -229,6 +233,7 @@ class ProjectNode:
         """Update the row value on all children."""
         for n, child in enumerate(self._children):
             child._row = n
+            child.item.setOrder(n)
         return
 
     def _updateRelationships(self, child: ProjectNode) -> None:

novelwriter/core/project.py

@@ -44,6 +44,7 @@ from novelwriter.core.options import OptionState
 from novelwriter.core.projectdata import NWProjectData
 from novelwriter.core.projectxml import ProjectXMLReader, ProjectXMLWriter, XMLReadState
 from novelwriter.core.sessions import NWSessionLog
+from novelwriter.core.status import T_StatusKinds, T_UpdateEntry
 from novelwriter.core.storage import NWStorage, NWStorageOpen
 from novelwriter.core.tree import NWTree
 from novelwriter.enum import nwItemClass, nwItemLayout, nwItemType
@@ -531,6 +532,18 @@ class NWProject:
                 self._data.itemImport.increment(nwItem.itemImport)
         return
 
+    def updateStatus(self, kind: T_StatusKinds, update: T_UpdateEntry) -> None:
+        """Update status or import entries."""
+        if kind == "s":
+            self._data.itemStatus.update(update)
+            SHARED.projectSignalProxy({"event": "statusLabels", "kind": kind})
+            self._tree.refreshAllItems()
+        elif kind == "i":
+            self._data.itemImport.update(update)
+            SHARED.projectSignalProxy({"event": "statusLabels", "kind": kind})
+            self._tree.refreshAllItems()
+        return
+
     def localLookup(self, word: str | int) -> str:
         """Look up a word or number in the translation map for the
         project and return it. The variable is cast to a string before

novelwriter/core/status.py

@@ -65,6 +65,9 @@ class StatusEntry:
 
 NO_ENTRY = StatusEntry("", QColor(0, 0, 0), nwStatusShape.SQUARE, QIcon(), 0)
 
+T_UpdateEntry = list[tuple[str | None, StatusEntry]]
+T_StatusKinds = Literal["s", "i"]
+
 
 class NWStatus:
 
@@ -73,7 +76,7 @@ class NWStatus:
 
     __slots__ = ("_store", "_default", "_prefix", "_height")
 
-    def __init__(self, prefix: Literal["s", "i"]) -> None:
+    def __init__(self, prefix: T_StatusKinds) -> None:
         self._store: dict[str, StatusEntry] = {}
         self._default = None
         self._prefix = prefix[:1]
@@ -120,7 +123,7 @@ class NWStatus:
 
         return key
 
-    def update(self, update: list[tuple[str | None, StatusEntry]]) -> None:
+    def update(self, update: T_UpdateEntry) -> None:
         """Update the list of statuses."""
         self._store.clear()
         for key, entry in update:
@@ -130,10 +133,6 @@ class NWStatus:
         if self._default not in self._store:
             self._default = next(iter(self._store)) if self._store else None
 
-        # Emit the change signal and refresh tree
-        SHARED.projectSignalProxy({"event": "statusLabels", "kind": self._prefix})
-        SHARED.project.tree.refreshAllItems()
-
         return
 
     def check(self, value: str) -> str:

novelwriter/core/tree.py

@@ -128,7 +128,7 @@ class NWTree:
                 self._model.insertChild(node, index, pos)
                 self._nodes[item.itemHandle] = node
                 self._items[item.itemHandle] = item
-                self._itemChange(item.itemHandle, nwChange.CREATE)
+                self._itemChange(item, nwChange.CREATE)
             else:
                 logger.error("Could not locate parent of '%s'", item.itemHandle)
                 return False
@@ -137,7 +137,7 @@ class NWTree:
             self._model.insertChild(node, QModelIndex(), pos)
             self._nodes[item.itemHandle] = node
             self._items[item.itemHandle] = item
-            self._itemChange(item.itemHandle, nwChange.CREATE)
+            self._itemChange(item, nwChange.CREATE)
         else:
             logger.error("Invalid project item '%s'", item.itemHandle)
             return False
@@ -148,7 +148,7 @@ class NWTree:
         if (node := self._nodes.get(tHandle)) and tHandle in self._items:
             index = self._model.indexFromNode(node)
             if index.isValid() and self._model.removeChild(index.parent(), index.row()):
-                self._itemChange(tHandle, nwChange.DELETE)
+                self._itemChange(node.item, nwChange.DELETE)
                 del self._nodes[tHandle]
                 del self._items[tHandle]
         return True
@@ -246,7 +246,7 @@ class NWTree:
                 indexS = self._model.indexFromNode(node, 0)
                 indexE = self._model.indexFromNode(node, 3)
                 self._model.dataChanged.emit(indexS, indexE)
-                self._itemChange(tHandle, nwChange.UPDATE)
+                self._itemChange(node.item, nwChange.UPDATE)
         return
 
     def refreshAllItems(self) -> None:
@@ -464,11 +464,18 @@ class NWTree:
     #  Internal Functions
     ##
 
-    def _itemChange(self, tHandle: str, change: nwChange) -> None:
+    def _itemChange(self, item: NWItem, change: nwChange) -> None:
         """Signal item change and notify project."""
+        tHandle = item.itemHandle
         logger.debug("Item change: %s -> %s", tHandle, change.name)
         self._project.setProjectChanged(True)
-        SHARED.projectSignalProxy({"event": "itemChanged", "handle": tHandle, "change": change})
+        SHARED.projectSignalProxy(
+            {"event": "itemChanged", "handle": tHandle, "change": change}
+        )
+        if item.isRootType():
+            SHARED.projectSignalProxy(
+                {"event": "rootChanged", "handle": tHandle, "change": change}
+            )
         return
 
     def _getTrashNode(self) -> ProjectNode | None: