novelWriter 2.6rc1__tar.gz → 2.6.1__tar.gz

{novelwriter-2.6rc1 → novelwriter-2.6.1}/CHANGELOG.md

@@ -1,5 +1,94 @@
 # novelWriter Changelog
 
+## Version 2.6.1 [2025-02-02]
+
+### Release Notes
+
+This is a patch release that fixes an issue with creating new notes from the editor context menu,
+adds an option to turn off the confirmation box that pops up when closing novelWriter, and improves
+the recent project list on the Welcome dialog.
+
+A French version of the user guide is now also available when the localisation is set to French,
+and the French, Latin American Spanish, Norwegian, US English, German and Japanese translations of
+the application have been updated.
+
+### Detailed Changelog
+
+**Bugfixes**
+
+* Fixed an issue where the "Create Note from Tag" would also show up for `@story` references. These
+  should not create new novel documents. The same menu entry was also removed for `@mention`
+  references, as it is not known what category the would belong to. Issue #2212. PR #2215.
+
+**Improvements**
+
+* A setting was added to Preferences to disable the dialog box when exiting novelWriter. It is
+  available under the "Behaviour" section. Issue #2209. PR#2213.
+* Recent projects on the Welcome dialog box are now tracked using their unique ID as well as their
+  path. This means that if a project is moved, it should not show up twice in the list, but the
+  path should be updated. Issue #2217. PR #2218.
+
+**Documentation**
+
+* A French version of the user guide is nov available from the Help menu if the GUi language is set
+  to French. The French translation was contributed by @Karduin. It is currently directly added to
+  the source, but from 2.7 it will be generated automatically in the same way the English user
+  guide is. Discussion #1834. PR #2220.
+
+**Internationalisation**
+
+* French translations are available up to the 2.6 release. That is, the new exit dialog setting is
+  not translated yet. PR #2214.
+* Latin American Spanish, Norwegian, US English, German and Japanese translations are fully
+  updated. PR #2214.
+
+See the [translation activity stream](https://crowdin.com/project/novelwriter/activity-stream) for
+more details.
+
+----
+
+## Version 2.6 [2025-01-26]
+
+### Release Notes
+
+The 2.6 release fixes a few minor issues from the RC 1 pre-release, and updates most translations.
+
+See the website for complete [Release Notes](https://novelwriter.io/releases/release_2_6.html).
+
+### Detailed Changelog
+
+**Bugfixes**
+
+* Fixed a bug in the novel selector dropdown used a few places that would clear the selection if
+  the novel list was refreshed. PR #2179.
+* Fixed a bug that would crash the app if the project tree was clicked without any project having
+  been loaded. The selection model does not exist prior to a project load. Issue #2173. PR #2181.
+* Replaced a broken link on the dictionary install tool available on Windows. PR #2189.
+* Backported a few code fixes from 2.7 related to freeing memory from closed dialogs and one
+  instance of a potentially uninitialised variable. PR #2202.
+* Fixed word wrapping in the item details panel for status and importance labels with very long
+  names. PR #2202.
+* Fixed the project tree context menu so that it is not opened when right-clicking on an empty area
+  of the tree widget. PR #2202.
+
+**Improvements**
+
+* Chapter headings are now level 1 headings in all manuscript output formats, not just HTML like
+  before. Most applications that post-processes output will assume chapters are level 1.
+  Correspondingly, scenes are now level 2 and sections are level 3. Notes headings remain
+  unchanged. Issue #2205. PR #2206.
+
+**Internationalisation**
+
+* German, US English, Italian, Japanese, Norwegian and Polish have been updated in full. Brazilian
+  Portuguese and Chinese have been partially updated. PR #2207.
+
+**Documentation**
+
+* Documentation has been updated with 2.6 features. PR #2210.
+
+----
+
 ## Version 2.6 RC 1 [2025-01-09]
 
 ### Release Notes

{novelwriter-2.6rc1 → novelwriter-2.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: novelWriter
-Version: 2.6rc1
+Version: 2.6.1
 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.6rc1 → novelwriter-2.6.1}/novelWriter.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: novelWriter
-Version: 2.6rc1
+Version: 2.6.1
 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.6rc1 → novelwriter-2.6.1}/novelWriter.egg-info/SOURCES.txt

@@ -21,6 +21,7 @@ novelwriter/guimain.py
 novelwriter/shared.py
 novelwriter/types.py
 novelwriter/assets/manual.pdf
+novelwriter/assets/manual_fr_FR.pdf
 novelwriter/assets/sample.zip
 novelwriter/assets/i18n/nw_de_DE.qm
 novelwriter/assets/i18n/nw_en_US.qm

{novelwriter-2.6rc1 → novelwriter-2.6.1}/novelwriter/__init__.py

@@ -47,9 +47,9 @@ __license__    = "GPLv3"
 __author__     = "Veronica Berglyd Olsen"
 __maintainer__ = "Veronica Berglyd Olsen"
 __email__      = "code@vkbo.net"
-__version__    = "2.6rc1"
-__hexversion__ = "0x020600c1"
-__date__       = "2025-01-09"
+__version__    = "2.6.1"
+__hexversion__ = "0x020601f0"
+__date__       = "2025-02-02"
 __status__     = "Stable"
 __domain__     = "novelwriter.io"
 

{novelwriter-2.6rc1 → novelwriter-2.6.1}/novelwriter/assets/i18n/project_de_DE.json

@@ -1,6 +1,7 @@
 {
   "Synopsis": "Synopsis",
   "Short Description": "Kurzbeschreibung",
+  "Footnotes": "Fußnoten",
   "Comment": "Kommentar",
   "Notes": "Notizen",
   "Tag": "Schlagwort",
@@ -13,6 +14,7 @@
   "Objects": "Objekte",
   "Entities": "Organisationen",
   "Custom": "Benutzerdefiniert",
+  "New Page": "Neue Seite",
   "0": "Null",
   "1": "Eins",
   "2": "Zwei",

{novelwriter-2.6rc1 → novelwriter-2.6.1}/novelwriter/assets/i18n/project_en_US.json

@@ -1,6 +1,7 @@
 {
   "Synopsis": "Synopsis",
   "Short Description": "Short Description",
+  "Footnotes": "Footnotes",
   "Comment": "Comment",
   "Notes": "Notes",
   "Tag": "Tag",
@@ -13,6 +14,7 @@
   "Objects": "Objects",
   "Entities": "Entities",
   "Custom": "Custom",
+  "New Page": "New Page",
   "0": "Zero",
   "1": "One",
   "2": "Two",

{novelwriter-2.6rc1 → novelwriter-2.6.1}/novelwriter/assets/i18n/project_es_419.json

@@ -1,6 +1,7 @@
 {
   "Synopsis": "Sinopsis",
   "Short Description": "Breve Descripción",
+  "Footnotes": "Notas al pie",
   "Comment": "Comentario",
   "Notes": "Notas",
   "Tag": "Etiqueta",
@@ -13,6 +14,7 @@
   "Objects": "Objetos",
   "Entities": "Entidades",
   "Custom": "Otros",
+  "New Page": "Nueva Página",
   "0": "Cero",
   "1": "Uno",
   "2": "Dos",

{novelwriter-2.6rc1 → novelwriter-2.6.1}/novelwriter/assets/i18n/project_fr_FR.json

@@ -1,6 +1,7 @@
 {
   "Synopsis": "Synopsis",
   "Short Description": "Description sommaire",
+  "Footnotes": "Notes de bas de page",
   "Comment": "Commentaire",
   "Notes": "Notes",
   "Tag": "Étiquette",
@@ -13,7 +14,8 @@
   "Objects": "Objets",
   "Entities": "Entités",
   "Custom": "Personnalisé",
-  "0": "Zero",
+  "New Page": "Nouvelle page",
+  "0": "Zéro",
   "1": "Un",
   "2": "Deux",
   "3": "Trois",

{novelwriter-2.6rc1 → novelwriter-2.6.1}/novelwriter/assets/i18n/project_it_IT.json

@@ -1,6 +1,7 @@
 {
   "Synopsis": "Sinossi",
   "Short Description": "Breve descrizione",
+  "Footnotes": "Note a piè pagina",
   "Comment": "Commento",
   "Notes": "Note",
   "Tag": "Etichetta",
@@ -13,6 +14,7 @@
   "Objects": "Oggetti",
   "Entities": "Enti",
   "Custom": "Personalizzato",
+  "New Page": "Nuova pagina",
   "0": "Zero",
   "1": "Uno",
   "2": "Due",

{novelwriter-2.6rc1 → novelwriter-2.6.1}/novelwriter/assets/i18n/project_ja_JP.json

@@ -1,6 +1,7 @@
 {
   "Synopsis": "あらすじ",
   "Short Description": "短い説明",
+  "Footnotes": "脚注",
   "Comment": "コメント ",
   "Notes": "ノート",
   "Tag": "タグ",
@@ -13,6 +14,7 @@
   "Objects": "オブジェクト",
   "Entities": "エンティティ",
   "Custom": "カスタム",
+  "New Page": "新規ページ",
   "0": "零",
   "1": "一",
   "2": "二",

{novelwriter-2.6rc1 → novelwriter-2.6.1}/novelwriter/assets/i18n/project_nb_NO.json

@@ -1,6 +1,7 @@
 {
   "Synopsis": "Sammendrag",
   "Short Description": "Kort beskrivelse",
+  "Footnotes": "Fotnoter",
   "Comment": "Kommentar",
   "Notes": "Notat",
   "Tag": "Knagg",
@@ -13,6 +14,7 @@
   "Objects": "Objekter",
   "Entities": "Enheter",
   "Custom": "Annet",
+  "New Page": "Ny side",
   "0": "null",
   "1": "én",
   "2": "to",

{novelwriter-2.6rc1 → novelwriter-2.6.1}/novelwriter/assets/i18n/project_nl_NL.json

@@ -1,6 +1,7 @@
 {
   "Synopsis": "Synopsis",
   "Short Description": "Korte beschrijving",
+  "Footnotes": "Voetnoten",
   "Comment": "Opmerking",
   "Notes": "Notities",
   "Tag": "Label",
@@ -13,6 +14,7 @@
   "Objects": "Objecten",
   "Entities": "Entiteiten",
   "Custom": "Aangepast",
+  "New Page": "Nieuwe pagina",
   "0": "nul",
   "1": "één",
   "2": "twee",

{novelwriter-2.6rc1 → novelwriter-2.6.1}/novelwriter/assets/i18n/project_pl_PL.json

@@ -1,6 +1,7 @@
 {
   "Synopsis": "Streszczenie",
   "Short Description": "Krótki opis",
+  "Footnotes": "Przypisy",
   "Comment": "Komentarz",
   "Notes": "Notatki",
   "Tag": "Znacznik",
@@ -13,6 +14,7 @@
   "Objects": "Obiekty",
   "Entities": "Podmioty",
   "Custom": "Różne",
+  "New Page": "Nowa strona",
   "0": "zero",
   "1": "pierwszy",
   "2": "drugi",

{novelwriter-2.6rc1 → novelwriter-2.6.1}/novelwriter/assets/i18n/project_pt_BR.json

@@ -1,6 +1,7 @@
 {
   "Synopsis": "Sinopse",
   "Short Description": "Descrição breve",
+  "Footnotes": "Notas de rodapé",
   "Comment": "Comentário",
   "Notes": "Notas",
   "Tag": "Etiqueta",
@@ -13,6 +14,7 @@
   "Objects": "Objetos",
   "Entities": "Entidades",
   "Custom": "Outros",
+  "New Page": "Nova página",
   "0": "Zero",
   "1": "Um",
   "2": "Dois",

{novelwriter-2.6rc1 → novelwriter-2.6.1}/novelwriter/assets/i18n/project_zh_CN.json

@@ -1,6 +1,7 @@
 {
   "Synopsis": "概要",
   "Short Description": "简短描述",
+  "Footnotes": "注释",
   "Comment": "注释",
   "Notes": "笔记",
   "Tag": "标签",
@@ -13,6 +14,7 @@
   "Objects": "物品",
   "Entities": "条目",
   "Custom": "自定义",
+  "New Page": "新建页面",
   "0": "零",
   "1": "一",
   "2": "二",

{novelwriter-2.6rc1 → novelwriter-2.6.1}/novelwriter/config.py

@@ -32,6 +32,7 @@ import sys
 from datetime import datetime
 from pathlib import Path
 from time import time
+from typing import TYPE_CHECKING
 
 from PyQt5.QtCore import (
     PYQT_VERSION, PYQT_VERSION_STR, QT_VERSION, QT_VERSION_STR, QLibraryInfo,
@@ -47,6 +48,9 @@ from novelwriter.common import (
 from novelwriter.constants import nwFiles, nwUnicode
 from novelwriter.error import formatException, logException
 
+if TYPE_CHECKING:  # pragma: no cover
+    from novelwriter.core.projectdata import NWProjectData
+
 logger = logging.getLogger(__name__)
 
 
@@ -101,8 +105,11 @@ class Config:
         self._qtTrans = {}
 
         # PDF Manual
-        pdfDocs = self._appPath / "assets" / "manual.pdf"
-        self.pdfDocs = pdfDocs if pdfDocs.is_file() else None
+        self._manuals: dict[str, Path] = {}
+        if (assets := self._appPath / "assets").is_dir():
+            for item in assets.iterdir():
+                if item.is_file() and item.stem.startswith("manual") and item.suffix == ".pdf":
+                    self._manuals[item.stem] = item
 
         # User Settings
         # =============
@@ -112,7 +119,7 @@ class Config:
 
         # General GUI Settings
         self.guiLocale    = self._qLocale.name()
-        self.guiTheme     = "default"        # GUI theme
+        self.guiTheme     = "default_light"  # GUI theme
         self.guiSyntax    = "default_light"  # Syntax theme
         self.guiFont      = QFont()          # Main GUI font
         self.guiScale     = 1.0              # Set automatically by Theme class
@@ -135,6 +142,7 @@ class Config:
         self.emphLabels      = True   # Add emphasis to H1 and H2 item labels
         self.backupOnClose   = False  # Flag for running automatic backups
         self.askBeforeBackup = True   # Flag for asking before running automatic backup
+        self.askBeforeExit   = True   # Flag for asking before exiting the app
 
         # Text Editor Settings
         self.textFont        = QFont()  # Editor font
@@ -257,6 +265,10 @@ class Config:
     def hasError(self) -> bool:
         return self._hasError
 
+    @property
+    def pdfDocs(self) -> Path | None:
+        return self._manuals.get(f"manual_{self.locale.name()}", self._manuals.get("manual"))
+
     @property
     def locale(self) -> QLocale:
         return self._dLocale
@@ -628,6 +640,7 @@ class Config:
         self._backupPath     = conf.rdPath(sec, "backuppath", self._backupPath)
         self.backupOnClose   = conf.rdBool(sec, "backuponclose", self.backupOnClose)
         self.askBeforeBackup = conf.rdBool(sec, "askbeforebackup", self.askBeforeBackup)
+        self.askBeforeExit   = conf.rdBool(sec, "askbeforeexit", self.askBeforeExit)
 
         # Editor
         sec = "Editor"
@@ -739,6 +752,7 @@ class Config:
             "backuppath":      str(self._backupPath),
             "backuponclose":   str(self.backupOnClose),
             "askbeforebackup": str(self.askBeforeBackup),
+            "askbeforeexit":   str(self.askBeforeExit),
         }
 
         conf["Editor"] = {
@@ -842,29 +856,30 @@ class RecentProjects:
 
     def __init__(self, config: Config) -> None:
         self._conf = config
-        self._data = {}
+        self._data: dict[str, dict[str, str | int]] = {}
+        self._map: dict[str, str] = {}
         return
 
     def loadCache(self) -> bool:
         """Load the cache file for recent projects."""
         self._data = {}
-
+        self._map = {}
         cacheFile = self._conf.dataPath(nwFiles.RECENT_FILE)
         if cacheFile.is_file():
             try:
                 with open(cacheFile, mode="r", encoding="utf-8") as inFile:
                     data = json.load(inFile)
                 for path, entry in data.items():
-                    self._data[path] = {
-                        "title": entry.get("title", ""),
-                        "words": entry.get("words", 0),
-                        "time": entry.get("time", 0),
-                    }
+                    puuid = str(entry.get("uuid", ""))
+                    title = str(entry.get("title", ""))
+                    words = checkInt(entry.get("words", 0), 0)
+                    saved = checkInt(entry.get("time", 0), 0)
+                    if path and title:
+                        self._setEntry(puuid, path, title, words, saved)
             except Exception:
                 logger.error("Could not load recent project cache")
                 logException()
                 return False
-
         return True
 
     def saveCache(self) -> bool:
@@ -879,7 +894,6 @@ class RecentProjects:
             logger.error("Could not save recent project cache")
             logException()
             return False
-
         return True
 
     def listEntries(self) -> list[tuple[str, str, int, int]]:
@@ -889,14 +903,15 @@ class RecentProjects:
             for k, e in self._data.items()
         ]
 
-    def update(self, path: str | Path, title: str, words: int, saved: float | int) -> None:
+    def update(self, path: str | Path, data: NWProjectData, saved: float | int) -> None:
         """Add or update recent cache information on a given project."""
-        self._data[str(path)] = {
-            "title": title,
-            "words": int(words),
-            "time": int(saved),
-        }
-        self.saveCache()
+        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.saveCache()
+        except Exception:
+            pass
         return
 
     def remove(self, path: str | Path) -> None:
@@ -906,6 +921,13 @@ class RecentProjects:
             self.saveCache()
         return
 
+    def _setEntry(self, puuid: str, path: str, title: str, words: int, saved: int) -> None:
+        """Set an entry in the recent projects record."""
+        self._data[path] = {"uuid": puuid, "title": title, "words": words, "time": saved}
+        if puuid:
+            self._map[puuid] = path
+        return
+
 
 class RecentPaths:
 

{novelwriter-2.6rc1 → novelwriter-2.6.1}/novelwriter/constants.py

@@ -173,6 +173,10 @@ class nwKeyWords:
         TAG_KEY, POV_KEY, FOCUS_KEY, CHAR_KEY, PLOT_KEY, TIME_KEY, WORLD_KEY,
         OBJECT_KEY, ENTITY_KEY, CUSTOM_KEY, STORY_KEY, MENTION_KEY,
     ]
+    CAN_CREATE = [
+        POV_KEY, FOCUS_KEY, CHAR_KEY, PLOT_KEY, TIME_KEY, WORLD_KEY,
+        OBJECT_KEY, ENTITY_KEY, CUSTOM_KEY,
+    ]
 
     # Set of Valid Keys
     VALID_KEYS = set(ALL_KEYS)

{novelwriter-2.6rc1 → novelwriter-2.6.1}/novelwriter/core/buildsettings.py

@@ -159,6 +159,13 @@ SETTINGS_LABELS = {
     "format.indentFirstPar":   QT_TRANSLATE_NOOP("Builds", "Indent First Paragraph"),
 
     "format.grpMargins":       QT_TRANSLATE_NOOP("Builds", "Text Margins"),
+    "format.titleMargin":      QT_TRANSLATE_NOOP("Builds", "Title and Partition"),
+    "format.h1Margin":         QT_TRANSLATE_NOOP("Builds", "Heading 1 and Chapter"),
+    "format.h2Margin":         QT_TRANSLATE_NOOP("Builds", "Heading 2 and Scene"),
+    "format.h3Margin":         QT_TRANSLATE_NOOP("Builds", "Heading 3 and Section"),
+    "format.h4Margin":         QT_TRANSLATE_NOOP("Builds", "Heading 4"),
+    "format.textMargin":       QT_TRANSLATE_NOOP("Builds", "Text Paragraph"),
+    "format.sepMargin":        QT_TRANSLATE_NOOP("Builds", "Scene Separator"),
 
     "format.grpPage":          QT_TRANSLATE_NOOP("Builds", "Page Layout"),
     "format.pageUnit":         QT_TRANSLATE_NOOP("Builds", "Unit"),

{novelwriter-2.6rc1 → novelwriter-2.6.1}/novelwriter/core/project.py

@@ -353,9 +353,7 @@ class NWProject:
 
         # Update recent projects
         if storePath := self._storage.storagePath:
-            CONFIG.recentProjects.update(
-                storePath, self._data.name, sum(self._data.initCounts), time()
-            )
+            CONFIG.recentProjects.update(storePath, self._data, time())
 
         # Check the project tree consistency
         # This also handles any orphaned files found
@@ -421,9 +419,7 @@ class NWProject:
 
         # Update recent projects
         if storagePath := self._storage.storagePath:
-            CONFIG.recentProjects.update(
-                storagePath, self._data.name, sum(self._data.currCounts), saveTime
-            )
+            CONFIG.recentProjects.update(storagePath, self._data, saveTime)
 
         SHARED.newStatusMessage(self.tr("Saved Project: {0}").format(self._data.name))
         self.setProjectChanged(False)

{novelwriter-2.6rc1 → novelwriter-2.6.1}/novelwriter/dialogs/preferences.py

@@ -271,10 +271,10 @@ class GuiPreferences(NDialog):
             self.tr("Include project notes in status bar word count"), self.incNotesWCount
         )
 
-        # Auto Save
+        # Behaviour
         # =========
 
-        title = self.tr("Auto Save")
+        title = self.tr("Behaviour")
         section += 1
         self.sidebar.addButton(title, section)
         self.mainForm.addGroupLabel(title, section)
@@ -301,6 +301,14 @@ class GuiPreferences(NDialog):
             self.tr("How often the project is automatically saved."), unit=self.tr("seconds")
         )
 
+        # Ask before exiting novelWriter
+        self.askBeforeExit = NSwitch(self)
+        self.askBeforeExit.setChecked(CONFIG.askBeforeExit)
+        self.mainForm.addRow(
+            self.tr("Ask before exiting novelWriter"), self.askBeforeExit,
+            self.tr("Only applies when a project is open.")
+        )
+
         # Project Backup
         # ==============
 
@@ -927,9 +935,10 @@ class GuiPreferences(NDialog):
         CONFIG.incNotesWCount = self.incNotesWCount.isChecked()
         CONFIG.setTextFont(self._textFont)
 
-        # Auto Save
-        CONFIG.autoSaveDoc  = self.autoSaveDoc.value()
-        CONFIG.autoSaveProj = self.autoSaveProj.value()
+        # Behaviour
+        CONFIG.autoSaveDoc   = self.autoSaveDoc.value()
+        CONFIG.autoSaveProj  = self.autoSaveProj.value()
+        CONFIG.askBeforeExit = self.askBeforeExit.isChecked()
 
         # Project Backup
         CONFIG.setBackupPath(self.backupPath)

{novelwriter-2.6rc1 → novelwriter-2.6.1}/novelwriter/enum.py

@@ -68,13 +68,6 @@ class nwComment(Enum):
     STORY    = 7
 
 
-class nwTrinary(Enum):
-
-    NEGATIVE = -1
-    NEUTRAL  = 0
-    POSITIVE = 1
-
-
 class nwChange(Enum):
 
     CREATE = 0

{novelwriter-2.6rc1 → novelwriter-2.6.1}/novelwriter/extensions/novelselector.py

@@ -90,12 +90,13 @@ class NovelSelector(QComboBox):
     @pyqtSlot()
     def refreshNovelList(self) -> None:
         """Rebuild the list of novel items."""
+        cHandle = self.currentData()
+
         self._blockSignal = True
         self._firstHandle = None
         self.clear()
 
         icon = SHARED.theme.getIcon(nwLabels.CLASS_ICON[nwItemClass.NOVEL])
-        handle = self.currentData()
         for tHandle, nwItem in SHARED.project.tree.iterRoots(nwItemClass.NOVEL):
             if self._listFormat:
                 name = self._listFormat.format(nwItem.itemName)
@@ -110,7 +111,7 @@ class NovelSelector(QComboBox):
             self.insertSeparator(self.count())
             self.addItem(icon, self.tr("All Novel Folders"), "")
 
-        self.setHandle(handle)
+        self.setHandle(cHandle)
         self.setEnabled(self.count() > 1)
         self._blockSignal = False