novelWriter 2.7.4__py3-none-any.whl → 2.8b1__py3-none-any.whl

novelwriter/assets/themes/waterlily_dark.conf

@@ -0,0 +1,95 @@
+[Main]
+name   = Waterlily Dark
+mode   = dark
+author = Myian
+
+[Base]
+base    = #1e2b33
+default = #d0dee6
+faded   = #7b8e99
+red     = #ff7474
+orange  = #fca469
+yellow  = #f7eaa4
+green   = #9ae37f
+cyan    = #8ef3d1
+blue    = #71caeb
+purple  = #c89dfd
+
+[Project]
+root     = default
+folder   = blue
+file     = purple
+title    = green
+chapter  = yellow
+scene    = #ff9fbd
+note     = faded
+active   = #ff9fbd
+inactive = faded
+disabled = #3e5366
+
+[Icon]
+tool      = default
+sidebar   = default
+accept    = green
+reject    = red
+action    = blue
+altaction = orange
+apply     = green
+create    = yellow
+destroy   = faded
+reset     = green
+add       = green
+change    = green
+remove    = red
+shortcode = default
+markdown  = orange
+systemio  = yellow
+info      = blue
+warning   = orange
+error     = red
+
+[Palette]
+window          = #151f25
+windowtext      = default
+base            = base
+alternatebase   = #3b515f
+text            = default
+tooltipbase     = #ffbad0
+tooltiptext     = base
+button          = base
+buttontext      = default
+brighttext      = base
+highlight       = #87bcc0
+highlightedtext = base
+link            = blue
+linkvisited     = blue
+accent          = #ff9fbd
+
+[GUI]
+helptext  = faded
+fadedtext = faded
+errortext = red
+
+[Syntax]
+background     = base
+text           = default
+line           = #283842
+link           = blue
+headertext     = #e8eef1
+headertag      = faded
+emphasis       = green
+whitespace     = green:64
+dialog         = #ff9fbd
+altdialog      = orange
+note           = blue
+hidden         = faded
+shortcode      = purple
+keyword        = purple
+tag            = yellow
+value          = cyan
+optional       = faded
+spellcheckline = #ff5d5d
+errorline      = #4ae698
+replacetag     = blue
+modifier       = purple
+texthighlight  = blue:64

novelwriter/assets/themes/waterlily_light.conf

@@ -0,0 +1,95 @@
+[Main]
+name   = Waterlily Light
+mode   = light
+author = Myian
+
+[Base]
+base    = #f4fcfb
+default = #435e66
+faded   = #91acab
+red     = #d36868
+orange  = #e08b63
+yellow  = #cab330
+green   = #62a729
+cyan    = #41a594
+blue    = #589dca
+purple  = #bd7fe7
+
+[Project]
+root     = default
+folder   = blue
+file     = purple
+title    = green
+chapter  = yellow
+scene    = #e6859a
+note     = faded
+active   = #da7b8f
+inactive = faded
+disabled = #b6cac7
+
+[Icon]
+tool      = default
+sidebar   = default
+accept    = green
+reject    = red
+action    = blue
+altaction = orange
+apply     = green
+create    = yellow
+destroy   = faded
+reset     = green
+add       = green
+change    = green
+remove    = red
+shortcode = default
+markdown  = orange
+systemio  = yellow
+info      = blue
+warning   = orange
+error     = red
+
+[Palette]
+window          = #e2eeed
+windowtext      = default
+base            = base
+alternatebase   = #c7e0e0
+text            = default
+tooltipbase     = #ffdfe6
+tooltiptext     = #223f47
+button          = base
+buttontext      = default
+brighttext      = base
+highlight       = #4da1af
+highlightedtext = base
+link            = blue
+linkvisited     = blue
+accent          = #e6859a
+
+[GUI]
+helptext  = default:192
+fadedtext = faded
+errortext = red
+
+[Syntax]
+background     = base
+text           = default
+line           = #e2eeed
+link           = #0b9caf
+headertext     = #57757e
+headertag      = #b6cac7
+emphasis       = #1e920e
+whitespace     = #1e920e64
+dialog         = #d15574
+altdialog      = #dd6b37
+note           = #0b9caf
+hidden         = #87a3a0
+shortcode      = #9a54c9
+keyword        = #9a54c9
+tag            = #c9a02e
+value          = #05af77
+optional       = #87a3a0
+spellcheckline = #ff3e3e
+errorline      = #05af77
+replacetag     = #0b9caf
+modifier       = #9a54c9
+texthighlight  = cyan:64

