novelWriter 2.7b1__tar.gz → 2.7rc1__tar.gz

{novelwriter-2.7b1 → novelwriter-2.7rc1}/CHANGELOG.md

@@ -1,5 +1,84 @@
 # novelWriter Changelog
 
+## Version 2.7 RC 1 [2025-05-19]
+
+### Release Notes
+
+This is a release candidate of the next release version, and is intended for testing purposes.
+Please be careful when using this version on live writing projects, and make sure you take frequent
+backups.
+
+### Detailed Changelog
+
+**New Features**
+
+* It is now possible to set character count as the main statistics displayed on the GUI instead of
+  word count. The setting is available under the "Appearance" section in Preferences. Issue #1657.
+  PR #2323.
+* Comments can now be marked as "Manuscript Notes" with the `%Note.term:` syntax. The term is a
+  free form value that is displayed alongside the note when exported to the manuscript. Each term
+  is also added as a column in exports from the Outline View. Issue #1133. PR #2346.
+* A completer drop down menu has been added to comments as well in the editor. It is triggered when
+  a new line starts with `%`. It will show the options of Synopsis, Short, Story and Note, and when
+  a period is added after the latter two, show a list of previously used Story and Note keys.
+  Issue #1784. PR #2290.
+
+**Improvements**
+
+* The dialogue colour of the Snazzy Light syntax theme has changed from yellow to blue, which
+  should make it easier to read. PR #2336.
+* The Snazzy Light theme has also been added as a GUI theme. PR #2334.
+* The auto-generated title page for new projects should now make a little more sense in terms of
+  default values filled in for the author. PR #2333.
+* The new project form on the Welcome dialog now remembers the previous author name filled in, so
+  there should be no need to type it again every time. PR #2333.
+* Project name and author name values are now also used for new example projects. PR #2333.
+* The narrator break symbol settings for dialogue have been changed from a free text field to a
+  dropdown list of dashes. This helps to avoid misunderstandings where the field was populated with
+  other symbols, like quote symbols (see #2320). Issue #2324. PR #2327.
+* A splash screen is now shown at startup, providing some information about the initialisation
+  steps the startup script is running before the GUI is launched. Since loading system fonts can be
+  quote heavy, this at least gives some user feedback to users running on systems where there is a
+  significant delay. In particular, there is a long delay when loading fonts with poor Unicode
+  support, in which case the Qt library will look for replacement glyphs when the symbols are first
+  encountered. Previously, the delay happened when the Welcome dialog was being drawn, since this
+  is the first time a non-Ascii Unicode character is used. Now these Unicode characters are probed
+  when the config is loaded, with progress output on the splash screen. Issue #2315. PR #2316.
+
+**Bugfixes**
+
+* Moving a note between root folders of a different type will now update the class the tags defined
+  within the note are associated with. This association is used to populate the tag auto-completion
+  in the editor. Issue #2330. PR #2343.
+* The story structure comments now appear under the correct column when exported to CSV from the
+  Outline View. Issue #2313. PR #2343.
+* A new unique ID is now assigned to new example projects. Creating multiple example projects would
+  previously retain the original ID, causing the Welcome dialog to override them rather than list
+  them as unique projects. PR #2333.
+* In Qt6, or probably in PyQt6, the datetime type from Python was truncated to a date variable when
+  localising it. This has been fixed by explicitly converting the Python datetime to a QDateTime
+  before passing it to the PyQt wrapper. This is probably a bug in PyQt6. Issue #2325. PR #2326.
+* A missing Remix icon for project copy has been added. Issue #2314. PR #2317.
+
+**Accessibility**
+
+* Trees and lists on the GUI have been assigned names so that screen readers can more easily
+  identify them. Switches on the GUI have also been associated with their labels so the screen
+  reader can pick up the label text. Icons on the project tree also have an accessibility label.
+  Issues #2106 and #2107. PR #2337.
+* Switches should now show a highlighted border when they have focus, and the toggle animation also
+  now works properly when a switch is toggled using the keyboard. This should improve keyboard
+  navigation. PR #2337.
+* The default status and importance labels for new projects now use shapes for icons, to make the
+  defaults more accessible for people with reduced colour vision. Issue #2332. PR #2333.
+
+**Code Improvements**
+
+* New tests have been added for the custom data models, using the Qt model tester framework that
+  ensures the models have all the virtual methods implemented. PR #2331.
+
+----
+
 ## Version 2.7 Beta 1 [2025-04-20]
 
 ### Release Notes
@@ -49,8 +128,7 @@ careful when using this version on live writing projects, and make sure you take
 * The move to Qt6 is complete, and the new minimum requirement is Qt 6.4. Issues #864, #1142,
   #2192, #2193, #2194 and #2195. PRs #2184, #2187, #2190, #2191, #2196, #2204, #2301 and #2306.
 * Support for Python 3.9 has been dropped. Due to the Qt6 change, older distros are no longer
-  supported. The oldest Ubuntu release still supported is 22.04, which comes with Python 3.10.
-  PR #2182.
+  supported. The oldest Ubuntu release still supported is 24.04. PR #2182.
 * The Windows release now uses a custom novelWriter.exe launcher rather than calling the Python exe
   directly with novelWriter.pyw as an argument. This means novelWriter can also be launched from
   its install folder, and desktop shortcuts created directly. It also simplifies the registry
@@ -66,7 +144,7 @@ careful when using this version on live writing projects, and make sure you take
 **Code Improvements**
 
 * The log output now obeys the `NO_COLOR` and `FORCE_COLOR` environment variables. PR #2228.
-* The CI/CD pipeline now runs type checking on the code base using Pyright. Issue #2276. PR #2279.
+* The CI/CD pipeline now runs type checking on the code base using Pyright. PR #2279.
 * The CI/CD pipeline now uses Ruff to check code style and format. PRs #2281, #2282 and #2287.
 * The code base has been updated to conform to new linting rules. PR #2201.
 

{novelwriter-2.7b1 → novelwriter-2.7rc1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: novelWriter
-Version: 2.7b1
+Version: 2.7rc1
 Summary: A markdown-like text editor for planning and writing novels
 Author-email: Veronica Berglyd Olsen <code@vkbo.net>
 License: GNU General Public License v3

{novelwriter-2.7b1 → novelwriter-2.7rc1}/novelWriter.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: novelWriter
-Version: 2.7b1
+Version: 2.7rc1
 Summary: A markdown-like text editor for planning and writing novels
 Author-email: Veronica Berglyd Olsen <code@vkbo.net>
 License: GNU General Public License v3

{novelwriter-2.7b1 → novelwriter-2.7rc1}/novelWriter.egg-info/SOURCES.txt

@@ -19,6 +19,7 @@ novelwriter/enum.py
 novelwriter/error.py
 novelwriter/guimain.py
 novelwriter/shared.py
+novelwriter/splash.py
 novelwriter/types.py
 novelwriter/assets/manual.pdf
 novelwriter/assets/manual_fr.pdf
@@ -67,6 +68,7 @@ novelwriter/assets/icons/x-novelwriter-project.ico
 novelwriter/assets/icons/x-novelwriter-project.svg
 novelwriter/assets/images/novelwriter-text-dark.svg
 novelwriter/assets/images/novelwriter-text-light.svg
+novelwriter/assets/images/splash.png
 novelwriter/assets/images/welcome-dark.jpg
 novelwriter/assets/images/welcome-light.jpg
 novelwriter/assets/syntax/cyberpunk_night.conf
@@ -93,6 +95,7 @@ novelwriter/assets/themes/default.conf
 novelwriter/assets/themes/default_dark.conf
 novelwriter/assets/themes/default_light.conf
 novelwriter/assets/themes/dracula.conf
+novelwriter/assets/themes/snazzy.conf
 novelwriter/assets/themes/solarized_dark.conf
 novelwriter/assets/themes/solarized_light.conf
 novelwriter/core/buildsettings.py

{novelwriter-2.7b1 → novelwriter-2.7rc1}/novelwriter/__init__.py

@@ -35,6 +35,7 @@ from PyQt6.QtWidgets import QApplication, QErrorMessage
 from novelwriter.config import Config
 from novelwriter.error import exceptionHandler
 from novelwriter.shared import SharedData
+from novelwriter.splash import NSplashScreen
 
 if TYPE_CHECKING:
     from novelwriter.guimain import GuiMain
@@ -48,9 +49,9 @@ __license__    = "GPLv3"
 __author__     = "Veronica Berglyd Olsen"
 __maintainer__ = "Veronica Berglyd Olsen"
 __email__      = "code@vkbo.net"
-__version__    = "2.7b1"
-__hexversion__ = "0x020700b1"
-__date__       = "2025-04-20"
+__version__    = "2.7rc1"
+__hexversion__ = "0x020700c1"
+__date__       = "2025-05-19"
 __status__     = "Stable"
 __domain__     = "novelwriter.io"
 
@@ -267,13 +268,25 @@ def main(sysArgs: list | None = None) -> GuiMain | None:
     # Connect the exception handler before making the main GUI
     sys.excepthook = exceptionHandler
 
+    splash = NSplashScreen()
+    splash.show()
+
+    splash.showStatus("")
+    splash.showStatus("Starting novelWriter ...")
+
     # Run Config steps that require the QApplication
-    CONFIG.loadConfig()
+    CONFIG.loadConfig(splash)
     CONFIG.initLocalisation(app)
     SHARED.initTheme(GuiTheme())
 
     # Launch main GUI
     nwGUI = GuiMain()
+    nwGUI.showNormal()
+    splash.finish(nwGUI)
+
+    CONFIG.finishStartup()
+    del splash
+
     nwGUI.postLaunchTasks(cmdOpen)
 
     sys.exit(app.exec())

{novelwriter-2.7b1 → novelwriter-2.7rc1}/novelwriter/assets/i18n/project_en_GB.json

@@ -4,6 +4,7 @@
   "Footnotes": "Footnotes",
   "Comment": "Comment",
   "Story Structure": "Story Structure",
+  "Note": "Note",
   "Notes": "Notes",
   "Tag": "Tag",
   "Point of View": "Point of View",

{novelwriter-2.7b1 → novelwriter-2.7rc1}/novelwriter/assets/icons/remix_filled.icons

@@ -94,6 +94,7 @@ icon:noncheckable    = <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 2
 icon:open            = <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#000000" height="128" width="128"><path d="M16 2L21 7V21.0082C21 21.556 20.5551 22 20.0066 22H3.9934C3.44476 22 3 21.5447 3 21.0082V2.9918C3 2.44405 3.44495 2 3.9934 2H16ZM13 12H16L12 8L8 12H11V16H13V12Z" /></svg>
 icon:panel           = <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#000000" height="128" width="128"><path d="M22 16V20C22 20.5523 21.5523 21 21 21H3C2.44772 21 2 20.5523 2 20V16H22ZM21 3C21.5523 3 22 3.44772 22 4V14H2V4C2 3.44772 2.44772 3 3 3H21Z" /></svg>
 icon:pin             = <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#000000" height="128" width="128"><path d="M22.3126 10.1753L20.8984 11.5895L20.1913 10.8824L15.9486 15.125L15.2415 18.6606L13.8273 20.0748L9.58466 15.8321L4.63492 20.7819L3.2207 19.3677L8.17045 14.4179L3.92781 10.1753L5.34202 8.76107L8.87756 8.05396L13.1202 3.81132L12.4131 3.10422L13.8273 1.69L22.3126 10.1753Z" /></svg>
+icon:project_copy    = <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#000000" height="128" width="128"><path d="M6.9998 6V3C6.9998 2.44772 7.44752 2 7.9998 2H19.9998C20.5521 2 20.9998 2.44772 20.9998 3V17C20.9998 17.5523 20.5521 18 19.9998 18H16.9998V20.9991C16.9998 21.5519 16.5499 22 15.993 22H4.00666C3.45059 22 3 21.5554 3 20.9991L3.0026 7.00087C3.0027 6.44811 3.45264 6 4.00942 6H6.9998ZM8.9998 6H16.9998V16H18.9998V4H8.9998V6ZM6.9998 11V13H12.9998V11H6.9998ZM6.9998 15V17H12.9998V15H6.9998Z" /></svg>
 icon:quote           = <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#000000" height="128" width="128"><path d="M19.4167 6.67891C20.4469 7.77257 21.0001 9 21.0001 10.9897C21.0001 14.4891 18.5436 17.6263 14.9695 19.1768L14.0768 17.7992C17.4121 15.9946 18.0639 13.6539 18.3245 12.178C17.7875 12.4557 17.0845 12.5533 16.3954 12.4895C14.591 12.3222 13.1689 10.8409 13.1689 9C13.1689 7.067 14.7359 5.5 16.6689 5.5C17.742 5.5 18.7681 5.99045 19.4167 6.67891ZM9.41669 6.67891C10.4469 7.77257 11.0001 9 11.0001 10.9897C11.0001 14.4891 8.54359 17.6263 4.96951 19.1768L4.07682 17.7992C7.41206 15.9946 8.06392 13.6539 8.32447 12.178C7.78747 12.4557 7.08452 12.5533 6.39539 12.4895C4.59102 12.3222 3.16895 10.8409 3.16895 9C3.16895 7.067 4.73595 5.5 6.66895 5.5C7.742 5.5 8.76814 5.99045 9.41669 6.67891Z" /></svg>
 icon:refresh         = <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#000000" height="128" width="128"><path d="M5.46257 4.43262C7.21556 2.91688 9.5007 2 12 2C17.5228 2 22 6.47715 22 12C22 14.1361 21.3302 16.1158 20.1892 17.7406L17 12H20C20 7.58172 16.4183 4 12 4C9.84982 4 7.89777 4.84827 6.46023 6.22842L5.46257 4.43262ZM18.5374 19.5674C16.7844 21.0831 14.4993 22 12 22C6.47715 22 2 17.5228 2 12C2 9.86386 2.66979 7.88416 3.8108 6.25944L7 12H4C4 16.4183 7.58172 20 12 20C14.1502 20 16.1022 19.1517 17.5398 17.7716L18.5374 19.5674Z" /></svg>
 icon:remove          = <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#000000" height="128" width="128"><path d="M19 11H5V13H19V11Z" /></svg>

{novelwriter-2.7b1 → novelwriter-2.7rc1}/novelwriter/assets/icons/remix_outline.icons

@@ -94,6 +94,7 @@ icon:noncheckable    = <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 2
 icon:open            = <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#000000" height="128" width="128"><path d="M15 4H5V20H19V8H15V4ZM3 2.9918C3 2.44405 3.44749 2 3.9985 2H16L20.9997 7L21 20.9925C21 21.5489 20.5551 22 20.0066 22H3.9934C3.44476 22 3 21.5447 3 21.0082V2.9918ZM13 12V16H11V12H8L12 8L16 12H13Z" /></svg>
 icon:panel           = <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#000000" height="128" width="128"><path d="M21 3C21.5523 3 22 3.44772 22 4V20C22 20.5523 21.5523 21 21 21H3C2.44772 21 2 20.5523 2 20V4C2 3.44772 2.44772 3 3 3H21ZM4 16V19H20V16H4ZM4 14H20V5H4V14Z" /></svg>
 icon:pin             = <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#000000" height="128" width="128"><path d="M13.8273 1.69L22.3126 10.1753L20.8984 11.5895L20.1913 10.8824L15.9486 15.125L15.2415 18.6606L13.8273 20.0748L9.58466 15.8321L4.63492 20.7819L3.2207 19.3677L8.17045 14.4179L3.92781 10.1753L5.34202 8.76107L8.87756 8.05396L13.1202 3.81132L12.4131 3.10422L13.8273 1.69ZM14.5344 5.22554L9.86358 9.89637L7.0417 10.4607L13.5418 16.9609L14.1062 14.139L18.7771 9.46818L14.5344 5.22554Z" /></svg>
+icon:project_copy    = <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#000000" height="128" width="128"><path d="M6.9998 6V3C6.9998 2.44772 7.44752 2 7.9998 2H19.9998C20.5521 2 20.9998 2.44772 20.9998 3V17C20.9998 17.5523 20.5521 18 19.9998 18H16.9998V20.9991C16.9998 21.5519 16.5499 22 15.993 22H4.00666C3.45059 22 3 21.5554 3 20.9991L3.0026 7.00087C3.0027 6.44811 3.45264 6 4.00942 6H6.9998ZM5.00242 8L5.00019 20H14.9998V8H5.00242ZM8.9998 6H16.9998V16H18.9998V4H8.9998V6ZM7 11H13V13H7V11ZM7 15H13V17H7V15Z" /></svg>
 icon:quote           = <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#000000" height="128" width="128"><path d="M19.4167 6.67891C20.4469 7.77257 21.0001 9 21.0001 10.9897C21.0001 14.4891 18.5436 17.6263 14.9695 19.1768L14.0768 17.7992C17.4121 15.9946 18.0639 13.6539 18.3245 12.178C17.7875 12.4557 17.0845 12.5533 16.3954 12.4895C14.591 12.3222 13.1689 10.8409 13.1689 9C13.1689 7.067 14.7359 5.5 16.6689 5.5C17.742 5.5 18.7681 5.99045 19.4167 6.67891ZM9.41669 6.67891C10.4469 7.77257 11.0001 9 11.0001 10.9897C11.0001 14.4891 8.54359 17.6263 4.96951 19.1768L4.07682 17.7992C7.41206 15.9946 8.06392 13.6539 8.32447 12.178C7.78747 12.4557 7.08452 12.5533 6.39539 12.4895C4.59102 12.3222 3.16895 10.8409 3.16895 9C3.16895 7.067 4.73595 5.5 6.66895 5.5C7.742 5.5 8.76814 5.99045 9.41669 6.67891Z" /></svg>
 icon:refresh         = <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#000000" height="128" width="128"><path d="M5.46257 4.43262C7.21556 2.91688 9.5007 2 12 2C17.5228 2 22 6.47715 22 12C22 14.1361 21.3302 16.1158 20.1892 17.7406L17 12H20C20 7.58172 16.4183 4 12 4C9.84982 4 7.89777 4.84827 6.46023 6.22842L5.46257 4.43262ZM18.5374 19.5674C16.7844 21.0831 14.4993 22 12 22C6.47715 22 2 17.5228 2 12C2 9.86386 2.66979 7.88416 3.8108 6.25944L7 12H4C4 16.4183 7.58172 20 12 20C14.1502 20 16.1022 19.1517 17.5398 17.7716L18.5374 19.5674Z" /></svg>
 icon:remove          = <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#000000" height="128" width="128"><path d="M5 11V13H19V11H5Z" /></svg>

{novelwriter-2.7b1 → novelwriter-2.7rc1}/novelwriter/assets/syntax/snazzy.conf

@@ -25,15 +25,15 @@ text           =  86,  88, 105
 link           =   9, 161, 237
 headertext     =  45, 174,  88
 headertag      =  45, 174,  88, 160
-emphasis       =  19, 187, 183
-dialog         = 207, 156,   0
+emphasis       = 247, 103, 187
+dialog         =   9, 161, 237
 altdialog      = 207, 156,   0
 note           = 120, 187, 185
 hidden         = 145, 148, 162
 shortcode      = 247, 103, 187
 keyword        =   9, 161, 237
 tag            =  45, 174,  88
-value          =   9, 161, 237
+value          = 207, 156,   0
 optional       = 207, 156,   0
 spellcheckline = 255,  92,  87
 errorline      =  45, 174,  88

novelwriter-2.7rc1/novelwriter/assets/themes/snazzy.conf

@@ -0,0 +1,48 @@
+[Main]
+name       = Snazzy Light
+author     = Veronica Berglyd Olsen (adaptation)
+credit     = Florian Reuschel (color theme)
+url        = https://github.com/loilo/vscode-snazzy-light
+license    = MIT License
+licenseurl = https://github.com/loilo/vscode-snazzy-light/blob/master/LICENSE
+
+[Icons]
+default         =  86,  88, 105
+faded           =  84,  85,  84
+red             = 255,  92,  87
+orange          = 245, 185,   0
+yellow          = 207, 156,   0
+green           =  45, 174,  88
+aqua            =  19, 187, 183
+blue            =   9, 161, 237
+purple          = 247, 103, 187
+
+[Project]
+root            =   9, 161, 237
+folder          = 207, 156,   0
+file            =  84,  85,  84
+title           =  45, 174,  88
+chapter         = 255,  92,  87
+scene           =   9, 161, 237
+note            = 207, 156,   0
+
+[Palette]
+window          = 243, 244, 245
+windowtext      =  86,  88, 105
+base            = 250, 251, 252
+alternatebase   = 234, 234, 235
+text            =  86,  88, 105
+tooltipbase     = 245, 233, 194
+tooltiptext     =  86,  88, 105
+button          = 250, 251, 252
+buttontext      =  86,  88, 105
+brighttext      = 255, 255, 255
+highlight       =   9, 161, 237
+highlightedtext = 255, 255, 255
+link            =   9, 161, 237
+linkvisited     =   9, 161, 237
+
+[GUI]
+helptext        =   9, 161, 237
+fadedtext       =  84,  85,  84
+errortext       = 255,  92,  87

{novelwriter-2.7b1 → novelwriter-2.7rc1}/novelwriter/common.py

@@ -40,7 +40,7 @@ from PyQt6.QtCore import QCoreApplication, QMimeData, QUrl
 from PyQt6.QtGui import QAction, QDesktopServices, QFont, QFontDatabase, QFontInfo
 from PyQt6.QtWidgets import QMenu, QMenuBar, QWidget
 
-from novelwriter.constants import nwConst, nwLabels, nwUnicode, trConst
+from novelwriter.constants import nwConst, nwLabels, nwQuotes, nwUnicode, trConst
 from novelwriter.enum import nwItemClass, nwItemLayout, nwItemType
 from novelwriter.error import logException
 
@@ -298,6 +298,15 @@ def uniqueCompact(text: str) -> str:
     return "".join(sorted(set(compact(text))))
 
 
+def processDialogSymbols(symbols: str) -> str:
+    """Process dialogue line symbols."""
+    result = ""
+    for c in uniqueCompact(symbols):
+        if c in nwQuotes.ALLOWED:
+            result += c
+    return result
+
+
 def elide(text: str, length: int) -> str:
     """Elide a piece of text to a maximum length."""
     if len(text) > (cut := max(4, length)):

{novelwriter-2.7b1 → novelwriter-2.7rc1}/novelwriter/config.py

@@ -34,23 +34,24 @@ from time import time
 from typing import TYPE_CHECKING, Final
 
 from PyQt6.QtCore import (
-    PYQT_VERSION, PYQT_VERSION_STR, QT_VERSION, QT_VERSION_STR, QLibraryInfo,
-    QLocale, QStandardPaths, QSysInfo, QTranslator
+    PYQT_VERSION, PYQT_VERSION_STR, QT_VERSION, QT_VERSION_STR, QDate,
+    QDateTime, QLibraryInfo, QLocale, QStandardPaths, QSysInfo, QTranslator
 )
-from PyQt6.QtGui import QFont, QFontDatabase
+from PyQt6.QtGui import QFont, QFontDatabase, QFontMetrics
 from PyQt6.QtWidgets import QApplication
 
 from novelwriter.common import (
     NWConfigParser, checkInt, checkPath, describeFont, fontMatcher,
-    formatTimeStamp
+    formatTimeStamp, processDialogSymbols, simplified
 )
-from novelwriter.constants import nwFiles, nwUnicode
+from novelwriter.constants import nwFiles, nwHtmlUnicode, nwQuotes, nwUnicode
 from novelwriter.error import formatException, logException
 
 if TYPE_CHECKING:
     from datetime import datetime
 
     from novelwriter.core.projectdata import NWProjectData
+    from novelwriter.splash import NSplashScreen
 
 logger = logging.getLogger(__name__)
 
@@ -64,16 +65,16 @@ class Config:
 
     __slots__ = (
         "_appPath", "_appRoot", "_backPath", "_backupPath", "_confPath", "_dLocale", "_dShortDate",
-        "_dShortDateTime", "_dataPath", "_errData", "_hasError", "_homePath", "_manuals",
-        "_nwLangPath", "_qLocale", "_qtLangPath", "_qtTrans", "_recentPaths", "_recentProjects",
-        "allowOpenDial", "altDialogClose", "altDialogOpen", "appHandle", "appName",
-        "askBeforeBackup", "askBeforeExit", "autoSaveDoc", "autoSaveProj", "autoScroll",
-        "autoScrollPos", "autoSelect", "backupOnClose", "cursorWidth", "dialogLine", "dialogStyle",
-        "doJustify", "doReplace", "doReplaceDQuote", "doReplaceDash", "doReplaceDots",
-        "doReplaceSQuote", "emphLabels", "fmtApostrophe", "fmtDQuoteClose", "fmtDQuoteOpen",
-        "fmtPadAfter", "fmtPadBefore", "fmtPadThin", "fmtSQuoteClose", "fmtSQuoteOpen",
-        "focusWidth", "guiFont", "guiLocale", "guiSyntax", "guiTheme", "hasEnchant",
-        "hideFocusFooter", "hideHScroll", "hideVScroll", "highlightEmph", "hostName",
+        "_dShortDateTime", "_dataPath", "_errData", "_hasError", "_homePath", "_lastAuthor",
+        "_manuals", "_nwLangPath", "_qLocale", "_qtLangPath", "_qtTrans", "_recentPaths",
+        "_recentProjects", "_splash", "allowOpenDial", "altDialogClose", "altDialogOpen",
+        "appHandle", "appName", "askBeforeBackup", "askBeforeExit", "autoSaveDoc", "autoSaveProj",
+        "autoScroll", "autoScrollPos", "autoSelect", "backupOnClose", "cursorWidth", "dialogLine",
+        "dialogStyle", "doJustify", "doReplace", "doReplaceDQuote", "doReplaceDash",
+        "doReplaceDots", "doReplaceSQuote", "emphLabels", "fmtApostrophe", "fmtDQuoteClose",
+        "fmtDQuoteOpen", "fmtPadAfter", "fmtPadBefore", "fmtPadThin", "fmtSQuoteClose",
+        "fmtSQuoteOpen", "focusWidth", "guiFont", "guiLocale", "guiSyntax", "guiTheme",
+        "hasEnchant", "hideFocusFooter", "hideHScroll", "hideVScroll", "highlightEmph", "hostName",
         "iconColDocs", "iconColTree", "iconTheme", "incNotesWCount", "isDebug", "kernelVer",
         "lastNotes", "mainPanePos", "mainWinSize", "memInfo", "narratorBreak", "narratorDialog",
         "nativeFont", "osDarwin", "osLinux", "osType", "osUnknown", "osWindows", "outlinePanePos",
@@ -94,6 +95,8 @@ class Config:
         # Initialisation
         # ==============
 
+        self._splash = None
+
         # Set Application Variables
         self.appName   = "novelWriter"
         self.appHandle = "novelwriter"
@@ -146,6 +149,7 @@ class Config:
 
         self._recentProjects = RecentProjects(self)
         self._recentPaths = RecentPaths(self)
+        self._lastAuthor = ""
 
         # General GUI Settings
         self.guiLocale    = self._qLocale.name()
@@ -318,6 +322,11 @@ class Config:
     def recentProjects(self) -> RecentProjects:
         return self._recentProjects
 
+    @property
+    def lastAuthor(self) -> str:
+        """Return the last author name used."""
+        return simplified(self._lastAuthor)
+
     ##
     #  Getters
     ##
@@ -333,6 +342,11 @@ class Config:
     #  Setters
     ##
 
+    def setLastAuthor(self, value: str) -> None:
+        """Set tle last used author name."""
+        self._lastAuthor = simplified(value)
+        return
+
     def setMainWinSize(self, width: int, height: int) -> None:
         """Set the size of the main window, but only if the change is
         larger than 5 pixels. The OS window manager will sometimes
@@ -464,11 +478,16 @@ class Config:
 
     def localDate(self, value: datetime) -> str:
         """Return a localised date format."""
-        return self._dLocale.toString(value, self._dShortDate)
+        # Explicitly convert the date first, see bug #2325
+        return self._dLocale.toString(QDate(value.year, value.month, value.day), self._dShortDate)
 
     def localDateTime(self, value: datetime) -> str:
         """Return a localised datetime format."""
-        return self._dLocale.toString(value, self._dShortDateTime)
+        # Explicitly convert the datetime first, see bug #2325
+        return self._dLocale.toString(
+            QDateTime(value.year, value.month, value.day, value.hour, value.minute, value.second),
+            self._dShortDateTime,
+        )
 
     def listLanguages(self, lngSet: int) -> list[tuple[str, str]]:
         """List localisation files in the i18n folder. The default GUI
@@ -497,6 +516,12 @@ class Config:
 
         return sorted(langList.items(), key=lambda x: x[0])
 
+    def splashMessage(self, message: str) -> None:
+        """Send a message to the splash screen."""
+        if self._splash:
+            self._splash.showStatus(message)
+        return
+
     ##
     #  Config Actions
     ##
@@ -543,6 +568,8 @@ class Config:
 
     def initLocalisation(self, nwApp: QApplication) -> None:
         """Initialise the localisation of the GUI."""
+        self.splashMessage("Loading localisation ...")
+
         self._qLocale = QLocale(self.guiLocale)
         QLocale.setDefault(self._qLocale)
         self._qtTrans = {}
@@ -568,8 +595,11 @@ class Config:
 
         return
 
-    def loadConfig(self) -> bool:
+    def loadConfig(self, splash: NSplashScreen | None = None) -> bool:
         """Load preferences from file and replace default settings."""
+        self._splash = splash
+        self.splashMessage("Loading user configuration ...")
+
         logger.debug("Loading config file")
 
         conf = NWConfigParser()
@@ -626,6 +656,7 @@ class Config:
         self.backupOnClose   = conf.rdBool(sec, "backuponclose", self.backupOnClose)
         self.askBeforeBackup = conf.rdBool(sec, "askbeforebackup", self.askBeforeBackup)
         self.askBeforeExit   = conf.rdBool(sec, "askbeforeexit", self.askBeforeExit)
+        self._lastAuthor     = conf.rdStr(sec, "lastauthor", self._lastAuthor)
 
         # Editor
         sec = "Editor"
@@ -661,9 +692,9 @@ class Config:
         self.showFullPath    = conf.rdBool(sec, "showfullpath", self.showFullPath)
         self.dialogStyle     = conf.rdInt(sec, "dialogstyle", self.dialogStyle)
         self.allowOpenDial   = conf.rdBool(sec, "allowopendial", self.allowOpenDial)
-        self.dialogLine      = conf.rdStr(sec, "dialogline", self.dialogLine)
-        self.narratorBreak   = conf.rdStr(sec, "narratorbreak", self.narratorBreak)
-        self.narratorDialog  = conf.rdStr(sec, "narratordialog", self.narratorDialog)
+        dialogLine           = conf.rdStr(sec, "dialogline", self.dialogLine)
+        narratorBreak        = conf.rdStr(sec, "narratorbreak", self.narratorBreak)
+        narratorDialog       = conf.rdStr(sec, "narratordialog", self.narratorDialog)
         self.altDialogOpen   = conf.rdStr(sec, "altdialogopen", self.altDialogOpen)
         self.altDialogClose  = conf.rdStr(sec, "altdialogclose", self.altDialogClose)
         self.highlightEmph   = conf.rdBool(sec, "highlightemph", self.highlightEmph)
@@ -690,6 +721,9 @@ class Config:
         # Check Values
         # ============
 
+        self._prepareFont(self.guiFont, "GUI")
+        self._prepareFont(self.textFont, "document")
+
         # If we're using straight quotes, disable auto-replace
         if self.fmtSQuoteOpen == self.fmtSQuoteClose == "'" and self.doReplaceSQuote:
             logger.info("Using straight single quotes, so disabling auto-replace")
@@ -699,6 +733,10 @@ class Config:
             logger.info("Using straight double quotes, so disabling auto-replace")
             self.doReplaceDQuote = False
 
+        self.dialogLine = processDialogSymbols(dialogLine)
+        self.narratorBreak = narratorBreak if narratorBreak in nwQuotes.DASHES else ""
+        self.narratorDialog = narratorDialog if narratorDialog in nwQuotes.DASHES else ""
+
         return True
 
     def saveConfig(self) -> bool:
@@ -743,6 +781,7 @@ class Config:
             "backuponclose":   str(self.backupOnClose),
             "askbeforebackup": str(self.askBeforeBackup),
             "askbeforeexit":   str(self.askBeforeExit),
+            "lastauthor":      str(self._lastAuthor),
         }
 
         conf["Editor"] = {
@@ -820,6 +859,11 @@ class Config:
 
         return True
 
+    def finishStartup(self) -> None:
+        """Call after startup is complete."""
+        self._splash = None
+        return
+
     ##
     #  Internal Functions
     ##
@@ -842,6 +886,17 @@ class Config:
             logger.debug("Checking package 'pyenchant': OK")
         return
 
+    def _prepareFont(self, font: QFont, kind: str) -> None:
+        """Check Unicode availability in font. This also initialises any
+        alternative character used for missing glyphs. See #2315.
+        """
+        self.splashMessage(f"Initialising {kind} font: {font.family()}")
+        metrics = QFontMetrics(font)
+        for char in nwHtmlUnicode.U_TO_H.keys():
+            if not metrics.inFont(char):  # type: ignore
+                logger.warning("No glyph U+%04x in font", ord(char))  # pragma: no cover
+        return
+
 
 class RecentProjects:
 
@@ -864,9 +919,10 @@ class RecentProjects:
                     puuid = str(entry.get("uuid", ""))
                     title = str(entry.get("title", ""))
                     words = checkInt(entry.get("words", 0), 0)
+                    chars = checkInt(entry.get("chars", 0), 0)
                     saved = checkInt(entry.get("time", 0), 0)
                     if path and title:
-                        self._setEntry(puuid, path, title, words, saved)
+                        self._setEntry(puuid, path, title, words, chars, saved)
             except Exception:
                 logger.error("Could not load recent project cache")
                 logException()
@@ -899,7 +955,14 @@ class RecentProjects:
         try:
             if (remove := self._map.get(data.uuid)) and (remove != str(path)):
                 self.remove(remove)
-            self._setEntry(data.uuid, str(path), data.name, sum(data.currCounts), int(saved))
+            self._setEntry(
+                data.uuid,
+                str(path),
+                data.name,
+                sum(data.currCounts[:2]),
+                sum(data.currCounts[2:]),
+                int(saved),
+            )
             self.saveCache()
         except Exception:
             pass
@@ -912,9 +975,17 @@ class RecentProjects:
             self.saveCache()
         return
 
-    def _setEntry(self, puuid: str, path: str, title: str, words: int, saved: int) -> None:
+    def _setEntry(
+        self, puuid: str, path: str, title: str, words: int, chars: int, saved: int
+    ) -> None:
         """Set an entry in the recent projects record."""
-        self._data[path] = {"uuid": puuid, "title": title, "words": words, "time": saved}
+        self._data[path] = {
+            "uuid": puuid,
+            "title": title,
+            "words": words,
+            "chars": chars,
+            "time": saved,
+        }
         if puuid:
             self._map[puuid] = path
         return

{novelwriter-2.7b1 → novelwriter-2.7rc1}/novelwriter/constants.py

@@ -352,6 +352,10 @@ class nwLabels:
         nwStats.WORDS_TEXT:   QT_TRANSLATE_NOOP("Stats", "Words in Text"),
         nwStats.WORDS_TITLE:  QT_TRANSLATE_NOOP("Stats", "Words in Headings"),
     }
+    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)"),
@@ -505,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."""