novelWriter 2.2rc1__py3-none-any.whl → 2.3__py3-none-any.whl

novelwriter/assets/syntax/cyberpunk_night.conf

@@ -0,0 +1,26 @@
+[Main]
+name       = Cyberpunk Night
+author     = Anders Lemvigh
+url        = https://github.com/alemvigh
+license    = CC BY-SA 4.0
+licenseurl = https://creativecommons.org/licenses/by-sa/4.0/
+
+[Syntax]
+background     =   0,   0,   0
+text           = 150, 150, 150
+link           =  77, 077, 255
+headertext     = 255, 255, 255
+headertag      =  50,   0, 180
+emphasis       =   0, 255, 255
+straightquotes =   7,  27, 219
+doublequotes   =   0, 255,   0
+singlequotes   =   0, 140, 255
+hidden         =  77,  77, 100
+shortcode      = 255, 255,   0
+keyword        = 255, 100, 255
+value          = 255, 150,  10
+spellcheckline = 242,  72,  23
+errorline      = 186, 218,   4
+replacetag     =   0,   0, 180
+modifier       = 144, 142, 176
+optional       = 180, 180, 180

novelwriter/assets/syntax/default_dark.conf

@@ -20,6 +20,7 @@ hidden         = 150, 150, 150
 shortcode      =   0, 155, 200
 keyword        = 200,  46,   0
 value          = 184, 200,   0
+optional       =   0, 155, 200
 spellcheckline = 200,  46,   0
 errorline      =  46, 200,   0
 replacetag     =   0, 184,  46

novelwriter/assets/syntax/default_light.conf

@@ -20,6 +20,7 @@ hidden         = 100, 100, 100
 shortcode      =   0, 100,   0
 keyword        = 200,  50,  50
 value          =  50, 150,  50
+optional       =   0, 100,   0
 spellcheckline = 200,   0,   0
 errorline      =   0, 150,   0
 replacetag     =   0, 150,   0

novelwriter/assets/syntax/grey_dark.conf

@@ -20,6 +20,7 @@ hidden         = 150, 150, 150
 shortcode      = 225, 225, 225
 keyword        = 225, 225, 225
 value          = 200, 200, 200
+optional       = 225, 225, 225
 spellcheckline = 200,  46,   0
 errorline      =  46, 200,   0
 replacetag     = 225, 225, 225

novelwriter/assets/syntax/grey_light.conf

@@ -20,6 +20,7 @@ hidden         = 100, 100, 100
 shortcode      =   0,   0,   0
 keyword        =   0,   0,   0
 value          =  20,  20,  20
+optional       =   0,   0,   0
 spellcheckline = 200,   0,   0
 errorline      =   0, 150,   0
 replacetag     =   0,   0,   0

novelwriter/assets/syntax/light_owl.conf

@@ -40,6 +40,7 @@ hidden         = 152, 159, 177
 shortcode      =  40, 142, 215
 keyword        = 222,  61,  58
 value          = 150,  74, 193
+optional       =  40, 142, 215
 spellcheckline = 222,  61,  58
 errorline      =   8, 145, 106
 replacetag     =  42, 162, 152

novelwriter/assets/syntax/night_owl.conf

@@ -40,6 +40,7 @@ hidden         =  99, 119, 119
 shortcode      = 130, 170, 255
 keyword        = 247, 140, 108
 value          = 199, 146, 234
+optional       = 130, 170, 255
 spellcheckline = 247, 140, 108
 errorline      = 173, 219, 103
 replacetag     = 127, 219, 202

novelwriter/assets/syntax/solarized_dark.conf

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

novelwriter/assets/syntax/solarized_light.conf

@@ -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/tango.conf

@@ -0,0 +1,23 @@
+[Main]
+name   = Tango
+author = Veronica Berglyd Olsen (adaptation)
+
+[Syntax]
+background     =  48,  48,  47
+text           = 238, 238, 236
+link           = 115, 159, 207
+headertext     = 115, 159, 207
+headertag      =  52, 101, 164
+emphasis       = 196, 160,   0
+straightquotes = 239,  41,  41
+doublequotes   = 138, 226,  52
+singlequotes   = 252, 233,  79
+hidden         = 143, 143, 141
+shortcode      = 115, 159, 207
+keyword        = 239,  41,  41
+value          = 173, 127, 168
+optional       = 115, 159, 207
+spellcheckline = 239,  41,  41
+errorline      = 138, 226,  52
+replacetag     =  51, 226, 226
+modifier       = 196, 160,   0

