From 453502e1c70c505fa6dc5f4e8c6745d4e2fe7157 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Wed, 25 Jun 2025 10:23:00 +0200 Subject: [PATCH 1/8] Revert the format of the license field in the pyrproject file (#2434) --- pyproject.toml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 8375e9b8..9263eb81 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,7 +9,7 @@ authors = [ ] description = "A plain text editor for planning and writing novels" readme = {file = "setup/description_pypi.md", content-type = "text/markdown"} -license = "GPL-3.0" +license = {text = "GPL-3.0-or-later"} classifiers = [ "Programming Language :: Python :: 3 :: Only", "Programming Language :: Python :: 3.10", @@ -17,7 +17,6 @@ classifiers = [ "Programming Language :: Python :: 3.12", "Programming Language :: Python :: 3.13", "Programming Language :: Python :: Implementation :: CPython", - "License :: OSI Approved :: GNU General Public License v3 (GPLv3)", "Development Status :: 5 - Production/Stable", "Operating System :: OS Independent", "Intended Audience :: End Users/Desktop", From 3149e7ec0d34be716d7df2aee4eaaacf89e49189 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Sun, 6 Jul 2025 17:29:19 +0200 Subject: [PATCH 2/8] Disable config parser interpolation with % (#2455) --- novelwriter/common.py | 5 +++-- tests/test_dialogs/test_dlg_preferences.py | 8 ++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/novelwriter/common.py b/novelwriter/common.py index a4e37f62..2ad42935 100644 --- a/novelwriter/common.py +++ b/novelwriter/common.py @@ -680,11 +680,12 @@ class NWConfigParser(ConfigParser): """Common: Adapted Config Parser This is a subclass of the standard config parser that adds type safe - helper functions, and support for lists. + helper functions, and support for lists. It also turns off + interpolation, which would require % symbols to be escaped (#2455). """ def __init__(self) -> None: - super().__init__() + super().__init__(interpolation=None) return def rdStr(self, section: str, option: str, default: str) -> str: diff --git a/tests/test_dialogs/test_dlg_preferences.py b/tests/test_dialogs/test_dlg_preferences.py index 5572f430..ab5822be 100644 --- a/tests/test_dialogs/test_dlg_preferences.py +++ b/tests/test_dialogs/test_dlg_preferences.py @@ -271,8 +271,8 @@ def testDlgPreferences_Settings(qtbot, monkeypatch, nwGUI, fncPath, tstPaths): prefs.dialogLine.setText("–") prefs.narratorBreak.setCurrentData("–", "") prefs.narratorDialog.setCurrentData("–", "") - prefs.altDialogOpen.setText("<") - prefs.altDialogClose.setText(">") + prefs.altDialogOpen.setText("%") # Symbol also tests for #2455 + prefs.altDialogClose.setText("%") # Symbol also tests for #2455 prefs.highlightEmph.setChecked(False) prefs.showMultiSpaces.setChecked(False) @@ -401,8 +401,8 @@ def testDlgPreferences_Settings(qtbot, monkeypatch, nwGUI, fncPath, tstPaths): assert CONFIG.dialogLine == "–" assert CONFIG.narratorBreak == "–" assert CONFIG.narratorDialog == "–" - assert CONFIG.altDialogOpen == "<" - assert CONFIG.altDialogClose == ">" + assert CONFIG.altDialogOpen == "%" + assert CONFIG.altDialogClose == "%" assert CONFIG.highlightEmph is False assert CONFIG.showMultiSpaces is False From dadc7edbd9e65e44692dc79ed92c3ec8364a6686 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Sun, 6 Jul 2025 18:14:33 +0200 Subject: [PATCH 3/8] Move the open ended dialogue setting in Preferences (#2454) --- novelwriter/dialogs/preferences.py | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/novelwriter/dialogs/preferences.py b/novelwriter/dialogs/preferences.py index 281487b3..c01275ba 100644 --- a/novelwriter/dialogs/preferences.py +++ b/novelwriter/dialogs/preferences.py @@ -600,6 +600,7 @@ class GuiPreferences(NDialog): self.sidebar.addButton(title, section) self.mainForm.addGroupLabel(title, section) + # Dialogue Quotes self.dialogStyle = NComboBox(self) self.dialogStyle.addItem(self.tr("None"), 0) self.dialogStyle.addItem(self.tr("Single Quotes"), 1) @@ -611,6 +612,15 @@ class GuiPreferences(NDialog): self.tr("Applies to the selected quote styles.") ) + # Open-Ended Dialogue + self.allowOpenDial = NSwitch(self) + self.allowOpenDial.setChecked(CONFIG.allowOpenDial) + self.mainForm.addRow( + self.tr("Allow open-ended dialogue"), self.allowOpenDial, + self.tr("Highlight dialogue line with no closing quote.") + ) + + # Alternative Dialogue self.altDialogOpen = QLineEdit(self) self.altDialogOpen.setMaxLength(4) self.altDialogOpen.setFixedWidth(boxFixed) @@ -628,13 +638,7 @@ class GuiPreferences(NDialog): self.tr("Custom highlighting of dialogue text.") ) - self.allowOpenDial = NSwitch(self) - self.allowOpenDial.setChecked(CONFIG.allowOpenDial) - self.mainForm.addRow( - self.tr("Allow open-ended dialogue"), self.allowOpenDial, - self.tr("Highlight dialogue line with no closing quote.") - ) - + # Dialogue Line self.dialogLine = QLineEdit(self) self.dialogLine.setMaxLength(4) self.dialogLine.setFixedWidth(boxFixed) @@ -645,6 +649,7 @@ class GuiPreferences(NDialog): self.tr("Lines starting with any of these symbols are dialogue.") ) + # Narrator Break self.narratorBreak = NComboBox(self) self.narratorDialog = NComboBox(self) for key, value in nwQuotes.DASHES.items(): @@ -664,6 +669,7 @@ class GuiPreferences(NDialog): self.tr("Alternates dialogue highlighting within any paragraph.") ) + # Emphasis self.highlightEmph = NSwitch(self) self.highlightEmph.setChecked(CONFIG.highlightEmph) self.mainForm.addRow( @@ -671,6 +677,7 @@ class GuiPreferences(NDialog): self.tr("Applies to the document editor only.") ) + # Additional Spaces self.showMultiSpaces = NSwitch(self) self.showMultiSpaces.setChecked(CONFIG.showMultiSpaces) self.mainForm.addRow( From ec9e478399b35fcd9f57753a30c8bee87cc76c4a Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Sun, 6 Jul 2025 18:20:13 +0200 Subject: [PATCH 4/8] Improve dialogue line symbol setting box (#2453) --- novelwriter/common.py | 2 +- novelwriter/dialogs/preferences.py | 30 ++++++++++++++++++---- tests/test_dialogs/test_dlg_preferences.py | 15 ++++++----- 3 files changed, 35 insertions(+), 12 deletions(-) diff --git a/novelwriter/common.py b/novelwriter/common.py index 2ad42935..9d18515f 100644 --- a/novelwriter/common.py +++ b/novelwriter/common.py @@ -301,7 +301,7 @@ def uniqueCompact(text: str) -> str: def processDialogSymbols(symbols: str) -> str: """Process dialogue line symbols.""" result = "" - for c in uniqueCompact(symbols): + for c in uniqueCompact("".join(symbols.split())): if c in nwQuotes.ALLOWED: result += c return result diff --git a/novelwriter/dialogs/preferences.py b/novelwriter/dialogs/preferences.py index c01275ba..fbeb0523 100644 --- a/novelwriter/dialogs/preferences.py +++ b/novelwriter/dialogs/preferences.py @@ -29,7 +29,7 @@ import logging from PyQt6.QtCore import Qt, pyqtSignal, pyqtSlot from PyQt6.QtGui import QAction, QCloseEvent, QKeyEvent, QKeySequence from PyQt6.QtWidgets import ( - QCompleter, QDialogButtonBox, QFileDialog, QHBoxLayout, QLineEdit, + QCompleter, QDialogButtonBox, QFileDialog, QHBoxLayout, QLineEdit, QMenu, QPushButton, QVBoxLayout, QWidget ) @@ -639,14 +639,26 @@ class GuiPreferences(NDialog): ) # Dialogue Line + self.mnLineSymbols = QMenu(self) + for symbol in nwQuotes.ALLOWED: + label = trConst(nwQuotes.SYMBOLS.get(symbol, nwQuotes.DASHES.get(symbol, "None"))) + self.mnLineSymbols.addAction( + f"[ {symbol } ] {label}", + lambda symbol=symbol: self._insertDialogLineSymbol(symbol) + ) + self.dialogLine = QLineEdit(self) - self.dialogLine.setMaxLength(4) - self.dialogLine.setFixedWidth(boxFixed) + self.dialogLine.setMinimumWidth(100) self.dialogLine.setAlignment(QtAlignCenter) - self.dialogLine.setText(CONFIG.dialogLine) + self.dialogLine.setText(" ".join(CONFIG.dialogLine)) + + self.dialogLineButton = NIconToolButton(self, iSz, "add", "green") + self.dialogLineButton.setMenu(self.mnLineSymbols) + self.mainForm.addRow( self.tr("Dialogue line symbols"), self.dialogLine, - self.tr("Lines starting with any of these symbols are dialogue.") + self.tr("Lines starting with any of these symbols are dialogue."), + button=self.dialogLineButton ) # Narrator Break @@ -913,6 +925,14 @@ class GuiPreferences(NDialog): self.askBeforeBackup.setEnabled(state) return + @pyqtSlot(str) + def _insertDialogLineSymbol(self, symbol: str) -> None: + """Insert a symbol in the dialogue line box.""" + current = self.dialogLine.text() + values = processDialogSymbols(f"{current} {symbol}") + self.dialogLine.setText(" ".join(values)) + return + @pyqtSlot(bool) def _toggleAutoReplaceMain(self, state: bool) -> None: """Toggle switches controlled by the auto replace switch.""" diff --git a/tests/test_dialogs/test_dlg_preferences.py b/tests/test_dialogs/test_dlg_preferences.py index ab5822be..05d7b7e5 100644 --- a/tests/test_dialogs/test_dlg_preferences.py +++ b/tests/test_dialogs/test_dlg_preferences.py @@ -268,14 +268,17 @@ def testDlgPreferences_Settings(qtbot, monkeypatch, nwGUI, fncPath, tstPaths): # Text Highlighting prefs.dialogStyle.setCurrentData(3, 0) prefs.allowOpenDial.setChecked(False) - prefs.dialogLine.setText("–") - prefs.narratorBreak.setCurrentData("–", "") - prefs.narratorDialog.setCurrentData("–", "") + prefs.dialogLine.setText(nwUnicode.U_EMDASH) + prefs.narratorBreak.setCurrentData(nwUnicode.U_EMDASH, "") + prefs.narratorDialog.setCurrentData(nwUnicode.U_EMDASH, "") prefs.altDialogOpen.setText("%") # Symbol also tests for #2455 prefs.altDialogClose.setText("%") # Symbol also tests for #2455 prefs.highlightEmph.setChecked(False) prefs.showMultiSpaces.setChecked(False) + prefs._insertDialogLineSymbol(nwUnicode.U_ENDASH) + assert prefs.dialogLine.text() == f"{nwUnicode.U_ENDASH} {nwUnicode.U_EMDASH}" + assert CONFIG.dialogStyle == 2 assert CONFIG.allowOpenDial is True assert CONFIG.dialogLine == "" @@ -398,9 +401,9 @@ def testDlgPreferences_Settings(qtbot, monkeypatch, nwGUI, fncPath, tstPaths): # Text Highlighting assert CONFIG.dialogStyle == 3 assert CONFIG.allowOpenDial is False - assert CONFIG.dialogLine == "–" - assert CONFIG.narratorBreak == "–" - assert CONFIG.narratorDialog == "–" + assert CONFIG.dialogLine == f"{nwUnicode.U_ENDASH}{nwUnicode.U_EMDASH}" + assert CONFIG.narratorBreak == nwUnicode.U_EMDASH + assert CONFIG.narratorDialog == nwUnicode.U_EMDASH assert CONFIG.altDialogOpen == "%" assert CONFIG.altDialogClose == "%" assert CONFIG.highlightEmph is False From a748a69de38758f962fb5312d3eb17d25185f37c Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Sun, 6 Jul 2025 18:24:05 +0200 Subject: [PATCH 5/8] Remove redundant string compact implementation --- novelwriter/common.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/novelwriter/common.py b/novelwriter/common.py index 9d18515f..2ad42935 100644 --- a/novelwriter/common.py +++ b/novelwriter/common.py @@ -301,7 +301,7 @@ def uniqueCompact(text: str) -> str: def processDialogSymbols(symbols: str) -> str: """Process dialogue line symbols.""" result = "" - for c in uniqueCompact("".join(symbols.split())): + for c in uniqueCompact(symbols): if c in nwQuotes.ALLOWED: result += c return result From cd5151be9471501caeea403906441f0cb47d146a Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Mon, 7 Jul 2025 17:04:53 +0200 Subject: [PATCH 6/8] Update license info --- pyproject.toml | 6 +- setup/LICENSE-Apache-2.0.txt | 202 +++++++++++++++++++++++++++++++++++ 2 files changed, 207 insertions(+), 1 deletion(-) create mode 100644 setup/LICENSE-Apache-2.0.txt diff --git a/pyproject.toml b/pyproject.toml index 9263eb81..3610e012 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,7 +9,11 @@ authors = [ ] description = "A plain text editor for planning and writing novels" readme = {file = "setup/description_pypi.md", content-type = "text/markdown"} -license = {text = "GPL-3.0-or-later"} +license = "GPL-3.0-or-later AND Apache-2.0 AND CC-BY-4.0" +license-files = [ + "LICENSE.md", + "setup/LICENSE-Apache-2.0.txt", +] classifiers = [ "Programming Language :: Python :: 3 :: Only", "Programming Language :: Python :: 3.10", diff --git a/setup/LICENSE-Apache-2.0.txt b/setup/LICENSE-Apache-2.0.txt new file mode 100644 index 00000000..7a4a3ea2 --- /dev/null +++ b/setup/LICENSE-Apache-2.0.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. \ No newline at end of file From 64b0896eafdc0e7691f2f43d10b46898b84eedaf Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Mon, 7 Jul 2025 17:14:51 +0200 Subject: [PATCH 7/8] Bump version and update changelog --- CHANGELOG.md | 30 ++++++++++++++++++++++++++++++ novelwriter/__init__.py | 6 +++--- sample/nwProject.nwx | 4 ++-- 3 files changed, 35 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b7c7a039..198c1238 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,35 @@ # novelWriter Changelog +## Version 2.7.3 [2025-07-07] + +### Release Notes + +This is a patch release that fixes several issues related to + +### Detailed Changelog + +**Bugfixes** + +* Fixes an issue where novelWriter would crash if a `%` was added to any of the free text settings + fields in Preferences. Issue #2455. PR #2456. + +**Improvements** + +* The "Dialogue line symbols" setting in Preferences now has an "Add" button with a dropdown menu + for all the symbols allowed in this field. Since virtually none of them are available on a + regular keyboard, this makes it easier to add them and more transparent which symbols are allowed + in the box. Issue #2453. PR #2457. +* The switch for the "Allow open-ended dialogue" setting in Preferences has been moved up one line + so it is clearer that it only applies to quoted dialogue, and not to the alternative dialogue + settings. Issue #2454. PR #2457. + +**Packaging** + +* Package license information has been updated to also list the licenses for the new icon themes. + Issue #2434. PRs #2435 and #2458. + +---- + ## Version 2.7.2 [2025-06-24] ### Release Notes diff --git a/novelwriter/__init__.py b/novelwriter/__init__.py index 7e9f604a..df5cafa8 100644 --- a/novelwriter/__init__.py +++ b/novelwriter/__init__.py @@ -49,9 +49,9 @@ __license__ = "GPLv3" __author__ = "Veronica Berglyd Olsen" __maintainer__ = "Veronica Berglyd Olsen" __email__ = "code@vkbo.net" -__version__ = "2.7.2" -__hexversion__ = "0x020702f0" -__date__ = "2025-06-24" +__version__ = "2.7.3" +__hexversion__ = "0x020703f0" +__date__ = "2025-07-07" __status__ = "Stable" __domain__ = "novelwriter.io" diff --git a/sample/nwProject.nwx b/sample/nwProject.nwx index d25301aa..47a1e5de 100644 --- a/sample/nwProject.nwx +++ b/sample/nwProject.nwx @@ -1,6 +1,6 @@ - - + + Sample Project Jane Smith From 0b8d613044b3bc83b234a3e3d97482da4b10913e Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Mon, 7 Jul 2025 17:16:11 +0200 Subject: [PATCH 8/8] Update changelog notes --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 198c1238..3c3bd6e1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ ### Release Notes -This is a patch release that fixes several issues related to +This is a patch release that fixes a bug in, and makes a few improvement to, Preferences. ### Detailed Changelog