PyPI - novelWriter - Versions diffs - 2.2.1__py3-none-any.whl → 2.3b1__py3-none-any.whl - Mend

novelWriter 2.2.1py3-none-any.whl → 2.3b1py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (110) hide show

{novelWriter-2.2.1.dist-info → novelWriter-2.3b1.dist-info}/METADATA +1 -1
{novelWriter-2.2.1.dist-info → novelWriter-2.3b1.dist-info}/RECORD +102 -92
novelwriter/__init__.py +4 -4
novelwriter/assets/icons/typicons_dark/icons.conf +6 -0
novelwriter/assets/icons/typicons_dark/mixed_import.svg +5 -0
novelwriter/assets/icons/typicons_dark/typ_document-add-col.svg +8 -0
novelwriter/assets/icons/typicons_dark/typ_document-add.svg +4 -0
novelwriter/assets/icons/typicons_dark/typ_document.svg +4 -0
novelwriter/assets/icons/typicons_dark/typ_th-dot-more.svg +4 -0
novelwriter/assets/icons/typicons_light/icons.conf +6 -0
novelwriter/assets/icons/typicons_light/mixed_import.svg +5 -0
novelwriter/assets/icons/typicons_light/typ_document-add-col.svg +8 -0
novelwriter/assets/icons/typicons_light/typ_document-add.svg +4 -0
novelwriter/assets/icons/typicons_light/typ_document.svg +4 -0
novelwriter/assets/icons/typicons_light/typ_th-dot-more.svg +4 -0
novelwriter/assets/images/novelwriter-text-dark.svg +4 -0
novelwriter/assets/images/novelwriter-text-light.svg +4 -0
novelwriter/assets/images/welcome-dark.jpg +0 -0
novelwriter/assets/images/welcome-light.jpg +0 -0
novelwriter/assets/manual.pdf +0 -0
novelwriter/assets/sample.zip +0 -0
novelwriter/assets/syntax/default_dark.conf +1 -0
novelwriter/assets/syntax/default_light.conf +1 -0
novelwriter/assets/syntax/grey_dark.conf +1 -0
novelwriter/assets/syntax/grey_light.conf +1 -0
novelwriter/assets/syntax/light_owl.conf +1 -0
novelwriter/assets/syntax/night_owl.conf +1 -0
novelwriter/assets/syntax/solarized_dark.conf +1 -0
novelwriter/assets/syntax/solarized_light.conf +1 -0
novelwriter/assets/syntax/tomorrow.conf +1 -0
novelwriter/assets/syntax/tomorrow_night.conf +1 -0
novelwriter/assets/syntax/tomorrow_night_blue.conf +1 -0
novelwriter/assets/syntax/tomorrow_night_bright.conf +1 -0
novelwriter/assets/syntax/tomorrow_night_eighties.conf +1 -0
novelwriter/assets/text/credits_en.htm +4 -2
novelwriter/assets/themes/default_dark.conf +2 -2
novelwriter/assets/themes/default_light.conf +2 -2
novelwriter/common.py +48 -37
novelwriter/config.py +36 -41
novelwriter/constants.py +38 -16
novelwriter/core/buildsettings.py +7 -7
novelwriter/core/coretools.py +192 -154
novelwriter/core/docbuild.py +6 -3
novelwriter/core/document.py +6 -6
novelwriter/core/index.py +89 -56
novelwriter/core/item.py +21 -3
novelwriter/core/options.py +8 -7
novelwriter/core/project.py +69 -44
novelwriter/core/projectdata.py +1 -14
novelwriter/core/projectxml.py +13 -41
novelwriter/core/sessions.py +2 -1
novelwriter/core/spellcheck.py +2 -1
novelwriter/core/status.py +2 -1
novelwriter/core/storage.py +178 -140
novelwriter/core/tohtml.py +4 -2
novelwriter/core/tokenizer.py +73 -45
novelwriter/core/toodt.py +40 -30
novelwriter/core/tree.py +3 -2
novelwriter/dialogs/about.py +70 -160
novelwriter/dialogs/docmerge.py +6 -5
novelwriter/dialogs/docsplit.py +6 -6
novelwriter/dialogs/editlabel.py +1 -1
novelwriter/dialogs/preferences.py +553 -703
novelwriter/dialogs/{projsettings.py → projectsettings.py} +288 -262
novelwriter/dialogs/quotes.py +27 -23
novelwriter/dialogs/wordlist.py +96 -40
novelwriter/enum.py +20 -18
novelwriter/error.py +1 -1
novelwriter/extensions/circularprogress.py +11 -11
novelwriter/extensions/configlayout.py +185 -134
novelwriter/extensions/modified.py +81 -0
novelwriter/extensions/novelselector.py +26 -12
novelwriter/extensions/pagedsidebar.py +14 -16
novelwriter/extensions/simpleprogress.py +5 -5
novelwriter/extensions/statusled.py +8 -8
novelwriter/extensions/switch.py +31 -63
novelwriter/extensions/switchbox.py +1 -1
novelwriter/extensions/versioninfo.py +153 -0
novelwriter/gui/doceditor.py +178 -150
novelwriter/gui/dochighlight.py +63 -92
novelwriter/gui/docviewer.py +49 -51
novelwriter/gui/docviewerpanel.py +72 -24
novelwriter/gui/itemdetails.py +7 -7
novelwriter/gui/mainmenu.py +14 -18
novelwriter/gui/noveltree.py +9 -8
novelwriter/gui/outline.py +98 -75
novelwriter/gui/projtree.py +188 -61
novelwriter/gui/sidebar.py +3 -4
novelwriter/gui/statusbar.py +3 -4
novelwriter/gui/theme.py +60 -68
novelwriter/guimain.py +49 -156
novelwriter/shared.py +15 -1
novelwriter/tools/dictionaries.py +5 -6
novelwriter/tools/manuscript.py +6 -6
novelwriter/tools/manussettings.py +192 -221
novelwriter/tools/noveldetails.py +525 -0
novelwriter/tools/welcome.py +802 -0
novelwriter/tools/writingstats.py +9 -9
novelwriter/assets/images/wizard-back.jpg +0 -0
novelwriter/assets/text/gplv3_en.htm +0 -641
novelwriter/assets/text/release_notes.htm +0 -60
novelwriter/dialogs/projdetails.py +0 -518
novelwriter/dialogs/projload.py +0 -294
novelwriter/dialogs/updates.py +0 -172
novelwriter/extensions/pageddialog.py +0 -130
novelwriter/tools/projwizard.py +0 -478
{novelWriter-2.2.1.dist-info → novelWriter-2.3b1.dist-info}/LICENSE.md +0 -0
{novelWriter-2.2.1.dist-info → novelWriter-2.3b1.dist-info}/WHEEL +0 -0
{novelWriter-2.2.1.dist-info → novelWriter-2.3b1.dist-info}/entry_points.txt +0 -0
{novelWriter-2.2.1.dist-info → novelWriter-2.3b1.dist-info}/top_level.txt +0 -0

