novelWriter 2.4b1__tar.gz → 2.4.1__tar.gz

{novelWriter-2.4b1 → novelwriter-2.4.1}/CHANGELOG.md

@@ -1,5 +1,131 @@
 # novelWriter Changelog
 
+## Version 2.4.1 [2024-05-06]
+
+### Release Notes
+
+This is a patch release that fixes a number of minor issues with the Manuscript Build tool. The
+only critical fix is related to a potential crash when deleting a build entry when its settings
+dialog is still open.
+
+### Detailed Changelog
+
+**Bugfixes**
+
+* Fixed an issue that could crash novelWriter if a build settings entry was deleted from the
+  Manuscript tool while its settings window was open. PR #1845.
+
+**Improvements**
+
+* Changed the font used for the document editor and viewer header and footer from the one used for
+  the document text to the one used for the user interface. Issue #1842. PR #1843.
+* Added a save document step in the editor before running a manuscript build or a preview job. This
+  ensures that the text in the editor is included in the manuscript. Issue #1835. PR #1846.
+* Restore preview panel scroll bar position after updating the preview on the Manuscript tool.
+  Issue #1837. PR #1846.
+* Close all non-modal dialogs when a project is closed. PR #1848.
+
+**Code Improvements**
+
+* Fixed an issue with the Build Settings dialog that blocks the garbage collector from deleting the
+  dialog after it's been closed. PR #1843.
+* Remove some deprecated translation entries from the translation files. PR #1850.
+
+----
+
+## Version 2.4 [2024-04-20]
+
+### Release Notes
+
+This release adds a new global search feature. The tool is still relatively basic, and will likely
+be extended in later releases.
+
+Among new text editing features is the ability to highlight text using `[m]text[/m]` shortcodes.
+The code `[m]` is for "mark", which is the equivalent code in HTML.
+
+A second feature added for text editing is the ability to add an alternatively formatted scene
+heading by adding a `!` to the markup, like for chapters and main titles. This allows to
+distinguish between two scene formatting styles, `### Title` and `###! Title`, which can for
+instance be used for soft and hard scene breaks.
+
+The **Manuscript Build** tool has also been extended with multiple new formatting options.
+
+See the website for complete [Release Notes](https://novelwriter.io/releases/release_2_4.html).
+
+### Detailed Changelog
+
+**Bugfixes**
+
+* Fixed background colour on some widgets on the new Project Search tool. PR #1800.
+* Fixed a bug when using bold/italic/strike through toggle on an existing text selection in the
+  editor. Issue #1807. PR #1808.
+* An index out of bounds error in the word counter has been fixed. It could only be triggered by a
+  single line only containing a ">" character. Issues #1816 and #1825. PR #1817.
+* Fixed an issue where not all theme colours were completely reset before changing theme. PR #1820.
+* Shortcodes are no longer passed to the spell checker. PR #1823.
+
+**Improvements**
+
+* Made placeholder text for search read as "Search for" and "Replace with". PR #1799.
+* The initial count for adding chapter and scenes to new project in the Welcome dialog has been
+  changed to 0. The user must now select to add chapters and scenes. Issue #1811. PR #1815.
+
+**Documentation**
+
+* Updated the documentation for 2.4 features. PR #1818.
+
+**Internationalisation**
+
+* Norwegian and US English translations updated by Veronica Berglyd Olsen (@vkbo).
+  PRs #1799 and #1814.
+* Latin American Spanish translation updated by Tommy Marplatt (@tmarplatt). PR #1814.
+* Italian translation updated by Lou Cyper (loucyper1). PR #1814.
+* Japanese translation updated by @hebekeg. PR #1814.
+* French translation updated by Albert Aribaud (@aaribaud). PR #1821.
+* German translation updated by Myian (@HeyMyian). PR #1821.
+
+----
+
+## Version 2.4 RC 1 [2024-04-06]
+
+### 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 writing projects, and make frequent backups.
+
+### Detailed Changelog
+
+**Bugfixes**
+
+* A number of issues GUI icon scaling has been fixed. Icons and buttons are supposed to scale
+  relative to the GUI font size, but several of them were not. Issue #1787. PR #1788.
+* The persistence of button state for the editor search box has been improved. The present state
+  was only saved when the search box was actively closed, and there were several scenarios where
+  this didn't happen. The button states are now tracked in the central config, and will always be
+  preserved. Issue #1794. PR #1795.
+
+**Other Improvements**
+
+* A placeholder icon has been added for cases where users have their own icon theme, and icons are
+  missing. Issue #1780. PR #1781.
+* The project search now refreshes the search results for the currently open document when it's
+  being edited. PR #1782.
+* When activating project search from the editor while text is selected, the search box is
+  populated with this text. Issue #1789. PR #1790.
+
+**Packaging**
+
+* The project has moved from using a `setup.cfg` to only using the `pyproject.toml` meta data file
+  for packaging. This is the preferred file format now. PR #1791.
+
+**Code Improvements**
+
+* The part of the code related to Qt widgets and flags has been updated and refactored in
+  preparation for the eventual move to the Qt6 framework. Part of issue #1142. PR #1792.
+* The Open Document writer class has been refactored and improved. PR #1796.
+
+----
+
 ## Version 2.4 Beta 1 [2024-03-26]
 
 ### Release Notes
@@ -7,9 +133,6 @@
 This is a beta release 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.
 
-Please check the changelog for an overview of changes. The full release notes will be added to the
-final release.
-
 ### Detailed Changelog
 
 **Major Features**

{novelWriter-2.4b1 → novelwriter-2.4.1}/PKG-INFO

@@ -1,14 +1,13 @@
 Metadata-Version: 2.1
 Name: novelWriter
-Version: 2.4b1
+Version: 2.4.1
 Summary: A markdown-like text editor for planning and writing novels
-Home-page: https://novelwriter.io
-Author: Veronica Berglyd Olsen
-Author-email: code@vkbo.net
+Author-email: Veronica Berglyd Olsen <code@vkbo.net>
 License: GNU General Public License v3
-Project-URL: Bug Tracker, https://github.com/vkbo/novelWriter/issues
+Project-URL: Homepage, https://novelwriter.io
 Project-URL: Documentation, https://docs.novelwriter.io
-Project-URL: Source Code, https://github.com/vkbo/novelWriter
+Project-URL: Repository, https://github.com/vkbo/novelWriter
+Project-URL: Issues, https://github.com/vkbo/novelWriter/issues
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9

{novelWriter-2.4b1 → novelwriter-2.4.1}/README.md

@@ -49,6 +49,10 @@ code, please also read the full
 
 Project credits are available in [CREDITS.md](https://github.com/vkbo/novelWriter/blob/main/CREDITS.md).
 
+**Note:** As of April 2024 only pre-releases are made from the `main` branch. Full releases are
+made from the `release` branch. So if you're submitting a fix to a current release, **including
+changes to documentation**, they must be made to the `release` branch.
+
 ### Translations
 
 New translations are always welcome. This project uses Crowdin to maintain translations, and you

{novelWriter-2.4b1 → novelwriter-2.4.1}/novelWriter.egg-info/PKG-INFO

@@ -1,14 +1,13 @@
 Metadata-Version: 2.1
 Name: novelWriter
-Version: 2.4b1
+Version: 2.4.1
 Summary: A markdown-like text editor for planning and writing novels
-Home-page: https://novelwriter.io
-Author: Veronica Berglyd Olsen
-Author-email: code@vkbo.net
+Author-email: Veronica Berglyd Olsen <code@vkbo.net>
 License: GNU General Public License v3
-Project-URL: Bug Tracker, https://github.com/vkbo/novelWriter/issues
+Project-URL: Homepage, https://novelwriter.io
 Project-URL: Documentation, https://docs.novelwriter.io
-Project-URL: Source Code, https://github.com/vkbo/novelWriter
+Project-URL: Repository, https://github.com/vkbo/novelWriter
+Project-URL: Issues, https://github.com/vkbo/novelWriter/issues
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9

{novelWriter-2.4b1 → novelwriter-2.4.1}/novelWriter.egg-info/SOURCES.txt

@@ -5,12 +5,10 @@ MANIFEST.in
 README.md
 pkgutils.py
 pyproject.toml
-setup.cfg
 novelWriter.egg-info/PKG-INFO
 novelWriter.egg-info/SOURCES.txt
 novelWriter.egg-info/dependency_links.txt
 novelWriter.egg-info/entry_points.txt
-novelWriter.egg-info/not-zip-safe
 novelWriter.egg-info/requires.txt
 novelWriter.egg-info/top_level.txt
 novelwriter/__init__.py
@@ -21,6 +19,7 @@ novelwriter/enum.py
 novelwriter/error.py
 novelwriter/guimain.py
 novelwriter/shared.py
+novelwriter/types.py
 novelwriter/assets/manual.pdf
 novelwriter/assets/sample.zip
 novelwriter/assets/i18n/nw_de_DE.qm
@@ -46,6 +45,7 @@ novelwriter/assets/i18n/project_nn_NO.json
 novelwriter/assets/i18n/project_pt_BR.json
 novelwriter/assets/i18n/project_ru_RU.json
 novelwriter/assets/i18n/project_zh_CN.json
+novelwriter/assets/icons/none.svg
 novelwriter/assets/icons/novelwriter.ico
 novelwriter/assets/icons/novelwriter.svg
 novelwriter/assets/icons/x-novelwriter-project.ico
@@ -90,12 +90,10 @@ novelwriter/assets/icons/typicons_dark/nw_tb-subscript.svg
 novelwriter/assets/icons/typicons_dark/nw_tb-superscript.svg
 novelwriter/assets/icons/typicons_dark/nw_tb-underline.svg
 novelwriter/assets/icons/typicons_dark/typ_arrow-down-thick-grey.svg
-novelwriter/assets/icons/typicons_dark/typ_arrow-down.svg
 novelwriter/assets/icons/typicons_dark/typ_arrow-forward.svg
 novelwriter/assets/icons/typicons_dark/typ_arrow-maximise.svg
 novelwriter/assets/icons/typicons_dark/typ_arrow-minimise.svg
 novelwriter/assets/icons/typicons_dark/typ_arrow-repeat-grey.svg
-novelwriter/assets/icons/typicons_dark/typ_arrow-right.svg
 novelwriter/assets/icons/typicons_dark/typ_book-grey.svg
 novelwriter/assets/icons/typicons_dark/typ_book.svg
 novelwriter/assets/icons/typicons_dark/typ_bookmark.svg
@@ -146,6 +144,8 @@ novelwriter/assets/icons/typicons_dark/typ_th-list-grey.svg
 novelwriter/assets/icons/typicons_dark/typ_th-list.svg
 novelwriter/assets/icons/typicons_dark/typ_times.svg
 novelwriter/assets/icons/typicons_dark/typ_trash.svg
+novelwriter/assets/icons/typicons_dark/typ_unfold-hidden.svg
+novelwriter/assets/icons/typicons_dark/typ_unfold-visible.svg
 novelwriter/assets/icons/typicons_dark/typ_user.svg
 novelwriter/assets/icons/typicons_dark/typ_warning-full.svg
 novelwriter/assets/icons/typicons_light/README.md
@@ -188,12 +188,10 @@ novelwriter/assets/icons/typicons_light/nw_tb-subscript.svg
 novelwriter/assets/icons/typicons_light/nw_tb-superscript.svg
 novelwriter/assets/icons/typicons_light/nw_tb-underline.svg
 novelwriter/assets/icons/typicons_light/typ_arrow-down-thick-grey.svg
-novelwriter/assets/icons/typicons_light/typ_arrow-down.svg
 novelwriter/assets/icons/typicons_light/typ_arrow-forward.svg
 novelwriter/assets/icons/typicons_light/typ_arrow-maximise.svg
 novelwriter/assets/icons/typicons_light/typ_arrow-minimise.svg
 novelwriter/assets/icons/typicons_light/typ_arrow-repeat-grey.svg
-novelwriter/assets/icons/typicons_light/typ_arrow-right.svg
 novelwriter/assets/icons/typicons_light/typ_book-grey.svg
 novelwriter/assets/icons/typicons_light/typ_book.svg
 novelwriter/assets/icons/typicons_light/typ_bookmark.svg
@@ -244,6 +242,8 @@ novelwriter/assets/icons/typicons_light/typ_th-list-grey.svg
 novelwriter/assets/icons/typicons_light/typ_th-list.svg
 novelwriter/assets/icons/typicons_light/typ_times.svg
 novelwriter/assets/icons/typicons_light/typ_trash.svg
+novelwriter/assets/icons/typicons_light/typ_unfold-hidden.svg
+novelwriter/assets/icons/typicons_light/typ_unfold-visible.svg
 novelwriter/assets/icons/typicons_light/typ_user.svg
 novelwriter/assets/icons/typicons_light/typ_warning-full.svg
 novelwriter/assets/images/novelwriter-text-dark.svg
@@ -273,7 +273,6 @@ novelwriter/assets/themes/default_dark.conf
 novelwriter/assets/themes/default_light.conf
 novelwriter/assets/themes/solarized_dark.conf
 novelwriter/assets/themes/solarized_light.conf
-novelwriter/core/__init__.py
 novelwriter/core/buildsettings.py
 novelwriter/core/coretools.py
 novelwriter/core/docbuild.py
@@ -293,7 +292,6 @@ novelwriter/core/tokenizer.py
 novelwriter/core/tomd.py
 novelwriter/core/toodt.py
 novelwriter/core/tree.py
-novelwriter/dialogs/__init__.py
 novelwriter/dialogs/about.py
 novelwriter/dialogs/docmerge.py
 novelwriter/dialogs/docsplit.py
@@ -302,7 +300,6 @@ novelwriter/dialogs/preferences.py
 novelwriter/dialogs/projectsettings.py
 novelwriter/dialogs/quotes.py
 novelwriter/dialogs/wordlist.py
-novelwriter/extensions/__init__.py
 novelwriter/extensions/circularprogress.py
 novelwriter/extensions/configlayout.py
 novelwriter/extensions/eventfilters.py
@@ -314,7 +311,6 @@ novelwriter/extensions/statusled.py
 novelwriter/extensions/switch.py
 novelwriter/extensions/switchbox.py
 novelwriter/extensions/versioninfo.py
-novelwriter/gui/__init__.py
 novelwriter/gui/doceditor.py
 novelwriter/gui/dochighlight.py
 novelwriter/gui/docviewer.py
@@ -329,9 +325,7 @@ novelwriter/gui/search.py
 novelwriter/gui/sidebar.py
 novelwriter/gui/statusbar.py
 novelwriter/gui/theme.py
-novelwriter/text/__init__.py
 novelwriter/text/counting.py
-novelwriter/tools/__init__.py
 novelwriter/tools/dictionaries.py
 novelwriter/tools/lipsum.py
 novelwriter/tools/manusbuild.py
@@ -344,6 +338,7 @@ setup/appimage_launcher.sh
 setup/description_pypi.md
 setup/description_short.txt
 setup/iss_license.txt
+setup/launchpad_setup.cfg
 setup/make_clean.sh
 setup/make_pip.sh
 setup/make_release.sh

{novelWriter-2.4b1 → novelwriter-2.4.1}/novelwriter/__init__.py

@@ -23,16 +23,21 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 """
 from __future__ import annotations
 
-import sys
 import getopt
 import logging
+import sys
+
+from typing import TYPE_CHECKING
 
 from PyQt5.QtWidgets import QApplication, QErrorMessage
 
-from novelwriter.error import exceptionHandler, logException
 from novelwriter.config import Config
+from novelwriter.error import exceptionHandler, logException
 from novelwriter.shared import SharedData
 
+if TYPE_CHECKING:  # pragma: no cover
+    from novelwriter.guimain import GuiMain
+
 # Package Meta
 # ============
 
@@ -42,9 +47,9 @@ __license__    = "GPLv3"
 __author__     = "Veronica Berglyd Olsen"
 __maintainer__ = "Veronica Berglyd Olsen"
 __email__      = "code@vkbo.net"
-__version__    = "2.4b1"
-__hexversion__ = "0x020400b1"
-__date__       = "2024-03-26"
+__version__    = "2.4.1"
+__hexversion__ = "0x020401f0"
+__date__       = "2024-05-06"
 __status__     = "Stable"
 __domain__     = "novelwriter.io"
 
@@ -60,7 +65,7 @@ CONFIG = Config()
 SHARED = SharedData()
 
 
-def main(sysArgs: list | None = None):
+def main(sysArgs: list | None = None) -> GuiMain | None:
     """Parse command line, set up logging, and launch main GUI."""
     if sysArgs is None:
         sysArgs = sys.argv[1:]
@@ -187,7 +192,7 @@ def main(sysArgs: list | None = None):
         ))
         for errLine in errorData:
             logger.critical(errLine)
-        errApp.exec_()
+        errApp.exec()
         sys.exit(errorCode)
 
     # Finish initialising config
@@ -237,6 +242,8 @@ def main(sysArgs: list | None = None):
         nwGUI = GuiMain()
         nwGUI.postLaunchTasks(cmdOpen)
 
-        sys.exit(nwApp.exec_())
+        sys.exit(nwApp.exec())
+
+    return None
 
 # END Function main

novelwriter-2.4.1/novelwriter/assets/icons/none.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m0 0v4l8 8-8 8v4h4l8-8 8 8h4v-4l-8-8 8-8v-4h-4l-8 8-8-8h-4z" fill="#f00" stroke-width=".70711"/>
+</svg>

{novelWriter-2.4b1 → novelwriter-2.4.1}/novelwriter/assets/icons/typicons_dark/icons.conf

@@ -100,8 +100,8 @@ status_time     = typ_stopwatch-grey.svg
 sticky-off      = typ_pin-outline.svg
 sticky-on       = typ_pin.svg
 unchecked       = mixed_input-unchecked.svg
-unfold-hide     = typ_arrow-right.svg
-unfold-show     = typ_arrow-down.svg
+unfold-hide     = typ_unfold-hidden.svg
+unfold-show     = typ_unfold-visible.svg
 up              = typ_chevron-up.svg
 view            = typ_eye.svg
 view_build      = typ_export-grey.svg

novelwriter-2.4.1/novelwriter/assets/icons/typicons_dark/typ_unfold-hidden.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m9.8767 17.723 5.8157-5.723-5.8157-5.723c-0.18462-0.18462-0.46155-0.27693-0.64616-0.27693-0.18462 0-0.46155 0.092309-0.64616 0.27693-0.18462 0.18462-0.27693 0.36924-0.27693 0.64616v10.154c0 0.27693 0.092309 0.46154 0.27693 0.64616 0.18462 0.18462 0.46155 0.27693 0.64616 0.27693 0.18462 0 0.46155-0.09231 0.64616-0.27693z" fill="#aeaeae" stroke-width=".92309"/>
+</svg>

novelwriter-2.4.1/novelwriter/assets/icons/typicons_dark/typ_unfold-visible.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m6.277 9.8767 5.723 5.8157 5.723-5.8157c0.18462-0.18462 0.27693-0.46155 0.27693-0.64616 0-0.18462-0.092309-0.46155-0.27693-0.64616-0.18462-0.18462-0.36924-0.27693-0.64616-0.27693h-10.154c-0.27693 0-0.46155 0.092309-0.64616 0.27693-0.18462 0.18462-0.27693 0.46155-0.27693 0.64616 0 0.18462 0.092309 0.46155 0.27693 0.64616z" fill="#aeaeae" stroke-width=".92309"/>
+</svg>

{novelWriter-2.4b1 → novelwriter-2.4.1}/novelwriter/assets/icons/typicons_light/icons.conf

@@ -100,8 +100,8 @@ status_time     = typ_stopwatch-grey.svg
 sticky-off      = typ_pin-outline.svg
 sticky-on       = typ_pin.svg
 unchecked       = mixed_input-unchecked.svg
-unfold-hide     = typ_arrow-right.svg
-unfold-show     = typ_arrow-down.svg
+unfold-hide     = typ_unfold-hidden.svg
+unfold-show     = typ_unfold-visible.svg
 up              = typ_chevron-up.svg
 view            = typ_eye.svg
 view_build      = typ_export-grey.svg

novelwriter-2.4.1/novelwriter/assets/icons/typicons_light/typ_unfold-hidden.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m9.8767 17.723 5.8157-5.723-5.8157-5.723c-0.18462-0.18462-0.46155-0.27693-0.64616-0.27693-0.18462 0-0.46155 0.092309-0.64616 0.27693-0.18462 0.18462-0.27693 0.36924-0.27693 0.64616v10.154c0 0.27693 0.092309 0.46154 0.27693 0.64616 0.18462 0.18462 0.46155 0.27693 0.64616 0.27693 0.18462 0 0.46155-0.09231 0.64616-0.27693z" fill-opacity=".78039" stroke-width="1.6923"/>
+</svg>

novelwriter-2.4.1/novelwriter/assets/icons/typicons_light/typ_unfold-visible.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m6.277 9.8767 5.723 5.8157 5.723-5.8157c0.18462-0.18462 0.27693-0.46155 0.27693-0.64616 0-0.18462-0.09231-0.46155-0.27693-0.64616-0.18462-0.18462-0.36924-0.27693-0.64616-0.27693h-10.154c-0.27693 0-0.46155 0.092309-0.64616 0.27693-0.18462 0.18462-0.27693 0.46155-0.27693 0.64616 0 0.18462 0.092309 0.46155 0.27693 0.64616z" fill-opacity=".78039" stroke-width="1.6923"/>
+</svg>

{novelWriter-2.4b1 → novelwriter-2.4.1}/novelwriter/common.py

@@ -36,7 +36,7 @@ from configparser import ConfigParser
 from urllib.parse import urljoin
 from urllib.request import pathname2url
 
-from PyQt5.QtGui import QDesktopServices
+from PyQt5.QtGui import QColor, QDesktopServices
 from PyQt5.QtCore import QCoreApplication, QUrl
 
 from novelwriter.enum import nwItemClass, nwItemType, nwItemLayout
@@ -382,6 +382,11 @@ def numberToRoman(value: int, toLower: bool = False) -> str:
     return roman.lower() if toLower else roman
 
 
+def cssCol(col: QColor, alpha: int | None = None) -> str:
+    """Convert a QColor object to an rgba entry to use in CSS."""
+    return f"rgba({col.red()}, {col.green()}, {col.blue()}, {alpha or col.alpha()})"
+
+
 ##
 #  Encoder Functions
 ##
@@ -444,7 +449,7 @@ def xmlIndent(tree: ET.Element | ET.ElementTree) -> None:
 
     indentations = ["\n"]
 
-    def indentChildren(elem, level):
+    def indentChildren(elem: ET.Element, level: int) -> None:
         chLevel = level + 1
         try:
             chIndent = indentations[chLevel]
@@ -467,6 +472,8 @@ def xmlIndent(tree: ET.Element | ET.ElementTree) -> None:
         if last is not None:
             last.tail = indentations[level]
 
+        return
+
     if len(tree):
         indentChildren(tree, 0)
     tree.tail = "\n"
@@ -529,8 +536,9 @@ class NWConfigParser(ConfigParser):
     helper functions, and support for lists.
     """
 
-    def __init__(self):
+    def __init__(self) -> None:
         super().__init__()
+        return
 
     def rdStr(self, section: str, option: str, default: str) -> str:
         """Read string value."""

{novelWriter-2.4b1 → novelwriter-2.4.1}/novelwriter/config.py

@@ -61,8 +61,12 @@ class Config:
         self.appHandle = "novelwriter"
 
         # Set Paths
-        confRoot = Path(QStandardPaths.writableLocation(QStandardPaths.ConfigLocation))
-        dataRoot = Path(QStandardPaths.writableLocation(QStandardPaths.AppDataLocation))
+        confRoot = Path(QStandardPaths.writableLocation(
+            QStandardPaths.StandardLocation.ConfigLocation)
+        )
+        dataRoot = Path(QStandardPaths.writableLocation(
+            QStandardPaths.StandardLocation.AppDataLocation)
+        )
 
         self._confPath = confRoot.absolute() / self.appHandle  # The user config location
         self._dataPath = dataRoot.absolute() / self.appHandle  # The user data location
@@ -83,7 +87,7 @@ class Config:
         # Localisation
         # Note that these paths must be strings
         self._nwLangPath = self._appPath / "assets" / "i18n"
-        self._qtLangPath = QLibraryInfo.location(QLibraryInfo.TranslationsPath)
+        self._qtLangPath = QLibraryInfo.location(QLibraryInfo.LibraryLocation.TranslationsPath)
 
         hasLocale = (self._nwLangPath / f"nw_{QLocale.system().name()}.qm").exists()
         self._qLocale = QLocale.system() if hasLocale else QLocale("en_GB")
@@ -369,7 +373,7 @@ class Config:
             elif self.osDarwin and "Helvetica" in fontFam:
                 self.textFont = "Helvetica"
             else:
-                self.textFont = fontDB.systemFont(QFontDatabase.GeneralFont).family()
+                self.textFont = fontDB.systemFont(QFontDatabase.SystemFont.GeneralFont).family()
         else:
             self.textFont = family
         return
@@ -386,6 +390,10 @@ class Config:
         """Un-scale fixed gui sizes by the screen scale factor."""
         return int(value/self.guiScale)
 
+    def homePath(self) -> Path:
+        """The user's home folder."""
+        return self._homePath
+
     def dataPath(self, target: str | None = None) -> Path:
         """Return a path in the data folder."""
         if isinstance(target, str):

{novelWriter-2.4b1 → novelwriter-2.4.1}/novelwriter/core/buildsettings.py

@@ -56,13 +56,13 @@ SETTINGS_TEMPLATE = {
     "headings.fmtChapter":     (str, nwHeadFmt.TITLE),
     "headings.fmtUnnumbered":  (str, nwHeadFmt.TITLE),
     "headings.fmtScene":       (str, "* * *"),
-    "headings.fmtHardScene":   (str, ""),
+    "headings.fmtAltScene":    (str, ""),
     "headings.fmtSection":     (str, ""),
     "headings.hideTitle":      (bool, False),
     "headings.hideChapter":    (bool, False),
     "headings.hideUnnumbered": (bool, False),
     "headings.hideScene":      (bool, False),
-    "headings.hideHardScene":  (bool, False),
+    "headings.hideAltScene":   (bool, False),
     "headings.hideSection":    (bool, True),
     "headings.centerTitle":    (bool, True),
     "headings.centerChapter":  (bool, False),
@@ -110,7 +110,7 @@ SETTINGS_LABELS = {
     "headings.fmtChapter":    QT_TRANSLATE_NOOP("Builds", "Chapter Format"),
     "headings.fmtUnnumbered": QT_TRANSLATE_NOOP("Builds", "Unnumbered Format"),
     "headings.fmtScene":      QT_TRANSLATE_NOOP("Builds", "Scene Format"),
-    "headings.fmtHardScene":  QT_TRANSLATE_NOOP("Builds", "Hard Scene Format"),
+    "headings.fmtAltScene":   QT_TRANSLATE_NOOP("Builds", "Alt. Scene Format"),
     "headings.fmtSection":    QT_TRANSLATE_NOOP("Builds", "Section Format"),
 
     "text.grpContent":        QT_TRANSLATE_NOOP("Builds", "Text Content"),
@@ -178,7 +178,7 @@ class BuildSettings:
     def __init__(self) -> None:
         self._name = ""
         self._uuid = str(uuid.uuid4())
-        self._path = Path.home()
+        self._path = CONFIG.homePath()
         self._build = ""
         self._order = 0
         self._format = nwBuildFmt.ODT
@@ -220,7 +220,7 @@ class BuildSettings:
         """The last used build path."""
         if self._path.is_dir():
             return self._path
-        return Path.home()
+        return CONFIG.homePath()
 
     @property
     def lastBuildName(self) -> str:
@@ -297,7 +297,7 @@ class BuildSettings:
         if isinstance(path, Path) and path.is_dir():
             self._path = path
         else:
-            self._path = Path.home()
+            self._path = CONFIG.homePath()
         self._changed = True
         return
 
@@ -382,7 +382,7 @@ class BuildSettings:
 
         postponed = []
 
-        def allowRoot(rHandle):
+        def allowRoot(rHandle: str | None) -> None:
             if rHandle in postponed and rHandle in result and rHandle is not None:
                 result[rHandle] = (True, FilterMode.ROOT)
                 postponed.remove(rHandle)