Merge pull request #450 from vkbo/release_1.0b3

Release 1.0b3

CHANGELOG.md

@@ -1,5 +1,28 @@
 # novelWriter ChangeLog
 
+## Version 1.0 Beta 3 [2020-09-20]
+
+**Bugfixes**
+
+* After recent changes, the `Edit Project Item` entry (or shortcut `F2`) in the menu would cause an error. Other means of triggering the edit dialog for a selected item were working fine. The error was caused by a dummy variable being sent by the menu QAction element that was caught by a new optional variable in the dialog function. All other menu actions have been wrapped in lambda functions to prevent this from happening again. PR #448.
+* The Merge Tool was permitting a merge on an empty list of files to be merged. This would result in a new, empty file. The Merge Tool will now stop if the list of files is empty. PR #448.
+* The orphaned file handling function would cause an error if the orphaned file was empty. This would trigger a secondary issue with uninitialised variables, which have also been fixed. PR #448.
+* The context menu on the Project Tree would not show the `New File` and `New Folder` options on root folders if there were no Trash folder present. This weird bug was caused by the filter getting a `None` Trash handle and therefore assuming all root folders were Trash folders as they too have parent handle `None`. PR #452.
+
+**User Interface**
+
+* The Last Opened column in the Open Project dialog now has a fixed width font, and the Words column has a thin space between number and multiplier unit to make it easier to read. PR #452.
+
+**Code Improvements**
+
+* Minor improvemenmts have been made to the core project classes to improve encapsulation and better ensure consistency between the different data structures that store the novel project in memory. PR #447.
+* Some unused or redundant code has been removed, and in some places, functions have been merged to reduce code repetition. PR #449.
+
+**Test Suite**
+
+* A lot more tests have been added and test coverage improved. PR #449.
+
+
 ## Version 1.0 Beta 2 [2020-09-13]
 
 **Bugfixes**

docs/source/conf.py

@@ -28,7 +28,7 @@ author = "Veronica Berglyd Olsen"
 # The short X.Y version
 version = "1.0"
 # The full version, including alpha/beta/rc tags
-release = "1.0-beta2"
+release = "1.0-beta3"
 
 
 # -- General configuration ---------------------------------------------------

nw/__init__.py

@@ -41,9 +41,9 @@ __package__    = "nw"
 __author__     = "Veronica Berglyd Olsen"
 __copyright__  = "Copyright 2018–2020, Veronica Berglyd Olsen"
 __license__    = "GPLv3"
-__version__    = "1.0b2"
-__hexversion__ = "0x010000b2"
-__date__       = "2020-09-13"
+__version__    = "1.0b3"
+__hexversion__ = "0x010000b3"
+__date__       = "2020-09-20"
 __maintainer__ = "Veronica Berglyd Olsen"
 __email__      = "code@vkbo.net"
 __status__     = "Beta"

sample/nwProject.nwx

@@ -1,13 +1,13 @@
 <?xml version='1.0' encoding='utf-8'?>
-<novelWriterXML appVersion="1.0b1" hexVersion="0x010000b1" fileVersion="1.2" timeStamp="2020-09-05 17:30:17">
+<novelWriterXML appVersion="1.0b3" hexVersion="0x010000b3" fileVersion="1.2" timeStamp="2020-09-19 23:16:35">
   <project>
     <name>Sample Project</name>
     <title>Sample Project</title>
     <author>Jane Smith</author>
     <author>Jay Doh</author>
-    <saveCount>743</saveCount>
-    <autoCount>143</autoCount>
-    <editTime>36089</editTime>
+    <saveCount>744</saveCount>
+    <autoCount>144</autoCount>
+    <editTime>36162</editTime>
   </project>
   <settings>
     <doBackup>False</doBackup>