novelwriter/assets/syntax/solarized_light.conf CHANGED Viewed

@@ -20,6 +20,7 @@ hidden         =  88, 110, 117
 shortcode      =  88, 110, 117
 keyword        = 133, 153,   0
 value          = 203,  75,  22
+optional       =  88, 110, 117
 spellcheckline = 203,  75,  22
 errorline      = 220,  50,  47
 replacetag     = 133, 153,   0

novelwriter/assets/syntax/tomorrow.conf CHANGED Viewed

@@ -40,6 +40,7 @@ hidden         = 142, 144, 140
 shortcode      =  66, 113, 174
 keyword        = 240,  40,  41
 value          = 137,  89, 168
+optional       =  66, 113, 174
 spellcheckline = 240,  40,  41
 errorline      = 113, 140,   0
 replacetag     =  62, 153, 159

novelwriter/assets/syntax/tomorrow_night.conf CHANGED Viewed

@@ -40,6 +40,7 @@ hidden         = 150, 152, 150
 shortcode      = 129, 162, 190
 keyword        = 204, 102, 102
 value          = 178, 148, 187
+optional       = 129, 162, 190
 spellcheckline = 204, 102, 102
 errorline      = 181, 189, 104
 replacetag     = 138, 190, 183

novelwriter/assets/syntax/tomorrow_night_blue.conf CHANGED Viewed

