Merge branch 'dev' into project_handling

novelwriter/core/coretools.py

@@ -374,7 +374,6 @@ class ProjectBuilder:
 
         project.data.setUuid(None)
         project.data.setName(projName)
-        project.data.setTitle(projName)
         project.data.setAuthor(projAuthor)
         project.data.setLanguage(projLang)
         project.setDefaultStatusImport()
@@ -383,7 +382,7 @@ class ProjectBuilder:
         # Add Root Folders
         hNovelRoot = project.newRoot(nwItemClass.NOVEL)
         hTitlePage = project.newFile(lblTitlePage, hNovelRoot)
-        novelTitle = project.data.title if project.data.title else project.data.name
+        novelTitle = project.data.name
 
         titlePage = f"#! {novelTitle}\n\n"
         if project.data.author:

novelwriter/core/index.py

@@ -528,17 +528,20 @@ class NWIndex:
             yield f"{tHandle}:{sTitle}", tHandle, sTitle, hItem
         return
 
-    def getNovelWordCount(self, activeOnly: bool = True) -> int:
-        """Count the number of words in the novel project."""
-        wCount = 0
-        for _, _, hItem in self._itemIndex.iterNovelStructure(activeOnly=activeOnly):
-            wCount += hItem.wordCount
-        return wCount
+    def getNovelWordCount(self, rootHandle: str | None = None, activeOnly: bool = True) -> int:
+        """Count the number of words in one or all novel roots."""
+        return sum(hItem.wordCount for _, _, hItem in self._itemIndex.iterNovelStructure(
+            rHandle=rootHandle, activeOnly=activeOnly
+        ))
 
-    def getNovelTitleCounts(self, activeOnly: bool = True) -> list[int]:
-        """Count the number of titles in the novel project."""
+    def getNovelTitleCounts(
+        self, rootHandle: str | None = None, activeOnly: bool = True
+    ) -> list[int]:
+        """Count the number of titles in one or all novel roots."""
         hCount = [0, 0, 0, 0, 0]
-        for _, _, hItem in self._itemIndex.iterNovelStructure(activeOnly=activeOnly):
+        for _, _, hItem in self._itemIndex.iterNovelStructure(
+            rHandle=rootHandle, activeOnly=activeOnly
+        ):
             iLevel = nwHeaders.H_LEVEL.get(hItem.level, 0)
             hCount[iLevel] += 1
         return hCount

novelwriter/core/options.py

@@ -53,10 +53,6 @@ VALID_MAP: dict[str, set[str]] = {
     "GuiProjectSettings": {
         "winWidth", "winHeight", "replaceColW", "statusColW", "importColW",
     },
-    "GuiProjectDetails": {
-        "winWidth", "winHeight", "widthCol0", "widthCol1", "widthCol2",
-        "widthCol3", "widthCol4", "wordsPerPage", "countFrom", "clearDouble",
-    },
     "GuiWordList": {"winWidth", "winHeight"},
     "GuiNovelView": {"lastCol", "lastColSize"},
     "GuiBuildSettings": {
@@ -71,7 +67,12 @@ VALID_MAP: dict[str, set[str]] = {
     },
     "GuiDocViewerPanel": {
         "colWidths", "hideInactive",
-    }
+    },
+    "GuiNovelDetails": {
+        "winWidth", "winHeight", "widthCol0", "widthCol1", "widthCol2",
+        "widthCol3", "widthCol4", "wordsPerPage", "countFrom", "clearDouble",
+        "novelRoot",
+    },
 }
 
 

novelwriter/core/projectdata.py

@@ -53,7 +53,6 @@ class NWProjectData:
         # Project Meta
         self._uuid = ""
         self._name = ""
-        self._title = ""
         self._author = ""
         self._saveCount = 0
         self._autoCount = 0
@@ -102,11 +101,6 @@ class NWProjectData:
         """Return the project name."""
         return self._name
 
