From 141b5eb776449025d5a71f13014f35e06c1fe4c6 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Sun, 13 Jun 2021 16:53:40 +0200 Subject: [PATCH 1/3] Update project word count when a file is permanently deleted --- nw/gui/projtree.py | 1 + 1 file changed, 1 insertion(+) diff --git a/nw/gui/projtree.py b/nw/gui/projtree.py index e0d5b4b3..15984f28 100644 --- a/nw/gui/projtree.py +++ b/nw/gui/projtree.py @@ -529,6 +529,7 @@ class GuiProjectTree(QTreeWidget): self.theIndex.deleteHandle(tHandle) self._deleteTreeItem(tHandle) self._setTreeChanged(True) + self.projectWordCount() else: # The file is not already in the trash folder, so we From 1d1be18689a372f553bddee71cca7e11b1454c4b Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Sun, 13 Jun 2021 16:56:29 +0200 Subject: [PATCH 2/3] Bumped version to 1.3.3 --- docs/source/conf.py | 4 ++-- nw/__init__.py | 6 +++--- sample/nwProject.nwx | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/source/conf.py b/docs/source/conf.py index aa04ace8..a7bd2423 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -25,9 +25,9 @@ copyright = "2018–2021, Veronica Berglyd Olsen" author = "Veronica Berglyd Olsen" # The short X.Y version -version = "1.3.2" +version = "1.3.3" # The full version, including alpha/beta/rc tags -release = "1.3.2" +release = "1.3.3" # -- General configuration --------------------------------------------------- diff --git a/nw/__init__.py b/nw/__init__.py index a129828e..65a5c2d2 100644 --- a/nw/__init__.py +++ b/nw/__init__.py @@ -62,9 +62,9 @@ __license__ = "GPLv3" __author__ = "Veronica Berglyd Olsen" __maintainer__ = "Veronica Berglyd Olsen" __email__ = "code@vkbo.net" -__version__ = "1.3.2" -__hexversion__ = "0x010302f0" -__date__ = "2021-05-30" +__version__ = "1.3.3" +__hexversion__ = "0x010303f0" +__date__ = "2021-06-13" __status__ = "Stable" __domain__ = "novelwriter.io" __url__ = "https://novelwriter.io" diff --git a/sample/nwProject.nwx b/sample/nwProject.nwx index fe3bcc24..1452e764 100644 --- a/sample/nwProject.nwx +++ b/sample/nwProject.nwx @@ -1,13 +1,13 @@ - + Sample Project Sample Project Jane Smith Jay Doh - 1062 - 166 - 49870 + 1070 + 169 + 50449 False From b28d826d7629323e09c302ea85aa55129fd2cb00 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Sun, 13 Jun 2021 17:11:19 +0200 Subject: [PATCH 3/3] Updated changelog and release notes --- CHANGELOG.md | 35 ++++++++++++++++++++++++++++++++ nw/assets/text/release_notes.htm | 15 ++++++++++++-- sample/nwProject.nwx | 6 +++--- 3 files changed, 51 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ab89e762..3b08b2ac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,40 @@ # novelWriter Changelog +## Version 1.3.3 [2021-06-13] + +### Release Notes + +This patch release fixes a potential file encoding issue when running setup on Windows, and a minor +issue with the project word count not being updated immediately when a file is deleted. In +addition, the keyboard shortcuts to change focus between the project tree, the editor, the viewer, +and the outline panel, have been changed for Windows users. They keyboard shortcuts were +interfering with the Alt codes used for special characters. The shortcuts are unchanged for Linux +and macOS. + +### Detailed Changelog + +**Bugfixes** + +* Fix an issue with file encoding when extracting version information from the source code during + setup on Windows. This seems to be a limited issue, but the changes make the relevant function + more fault tolerant. Issue #805. PR #807. +* The project word count on the status bar was not always updated when a file was permanently + deleted from the project. This has now been resolved. Issue #799. PR #810. +* The keyboard shortcuts to change focus will on Windows interfere with the alt key codes as the + focus shortcuts used `Alt+` to `Alt+4`. On Windows, these are now instead `Ctrl+Alt+1` to + `Ctrl+Alt+4`. Part of issue #740. PR #808. + +**Source Code** + +* Remove a redundant line in the source code. PR #802. +* Make the XML parse for project items a little less panicky when encountering unexpected XML tags. + Generally, this shouldn't be a problem, but the XML parser should silently ignore unexpected tags + when parsing the project file. This may occur if a project is opened in an earlier version of + novelWriter. If so, a warning is issued anyway, so it is safe to disregard unrecognised tags as + the user has already actively selected to proceed and been sufficiently warned. PR #809. + +---- + ## Version 1.3.2 [2021-05-30] ### Release Notes diff --git a/nw/assets/text/release_notes.htm b/nw/assets/text/release_notes.htm index 8ee9b560..e0f6882f 100644 --- a/nw/assets/text/release_notes.htm +++ b/nw/assets/text/release_notes.htm @@ -2,6 +2,19 @@ +

Release Notes for 1.3.3

+

Released on 13 June 2021

+

This patch release fixes a potential file encoding issue when running setup on Windows, and a +minor issue with the project word count not being updated immediately when a file is deleted. In +addition, the keyboard shortcuts to change focus between the project tree, the editor, the viewer, +and the outline panel, have been changed for Windows users. They keyboard shortcuts were +interfering with the Alt codes used for special characters. The shortcuts are unchanged for Linux +and macOS.

+ +

See also the Releases page.

+ +
+

Release Notes for 1.3.2

Released on 30 May 2021

This is a patch release that fixes some minor issues. One issue was with the split tool, which @@ -9,8 +22,6 @@ would drop the last line from the source document during a split if it was missi break. A minor issue with the display of word counts on the details panel under the project tree has also been fixed. In addition, the setup script commands for Linux have been improved a bit.

-

See also the Releases page.

-

Release Notes for 1.3.1

diff --git a/sample/nwProject.nwx b/sample/nwProject.nwx index 1452e764..f65a3729 100644 --- a/sample/nwProject.nwx +++ b/sample/nwProject.nwx @@ -1,13 +1,13 @@ - + Sample Project Sample Project Jane Smith Jay Doh - 1070 + 1071 169 - 50449 + 50488 False