@@ -40,6 +40,7 @@ hidden         = 114, 133, 183
 shortcode      = 187, 218, 255
 keyword        = 255, 157, 164
 value          = 235, 187, 255
+optional       = 187, 218, 255
 spellcheckline = 255, 157, 164
 errorline      = 209, 241, 169
 replacetag     = 153, 255, 255

novelwriter/assets/syntax/tomorrow_night_bright.conf CHANGED Viewed

@@ -40,6 +40,7 @@ hidden         = 150, 152, 150
 shortcode      = 122, 166, 218
 keyword        = 213,  78,  83
 value          = 195, 151, 216
+optional       = 122, 166, 218
 spellcheckline = 213,  78,  83
 errorline      = 185, 202,  74
 replacetag     = 112, 192, 177

novelwriter/assets/syntax/tomorrow_night_eighties.conf CHANGED Viewed

@@ -40,6 +40,7 @@ hidden         = 153, 153, 153
 shortcode      = 102, 153, 204
 keyword        = 242, 119, 122
 value          = 204, 153, 204
+optional       = 102, 153, 204
 spellcheckline = 242, 119, 122
 errorline      = 153, 204, 153
 replacetag     = 102, 204, 204

novelwriter/assets/text/credits_en.htm CHANGED Viewed

@@ -2,8 +2,6 @@
 <html>
 <body>
-<h2>Credits</h2>
 <h3>Main Developer</h3>
 <p>Veronica Berglyd Olsen (<a href="https://github.com/vkbo">@vkbo</a>)</p>
@@ -17,6 +15,10 @@
 <p>For other contributions, see the project's
 <a href="https://github.com/vkbo/novelWriter/graphs/contributors">Contributors</a> page.</p>
+<h3>Artwork</h3>
+<p>The artwork on the Welcome dialog was created by <a href="https://louisdurrant.art">Louis Durrant</a>.</p>
 <h3>Translations</h3>
 <p>The default language is English (UK) with English (US) as an option. These are the original

novelwriter/assets/themes/default_dark.conf CHANGED Viewed

@@ -21,8 +21,8 @@ buttontext      = 204, 204, 204
 brighttext      =  62,  62,  62
 highlight       =  44, 152, 247
 highlightedtext = 255, 255, 255
-link            =  44, 152, 247
-linkvisited     =  44, 152, 247
+link            = 102, 153, 204
+linkvisited     = 102, 153, 204
 [GUI]
 helptext        = 164, 164, 164

novelwriter/assets/themes/default_light.conf CHANGED Viewed

@@ -21,8 +21,8 @@ buttontext      =   0,   0,   0
 brighttext      = 255, 255, 255
 highlight       =  48, 135, 198
 highlightedtext = 255, 255, 255
-link            =   0,  84, 255
-linkvisited     =   0,  84, 255
+link            =  66, 113, 174
+linkvisited     =  66, 113, 174
 [GUI]
 helptext        =  92,  92,  92

novelwriter/common.py CHANGED Viewed

@@ -29,7 +29,7 @@ import logging
 import unicodedata
 import xml.etree.ElementTree as ET
-from typing import Any, Literal
+from typing import TYPE_CHECKING, Any, Literal
 from pathlib import Path
 from datetime import datetime
 from configparser import ConfigParser
@@ -41,7 +41,10 @@ from PyQt5.QtCore import QCoreApplication, QUrl
 from novelwriter.enum import nwItemClass, nwItemType, nwItemLayout
 from novelwriter.error import logException
-from novelwriter.constants import nwConst, nwUnicode
+from novelwriter.constants import nwConst, nwLabels, nwUnicode, trConst
+if TYPE_CHECKING:  # pragma: no cover
+    from typing import TypeGuard  # Requires Python 3.10
 logger = logging.getLogger(__name__)
