novelWriter 2.3rc1__tar.gz → 2.4__tar.gz

{novelWriter-2.3rc1 → novelwriter-2.4}/CHANGELOG.md

@@ -1,5 +1,238 @@
 # novelWriter Changelog
 
+## 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
+
+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.
+
+### Detailed Changelog
+
+**Major Features**
+
+* A global search feature has been added to the main sidebar. The search panel replaces the project
+  and novel tree when activated. PR #1775. Issue #894.
+* A new shortcode to highlight text has been added. PR #1715. Issue #705.
+* A new heading format for hard scene breaks has been added. It uses `###!` heading markup. The
+  only affect this has in the GUI is that these headings can be independently formatted in the
+  Manuscript tool. PR #1753. Issue #1050.
+* The document editor and viewer now have a dropdown menu in the header listing all headings of the
+  current document for quick navigation. The list is capped at 30 entries. PR #1764. issue #1059.
+
+**Build Tool Improvements**
+
+* The Manuscript Build Tool now has a word stats section below the preview that shows a number of
+  word and character counts for the previewed text. PR #1717. Issues #1114 and #1116.
+* The Manuscript Build Tool now shows an outline of the previewed document as a tab next to the
+  build settings list. PR #1768. Issue #1765.
+* Tabs handling in HTML output now has a separate setting from the other format. PR #1723.
+* Hard line breaks can now be excluded from Markdown builds. PR #1723. Issue #944.
+* It is now possible to control the centring and page breaks of partition, chapter and scene
+  headings. PR #1723. Issues #1117 and #1661.
+* Special titles (`#!`) can now be used in notes as well. PR #1723.
+* Meta data categories can be filtered out from the manuscript. PR #1723. issue #1132.
+* Any heading in a novel document can now be hidden in the manuscript. PR #1759. Issue #1756.
+* First line of a paragraph can now be indented in the manuscript. PR #1761. Issue #906.
+* Each meta data entry in HTML builds have a new class assigned to it that matches the tag used in
+  the text. PR #1767. Issue #1134.
+
+**Other Improvements**
+
+* The percentage progress counter in the editor document footer now counts progress per character
+  instead of per line. This is only noticeable on short documents. PR #1725.
+* Some improvements have been made to terms on the GUI and some strings have been simplified in
+  order to be easier to understand and to translate. PR #1727. Issue #1726.
+* Dates are now formatted according to the selected locale, if such a locale is available. If not,
+  it falls back to the local system locale. PR #1755. Issue #1739.
+
+**Code Improvements**
+
+* The tokenization of the novelWriter markup format has been refactored and improved. PR #1724.
+* A way to read project documents fast has been added. It is useful many places in the code where
+  only the text is needed, not the meta data. PR #1777.
+
+----
+
+## Version 2.3.1 [2024-03-17]
+
+### Release Notes
+
+This is a patch release that fixes several issues with translations into other languages than the
+default English, and adds completed translations for French.
+
+### Detailed Changelog
+
+**Internationalisation**
+
+* Fix untranslated text on the "Project Word List" dialog. PR #1744. Issue #1746.
+* Fix untranslated text on the dialog that pops up after an upgrade, PR #1754. Issue #1749.
+* Fix error in Norwegian translation. PR #1744.
+* Allow the translated text for adding chapter and scenes on the Welcome dialog to flow around the
+  number selector since the number is inserted into the sentence, and not all languages will split
+  the sentence around the number like is done in English. PR #1754. Issue #1750.
+* French translation updated by Albert Aribaud (@aaribaud). PR #1760.
+* Minor updates to other translations for the 2.3.1 fixes by other contributors. PR #1760.
+
+**Other Changes**
+
+* Bump the revision of the project file format to 1.5 Revision 3 from Revision 2. This should have
+  been done in the 2.3 release due to the addition of the Templates root folder type. PR #1748.
+
+----
+
+## Version 2.3 [2024-03-10]
+
+### Release Notes
+
+This release introduces a new Welcome dialog that replaces both the previous Open Project dialog
+and the New Project Wizard. The Welcome dialog has received a friendly custom art design created by
+Louis Durrant.
+
+The Preferences, Project Settings, Project Details, and About dialogs have received completely new
+designs and layouts, and the Manuscript Build Settings dialog has been updated to match.
+
+Among new features is a new Templates root folder where the writer can store template documents to
+be used when creating new project documents and notes. It is now also possible to include Point of
+View and Focus character names in chapter titles in Manuscripts. A new feature to ignore text has
+also been added. It behaves similarly to comments, but is never included in a manuscript even if
+comments in the manuscript are enabled.
+
+See the website for complete [Release Notes](https://novelwriter.io/releases/release_2_3.html).
+
+### Detailed Changelog
+
+**Bugfixes**
+
+* Fix an issue where the Tags and References panel below the document viewer was not cleared if a
+  project was opened, closed, and a new project with no tags defined were opened again. PR #1720.
+  Issue #1718.
+* Fixed an issue where multi-selecting documents in Trash would give the option to again move items
+  to Trash. The menu now properly offers the option to permanently delete the documents. PR #1728.
+* Fixed an issue where multi-select for deletion would only process the item right-clicked, and not
+  all the selected items. PR #1728.
+* Changed the error message that pops up when trying to open a project from the Welcome dialog that
+  no longer exists. The error message should no indicate that the project was not found, as opposed
+  to unreadable. PR #1740. Issue #1737.
+
+**Improvements**
+
+* The build tool no longer inserts a scene separator immediately after a partition heading, and
+  should now behave the same way as for chapters. If there is text before the first scene break,
+  the text flows continuously without a separator. PR #1716. Issue #1704.
+* Added one new GUI theme named "Cyberpunk Night" by @alemvigh. Also added a matching "Cyberpunk
+  Night" document editor theme by @alemvigh, and a new Tango theme by @vkbo. PR #1738. Issue #1730.
+* When the Welcome dialog fails to open a project, and there is not already a project open in the
+  app, the Welcome dialog appears again. PR #1740. Issue #1737.
+
+**Internationalisation**
+
+* Norwegian and US English translations updated by @vkbo. PR #1714.
+* Japanese translation updated by @hebekeg. PR #1714.
+* Italian translation updated by Lou Cyper (loucyper1). PR #1714.
+* Dutch translation updated by Annelotte and Martijn van der Kleijn (mvdkleijn). PR #1714.
+* Latin American Spanish translation updated by @tmarplatt. PR #1741.
+* German translation updated by Myian (@HeyMyian). PR #1741.
+
+**Other Changes**
+
+* Removed the novelwriter-cli entry point that was in any case broken. PR #1734. Issue #1732.
+
+----
+
 ## Version 2.3 RC 1 [2024-02-24]
 
 ### Release Notes

{novelWriter-2.3rc1 → novelwriter-2.4}/CREDITS.md

@@ -58,9 +58,11 @@ Some of the assets bundled with novelWriter were adapted from the following sour
 
 ## Fonts
 
-The font used for the main novelWriter logo, mimetype and text banners is:
+The font used for the main novelWriter logo, mimetype and text banners is Pridi. Other fonts are
+used on buttons and icons.
 
 * Pridi by Cadson Demak (Open Font License, Version 1.1)
+* Source Sans Pro by Paul D. Hunt (SIL Open Font License)
 
 ## Special Mentions
 

{novelWriter-2.3rc1 → novelwriter-2.4}/PKG-INFO

@@ -1,14 +1,13 @@
 Metadata-Version: 2.1
 Name: novelWriter
-Version: 2.3rc1
+Version: 2.4
 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.3rc1 → novelwriter-2.4}/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.3rc1 → novelwriter-2.4}/novelWriter.egg-info/PKG-INFO