novelwriter/common.py

@@ -20,7 +20,7 @@ General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program. If not, see <https://www.gnu.org/licenses/>.
-"""
+"""  # noqa
 from __future__ import annotations
 
 import json
@@ -31,6 +31,7 @@ import xml.etree.ElementTree as ET
 
 from configparser import ConfigParser
 from datetime import datetime
+from enum import Enum
 from pathlib import Path
 from typing import TYPE_CHECKING, Any, Literal, TypeGuard, TypeVar
 from urllib.parse import urljoin
@@ -134,7 +135,7 @@ def checkPath(value: Any, default: Path) -> Path:
 
 def isHandle(value: Any) -> TypeGuard[str]:
     """Check if a string is a valid novelWriter handle.
-    Note: This is case sensitive. Must be lower case!
+    Note: This is case sensitive. Must be lower case.
     """
     if not isinstance(value, str):
         return False
@@ -218,7 +219,7 @@ def firstFloat(*args: Any) -> float:
 ##
 
 def formatInt(value: int) -> str:
-    """Formats an integer with k, M, G etc."""
+    """Format an integer with k, M, G etc."""
     if not isinstance(value, int):
         return "ERR"
 
@@ -444,6 +445,7 @@ def fontMatcher(font: QFont) -> QFont:
     default Qt font matching algorithm doesn't handle well changing
     application fonts at runtime.
     """
+    font.setStyleName(None)  # Make sure no font style name is set from config, see #2502
     info = QFontInfo(font)
     if (famRequest := font.family()) != (famActual := info.family()):
         logger.warning("Font mismatch: Requested '%s', but got '%s'", famRequest, famActual)
@@ -462,21 +464,21 @@ def fontMatcher(font: QFont) -> QFont:
 
 
 def qtLambda(func: Callable, *args: Any, **kwargs: Any) -> Callable:
-    """A replacement for Python lambdas that works for Qt slots."""
+    """A replacement for Python lambdas that works for Qt slots."""  # noqa: D401
     def wrapper(*a_: Any) -> None:
         func(*args, **kwargs)
     return wrapper
 
 
 def qtAddAction(parent: QWidget, label: str) -> QAction:
-    """Helper to add action to widget and always return the action."""
+    """Helper to add action to widget and always return the action."""  # noqa: D401
     action = QAction(label, parent)
     parent.addAction(action)
     return action
 
 
 def qtAddMenu(parent: QMenuBar | QMenu, label: str) -> QMenu:
-    """Helper to add menu to menu and always return the menu."""
+    """Helper to add menu to menu and always return the menu."""  # noqa: D401
     menu = QMenu(label, parent)
     parent.addMenu(menu)
     return menu
@@ -485,7 +487,6 @@ def qtAddMenu(parent: QMenuBar | QMenu, label: str) -> QMenu:
 def encodeMimeHandles(mimeData: QMimeData, handles: list[str]) -> None:
     """Encode handles into a mime data object."""
     mimeData.setData(nwConst.MIME_HANDLE, b"|".join(h.encode() for h in handles))
-    return
 
 
 def decodeMimeHandles(mimeData: QMimeData) -> list[str]:
@@ -493,6 +494,21 @@ def decodeMimeHandles(mimeData: QMimeData) -> list[str]:
     return mimeData.data(nwConst.MIME_HANDLE).data().decode().split("|")
 
 
+def utf16CharMap(text: str) -> list[int]:
+    """Compute mapping from Python string index to QString index.
+    Python strings are always one character per position in either
+    ASCII, UCS-2 or UCS-4. QStrings are in UTF-16, so wide characters
+    use 2 indices, and thus create an offset.
+    """
+    utf16Map = list(range(0, len(text) + 1))
+    offset = 0
+    for i, c in enumerate(text, 1):
+        if ord(c) > 0xffff:
+            offset += 1
+        utf16Map[i] = i + offset
+    return utf16Map
+
+
 ##
 #  Encoder Functions
 ##
@@ -519,7 +535,7 @@ def jsonEncode(data: dict | list | tuple, n: int = 0, nmax: int = 0) -> str:
         elif first in ("{", "["):
             n += 1
             indent = "\n"+"  "*n
-            if n > nmax and nmax > 0:
+            if n > nmax > 0:
                 buffer.append(chunk)
             else:
                 buffer.append(chunk[0] + indent + chunk[1:])
@@ -527,13 +543,13 @@ def jsonEncode(data: dict | list | tuple, n: int = 0, nmax: int = 0) -> str:
         elif first in ("}", "]"):
             n -= 1
             indent = "\n"+"  "*n
-            if n >= nmax and nmax > 0:
+            if n >= nmax > 0:
                 buffer.append(chunk)
             else:
                 buffer.append(indent + chunk)
 
         elif first == ",":
-            if n > nmax and nmax > 0:
+            if n > nmax > 0:
                 buffer.append(chunk)
             else:
                 buffer.append(chunk[0] + indent + chunk[1:].lstrip())
@@ -544,6 +560,12 @@ def jsonEncode(data: dict | list | tuple, n: int = 0, nmax: int = 0) -> str:
     return "".join(buffer)
 
 
+def jsonCombine(data: dict[str, str]) -> str:
+    """Combine multiple already packed JSON strings."""
+    payload = ",\n".join(f'  "{k}": {v}' for k, v in data.items())
+    return f"{{\n{payload}\n}}\n"
+
+
 ##
 #  XML Helpers
 ##
@@ -551,7 +573,7 @@ def jsonEncode(data: dict | list | tuple, n: int = 0, nmax: int = 0) -> str:
 def xmlIndent(xml: ET.Element | ET.ElementTree) -> None:
     """A modified version of the XML indent function in the standard
     library. It behaves more closely to how the one from lxml does.