@@ -104,15 +107,6 @@ def checkBool(value: Any, default: bool) -> bool:
     return default
-def checkHandle(value, default, allowNone=False):
-    """Check if a value is a handle."""
-    if allowNone and (value is None or value == "None"):
-        return None
-    if isHandle(value):
-        return str(value)
-    return default
 def checkUuid(value: Any, default: str) -> str:
     """Try to process a value as an UUID, or return a default."""
     try:
@@ -135,7 +129,7 @@ def checkPath(value: Any, default: Path) -> Path:
 #  Validator Functions
 ##
-def isHandle(value: Any) -> bool:
+def isHandle(value: Any) -> TypeGuard[str]:
     """Check if a string is a valid novelWriter handle.
     Note: This is case sensitive. Must be lower case!
     """
@@ -149,7 +143,7 @@ def isHandle(value: Any) -> bool:
     return True
-def isTitleTag(value: Any) -> bool:
+def isTitleTag(value: Any) -> TypeGuard[str]:
     """Check if a string is a valid title tag string."""
     if not isinstance(value, str):
         return False
@@ -163,19 +157,19 @@ def isTitleTag(value: Any) -> bool:
     return True
-def isItemClass(value: str) -> bool:
+def isItemClass(value: Any) -> TypeGuard[str]:
     """Check if a string is a valid nwItemClass identifier."""
-    return value in nwItemClass.__members__
+    return isinstance(value, str) and value in nwItemClass.__members__
-def isItemType(value: str) -> bool:
+def isItemType(value: Any) -> TypeGuard[str]:
     """Check if a string is a valid nwItemType identifier."""
-    return value in nwItemType.__members__
+    return isinstance(value, str) and value in nwItemType.__members__
-def isItemLayout(value: str) -> bool:
+def isItemLayout(value: Any) -> TypeGuard[str]:
     """Check if a string is a valid nwItemLayout identifier."""
-    return value in nwItemLayout.__members__
+    return isinstance(value, str) and value in nwItemLayout.__members__
 def hexToInt(value: Any, default: int = 0) -> int:
@@ -189,8 +183,7 @@ def hexToInt(value: Any, default: int = 0) -> int:
 def minmax(value: int, minVal: int, maxVal: int) -> int:
-    """Make sure an integer is between min and max value (inclusive).
-    """
+    """Check that an value is between min and max value (inclusive)."""
     return min(maxVal, max(minVal, value))
@@ -213,17 +206,17 @@ def formatInt(value: int) -> str:
     if not isinstance(value, int):
         return "ERR"
-    theVal = float(value)
-    if theVal > 1000.0:
+    fVal = float(value)
+    if fVal > 1000.0:
         for pF in ["k", "M", "G", "T", "P", "E"]:
-            theVal /= 1000.0
-            if theVal < 1000.0:
-                if theVal < 10.0:
-                    return f"{theVal:4.2f}{nwUnicode.U_THSP}{pF}"
-                elif theVal < 100.0:
-                    return f"{theVal:4.1f}{nwUnicode.U_THSP}{pF}"
+            fVal /= 1000.0
+            if fVal < 1000.0:
+                if fVal < 10.0:
+                    return f"{fVal:4.2f}{nwUnicode.U_THSP}{pF}"
+                elif fVal < 100.0:
+                    return f"{fVal:4.1f}{nwUnicode.U_THSP}{pF}"
                 else:
-                    return f"{theVal:3.0f}{nwUnicode.U_THSP}{pF}"
+                    return f"{fVal:3.0f}{nwUnicode.U_THSP}{pF}"
     return str(value)
@@ -250,6 +243,24 @@ def formatTime(t: int) -> str:
     return "ERROR"