@@ -1,14 +1,13 @@
 Metadata-Version: 2.1
 Name: novelWriter
-Version: 2.3rc1
+Version: 2.4
 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.3rc1 → novelwriter-2.4}/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
@@ -83,6 +83,7 @@ novelwriter/assets/icons/typicons_dark/nw_tb-bold-md.svg
 novelwriter/assets/icons/typicons_dark/nw_tb-bold.svg
 novelwriter/assets/icons/typicons_dark/nw_tb-italic-md.svg
 novelwriter/assets/icons/typicons_dark/nw_tb-italic.svg
+novelwriter/assets/icons/typicons_dark/nw_tb-mark.svg
 novelwriter/assets/icons/typicons_dark/nw_tb-strike-md.svg
 novelwriter/assets/icons/typicons_dark/nw_tb-strike.svg
 novelwriter/assets/icons/typicons_dark/nw_tb-subscript.svg
@@ -133,6 +134,7 @@ novelwriter/assets/icons/typicons_dark/typ_puzzle-outline.svg
 novelwriter/assets/icons/typicons_dark/typ_puzzle.svg
 novelwriter/assets/icons/typicons_dark/typ_refresh-flipped.svg
 novelwriter/assets/icons/typicons_dark/typ_refresh.svg
+novelwriter/assets/icons/typicons_dark/typ_search-grey.svg
 novelwriter/assets/icons/typicons_dark/typ_search.svg
 novelwriter/assets/icons/typicons_dark/typ_star.svg
 novelwriter/assets/icons/typicons_dark/typ_stopwatch-grey.svg