-    @property
-    def title(self) -> str:
-        """Return the project title."""
-        return self._title
-
     @property
     def author(self) -> str:
         """Return the project author."""
@@ -228,16 +222,9 @@ class NWProjectData:
             self._project.setProjectChanged(True)
         return
 
-    def setTitle(self, value: str | None) -> None:
-        """Set a new novel title."""
-        if value != self._title:
-            self._title = simplified(str(value or ""))
-            self._project.setProjectChanged(True)
-        return
-
     def setAuthor(self, value: str | None) -> None:
         """Set the author value."""
-        if value != self._title:
+        if value != self._author:
             self._author = simplified(str(value or ""))
             self._project.setProjectChanged(True)
         return

novelwriter/core/projectxml.py

@@ -46,7 +46,7 @@ if TYPE_CHECKING:  # pragma: no cover
 logger = logging.getLogger(__name__)
 
 FILE_VERSION = "1.5"  # The current project file format version
-FILE_REVISION = "1"   # The current project file format revision
+FILE_REVISION = "2"   # The current project file format revision
 HEX_VERSION = 0x0105
 
 NUM_VERSION = {
@@ -105,7 +105,8 @@ class ProjectXMLReader:
         the project or the content into their respective section nodes
         as attributes. The id attribute was also added to the project.
 
-        Rev 1: Drops the titleFormat section of settings.
+        Rev 1: Drops the titleFormat node from settings. 2.1 Beta 1.
+        Rev 2: Drops the title node from project. 2.3 Beta 1.
     """
 
     def __init__(self, path: str | Path) -> None:
@@ -232,8 +233,6 @@ class ProjectXMLReader:
         for xItem in xSection:
             if xItem.tag == "name":
                 data.setName(xItem.text)
-            elif xItem.tag == "title":
-                data.setTitle(xItem.text)
             elif xItem.tag == "author":
                 data.setAuthor(xItem.text)
             else:
@@ -505,7 +504,6 @@ class ProjectXMLWriter:
 
         xProject = ET.SubElement(xRoot, "project", attrib=projAttr)
         self._packSingleValue(xProject, "name", data.name)
-        self._packSingleValue(xProject, "title", data.title)
         self._packSingleValue(xProject, "author", data.author)
 
         # Save Project Settings

novelwriter/core/tohtml.py

@@ -338,7 +338,6 @@ class ToHtml(Tokenizer):
         data = {
             "meta": {
                 "projectName": self._project.data.name,
-                "novelTitle": self._project.data.title,
                 "novelAuthor": self._project.data.author,
                 "buildTime": int(timeStamp),
                 "buildTimeStr": formatTimeStamp(timeStamp),

novelwriter/core/tokenizer.py

@@ -759,7 +759,6 @@ class Tokenizer(ABC):
         data = {
             "meta": {
                 "projectName": self._project.data.name,
-                "novelTitle": self._project.data.title,
                 "novelAuthor": self._project.data.author,
                 "buildTime": int(timeStamp),
                 "buildTimeStr": formatTimeStamp(timeStamp),

novelwriter/core/toodt.py

@@ -283,9 +283,7 @@ class ToOdt(Tokenizer):
         # ===============
 
         if self._headerText == "":
-            theTitle = self._project.data.title or self._project.data.name
-            theAuth = self._project.data.author
-            self._headerText = f"{theTitle} / {theAuth} /"
+            self._headerText = f"{self._project.data.name} / {self._project.data.author} /"
 
         # Create Roots
         # ============
@@ -373,7 +371,7 @@ class ToOdt(Tokenizer):
 
         # Dublin Core Meta Data
         xMeta = ET.SubElement(self._xMeta, _mkTag("dc", "title"))
-        xMeta.text = self._project.data.title or self._project.data.name
+        xMeta.text = self._project.data.name
 
         xMeta = ET.SubElement(self._xMeta, _mkTag("dc", "date"))
         xMeta.text = timeStamp