+def formatVersion(value: str) -> str:
+    """Format a version number into a more human readable form."""
+    return value.lower().replace("a", " Alpha ").replace("b", " Beta ").replace("rc", " RC ")
+def formatFileFilter(extensions: list[str | tuple[str, str]]) -> str:
+    """Format a list of extensions, or extension + label pairs into a
+    QFileDialog extensions filter.
+    """
+    result = []
+    for ext in extensions:
+        if isinstance(ext, str):
+            result.append(f"{trConst(nwLabels.FILE_FILTERS.get(ext))} ({ext})")
+        elif isinstance(ext, tuple) and len(ext) == 2:
+            result.append(f"{ext[0]} ({ext[1]})")
+    return ";;".join(result)
 ##
 #  String Functions
 ##
@@ -270,22 +281,22 @@ def transferCase(source: str, target: str) -> str:
     """Transfers the case of the source word to the target word. This
     will consider all upper or lower, and first char capitalisation.
     """
-    theResult = target
+    result = target
     if not isinstance(source, str) or not isinstance(target, str):
-        return theResult
+        return result
     if len(target) < 1 or len(source) < 1:
-        return theResult
+        return result
     if source.istitle():
-        theResult = target.title()
+        result = target.title()
     if source.isupper():
-        theResult = target.upper()
+        result = target.upper()
     elif source.islower():
-        theResult = target.lower()
+        result = target.lower()
-    return theResult
+    return result
 def fuzzyTime(seconds: int) -> str:

novelwriter/config.py CHANGED Viewed

@@ -110,8 +110,8 @@ class Config:
         # Size Settings
         self._mainWinSize  = [1200, 650]     # Last size of the main GUI window
+        self._welcomeSize  = [800, 550]      # Last size of the welcome window
         self._prefsWinSize = [700, 615]      # Last size of the Preferences dialog
-        self._projLoadCols = [280, 60, 160]  # Last columns widths of the Project Load dialog
         self._mainPanePos  = [300, 800]      # Last position of the main window splitter
         self._viewPanePos  = [500, 150]      # Last position of the document viewer splitter
         self._outlnPanePos = [500, 150]      # Last position of the outline panel splitter
@@ -150,9 +150,6 @@ class Config:
         self.autoScrollPos   = 30     # Start point for typewriter-like scrolling
         self.scrollPastEnd   = True   # Scroll past end of document, and centre cursor
-        self.wordCountTimer  = 5.0    # Interval for word count update in seconds
-        self.incNotesWCount  = True   # The status bar word count includes notes
         self.highlightQuotes = True   # Highlight text in quotes
         self.allowOpenSQuote = False  # Allow open-ended single quotes
         self.allowOpenDQuote = True   # Allow open-ended double quotes
@@ -160,6 +157,7 @@ class Config:
         self.stopWhenIdle    = True   # Stop the status bar clock when the user is idle
         self.userIdleTime    = 300    # Time of inactivity to consider user idle
+        self.incNotesWCount  = True   # The status bar word count includes notes
         # User-Selected Symbol Settings
         self.fmtApostrophe   = nwUnicode.U_RSQUO
@@ -250,12 +248,12 @@ class Config:
         return [int(x*self.guiScale) for x in self._mainWinSize]
     @property
-    def preferencesWinSize(self) -> list[int]:
-        return [int(x*self.guiScale) for x in self._prefsWinSize]
+    def welcomeWinSize(self) -> list[int]:
+        return [int(x*self.guiScale) for x in self._welcomeSize]
     @property
-    def projLoadColWidths(self) -> list[int]:
-        return [int(x*self.guiScale) for x in self._projLoadCols]
+    def preferencesWinSize(self) -> list[int]:
+        return [int(x*self.guiScale) for x in self._prefsWinSize]
     @property
     def mainPanePos(self) -> list[int]:
@@ -306,17 +304,18 @@ class Config:
             self._mainWinSize[1] = height
         return
+    def setWelcomeWinSize(self, width: int, height: int) -> None:
+        """Set the size of the Preferences dialog window."""
+        self._welcomeSize[0] = int(width/self.guiScale)
+        self._welcomeSize[1] = int(height/self.guiScale)
+        return
     def setPreferencesWinSize(self, width: int, height: int) -> None:
         """Set the size of the Preferences dialog window."""
         self._prefsWinSize[0] = int(width/self.guiScale)
         self._prefsWinSize[1] = int(height/self.guiScale)
         return
