From 5abb8d566a68099512416866c9eabeee98913108 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Thu, 25 Jan 2024 23:45:02 +0100 Subject: [PATCH 1/3] Bump version and update changelog and release notes --- CHANGELOG.md | 22 ++++++++++++++++++++++ novelwriter/__init__.py | 6 +++--- novelwriter/assets/text/release_notes.htm | 10 ++++++++++ sample/nwProject.nwx | 4 ++-- 4 files changed, 37 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 62974802..e0d6d603 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,27 @@ # novelWriter Changelog +## Version 2.2.1 [2024-01-28] + +### Release Notes + +This is a patch release that fixes an issue where the Project View would sometimes switch to the +Novel View when a new item was created. This patch also includes updated translations for German +and Chinese. + +### Detailed Changelog + +**Bugfixes** + +* Fix a bug in the toggle for the tree view on the left would trigger each time a new project item + was created. Issue #1649. PR #1648. + +**Internationalisation** + +* Updated German translation, by @HeyMyian. PR #1666. +* Updated Chinese translation, by @ruixuan658 and @longqzh. PR #1666. + +---- + ## Version 2.2 [2023-12-17] ### Release Notes diff --git a/novelwriter/__init__.py b/novelwriter/__init__.py index b96d8a69..f6c857ab 100644 --- a/novelwriter/__init__.py +++ b/novelwriter/__init__.py @@ -42,9 +42,9 @@ __license__ = "GPLv3" __author__ = "Veronica Berglyd Olsen" __maintainer__ = "Veronica Berglyd Olsen" __email__ = "code@vkbo.net" -__version__ = "2.2" -__hexversion__ = "0x020200f0" -__date__ = "2023-12-17" +__version__ = "2.2.1" +__hexversion__ = "0x020201f0" +__date__ = "2024-01-28" __status__ = "Stable" __domain__ = "novelwriter.io" diff --git a/novelwriter/assets/text/release_notes.htm b/novelwriter/assets/text/release_notes.htm index 8a5be5be..9c07dda7 100644 --- a/novelwriter/assets/text/release_notes.htm +++ b/novelwriter/assets/text/release_notes.htm @@ -5,6 +5,8 @@

Release Notes for 2.2

Released on 17 December 2023

+

Scroll down for Patch Notes

+

This release comes with a number of new features. These are some highlights.

In addition to the common Markdown style formatting for bold, italic and strike through, a set of new shortcodes have been added. The shortcodes are far more flexible than the Markdown style @@ -46,5 +48,13 @@ had to be removed. It may be added back later.

See also the Releases page.

+

Patch Notes

+ +

Patch 2.2.1 – 28 January 2024

+ +

This is a patch release that fixes an issue where the Project View would sometimes switch to the +Novel View when a new item was created. This patch also includes updated translations for German +and Chinese.

+ diff --git a/sample/nwProject.nwx b/sample/nwProject.nwx index b842ec06..6f137721 100644 --- a/sample/nwProject.nwx +++ b/sample/nwProject.nwx @@ -1,6 +1,6 @@ - - + + Sample Project Sample Project Jane Smith From 9ae36eaa245a1f6378611f5eb8ef562e6c316db1 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Sat, 27 Jan 2024 11:23:28 +0100 Subject: [PATCH 2/3] Update Ubuntu release targets --- pkgutils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgutils.py b/pkgutils.py index 2b821e1a..3c1715d9 100755 --- a/pkgutils.py +++ b/pkgutils.py @@ -870,8 +870,8 @@ def makeForLaunchpad(doSign=False, isFirst=False, isSnapshot=False): distLoop = [ ("20.04", "focal"), ("22.04", "jammy"), - ("23.04", "lunar"), ("23.10", "mantic"), + ("24.04", "noble"), ] tStamp = datetime.datetime.now().strftime("%Y%m%d~%H%M%S") From b008721bdb79aca59c32b291cf67242075271803 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Sat, 27 Jan 2024 15:47:02 +0100 Subject: [PATCH 3/3] Update changelog and change release date --- CHANGELOG.md | 3 ++- novelwriter/__init__.py | 2 +- novelwriter/assets/text/release_notes.htm | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e0d6d603..1e1953ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # novelWriter Changelog -## Version 2.2.1 [2024-01-28] +## Version 2.2.1 [2024-01-27] ### Release Notes @@ -14,6 +14,7 @@ and Chinese. * Fix a bug in the toggle for the tree view on the left would trigger each time a new project item was created. Issue #1649. PR #1648. +* Fix an issue where multiple Manuscript and Writing Stats dialogs could be opened. PR #1671. **Internationalisation** diff --git a/novelwriter/__init__.py b/novelwriter/__init__.py index f6c857ab..f98eecf9 100644 --- a/novelwriter/__init__.py +++ b/novelwriter/__init__.py @@ -44,7 +44,7 @@ __maintainer__ = "Veronica Berglyd Olsen" __email__ = "code@vkbo.net" __version__ = "2.2.1" __hexversion__ = "0x020201f0" -__date__ = "2024-01-28" +__date__ = "2024-01-27" __status__ = "Stable" __domain__ = "novelwriter.io" diff --git a/novelwriter/assets/text/release_notes.htm b/novelwriter/assets/text/release_notes.htm index 9c07dda7..17fc84cb 100644 --- a/novelwriter/assets/text/release_notes.htm +++ b/novelwriter/assets/text/release_notes.htm @@ -50,7 +50,7 @@ had to be removed. It may be added back later.

Patch Notes

-

Patch 2.2.1 – 28 January 2024

+

Patch 2.2.1 – 27 January 2024

This is a patch release that fixes an issue where the Project View would sometimes switch to the Novel View when a new item was created. This patch also includes updated translations for German