novelwriter/assets/syntax/tomorrow.conf

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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/cyberpunk_night.conf

@@ -0,0 +1,29 @@
+[Main]
+name        = Cyberpunk Night
+description = A taste of the future 80s
+author      = Anders Lemvigh
+url         = https://github.com/alemvigh
+license     = CC BY-SA 4.0
+licenseurl  = https://creativecommons.org/licenses/by-sa/4.0/
+icontheme   = typicons_dark
+
+[Palette]
+window          =   0,   0,   0
+windowtext      = 150, 150, 150
+base            =   0,   0,   0
+alternatebase   =  30,  20,  45
+text            = 150, 150, 150
+tooltipbase     =  40,  20,  70
+tooltiptext     = 255, 255, 255
+button          =  5,   0,   10
+buttontext      = 150, 150, 150
+brighttext      = 255, 255, 255
+highlight       =  50,  30,  80
+highlightedtext = 255, 255, 255
+link            =  77,  77, 255
+linkvisited     =  50,   0,  80
+
+[GUI]
+statusnone      =  50,  50,  50
+statussaved     =  77, 255,  77
+statusunsaved   = 255,  77,  77

novelwriter/assets/themes/default_dark.conf

@@ -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

@@ -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

@@ -3,10 +3,10 @@ novelWriter – Common Functions
 ==============================
 
 File History:
-Created: 2019-05-12 [0.1]
+Created: 2019-05-12 [0.1.0]
 
 This file is a part of novelWriter
-Copyright 2018–2023, Veronica Berglyd Olsen
+Copyright 2018–2024, Veronica Berglyd Olsen
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -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
@@ -38,18 +38,20 @@ from urllib.request import pathname2url
 
 from PyQt5.QtGui import QDesktopServices
 from PyQt5.QtCore import QCoreApplication, QUrl
-from PyQt5.QtWidgets import QWidget, qApp
 
 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__)
 
 
-# =============================================================================================== #
+##
 #  Checker Functions
-# =============================================================================================== #
+##
 
 def checkStringNone(value: Any, default: str | None) -> str | None:
     """Check if a variable is a string or a None."""
@@ -105,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:
@@ -132,11 +125,11 @@ def checkPath(value: Any, default: Path) -> Path:
     return default
 
 
-# =============================================================================================== #
+##
 #  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!
     """
@@ -150,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
@@ -164,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:
@@ -190,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))
 
 
@@ -205,26 +197,26 @@ def checkIntTuple(value: int, valid: tuple | list | set, default: int) -> int:
     return default
 
 
-# =============================================================================================== #
+##
 #  Formatting Functions
-# =============================================================================================== #
+##
 
 def formatInt(value: int) -> str:
     """Formats an integer with k, M, G etc."""
     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)
 
@@ -251,9 +243,27 @@ 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
-# =============================================================================================== #
+##
 
 def simplified(text: str) -> str:
     """Take a string and strip leading and trailing whitespaces, and
@@ -271,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:
@@ -372,9 +382,9 @@ def numberToRoman(value: int, toLower: bool = False) -> str:
     return roman.lower() if toLower else roman
 
 
-# =============================================================================================== #
+##
 #  Encoder Functions
-# =============================================================================================== #
+##
 
 def jsonEncode(data: dict | list | tuple, n: int = 0, nmax: int = 0) -> str:
     """Encode a dictionary, list or tuple as a json object or array, and
@@ -464,9 +474,9 @@ def xmlIndent(tree: ET.Element | ET.ElementTree) -> None:
     return
 
 
-# =============================================================================================== #
+##
 #  File and File System Functions
-# =============================================================================================== #
+##
 
 def readTextFile(path: str | Path) -> str:
     """Read the content of a text file in a robust manner."""
@@ -508,21 +518,9 @@ def openExternalPath(path: Path) -> bool:
     return False
 
 
-# =============================================================================================== #
-#  Other Functions
-# =============================================================================================== #
-
-def getGuiItem(objName: str) -> QWidget | None:
-    """Returns a QtWidget based on its objectName."""
-    for qWidget in qApp.topLevelWidgets():
-        if qWidget.objectName() == objName:
-            return qWidget
-    return None
-
-
-# =============================================================================================== #
+##
 #  Classes
-# =============================================================================================== #
+##
 
 class NWConfigParser(ConfigParser):
     """Common: Adapted Config Parser