From b0f000acfd6df39cd165f428e1ceec722a54f81c Mon Sep 17 00:00:00 2001 From: "Veronica B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Wed, 3 Mar 2021 09:21:52 +0100 Subject: [PATCH 1/4] Bumped version for 1.2 --- CHANGELOG.md | 120 +++++++++++++++++++++++++------------------- docs/source/conf.py | 2 +- nw/__init__.py | 6 +-- 3 files changed, 71 insertions(+), 57 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d37eee96..b1457486 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # novelWriter Changelog -## Version 1.2 RC 1 [2021-03-02] +## Version 1.2 [2021-03-14] ### Release Notes @@ -81,7 +81,17 @@ Lastly, a new keyword has been added to mark characters in the story. The new ke to tag a character as the focus character for a chapter or scene. This is useful for stories where the point-of-view character and the focus character are different. -_These Release Notes also include the changes from 1.2 Beta 1._ +_These Release Notes also include the changes from 1.2 Beta 1 and RC 1._ + +### Detailed Changelog + +---- + +## Version 1.2 RC 1 [2021-03-02] + +### Release Notes + +_The Release Notes have been moved and merged into the 1.2 notes._ ### Detailed Changelog @@ -107,60 +117,11 @@ _These Release Notes also include the changes from 1.2 Beta 1._ ---- -## Version 1.1.1 [2021-02-21] +## Version 1.2 Beta 1 [2021-02-11] ### Release Notes -This patch makes a couple of minor improvements to the GUI. The keyboard shortcut for deleting -entries in the project tree has been changed from `Ctrl+Del` to `Ctrl+Shift+Del` to free up that -shortcut for the document editor. It is now possible to use the shortcut for deleting the word in -front of the cursor, a common and useful feature of many text editors. - -The way the negative word count filter option works on the Writing Statistics tool has been changed -to be more intuitive. Enabling this filter now appears to remove all negative entries without -altering the other entries. Previously, the removed negative counts would be included in the -following entries to make it consistent with the total word count. In addition, writing sessions -shorter than five minutes, and with no change in the word count, are no longer recorded in the -session log file. - -Other changes include improving the speed of the internal spell checker, used when the Enchant -spell check library isn't available. The internal spell checker is no longer significantly slower, -but is still lacking in functionality compared to Enchant. - -### Detailed Changelog - -**User Interface** - -* The default GUI font on Windows is now Arial. It works better with the Qt framework than the - default system font. If Arial is missing, it falls back to the bundled font Cantarell. PR #655. -* The way word changes are calculated on the Writing Statistics tool has changed when the option to - exclude negative word counts is active. Previously, the entries with negative counts were - filtered out, but the change in count was still applied to the next line, altering the value. - Now, the GUI will instead just drop the lines that are negative and keep the other lines - unchanged. This is more intutitive, but it also means that the total count now longer matches the - sum of the lines. PR #659. -* The keyboard shortcut for deleting entries in the project tree has been changed from `Ctrl+Del` - to `Ctrl+Shift+Del`. The `Ctrl+Del` shortcut is thus free to be used exclusively by the editor to - delete the word in front of the cursor. Having the same shortcut do different things depending on - which area of the GUI has focus is a bit confusing. Related to #529. PR #666. - -**Other Improvements** - -* The internal spell checker, which is used when the Enchant library isn't available, has been - given a significant speed improvement by caching the imported dictionary as a Python `set` - instead of a `list`. The `set` has a hashed key lookup algorithm that is significantly faster. - PR #668. -* Sessions shortar than 5 minutes, and with no word count changes, are no longer recorded in the - session stats log file. PR #685. - -**Installation** - -* The PyPi packages now include the `setup.py` file, which makes it possible to install icon - launchers for novelWriter on both Linux and Windows after installing with `pip`. PR #655. - ----- - -## Version 1.2 Beta 1 [2021-02-11] +_The Release Notes have been moved and merged into the 1.2 RC 1 notes._ ### Detailed Changelog @@ -226,6 +187,59 @@ but is still lacking in functionality compared to Enchant. ---- +## Version 1.1.1 [2021-02-21] + +### Release Notes + +This patch makes a couple of minor improvements to the GUI. The keyboard shortcut for deleting +entries in the project tree has been changed from `Ctrl+Del` to `Ctrl+Shift+Del` to free up that +shortcut for the document editor. It is now possible to use the shortcut for deleting the word in +front of the cursor, a common and useful feature of many text editors. + +The way the negative word count filter option works on the Writing Statistics tool has been changed +to be more intuitive. Enabling this filter now appears to remove all negative entries without +altering the other entries. Previously, the removed negative counts would be included in the +following entries to make it consistent with the total word count. In addition, writing sessions +shorter than five minutes, and with no change in the word count, are no longer recorded in the +session log file. + +Other changes include improving the speed of the internal spell checker, used when the Enchant +spell check library isn't available. The internal spell checker is no longer significantly slower, +but is still lacking in functionality compared to Enchant. + +### Detailed Changelog + +**User Interface** + +* The default GUI font on Windows is now Arial. It works better with the Qt framework than the + default system font. If Arial is missing, it falls back to the bundled font Cantarell. PR #655. +* The way word changes are calculated on the Writing Statistics tool has changed when the option to + exclude negative word counts is active. Previously, the entries with negative counts were + filtered out, but the change in count was still applied to the next line, altering the value. + Now, the GUI will instead just drop the lines that are negative and keep the other lines + unchanged. This is more intutitive, but it also means that the total count now longer matches the + sum of the lines. PR #659. +* The keyboard shortcut for deleting entries in the project tree has been changed from `Ctrl+Del` + to `Ctrl+Shift+Del`. The `Ctrl+Del` shortcut is thus free to be used exclusively by the editor to + delete the word in front of the cursor. Having the same shortcut do different things depending on + which area of the GUI has focus is a bit confusing. Related to #529. PR #666. + +**Other Improvements** + +* The internal spell checker, which is used when the Enchant library isn't available, has been + given a significant speed improvement by caching the imported dictionary as a Python `set` + instead of a `list`. The `set` has a hashed key lookup algorithm that is significantly faster. + PR #668. +* Sessions shortar than 5 minutes, and with no word count changes, are no longer recorded in the + session stats log file. PR #685. + +**Installation** + +* The PyPi packages now include the `setup.py` file, which makes it possible to install icon + launchers for novelWriter on both Linux and Windows after installing with `pip`. PR #655. + +---- + ## Version 1.1 [2021-02-07] ### Release Notes diff --git a/docs/source/conf.py b/docs/source/conf.py index ba3c964d..b6ab9f0b 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -27,7 +27,7 @@ author = "Veronica Berglyd Olsen" # The short X.Y version version = "1.2" # The full version, including alpha/beta/rc tags -release = "1.2-rc1" +release = "1.2" # -- General configuration --------------------------------------------------- diff --git a/nw/__init__.py b/nw/__init__.py index b64fce04..129f97a1 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.2rc1" -__hexversion__ = "0x010200c1" -__date__ = "2021-03-02" +__version__ = "1.2" +__hexversion__ = "0x010200f0" +__date__ = "2021-03-14" __status__ = "Stable" __domain__ = "novelwriter.io" __url__ = "https://novelwriter.io" From 612ec0626248524734edc839e88571a1c457f22b Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Sat, 13 Mar 2021 16:44:59 +0100 Subject: [PATCH 2/4] Updated changelog and release notes --- CHANGELOG.md | 27 ++++++++++++++++++++++++--- nw/assets/text/release_notes.htm | 11 ++++++++--- 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b1457486..691e5839 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -77,14 +77,35 @@ project tree. The keyboard shortcut for this is `Ctrl+Shift+Z`, or it can be acc menu. The feature can only undo the last move, but it includes both documents moved to trash, moves by up/down keypress or menu entries, and drag and drop moves. -Lastly, a new keyword has been added to mark characters in the story. The new keyword is intended -to tag a character as the focus character for a chapter or scene. This is useful for stories where -the point-of-view character and the focus character are different. +A new keyword has been added to mark characters in the story. The new keyword is intended to tag a +character as the focus character for a chapter or scene. This is useful for stories where the +point-of-view character and the focus character are different. + +Lastly, two bugfixes have been made as well. The Empty Trash feature was no longer working due to +an earlier fix solving another issue. The feature has now been restored. In addition, the indexer +now checks that a keyword (tag or reference) is valid before saving it to the index. Previously, an +invalid keyword could be saved to the index and potentially crash the application. _These Release Notes also include the changes from 1.2 Beta 1 and RC 1._ ### Detailed Changelog +**Bugfixes** + +* Fixed an issue where a typo in a tag or reference using the `@` character would add an invalid + entry into the project index. The invalid keyword would be saved to the index cache, invalidating + the index on next load. For earlier versions of novelWriter before 1.1.1, it would also cause a + crash. Invalid keywords are now rejected during indexing. Issue #688. PR #689. +* The "Empty Trash" option was no longer working due to an earlier fix that added a requirement + that the project tree has focus to allow the emptying to procede. Since the Empty Trash feature + opens a dialog, the tree loses focus, and the deletions are therefore ignored. The focus check is + no longer considered when emptying the trash. Issue #701. PR #702. + +**Documentation** + +* The documentation has been updated to reflect the changes in 1.2, and a few corrections pointed + out by @jyhelle fixed. PR #700. + ---- ## Version 1.2 RC 1 [2021-03-02] diff --git a/nw/assets/text/release_notes.htm b/nw/assets/text/release_notes.htm index a519dc2f..bccedd14 100644 --- a/nw/assets/text/release_notes.htm +++ b/nw/assets/text/release_notes.htm @@ -66,9 +66,14 @@ go, can now be viewed and edited with a new "Project Word List" tool in the "Too project tree. The keyboard shortcut for this is `Ctrl+Shift+Z`, or it can be accessed from the menu. The feature can only undo the last move, but it includes both documents moved to trash, moves by up/down keypress or menu entries, and drag and drop moves.

