From 62344376d7038b422d321aa94f9a7c6b2ce34ce7 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Tue, 27 Jul 2021 23:46:15 +0200 Subject: [PATCH] Bump version to 1.4.1, and update changelog and release notes --- CHANGELOG.md | 25 ++++++++++++++++++------- docs/source/conf.py | 4 ++-- nw/__init__.py | 4 ++-- nw/assets/text/release_notes.htm | 12 ++++++++++-- sample/nwProject.nwx | 6 +++--- 5 files changed, 35 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e6b2fb26..c5649b6d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,23 @@ # novelWriter Changelog +## Version 1.4.1 [2021-07-27] + +### Release Notes + +This release fixes a couple of minor issue with some of the dialog boxes. The fix was accidentally +left out of release 1.4. + +### Detailed Changelog + +**Bugfixes** + +* The way margins are determined in the paged dialogs used many places, including Preferences, has + been improved. These margins would sometimes be set to zero when they shouldn't. PR #834. +* Dialogs that are non-modal are no longer duplicated when opened multiple times. Instead, the + existing dialog is moved to the front. PR #834. + +---- + ## Version 1.4 [2021-07-27] ### Release Notes @@ -60,13 +78,6 @@ _These Release Notes also include the changes from 1.4 Beta 1 and RC 1._ ### Detailed Changelog -**Bugfixes** - -* The way margins are determined in the paged dialogs used many places, including Preferences, has - been improved. These margins would sometimes be set to zero when they shouldn't. PR #834. -* Dialogs that are non-modal are no longer duplicated when opened multiple times. Instead, the - existing dialog is moved to the front. PR #834. - **Internationalisation** * US English and Norwegian translations have been updated by @vkbo. PR #825. diff --git a/docs/source/conf.py b/docs/source/conf.py index 4c50350c..3b65b43d 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -24,9 +24,9 @@ copyright = "2018–2021, Veronica Berglyd Olsen" author = "Veronica Berglyd Olsen" # The short X.Y version -version = "1.4" +version = "1.4.1" # The full version, including alpha/beta/rc tags -release = "1.4" +release = "1.4.1" # -- General configuration --------------------------------------------------- diff --git a/nw/__init__.py b/nw/__init__.py index c5c2e772..352eed02 100644 --- a/nw/__init__.py +++ b/nw/__init__.py @@ -61,8 +61,8 @@ __license__ = "GPLv3" __author__ = "Veronica Berglyd Olsen" __maintainer__ = "Veronica Berglyd Olsen" __email__ = "code@vkbo.net" -__version__ = "1.4" -__hexversion__ = "0x010400f0" +__version__ = "1.4.1" +__hexversion__ = "0x010401f0" __date__ = "2021-07-27" __status__ = "Stable" __domain__ = "novelwriter.io" diff --git a/nw/assets/text/release_notes.htm b/nw/assets/text/release_notes.htm index 8d578fff..e2b2bc36 100644 --- a/nw/assets/text/release_notes.htm +++ b/nw/assets/text/release_notes.htm @@ -2,6 +2,16 @@ +

Release Notes for 1.4.1

+

Released on 27 July 2021

+ +

This release fixes a couple of minor issue with some of the dialog boxes. The fix was +accidentally left out of release 1.4.

+ +

See also the Releases page.

+ +
+

Release Notes for 1.4

Released on 27 July 2021

@@ -47,7 +57,5 @@ at the same time, which results in the paragraph being centred.

Format menu entries and keyboard shortcuts have been added so that you don't have to memorise these codes.

-

See also the Releases page.

- diff --git a/sample/nwProject.nwx b/sample/nwProject.nwx index 372f2744..81b82b5e 100644 --- a/sample/nwProject.nwx +++ b/sample/nwProject.nwx @@ -1,13 +1,13 @@ - + Sample Project Sample Project Jane Smith Jay Doh - 1109 + 1110 189 - 53268 + 53279 False