Add a main count setting and use it for the project tree

novelwriter/core/item.py

@@ -164,6 +164,10 @@ class NWItem:
     def paraCount(self) -> int:
         return self._paraCount
 
+    @property
+    def mainCount(self) -> int:
+        return self._charCount if CONFIG.useCharCount else self._wordCount
+
     @property
     def initCount(self) -> int:
         return self._initCount

novelwriter/core/itemmodel.py

@@ -162,7 +162,7 @@ class ProjectNode:
 
     def updateCount(self, propagate: bool = True) -> None:
         """Update counts, and propagate upwards in the tree."""
-        self._count = self._item.wordCount + sum(c._count for c in self._children)  # noqa: SLF001
+        self._count = self._item.mainCount + sum(c._count for c in self._children)  # noqa: SLF001
         self._cache[C_COUNT_TEXT] = f"{self._count:n}"
         if propagate and (parent := self._parent):
             parent.updateCount()

tests/test_core/test_core_item.py

@@ -26,6 +26,7 @@ import pytest
 
 from PyQt6.QtGui import QIcon
 
+from novelwriter import CONFIG
 from novelwriter.core.item import NWItem
 from novelwriter.core.project import NWProject
 from novelwriter.enum import nwItemClass, nwItemLayout, nwItemType
@@ -168,6 +169,15 @@ def testCoreItem_Setters(mockGUI, mockRnd, fncPath):
     item.setParaCount(1)
     assert item.paraCount == 1
 
+    # MainCount
+    item.setWordCount(123)
+    item.setCharCount(1234)
+    CONFIG.useCharCount = False
+    assert item.mainCount == 123
+    CONFIG.useCharCount = True
+    assert item.mainCount == 1234
+    CONFIG.useCharCount = False
+
     # CursorPos
     item.setCursorPos(None)
     assert item.cursorPos == 0