-

Lastly, a new keyword has been added to mark characters in the story. The new keyword is -intended to tag a character as the focus character for a chapter or scene. This is useful for -stories where the point-of-view character and the focus character are different.

+

A new keyword has been added to mark characters in the story. The new keyword is intended to tag +a character as the focus character for a chapter or scene. This is useful for stories where the +point-of-view character and the focus character are different.

+

Lastly, two bugfixes have been made as well. The Empty Trash feature was no longer working due +to an earlier fix solving another issue. The feature has now been restored. In addition, the +indexer now checks that a keyword (tag or reference) is valid before saving it to the index. +Previously, an invalid keyword could be saved to the index and potentially crash the application. +

See also the Releases page.

From 32bcb52f147c83b1e7cba47fc7b9aae4fdfe4d10 Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Sat, 13 Mar 2021 16:54:02 +0100 Subject: [PATCH 3/4] Properly update release notes --- CHANGELOG.md | 13 ++++++++----- nw/assets/text/release_notes.htm | 16 ++++++++++------ 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 691e5839..db32fcdc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,13 +4,16 @@ ### Release Notes -This is the release candidate of 1.2. The release is intended for testing of new features and to -sort out potential bugs before the full release. Please take this into account when working on your -live projects. +This release is mainly focused on the Build Novel Project tool. Completely new export classes have +been written to support Open Document and Markdown exports. In addition, the way document layouts +are handled have been automated a little to assist the user in keeping header levels and document +layout flags in sync. The third new additoion is the ability to record and log idle time during a +writing session to improve the writing statistics information as requested by several users. +Finally, it is now possible to directly edit the project dictionary via a new, simple GUI dialog. #### The Build Novel Project Tool -The main changes for version 1.2 are to the Build Novel Project tool. The Open Document export, as +The main changes for this release are to the Build Novel Project tool. The Open Document export, as well as the Markdown export, is now handled entirely by code written for novelWriter. Previously, these export features depended on the underlying Qt library's save routines connected to the preview document shown in the build dialog. Using this method of export both meant that the content @@ -104,7 +107,7 @@ _These Release Notes also include the changes from 1.2 Beta 1 and RC 1._ **Documentation** * The documentation has been updated to reflect the changes in 1.2, and a few corrections pointed - out by @jyhelle fixed. PR #700. + out by @jyhelle applied. PR #700. ---- diff --git a/nw/assets/text/release_notes.htm b/nw/assets/text/release_notes.htm index bccedd14..fbbcdb5b 100644 --- a/nw/assets/text/release_notes.htm +++ b/nw/assets/text/release_notes.htm @@ -2,14 +2,18 @@ -