@@ -142,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
@@ -177,6 +181,7 @@ novelwriter/assets/icons/typicons_light/nw_tb-bold-md.svg
 novelwriter/assets/icons/typicons_light/nw_tb-bold.svg
 novelwriter/assets/icons/typicons_light/nw_tb-italic-md.svg
 novelwriter/assets/icons/typicons_light/nw_tb-italic.svg
+novelwriter/assets/icons/typicons_light/nw_tb-mark.svg
 novelwriter/assets/icons/typicons_light/nw_tb-strike-md.svg
 novelwriter/assets/icons/typicons_light/nw_tb-strike.svg
 novelwriter/assets/icons/typicons_light/nw_tb-subscript.svg
@@ -227,6 +232,7 @@ novelwriter/assets/icons/typicons_light/typ_puzzle-outline.svg
 novelwriter/assets/icons/typicons_light/typ_puzzle.svg
 novelwriter/assets/icons/typicons_light/typ_refresh-flipped.svg
 novelwriter/assets/icons/typicons_light/typ_refresh.svg
+novelwriter/assets/icons/typicons_light/typ_search-grey.svg
 novelwriter/assets/icons/typicons_light/typ_search.svg
 novelwriter/assets/icons/typicons_light/typ_star.svg
 novelwriter/assets/icons/typicons_light/typ_stopwatch-grey.svg
@@ -236,12 +242,15 @@ 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
 novelwriter/assets/images/novelwriter-text-light.svg
 novelwriter/assets/images/welcome-dark.jpg
 novelwriter/assets/images/welcome-light.jpg
+novelwriter/assets/syntax/cyberpunk_night.conf
 novelwriter/assets/syntax/default_dark.conf
 novelwriter/assets/syntax/default_light.conf
 novelwriter/assets/syntax/grey_dark.conf
@@ -250,6 +259,7 @@ novelwriter/assets/syntax/light_owl.conf
 novelwriter/assets/syntax/night_owl.conf
 novelwriter/assets/syntax/solarized_dark.conf
 novelwriter/assets/syntax/solarized_light.conf
+novelwriter/assets/syntax/tango.conf
 novelwriter/assets/syntax/tomorrow.conf
 novelwriter/assets/syntax/tomorrow_night.conf
 novelwriter/assets/syntax/tomorrow_night_blue.conf
@@ -257,12 +267,12 @@ novelwriter/assets/syntax/tomorrow_night_bright.conf
 novelwriter/assets/syntax/tomorrow_night_eighties.conf
 novelwriter/assets/text/credits_en.htm
 novelwriter/assets/text/lipsum.txt
+novelwriter/assets/themes/cyberpunk_night.conf
 novelwriter/assets/themes/default.conf
 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
@@ -282,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
@@ -291,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
@@ -303,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
@@ -314,10 +321,11 @@ novelwriter/gui/mainmenu.py
 novelwriter/gui/noveltree.py
 novelwriter/gui/outline.py
 novelwriter/gui/projtree.py
+novelwriter/gui/search.py
 novelwriter/gui/sidebar.py
 novelwriter/gui/statusbar.py
 novelwriter/gui/theme.py
-novelwriter/tools/__init__.py
+novelwriter/text/counting.py
 novelwriter/tools/dictionaries.py
 novelwriter/tools/lipsum.py
 novelwriter/tools/manusbuild.py
@@ -330,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.4/novelWriter.egg-info/entry_points.txt

@@ -0,0 +1,2 @@
+[gui_scripts]
+novelwriter = novelwriter:main