-    def setProjLoadColWidths(self, widths: list[int]) -> None:
-        """Set the column widths of the Load Project dialog."""
-        self._projLoadCols = [int(x/self.guiScale) for x in widths]
-        return
     def setMainPanePos(self, pos: list[int]) -> None:
         """Set the position of the main GUI splitter."""
         self._mainPanePos = [int(x/self.guiScale) for x in pos]
@@ -410,10 +409,10 @@ class Config:
         """Compile and return error messages from the initialisation of
         the Config class, and clear the error buffer.
         """
-        errMessage = "<br>".join(self._errData)
+        message = "<br>".join(self._errData)
         self._hasError = False
         self._errData = []
-        return errMessage
+        return message
     def listLanguages(self, lngSet: int) -> list[tuple[str, str]]:
         """List localisation files in the i18n folder. The default GUI
@@ -545,8 +544,8 @@ class Config:
         # Sizes
         sec = "Sizes"
         self._mainWinSize  = conf.rdIntList(sec, "mainwindow", self._mainWinSize)
+        self._welcomeSize  = conf.rdIntList(sec, "welcome", self._welcomeSize)
         self._prefsWinSize = conf.rdIntList(sec, "preferences", self._prefsWinSize)
-        self._projLoadCols = conf.rdIntList(sec, "projloadcols", self._projLoadCols)
         self._mainPanePos  = conf.rdIntList(sec, "mainpane", self._mainPanePos)
         self._viewPanePos  = conf.rdIntList(sec, "viewpane", self._viewPanePos)
         self._outlnPanePos = conf.rdIntList(sec, "outlinepane", self._outlnPanePos)
@@ -590,7 +589,6 @@ class Config:
         self.showTabsNSpaces = conf.rdBool(sec, "showtabsnspaces", self.showTabsNSpaces)
         self.showLineEndings = conf.rdBool(sec, "showlineendings", self.showLineEndings)
         self.showMultiSpaces = conf.rdBool(sec, "showmultispaces", self.showMultiSpaces)
-        self.wordCountTimer  = conf.rdFlt(sec, "wordcounttimer", self.wordCountTimer)
         self.incNotesWCount  = conf.rdBool(sec, "incnoteswcount", self.incNotesWCount)
         self.showFullPath    = conf.rdBool(sec, "showfullpath", self.showFullPath)
         self.highlightQuotes = conf.rdBool(sec, "highlightquotes", self.highlightQuotes)
@@ -635,7 +633,7 @@ class Config:
         conf = NWConfigParser()
         conf["Meta"] = {
-            "timestamp":    formatTimeStamp(time()),
+            "timestamp": formatTimeStamp(time()),
         }
         conf["Main"] = {
@@ -651,12 +649,12 @@ class Config:
         }
         conf["Sizes"] = {
-            "mainwindow":   self._packList(self._mainWinSize),
-            "preferences":  self._packList(self._prefsWinSize),
-            "projloadcols": self._packList(self._projLoadCols),
-            "mainpane":     self._packList(self._mainPanePos),
-            "viewpane":     self._packList(self._viewPanePos),
-            "outlinepane":  self._packList(self._outlnPanePos),
+            "mainwindow":  self._packList(self._mainWinSize),
+            "welcome":     self._packList(self._welcomeSize),
+            "preferences": self._packList(self._prefsWinSize),
+            "mainpane":    self._packList(self._mainPanePos),
+            "viewpane":    self._packList(self._viewPanePos),
+            "outlinepane": self._packList(self._outlnPanePos),
         }
         conf["Project"] = {
@@ -697,7 +695,6 @@ class Config:
             "showtabsnspaces": str(self.showTabsNSpaces),
             "showlineendings": str(self.showLineEndings),
             "showmultispaces": str(self.showMultiSpaces),
-            "wordcounttimer":  str(self.wordCountTimer),
             "incnoteswcount":  str(self.incNotesWCount),
             "showfullpath":    str(self.showFullPath),
             "highlightquotes": str(self.highlightQuotes),
@@ -774,22 +771,20 @@ class RecentProjects:
         self._data = {}
         cacheFile = self._conf.dataPath(nwFiles.RECENT_FILE)
-        if not cacheFile.is_file():
-            return True
-        try:
-            with open(cacheFile, mode="r", encoding="utf-8") as inFile:
-                theData = json.load(inFile)
-            for projPath, theEntry in theData.items():
-                self._data[projPath] = {
-                    "title": theEntry.get("title", ""),
-                    "words": theEntry.get("words", 0),
-                    "time": theEntry.get("time", 0),
-                }
-        except Exception:
-            logger.error("Could not load recent project cache")
-            logException()
-            return False
+        if cacheFile.is_file():
+            try:
+                with open(cacheFile, mode="r", encoding="utf-8") as inFile:
+                    data = json.load(inFile)
+                for path, entry in data.items():
+                    self._data[path] = {
+                        "title": entry.get("title", ""),
+                        "words": entry.get("words", 0),
+                        "time": entry.get("time", 0),
+                    }
+            except Exception:
+                logger.error("Could not load recent project cache")
+                logException()
+                return False
         return True

novelwriter/constants.py CHANGED Viewed

@@ -43,12 +43,12 @@ class nwConst:
     FMT_DSTAMP = "%Y-%m-%d"           # Date only format
     # URLs
-    URL_WEB     = "https://novelwriter.io"
-    URL_DOCS    = "https://docs.novelwriter.io"
-    URL_CODE    = "https://github.com/vkbo/novelWriter"
-    URL_REPORT  = "https://github.com/vkbo/novelWriter/issues"
-    URL_HELP    = "https://github.com/vkbo/novelWriter/discussions"
-    URL_RELEASE = "https://github.com/vkbo/novelWriter/releases/latest"
+    URL_WEB      = "https://novelwriter.io"
+    URL_DOCS     = "https://docs.novelwriter.io"
+    URL_RELEASES = "https://releases.novelwriter.io"
+    URL_CODE     = "https://github.com/vkbo/novelWriter"
+    URL_REPORT   = "https://github.com/vkbo/novelWriter/issues"
+    URL_HELP     = "https://github.com/vkbo/novelWriter/discussions"
     # Requests
     USER_AGENT = "Mozilla/5.0 (compatible; novelWriter (Python))"
@@ -56,6 +56,9 @@ class nwConst:
     # Gui Settings
     STATUS_MSG_TIMEOUT = 15000  # milliseconds
+    # Dialogs
+    DLG_FINISHED = 2
 # END Class nwConst
@@ -107,7 +110,6 @@ class nwFiles:
     # Project Root Files
     PROJ_FILE   = "nwProject.nwx"
-    PROJ_BACKUP = "nwProject.bak"
     PROJ_LOCK   = "nwProject.lock"
     TOC_TXT     = "ToC.txt"
@@ -184,6 +186,7 @@ class nwLabels:
         nwItemClass.ENTITY:    QT_TRANSLATE_NOOP("Constant", "Entities"),
         nwItemClass.CUSTOM:    QT_TRANSLATE_NOOP("Constant", "Custom"),
         nwItemClass.ARCHIVE:   QT_TRANSLATE_NOOP("Constant", "Archive"),
+        nwItemClass.TEMPLATE:  QT_TRANSLATE_NOOP("Constant", "Templates"),
         nwItemClass.TRASH:     QT_TRANSLATE_NOOP("Constant", "Trash"),
     }
     CLASS_ICON = {
@@ -197,6 +200,7 @@ class nwLabels:
         nwItemClass.ENTITY:    "cls_entity",
         nwItemClass.CUSTOM:    "cls_custom",
         nwItemClass.ARCHIVE:   "cls_archive",
+        nwItemClass.TEMPLATE:  "cls_template",
         nwItemClass.TRASH:     "cls_trash",
     }
     LAYOUT_NAME = {
@@ -266,6 +270,13 @@ class nwLabels:
         nwBuildFmt.J_HTML: ".json",
         nwBuildFmt.J_NWD:  ".json",
     }
+    FILE_FILTERS = {
+        "*.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 = {
         "mm": QT_TRANSLATE_NOOP("Constant", "Millimetres"),
         "cm": QT_TRANSLATE_NOOP("Constant", "Centimetres"),
@@ -298,16 +309,27 @@ class nwLabels:
 class nwHeadFmt:
-    BR      = "{BR}"
-    TITLE   = "{Title}"
-    CH_NUM  = "{Chapter}"
-    CH_WORD = "{Chapter:Word}"
-    CH_ROMU = "{Chapter:URoman}"
-    CH_ROML = "{Chapter:LRoman}"
-    SC_NUM  = "{Scene}"
-    SC_ABS  = "{Scene:Abs}"
+    BR         = "{BR}"
+    TITLE      = "{Title}"
+    CH_NUM     = "{Chapter}"
+    CH_WORD    = "{Chapter:Word}"
+    CH_ROMU    = "{Chapter:URoman}"
+    CH_ROML    = "{Chapter:LRoman}"
+    SC_NUM     = "{Scene}"
+    SC_ABS     = "{Scene:Abs}"
+    CHAR_POV   = "{Char:POV}"
+    CHAR_FOCUS = "{Char:Focus}"
+    PAGE_HEADERS = [
+        TITLE, CH_NUM, CH_WORD, CH_ROMU, CH_ROML, SC_NUM, SC_ABS,
+        CHAR_POV, CHAR_FOCUS
+    ]
-    ALL = [TITLE, CH_NUM, CH_WORD, CH_ROMU, CH_ROML, SC_NUM, SC_ABS]
+    # ODT Document Page Header
+    ODT_PROJECT = "{Project}"
+    ODT_AUTHOR = "{Author}"
+    ODT_PAGE = "{Page}"
+    ODT_AUTO = "{Project} / {Author} / {Page}"
 # END Class nwHeadFmt

novelwriter/core/buildsettings.py CHANGED Viewed

@@ -29,8 +29,8 @@ import uuid
 import logging
 from enum import Enum
-from typing import Iterable
 from pathlib import Path
+from collections.abc import Iterable
 from PyQt5.QtCore import QT_TRANSLATE_NOOP, QCoreApplication
@@ -79,6 +79,8 @@ SETTINGS_TEMPLATE = {
     "format.leftMargin":      (float, 2.0),
     "format.rightMargin":     (float, 2.0),
     "odt.addColours":         (bool, True),
+    "odt.pageHeader":         (str, nwHeadFmt.ODT_AUTO),
+    "odt.pageCountOffset":    (int, 0),
     "html.addStyles":         (bool, True),
 }
@@ -125,6 +127,8 @@ SETTINGS_LABELS = {
     "odt":                    QT_TRANSLATE_NOOP("Builds", "Open Document (.odt)"),
     "odt.addColours":         QT_TRANSLATE_NOOP("Builds", "Add Highlight Colours"),
+    "odt.pageHeader":         QT_TRANSLATE_NOOP("Builds", "Page Header"),
+    "odt.pageCountOffset":    QT_TRANSLATE_NOOP("Builds", "Page Counter Offset"),
     "html":                   QT_TRANSLATE_NOOP("Builds", "HTML (.html)"),
     "html.addStyles":         QT_TRANSLATE_NOOP("Builds", "Add CSS Styles"),
@@ -235,16 +239,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])
-        if isinstance(value, (int, float)):
-            return int(value)
-        return 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])
-        if isinstance(value, (int, float)):
-            return float(value)
-        return 0.0
+        return float(value) if isinstance(value, (int, float)) else 0.0
     ##
     #  Setters

novelWriter 2.2.1__py3-none-any.whl → 2.3b1__py3-none-any.whl

novelWriter 2.2.1py3-none-any.whl → 2.3b1py3-none-any.whl