Release Notes for 1.2 RC 1

-

Released on 2 March 2021

-

This is the release candidate of 1.2. The release is intended for testing of new features and to -sort out potential bugs before the full release. Please take this into account when working on your -live projects.

+

Release Notes for 1.2

+

Released on 14 March 2021

+

This release is mainly focused on the Build Novel Project tool. Completely new export classes +have been written to support Open Document and Markdown exports. In addition, the way document +layouts are handled have been automated a little to assist the user in keeping header levels and +document layout flags in sync. The third new additoion is the ability to record and log idle time +during a writing session to improve the writing statistics information as requested by several +users. Finally, it is now possible to directly edit the project dictionary via a new, simple GUI +dialog.

The Build Novel Project Tool

-

The main changes for version 1.2 are to the Build Novel Project tool. The Open Document export, +

The main changes for this release are to the Build Novel Project tool. The Open Document export, as well as the Markdown export, is now handled entirely by code written for novelWriter. Previously, these export features depended on the underlying Qt library's save routines connected to the preview document shown in the build dialog. Using this method of export both meant that the From 3b92c3d75c9e2b9c20e0d431efe420378b298a3d Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Sun, 14 Mar 2021 18:22:22 +0100 Subject: [PATCH 4/4] Wrong docs link on PyPi --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index ee034b55..01f6989b 100644 --- a/setup.cfg +++ b/setup.cfg @@ -25,7 +25,7 @@ classifiers = python_requires = >=3.6 project_urls = Bug Tracker = https://github.com/vkbo/novelWriter/issues - Documentation = https://github.com/vkbo/novelWriter/issues + Documentation = https://novelwriter.readthedocs.io/en/stable Source Code = https://github.com/vkbo/novelWriter [options]