{novelWriter-2.3rc1 → novelwriter-2.4}/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.3rc1"
-__hexversion__ = "0x020300c1"
-__date__       = "2024-02-24"
+__version__    = "2.4"
+__hexversion__ = "0x020400f0"
+__date__       = "2024-04-20"
 __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
@@ -195,7 +200,7 @@ def main(sysArgs: list | None = None):
 
     if CONFIG.osDarwin:
         try:
-            from Foundation import NSBundle
+            from Foundation import NSBundle  # type: ignore
             bundle = NSBundle.mainBundle()
             info = bundle.localizedInfoDictionary() or bundle.infoDictionary()
             info["CFBundleName"] = "novelWriter"
@@ -207,7 +212,7 @@ def main(sysArgs: list | None = None):
         try:
             import ctypes
             appID = f"io.novelwriter.{__version__}"
-            ctypes.windll.shell32.SetCurrentProcessExplicitAppUserModelID(appID)
+            ctypes.windll.shell32.SetCurrentProcessExplicitAppUserModelID(appID)  # type: ignore
         except Exception:
             logger.error("Failed to set application name")
             logException()
@@ -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.3rc1 → novelwriter-2.4}/novelwriter/assets/i18n/project_nl_NL.json

@@ -1,7 +1,18 @@
 {
   "Synopsis": "Synopsis",
+  "Short Description": "Korte beschrijving",
   "Comment": "Opmerking",
   "Notes": "Notities",
+  "Tag": "Label",
+  "Point of View": "Perspectief",
+  "Focus": "Focus",
+  "Characters": "Personages",
+  "Plot": "Plot",
+  "Timeline": "Tijdslijn",
+  "Locations": "Locaties",
+  "Objects": "Objecten",
+  "Entities": "Entiteiten",
+  "Custom": "Aangepast",
   "0": "nul",
   "1": "één",
   "2": "twee",

{novelWriter-2.3rc1 → novelwriter-2.4}/novelwriter/assets/i18n/project_pt_BR.json

@@ -1,7 +1,18 @@
 {
   "Synopsis": "Sinopse",
+  "Short Description": "Descrição breve",
   "Comment": "Comentários",
   "Notes": "Notas",
+  "Tag": "Etiqueta",
+  "Point of View": "Ponto de vista",
+  "Focus": "Foco",
+  "Characters": "Personagens",
+  "Plot": "Trama",
+  "Timeline": "Linha do tempo",
+  "Locations": "Lugares",
+  "Objects": "Objetos",
+  "Entities": "Entidades",
+  "Custom": "Outros",
   "0": "Zero",
   "1": "Um",
   "2": "Dois",

novelwriter-2.4/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.3rc1 → novelwriter-2.4}/novelwriter/assets/icons/typicons_dark/icons.conf

@@ -53,6 +53,7 @@ fmt_bold        = nw_tb-bold.svg
 fmt_bold-md     = nw_tb-bold-md.svg
 fmt_italic      = nw_tb-italic.svg
 fmt_italic-md   = nw_tb-italic-md.svg
+fmt_mark        = nw_tb-mark.svg
 fmt_strike      = nw_tb-strike.svg
 fmt_strike-md   = nw_tb-strike-md.svg
 fmt_subscript   = nw_tb-subscript.svg
@@ -99,12 +100,15 @@ 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_unfold-hidden.svg
+unfold-show     = typ_unfold-visible.svg
 up              = typ_chevron-up.svg
 view            = typ_eye.svg
 view_build      = typ_export-grey.svg
 view_editor     = mixed_edit.svg
 view_novel      = typ_book-grey.svg
 view_outline    = typ_puzzle-outline.svg
+view_search     = typ_search-grey.svg
 
 deco_doc_h0     = nw_deco-h0.svg
 deco_doc_h0_n   = nw_deco-h0.svg

novelwriter-2.4/novelwriter/assets/icons/typicons_dark/nw_tb-mark.svg

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.1" viewBox="0 0 6.35 6.35" xmlns="http://www.w3.org/2000/svg">
+ <rect x=".26458" y=".79375" width="5.8208" height="4.7625" fill="#ffff84" fill-opacity=".8" stroke-linecap="round" stroke-width=".1354"/>
+ <path d="m1.3229 5.2917v-4.2333h0.98087l0.6397 1.8829q0.060924 0.18829 0.11576 0.38957 0.054831 0.19479 0.11576 0.38957h0.024369q0.060924-0.19479 0.10966-0.38957 0.054831-0.20128 0.11576-0.38957l0.62752-1.8829h0.97478v4.2333h-0.81638v-1.5518q0-0.15583 0.012185-0.34412 0.012185-0.18829 0.030462-0.37658 0.018277-0.19479 0.036554-0.37658 0.018277-0.18829 0.036554-0.34412h-0.02437l-0.3229 1.0064-0.56659 1.6167h-0.49348l-0.56659-1.6167-0.3168-1.0064h-0.024369q0.018277 0.15583 0.036554 0.34412 0.018277 0.1818 0.036554 0.37658 0.018277 0.18829 0.030462 0.37658 0.012185 0.18829 0.012185 0.34412v1.5518z" fill="#808080" stroke-linecap="round" stroke-width=".11793"/>
+ <path d="m4.9555 5.5562v-0.43195h0.54619v-3.8986h-0.54619v-0.43195h1.1299v4.7624z" fill="#69c" stroke-width="1.1186"/>
+ <path d="m0.26458 5.5562v-4.7624h1.1299v0.43195h-0.54083v3.8986h0.54083v0.43195z" fill="#69c" stroke-width="1.1186"/>
+</svg>

novelwriter-2.4/novelwriter/assets/icons/typicons_dark/typ_refresh-flipped.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="m10.692 12.288h-7.692v-7.689c0.012-1.7022 1.0065-2.1116 2.2095-0.90734l1.731 1.7367c1.5225-1.1923 3.3855-1.8447 5.349-1.8447 2.325 0 4.5135 0.90583 6.156 2.5511 1.6485 1.6377 2.5545 3.8288 2.5545 6.1533 0 2.3291-0.906 4.5172-2.5515 6.1594-1.6455 1.6452-3.8325 2.5525-6.159 2.5525-2.325 0-4.5135-0.90734-6.159-2.554-0.444-0.44542-0.837-0.93132-1.17-1.4472-0.5205-0.81135-0.285-1.8897 0.525-2.4071 0.8085-0.51891 1.887-0.28344 2.406 0.5249 0.1995 0.31044 0.438 0.59988 0.702 0.86984 0.9885 0.98682 2.301 1.5297 3.696 1.5297 1.395 0 2.7075-0.5414 3.696-1.5297 0.9855-0.98682 1.53-2.2991 1.53-3.6969 0-1.3948-0.543-2.707-1.53-3.6908-0.9885-0.98682-2.301-1.5312-3.696-1.5312-1.032 0-2.019 0.30144-2.8635 0.85784l2.172 2.1761c1.2045 1.2027 0.795 2.1866-0.906 2.1866z" fill="#9c9" stroke-width="1.3332"/>
+</svg>

novelwriter-2.4/novelwriter/assets/icons/typicons_dark/typ_refresh.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="m13.308 12.288h7.692v-7.689c-0.012-1.7022-1.0065-2.1116-2.2095-0.90734l-1.731 1.7367c-1.5225-1.1923-3.3855-1.8447-5.349-1.8447-2.325 0-4.5135 0.90583-6.156 2.5511-1.6485 1.6377-2.5545 3.8288-2.5545 6.1533 0 2.3291 0.906 4.5172 2.5515 6.1594 1.6455 1.6452 3.8325 2.5525 6.159 2.5525 2.325 0 4.5135-0.90734 6.159-2.554 0.444-0.44542 0.837-0.93132 1.17-1.4472 0.5205-0.81135 0.285-1.8897-0.525-2.4071-0.8085-0.51891-1.887-0.28344-2.406 0.5249-0.1995 0.31044-0.438 0.59988-0.702 0.86984-0.9885 0.98682-2.301 1.5297-3.696 1.5297-1.395 0-2.7075-0.5414-3.696-1.5297-0.9855-0.98682-1.53-2.2991-1.53-3.6969 0-1.3948 0.543-2.707 1.53-3.6908 0.9885-0.98682 2.301-1.5312 3.696-1.5312 1.032 0 2.019 0.30144 2.8635 0.85784l-2.172 2.1761c-1.2045 1.2027-0.795 2.1866 0.906 2.1866z" fill="#9c9" stroke-width="1.3332"/>
+</svg>