-    """
+    """  # noqa: D401
     tree = xml.getroot() if isinstance(xml, ET.ElementTree) else xml
     if not isinstance(tree, ET.Element):
         return
@@ -581,8 +603,6 @@ def xmlIndent(xml: ET.Element | ET.ElementTree) -> None:
         if last is not None:
             last.tail = indentations[level]
 
-        return
-
     if len(tree):
         indentChildren(tree, 0)
     tree.tail = "\n"
@@ -597,7 +617,7 @@ def xmlElement(
     attrib: dict | None = None,
     tail: str | None = None,
 ) -> ET.Element:
-    """A custom implementation of Element with more arguments."""
+    """A custom implementation of Element with more arguments."""  # noqa: D401
     xSub = ET.Element(tag, attrib=attrib or {})
     if text is not None:
         if isinstance(text, bool):
@@ -617,7 +637,7 @@ def xmlSubElem(
     attrib: dict | None = None,
     tail: str | None = None,
 ) -> ET.Element:
-    """A custom implementation of SubElement with more arguments."""
+    """A custom implementation of SubElement with more arguments."""  # noqa: D401
     xSub = ET.SubElement(parent, tag, attrib=attrib or {})
     if text is not None:
         if isinstance(text, bool):
@@ -648,6 +668,7 @@ def readTextFile(path: str | Path) -> str:
 
 def makeFileNameSafe(text: str) -> str:
     """Return a filename-safe string.
+
     See: https://unicode.org/reports/tr15/#Norm_Forms
     """
     text = unicodedata.normalize("NFKC", text).strip()
@@ -676,8 +697,11 @@ def openExternalPath(path: Path) -> bool:
 #  Classes
 ##
 
+_T_Enum = TypeVar("_T_Enum", bound=Enum)
+
+
 class NWConfigParser(ConfigParser):
-    """Common: Adapted Config Parser
+    """Common: Adapted Config Parser.
 
     This is a subclass of the standard config parser that adds type safe
     helper functions, and support for lists. It also turns off
@@ -686,7 +710,6 @@ class NWConfigParser(ConfigParser):
 
     def __init__(self) -> None:
         super().__init__(interpolation=None)
-        return
 
     def rdStr(self, section: str, option: str, default: str) -> str:
         """Read string value."""
@@ -737,3 +760,10 @@ class NWConfigParser(ConfigParser):
             for i in range(min(len(data), len(result))):
                 result[i] = checkInt(data[i].strip(), result[i])
         return result
+
+    def rdEnum(self, section: str, option: str, default: _T_Enum) -> _T_Enum:
+        """Read enum value."""
+        if self.has_option(section, option):
+            data = self.get(section, option, fallback="")
+            return type(default).__members__.get(data.upper(), default)
+        return default