From 0fe4d0bf18351ad44cd5181cc8b282785bd44cdc Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Sat, 19 Sep 2020 23:13:48 +0200 Subject: [PATCH 1/3] Bumped version to 1.0 beta 3 --- docs/source/conf.py | 2 +- nw/__init__.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/source/conf.py b/docs/source/conf.py index 5576e6fb..afeadcd5 100644 --- a/docs/source/conf.py +++ b/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 --------------------------------------------------- diff --git a/nw/__init__.py b/nw/__init__.py index 55481bea..715b1e2e 100644 --- a/nw/__init__.py +++ b/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" From 5bb8ac0ef88a67340dff5f5a0917cc288413c1a5 Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Sat, 19 Sep 2020 23:32:11 +0200 Subject: [PATCH 2/3] Updated changelog --- CHANGELOG.md | 18 ++++++++++++++++++ sample/nwProject.nwx | 8 ++++---- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 404f7cdd..6810d867 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,23 @@ # 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. + +**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** diff --git a/sample/nwProject.nwx b/sample/nwProject.nwx index 226c40ba..2cbd1f6d 100644 --- a/sample/nwProject.nwx +++ b/sample/nwProject.nwx @@ -1,13 +1,13 @@ - + Sample Project Sample Project Jane Smith Jay Doh - 743 - 143 - 36089 + 744 + 144 + 36162 False From 476a5bedb6e7cc2ca7bc29ed920251446c71efba Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Sun, 20 Sep 2020 15:33:39 +0200 Subject: [PATCH 3/3] Updated changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6810d867..45995367 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,11 @@ * 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**