Merge branch 'main' into dev

This commit is contained in:
Veronica Berglyd Olsen
2021-06-13 17:58:49 +02:00
4 changed files with 53 additions and 6 deletions
+35
View File
@@ -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
+13 -2
View File
@@ -2,6 +2,19 @@
<html>
<body>
<h2>Release Notes for 1.3.3</h2>
<p><i>Released on 13 June 2021</i></p>
<p>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.</p>
<p><i>See also the <a href="https://github.com/vkbo/novelWriter/releases">Releases</a> page.</i></p>
<hr/>
<h2>Release Notes for 1.3.2</h2>
<p><i>Released on 30 May 2021</i></p>
<p>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.</p>
<p><i>See also the <a href="https://github.com/vkbo/novelWriter/releases">Releases</a> page.</i></p>
<hr/>
<h2>Release Notes for 1.3.1</h2>
+1
View File
@@ -538,6 +538,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
+4 -4
View File
@@ -1,13 +1,13 @@
<?xml version='1.0' encoding='utf-8'?>
<novelWriterXML appVersion="1.3.2" hexVersion="0x010302f0" fileVersion="1.2" timeStamp="2021-05-30 12:14:18">
<novelWriterXML appVersion="1.3.3" hexVersion="0x010303f0" fileVersion="1.2" timeStamp="2021-06-13 17:11:05">
<project>
<name>Sample Project</name>
<title>Sample Project</title>
<author>Jane Smith</author>
<author>Jay Doh</author>
<saveCount>1062</saveCount>
<autoCount>166</autoCount>
<editTime>49870</editTime>
<saveCount>1071</saveCount>
<autoCount>169</autoCount>
<editTime>50488</editTime>
</project>
<settings>
<doBackup>False</doBackup>