novelWriter 2.6.3__py3-none-any.whl → 2.7__py3-none-any.whl

novelwriter/constants.py

@@ -23,7 +23,9 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 """
 from __future__ import annotations
 
-from PyQt5.QtCore import QT_TRANSLATE_NOOP, QCoreApplication
+from typing import Final
+
+from PyQt6.QtCore import QT_TRANSLATE_NOOP, QCoreApplication
 
 from novelwriter.enum import (
     nwBuildFmt, nwComment, nwItemClass, nwItemLayout, nwOutline, nwStatusShape
@@ -99,7 +101,7 @@ class nwShortcode:
     FOOTNOTE_B = "[footnote:"
     FIELD_B    = "[field:"
 
-    COMMENT_STYLES = {
+    COMMENT_STYLES: Final[dict[nwComment, str]] = {
         nwComment.FOOTNOTE: "[footnote:{0}]",
         nwComment.COMMENT:  "[comment:{0}]",
     }
@@ -110,13 +112,13 @@ class nwShortcode:
 class nwStyles:
 
     H_VALID = ("H0", "H1", "H2", "H3", "H4")
-    H_LEVEL = {"H0": 0, "H1": 1, "H2": 2, "H3": 3, "H4": 4}
-    H_SIZES = {0: 2.50, 1: 2.00, 2: 1.75, 3: 1.50, 4: 1.25}
+    H_LEVEL: Final[dict[str, int]] = {"H0": 0, "H1": 1, "H2": 2, "H3": 3, "H4": 4}
+    H_SIZES: Final[dict[int, float]] = {0: 2.50, 1: 2.00, 2: 1.75, 3: 1.50, 4: 1.25}
 
     T_NORMAL = 1.0
     T_SMALL  = 0.8
 
-    T_LABEL = {
+    T_LABEL: Final[dict[str, str]] = {
         "H0": QT_TRANSLATE_NOOP("Constant", "Title"),
         "H1": QT_TRANSLATE_NOOP("Constant", "Heading 1 (Partition)"),
         "H2": QT_TRANSLATE_NOOP("Constant", "Heading 2 (Chapter)"),
@@ -125,7 +127,7 @@ class nwStyles:
         "TT": QT_TRANSLATE_NOOP("Constant", "Text Paragraph"),
         "SP": QT_TRANSLATE_NOOP("Constant", "Scene Separator"),
     }
-    T_MARGIN = {
+    T_MARGIN: Final[dict[str, tuple[float, float]]] = {
         "H0": (1.50, 0.60),  # Title margins (top, bottom)
         "H1": (1.50, 0.60),  # Heading 1 margins (top, bottom)
         "H2": (1.50, 0.60),  # Heading 2 margins (top, bottom)
@@ -174,20 +176,20 @@ class nwKeyWords:
     MENTION_KEY = "@mention"
 
     # Note: The order here affects the order of menu entries
-    ALL_KEYS = [
+    ALL_KEYS: Final[list[str]] = [
         TAG_KEY, POV_KEY, FOCUS_KEY, CHAR_KEY, PLOT_KEY, TIME_KEY, WORLD_KEY,
         OBJECT_KEY, ENTITY_KEY, CUSTOM_KEY, STORY_KEY, MENTION_KEY,
     ]
-    CAN_CREATE = [
+    CAN_CREATE: Final[list[str]] = [
         POV_KEY, FOCUS_KEY, CHAR_KEY, PLOT_KEY, TIME_KEY, WORLD_KEY,
         OBJECT_KEY, ENTITY_KEY, CUSTOM_KEY,
     ]
 
     # Set of Valid Keys
-    VALID_KEYS = set(ALL_KEYS)
+    VALID_KEYS: Final[set[str]] = set(ALL_KEYS)
 
     # Map from Keys to Item Class
-    KEY_CLASS = {
+    KEY_CLASS: Final[dict[str, nwItemClass]] = {
         POV_KEY:     nwItemClass.CHARACTER,
         FOCUS_KEY:   nwItemClass.CHARACTER,
         CHAR_KEY:    nwItemClass.CHARACTER,
@@ -203,7 +205,7 @@ class nwKeyWords:
 
 class nwLists:
 
-    USER_CLASSES = [
+    USER_CLASSES: Final[list[nwItemClass]] = [
         nwItemClass.CHARACTER,
         nwItemClass.PLOT,
         nwItemClass.WORLD,
@@ -229,7 +231,7 @@ class nwStats:
     WORDS_TITLE  = "titleWords"
 
     # Note: The order here affects the order of menu entries
-    ALL_FIELDS = [
+    ALL_FIELDS: Final[list[str]] = [
         WORDS, WORDS_TEXT, WORDS_TITLE,
         CHARS, CHARS_TEXT, CHARS_TITLE,
         WCHARS_ALL, WCHARS_TEXT, WCHARS_TITLE,
@@ -239,7 +241,7 @@ class nwStats:
 
 class nwLabels:
 
-    CLASS_NAME = {
+    CLASS_NAME: Final[dict[nwItemClass, str]] = {
         nwItemClass.NO_CLASS:  QT_TRANSLATE_NOOP("Constant", "None"),
         nwItemClass.NOVEL:     QT_TRANSLATE_NOOP("Constant", "Novel"),
         nwItemClass.PLOT:      QT_TRANSLATE_NOOP("Constant", "Plot"),
@@ -253,7 +255,7 @@ class nwLabels:
         nwItemClass.TEMPLATE:  QT_TRANSLATE_NOOP("Constant", "Templates"),
         nwItemClass.TRASH:     QT_TRANSLATE_NOOP("Constant", "Trash"),
     }
-    CLASS_ICON = {
+    CLASS_ICON: Final[dict[nwItemClass, str]] = {
         nwItemClass.NO_CLASS:  "cls_none",
         nwItemClass.NOVEL:     "cls_novel",
         nwItemClass.PLOT:      "cls_plot",
@@ -267,12 +269,12 @@ class nwLabels:
         nwItemClass.TEMPLATE:  "cls_template",
         nwItemClass.TRASH:     "cls_trash",
     }
-    LAYOUT_NAME = {
+    LAYOUT_NAME: Final[dict[nwItemLayout, str]] = {
         nwItemLayout.NO_LAYOUT: QT_TRANSLATE_NOOP("Constant", "None"),
         nwItemLayout.DOCUMENT:  QT_TRANSLATE_NOOP("Constant", "Novel Document"),
         nwItemLayout.NOTE:      QT_TRANSLATE_NOOP("Constant", "Project Note"),
     }
-    ITEM_DESCRIPTION = {
+    ITEM_DESCRIPTION: Final[dict[str, str]] = {
         "none":     QT_TRANSLATE_NOOP("Constant", "None"),
         "root":     QT_TRANSLATE_NOOP("Constant", "Root Folder"),
         "folder":   QT_TRANSLATE_NOOP("Constant", "Folder"),
@@ -283,11 +285,11 @@ class nwLabels:
         "doc_h4":   QT_TRANSLATE_NOOP("Constant", "Novel Section"),
         "note":     QT_TRANSLATE_NOOP("Constant", "Project Note"),
     }
-    ACTIVE_NAME = {
+    ACTIVE_NAME: Final[dict[str, str]] = {
         "checked":   QT_TRANSLATE_NOOP("Constant", "Active"),
         "unchecked": QT_TRANSLATE_NOOP("Constant", "Inactive"),
     }
-    KEY_NAME = {
+    KEY_NAME: Final[dict[str, str]] = {
         nwKeyWords.TAG_KEY:     QT_TRANSLATE_NOOP("Constant", "Tag"),
         nwKeyWords.POV_KEY:     QT_TRANSLATE_NOOP("Constant", "Point of View"),
         nwKeyWords.FOCUS_KEY:   QT_TRANSLATE_NOOP("Constant", "Focus"),
@@ -301,7 +303,7 @@ class nwLabels:
         nwKeyWords.STORY_KEY:   QT_TRANSLATE_NOOP("Constant", "Story"),
         nwKeyWords.MENTION_KEY: QT_TRANSLATE_NOOP("Constant", "Mentions"),
     }
-    KEY_SHORTCUT = {
+    KEY_SHORTCUT: Final[dict[str, str]] = {
         nwKeyWords.TAG_KEY:     "Ctrl+K, G",
         nwKeyWords.POV_KEY:     "Ctrl+K, V",
         nwKeyWords.FOCUS_KEY:   "Ctrl+K, F",
@@ -315,7 +317,7 @@ class nwLabels:
         nwKeyWords.STORY_KEY:   "Ctrl+K, N",
         nwKeyWords.MENTION_KEY: "Ctrl+K, M",
     }
-    OUTLINE_COLS = {
+    OUTLINE_COLS: Final[dict[nwOutline, str]] = {
         nwOutline.TITLE:   QT_TRANSLATE_NOOP("Constant", "Title"),
         nwOutline.LEVEL:   QT_TRANSLATE_NOOP("Constant", "Level"),
         nwOutline.LABEL:   QT_TRANSLATE_NOOP("Constant", "Document"),
@@ -337,7 +339,7 @@ class nwLabels:
         nwOutline.MENTION: KEY_NAME[nwKeyWords.MENTION_KEY],
         nwOutline.SYNOP:   QT_TRANSLATE_NOOP("Constant", "Synopsis"),
     }
-    STATS_NAME = {
+    STATS_NAME: Final[dict[str, str]] = {
         nwStats.CHARS:        QT_TRANSLATE_NOOP("Stats", "Characters"),
         nwStats.CHARS_TEXT:   QT_TRANSLATE_NOOP("Stats", "Characters in Text"),
         nwStats.CHARS_TITLE:  QT_TRANSLATE_NOOP("Stats", "Characters in Headings"),
@@ -350,7 +352,11 @@ class nwLabels:
         nwStats.WORDS_TEXT:   QT_TRANSLATE_NOOP("Stats", "Words in Text"),
         nwStats.WORDS_TITLE:  QT_TRANSLATE_NOOP("Stats", "Words in Headings"),
     }
-    BUILD_FMT = {
+    STATS_DISPLAY: Final[dict[str, str]] = {
+        nwStats.CHARS: QT_TRANSLATE_NOOP("Stats", "Characters: {0} ({1})"),
+        nwStats.WORDS: QT_TRANSLATE_NOOP("Stats", "Words: {0} ({1})"),
+    }
+    BUILD_FMT: Final[dict[nwBuildFmt, str]] = {
         nwBuildFmt.ODT:    QT_TRANSLATE_NOOP("Constant", "Open Document (.odt)"),
         nwBuildFmt.FODT:   QT_TRANSLATE_NOOP("Constant", "Flat Open Document (.fodt)"),
         nwBuildFmt.DOCX:   QT_TRANSLATE_NOOP("Constant", "Microsoft Word Document (.docx)"),
@@ -362,7 +368,7 @@ class nwLabels:
         nwBuildFmt.J_HTML: QT_TRANSLATE_NOOP("Constant", "JSON + HTML 5 (.json)"),
         nwBuildFmt.J_NWD:  QT_TRANSLATE_NOOP("Constant", "JSON + novelWriter Markup (.json)"),
     }
-    BUILD_EXT = {
+    BUILD_EXT: Final[dict[nwBuildFmt, str]] = {
         nwBuildFmt.ODT:    ".odt",
         nwBuildFmt.FODT:   ".fodt",
         nwBuildFmt.DOCX:   ".docx",
@@ -374,7 +380,7 @@ class nwLabels:
         nwBuildFmt.J_HTML: ".json",
         nwBuildFmt.J_NWD:  ".json",
     }
-    SHAPES_PLAIN = {
+    SHAPES_PLAIN: Final[dict[nwStatusShape, str]] = {
         nwStatusShape.SQUARE:   QT_TRANSLATE_NOOP("Constant", "Square"),
         nwStatusShape.TRIANGLE: QT_TRANSLATE_NOOP("Constant", "Triangle"),
         nwStatusShape.NABLA:    QT_TRANSLATE_NOOP("Constant", "Nabla"),
@@ -384,42 +390,42 @@ class nwLabels:
         nwStatusShape.STAR:     QT_TRANSLATE_NOOP("Constant", "Star"),
         nwStatusShape.PACMAN:   QT_TRANSLATE_NOOP("Constant", "Pacman"),
     }
-    SHAPES_CIRCLE = {
+    SHAPES_CIRCLE: Final[dict[nwStatusShape, str]] = {
         nwStatusShape.CIRCLE_Q: QT_TRANSLATE_NOOP("Constant", "1/4 Circle"),
         nwStatusShape.CIRCLE_H: QT_TRANSLATE_NOOP("Constant", "Half Circle"),
         nwStatusShape.CIRCLE_T: QT_TRANSLATE_NOOP("Constant", "3/4 Circle"),
         nwStatusShape.CIRCLE:   QT_TRANSLATE_NOOP("Constant", "Full Circle"),
     }
-    SHAPES_BARS = {
+    SHAPES_BARS: Final[dict[nwStatusShape, str]] = {
         nwStatusShape.BARS_1: QT_TRANSLATE_NOOP("Constant", "1 Bar"),
         nwStatusShape.BARS_2: QT_TRANSLATE_NOOP("Constant", "2 Bars"),
         nwStatusShape.BARS_3: QT_TRANSLATE_NOOP("Constant", "3 Bars"),
         nwStatusShape.BARS_4: QT_TRANSLATE_NOOP("Constant", "4 Bars"),
     }
-    SHAPES_BLOCKS = {
+    SHAPES_BLOCKS: Final[dict[nwStatusShape, str]] = {
         nwStatusShape.BLOCK_1: QT_TRANSLATE_NOOP("Constant", "1 Block"),
         nwStatusShape.BLOCK_2: QT_TRANSLATE_NOOP("Constant", "2 Blocks"),
         nwStatusShape.BLOCK_3: QT_TRANSLATE_NOOP("Constant", "3 Blocks"),
         nwStatusShape.BLOCK_4: QT_TRANSLATE_NOOP("Constant", "4 Blocks"),
     }
-    FILE_FILTERS = {
+    FILE_FILTERS: Final[dict[str, str]] = {
         "*.txt": QT_TRANSLATE_NOOP("Constant", "Text files"),
         "*.md":  QT_TRANSLATE_NOOP("Constant", "Markdown files"),
         "*.nwd": QT_TRANSLATE_NOOP("Constant", "novelWriter files"),
         "*.csv": QT_TRANSLATE_NOOP("Constant", "CSV files"),
         "*":     QT_TRANSLATE_NOOP("Constant", "All files"),
     }
-    UNIT_NAME = {
+    UNIT_NAME: Final[dict[str, str]] = {
         "mm": QT_TRANSLATE_NOOP("Constant", "Millimetres"),
         "cm": QT_TRANSLATE_NOOP("Constant", "Centimetres"),
         "in": QT_TRANSLATE_NOOP("Constant", "Inches"),
     }
-    UNIT_SCALE = {
+    UNIT_SCALE: Final[dict[str, float]] = {
         "mm": 1.0,
         "cm": 10.0,
         "in": 25.4,
     }
-    PAPER_NAME = {
+    PAPER_NAME: Final[dict[str, str]] = {
         "A4":     QT_TRANSLATE_NOOP("Constant", "A4"),
         "A5":     QT_TRANSLATE_NOOP("Constant", "A5"),
         "A6":     QT_TRANSLATE_NOOP("Constant", "A6"),
@@ -427,7 +433,7 @@ class nwLabels:
         "Letter": QT_TRANSLATE_NOOP("Constant", "US Letter"),
         "Custom": QT_TRANSLATE_NOOP("Constant", "Custom"),
     }
-    PAPER_SIZE = {
+    PAPER_SIZE: Final[dict[str, tuple[float, float]]] = {
         "A4":     (210.0, 297.0),
         "A5":     (148.0, 210.0),
         "A6":     (105.0, 148.0),
@@ -435,6 +441,18 @@ class nwLabels:
         "Letter": (215.9, 279.4),
         "Custom": (-1.0, -1.0),
     }
+    THEME_COLORS: Final[dict[str, str]] = {
+        "theme":   QT_TRANSLATE_NOOP("Constant", "Theme Colours"),
+        "default": QT_TRANSLATE_NOOP("Constant", "Foreground Colour"),
+        "faded":   QT_TRANSLATE_NOOP("Constant", "Faded Colour"),
+        "red":     QT_TRANSLATE_NOOP("Constant", "Red"),
+        "orange":  QT_TRANSLATE_NOOP("Constant", "Orange"),
+        "yellow":  QT_TRANSLATE_NOOP("Constant", "Yellow"),
+        "green":   QT_TRANSLATE_NOOP("Constant", "Green"),
+        "aqua":    QT_TRANSLATE_NOOP("Constant", "Aqua"),
+        "blue":    QT_TRANSLATE_NOOP("Constant", "Blue"),
+        "purple":  QT_TRANSLATE_NOOP("Constant", "Purple"),
+    }
 
 
 class nwHeadFmt:
@@ -450,7 +468,7 @@ class nwHeadFmt:
     CHAR_POV   = "{Char:POV}"
     CHAR_FOCUS = "{Char:Focus}"
 
-    PAGE_HEADERS = [
+    PAGE_HEADERS: Final[list[str]] = [
         TITLE, CH_NUM, CH_WORD, CH_ROMU, CH_ROML, SC_NUM, SC_ABS,
         CHAR_POV, CHAR_FOCUS
     ]
@@ -466,7 +484,7 @@ class nwQuotes:
     """Allowed quotation marks.
     Source: https://en.wikipedia.org/wiki/Quotation_mark
     """
-    SYMBOLS = {
+    SYMBOLS: Final[dict[str, str]] = {
         "\u0027": QT_TRANSLATE_NOOP("Constant", "Straight single quotation mark"),
         "\u0022": QT_TRANSLATE_NOOP("Constant", "Straight double quotation mark"),
 
@@ -491,6 +509,19 @@ class nwQuotes:
         "\u300f": QT_TRANSLATE_NOOP("Constant", "Right white corner bracket"),
     }
 
+    DASHES: Final[dict[str, str]] = {
+        "":       QT_TRANSLATE_NOOP("Constant", "None"),
+        "\u2013": QT_TRANSLATE_NOOP("Constant", "Short dash"),
+        "\u2014": QT_TRANSLATE_NOOP("Constant", "Long dash"),
+        "\u2015": QT_TRANSLATE_NOOP("Constant", "Horizontal bar"),
+    }
+
+    ALLOWED: Final[list[str]] = [
+        "\u0027", "\u0022", "\u2018", "\u2019", "\u201a", "\u201b", "\u201c", "\u201d", "\u201e",
+        "\u201f", "\u2e42", "\u2039", "\u203a", "\u00ab", "\u00bb", "\u300c", "\u300d", "\u300e",
+        "\u300f", "\u2013", "\u2014", "\u2015",
+    ]
+
 
 class nwUnicode:
     """Supported unicode character constants and their HTML equivalents."""
@@ -631,9 +662,9 @@ class nwUnicode:
     H_LTRIS  = "&#9666;"
 
 
-class nwHtmlUnicode():
+class nwHtmlUnicode:
 
-    U_TO_H = {
+    U_TO_H: Final[dict[str, str]] = {
         # Quotes
         nwUnicode.U_QUOT:   nwUnicode.H_QUOT,
         nwUnicode.U_APOS:   nwUnicode.H_APOS,

novelwriter/core/buildsettings.py

@@ -28,11 +28,11 @@ import json
 import logging
 import uuid
 
-from collections.abc import Iterable
 from enum import Enum
 from pathlib import Path
+from typing import TYPE_CHECKING
 
-from PyQt5.QtCore import QT_TRANSLATE_NOOP, QCoreApplication
+from PyQt6.QtCore import QT_TRANSLATE_NOOP, QCoreApplication
 
 from novelwriter import CONFIG
 from novelwriter.common import checkUuid, isHandle, jsonEncode
@@ -41,13 +41,18 @@ from novelwriter.core.project import NWProject
 from novelwriter.enum import nwBuildFmt
 from novelwriter.error import logException
 
+if TYPE_CHECKING:
+    from collections.abc import Iterable
+
 logger = logging.getLogger(__name__)
 
+T_BuildValue = str | int | float | bool
+
 # The Settings Template
 # =====================
 # Each entry contains a tuple on the form: (type, default)
 
-SETTINGS_TEMPLATE: dict[str, tuple[type, str | int | float | bool]] = {
+SETTINGS_TEMPLATE: dict[str, tuple[type, T_BuildValue]] = {
     "filter.includeNovel":     (bool, True),
     "filter.includeNotes":     (bool, False),
     "filter.includeInactive":  (bool, False),
@@ -73,6 +78,8 @@ SETTINGS_TEMPLATE: dict[str, tuple[type, str | int | float | bool]] = {
     "headings.breakScene":     (bool, False),
     "text.includeSynopsis":    (bool, False),
     "text.includeComments":    (bool, False),
+    "text.includeStory":       (bool, False),
+    "text.includeNotes":       (bool, False),
     "text.includeKeywords":    (bool, False),
     "text.includeBodyText":    (bool, True),
     "text.ignoredKeywords":    (str, ""),
@@ -139,6 +146,8 @@ SETTINGS_LABELS = {
     "text.grpContent":         QT_TRANSLATE_NOOP("Builds", "Text Content"),
     "text.includeSynopsis":    QT_TRANSLATE_NOOP("Builds", "Include Synopsis"),
     "text.includeComments":    QT_TRANSLATE_NOOP("Builds", "Include Comments"),
+    "text.includeStory":       QT_TRANSLATE_NOOP("Builds", "Include Story Structure"),
+    "text.includeNotes":       QT_TRANSLATE_NOOP("Builds", "Include Manuscript Notes"),
     "text.includeKeywords":    QT_TRANSLATE_NOOP("Builds", "Include Keywords"),
     "text.includeBodyText":    QT_TRANSLATE_NOOP("Builds", "Include Body Text"),
     "text.ignoredKeywords":    QT_TRANSLATE_NOOP("Builds", "Ignore These Keywords"),
@@ -185,7 +194,6 @@ SETTINGS_LABELS = {
 }
 
 RENAMED = {
-    "odt.addColours": "doc.addColours",
     "odt.pageHeader": "doc.pageHeader",
     "odt.pageCountOffset": "doc.pageCountOffset",
 }
@@ -226,9 +234,9 @@ class BuildSettings:
     @classmethod
     def fromDict(cls, data: dict) -> BuildSettings:
         """Create a build settings object from a dict."""
-        cls = BuildSettings()
-        cls.unpack(data)
-        return cls
+        new = cls()
+        new.unpack(data)
+        return new
 
     ##
     #  Properties
@@ -293,12 +301,12 @@ class BuildSettings:
     def getInt(self, key: str) -> int:
         """Type safe value access for integers."""
         value = self._settings.get(key, SETTINGS_TEMPLATE.get(key, (None, None))[1])
-        return int(value) if isinstance(value, (int, float)) else 0
+        return int(value) if isinstance(value, int | float) else 0
 
     def getFloat(self, key: str) -> float:
         """Type safe value access for floats."""
         value = self._settings.get(key, SETTINGS_TEMPLATE.get(key, (None, None))[1])
-        return float(value) if isinstance(value, (int, float)) else 0.0
+        return float(value) if isinstance(value, int | float) else 0.0
 
     ##
     #  Setters
@@ -379,10 +387,10 @@ class BuildSettings:
             self._changed = True
         return
 
-    def setValue(self, key: str, value: str | int | float | bool) -> None:
+    def setValue(self, key: str, value: T_BuildValue) -> None:
         """Set a specific value for a build setting."""
         if (d := SETTINGS_TEMPLATE.get(key)) and len(d) == 2 and isinstance(value, d[0]):
-            self._changed = value != self._settings[key]
+            self._changed |= (value != self._settings[key])
             self._settings[key] = value
         return
 
@@ -503,7 +511,8 @@ class BuildSettings:
         self._settings = {k: v[1] for k, v in SETTINGS_TEMPLATE.items()}
         if isinstance(settings, dict):
             for key, value in settings.items():
-                self.setValue(RENAMED.get(key, key), value)
+                if isinstance(key, str) and isinstance(value, T_BuildValue):
+                    self.setValue(RENAMED.get(key, key), value)
 
         self._changed = False
 
@@ -512,11 +521,11 @@ class BuildSettings:
     @classmethod
     def duplicate(cls, source: BuildSettings) -> BuildSettings:
         """Make a copy of another build."""
-        cls = BuildSettings()
-        cls.unpack(source.pack())
-        cls._uuid = str(uuid.uuid4())
-        cls._name = f"{source.name} 2"
-        return cls
+        new = cls()
+        new.unpack(source.pack())
+        new._uuid = str(uuid.uuid4())
+        new._name = f"{source.name} 2"
+        return new
 
 
 class BuildCollection:

novelwriter/core/coretools.py

@@ -30,20 +30,24 @@ import logging
 import re
 import shutil
 
-from collections.abc import Iterable
 from functools import partial
 from pathlib import Path
+from typing import TYPE_CHECKING
 from zipfile import ZipFile, is_zipfile
 
-from PyQt5.QtCore import QCoreApplication
+from PyQt6.QtCore import QCoreApplication
 
 from novelwriter import CONFIG, SHARED
 from novelwriter.common import isHandle, minmax, simplified
 from novelwriter.constants import nwConst, nwFiles, nwItemClass, nwStats
-from novelwriter.core.item import NWItem
 from novelwriter.core.project import NWProject
 from novelwriter.core.storage import NWStorageCreate
 
+if TYPE_CHECKING:
+    from collections.abc import Iterable
+
+    from novelwriter.core.item import NWItem
+
 logger = logging.getLogger(__name__)
 
 
@@ -284,7 +288,7 @@ class DocDuplicator:
 class DocSearch:
 
     def __init__(self) -> None:
-        self._regEx = re.compile("")
+        self._regEx = re.compile(r"")
         self._opts = re.UNICODE | re.IGNORECASE
         self._words = False
         self._escape = True
@@ -379,10 +383,12 @@ class ProjectBuilder:
         """Build or copy a project from a data dictionary."""
         if isinstance(data, dict):
             path = data.get("path", None) or None
-            if isinstance(path, (str, Path)):
+            if author := data.get("author"):
+                CONFIG.setLastAuthor(author)
+            if isinstance(path, str | Path):
                 self._path = Path(path).resolve()
-                if data.get("sample", False):
-                    return self._extractSampleProject(self._path)
+                if data.get("sample"):
+                    return self._extractSampleProject(self._path, data)
                 elif data.get("template"):
                     return self._copyProject(self._path, data)
                 else:
@@ -412,20 +418,21 @@ class ProjectBuilder:
 
         self._path = project.storage.storagePath
 
-        lblNewProject = self.tr("New Project")
-        lblTitlePage  = self.tr("Title Page")
+        trName = self.tr("New Project")
+        trAuthor = self.tr("Author Name")
+        trTitlePage = self.tr("Title Page")
 
         # Settings
         project.data.setUuid(None)
-        project.data.setName(data.get("name", lblNewProject))
-        project.data.setAuthor(data.get("author", ""))
+        project.data.setName(data.get("name", trName))
+        project.data.setAuthor(data.get("author", trAuthor))
         project.data.setLanguage(CONFIG.guiLocale)
         project.setDefaultStatusImport()
         project.session.startSession()
 
         # Add Root Folders
         hNovelRoot = project.newRoot(nwItemClass.NOVEL)
-        hTitlePage = project.newFile(lblTitlePage, hNovelRoot)
+        hTitlePage = project.newFile(trTitlePage, hNovelRoot)
 
         # Generate Title Page
         aDoc = project.storage.getDocument(hTitlePage)
@@ -442,25 +449,21 @@ class ProjectBuilder:
             "\n"
             ">> {count}: [field:{field}] <<\n"
         ).format(
-            author=project.data.author or "None",
-            address=self.tr("Address"),
-            title=project.data.name or "None",
+            author=project.data.author or trAuthor,
+            address=self.tr("Address Line"),
+            title=project.data.name or trName,
             by=self.tr("By"),
             count=self.tr("Word Count"),
             field=nwStats.WORDS_TEXT,
         ))
 
-        # Create a project structure based on selected root folders
-        # and a number of chapters and scenes selected in the
-        # wizard's custom page.
-
         # Create chapters and scenes
         numChapters = data.get("chapters", 0)
         numScenes = data.get("scenes", 0)
 
-        chSynop = self.tr("Summary of the chapter.")
-        scSynop = self.tr("Summary of the scene.")
-        bfNote = self.tr("A short description.")
+        trChSynop = self.tr("Summary of the chapter.")
+        trScSynop = self.tr("Summary of the scene.")
+        trNoteDesc = self.tr("A short description.")
 
         # Create chapters
         if numChapters > 0:
@@ -468,7 +471,7 @@ class ProjectBuilder:
                 chTitle = self.tr("Chapter {0}").format(f"{ch+1:d}")
                 cHandle = project.newFile(chTitle, hNovelRoot)
                 aDoc = project.storage.getDocument(cHandle)
-                aDoc.writeDocument(f"## {chTitle}\n\n%Synopsis: {chSynop}\n\n")
+                aDoc.writeDocument(f"## {chTitle}\n\n%Synopsis: {trChSynop}\n\n")
 
                 # Create chapter scenes
                 if numScenes > 0 and cHandle:
@@ -476,7 +479,7 @@ class ProjectBuilder:
                         scTitle = self.tr("Scene {0}").format(f"{ch+1:d}.{sc+1:d}")
                         sHandle = project.newFile(scTitle, cHandle)
                         aDoc = project.storage.getDocument(sHandle)
-                        aDoc.writeDocument(f"### {scTitle}\n\n%Synopsis: {scSynop}\n\n")
+                        aDoc.writeDocument(f"### {scTitle}\n\n%Synopsis: {trScSynop}\n\n")
 
         # Create scenes (no chapters)
         elif numScenes > 0:
@@ -484,7 +487,7 @@ class ProjectBuilder:
                 scTitle = self.tr("Scene {0}").format(f"{sc+1:d}")
                 sHandle = project.newFile(scTitle, hNovelRoot)
                 aDoc = project.storage.getDocument(sHandle)
-                aDoc.writeDocument(f"### {scTitle}\n\n%Synopsis: {scSynop}\n\n")
+                aDoc.writeDocument(f"### {scTitle}\n\n%Synopsis: {trScSynop}\n\n")
 
         # Create notes folders
         noteTitles = {
@@ -504,12 +507,12 @@ class ProjectBuilder:
                     aDoc.writeDocument(
                         f"# {noteTitles[newRoot]}\n\n"
                         f"@tag: {ntTag}\n\n"
-                        f"%Short: {bfNote}\n\n"
+                        f"%Short: {trNoteDesc}\n\n"
                     )
 
         # Also add the archive and trash folders
         project.newRoot(nwItemClass.ARCHIVE)
-        project.tree.trash  # Triggers the creation of Trash
+        _ = project.tree.trash  # Triggers the creation of Trash
 
         project.saveProject()
         project.closeProject()
@@ -559,23 +562,11 @@ class ProjectBuilder:
             return False
 
         # Open the copied project and update settings
-        project = NWProject()
-        project.openProject(dstPath)
-        project.data.setUuid("")  # Creates a fresh uuid
-        project.data.setName(data.get("name", "None"))
-        project.data.setAuthor(data.get("author", ""))
-        project.data.setSpellCheck(True)
-        project.data.setSpellLang(None)
-        project.data.setDoBackup(True)
-        project.data.setSaveCount(0)
-        project.data.setAutoCount(0)
-        project.data.setEditTime(0)
-        project.saveProject()
-        project.closeProject()
+        self._resetProject(dstPath, data)
 
         return True
 
-    def _extractSampleProject(self, path: Path) -> bool:
+    def _extractSampleProject(self, path: Path, data: dict) -> bool:
         """Make a copy of the sample project by extracting the
         sample.zip file to the new path.
         """
@@ -589,6 +580,7 @@ class ProjectBuilder:
         if (sample := CONFIG.assetPath("sample.zip")).is_file():
             try:
                 shutil.unpack_archive(sample, path)
+                self._resetProject(path, data)
             except Exception as exc:
                 SHARED.error(self.tr("Failed to create a new example project."), exc=exc)
                 return False
@@ -601,3 +593,22 @@ class ProjectBuilder:
             return False
 
         return True
+
+    def _resetProject(self, path: Path, data: dict) -> None:
+        """Open a project and reset/update its settings."""
+        project = NWProject()
+        project.openProject(path)
+        project.data.setUuid("")  # Creates a fresh uuid
+        if name := data.get("name", ""):
+            project.data.setName(name)
+        if author := data.get("author", ""):
+            project.data.setAuthor(author)
+        project.data.setSpellCheck(True)
+        project.data.setSpellLang(None)
+        project.data.setDoBackup(True)
+        project.data.setSaveCount(0)
+        project.data.setAutoCount(0)
+        project.data.setEditTime(0)
+        project.saveProject()
+        project.closeProject()
+        return