From f3f46858c98d9705ad9b905a95dd1a991d322e93 Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Sat, 13 Feb 2021 12:48:41 +0100 Subject: [PATCH 1/5] Bumped version for release 1.2 RC 1 --- CHANGELOG.md | 8 ++++++++ docs/source/conf.py | 2 +- nw/__init__.py | 6 +++--- nw/assets/text/release_notes.htm | 3 +-- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 40cf45b7..f0cdafea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # novelWriter Changelog +## Version 1.2 RC 1 [2021-02-28] + +### Release Notes + +### Detailed Changelog + +---- + ## Version 1.2 Beta 1 [2021-02-11] ### Release Notes diff --git a/docs/source/conf.py b/docs/source/conf.py index 71bded54..ba3c964d 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-beta1" +release = "1.2-rc1" # -- General configuration --------------------------------------------------- diff --git a/nw/__init__.py b/nw/__init__.py index 7aeb7da2..fb2cd9db 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.2b1" -__hexversion__ = "0x010200b1" -__date__ = "2021-02-11" +__version__ = "1.2rc1" +__hexversion__ = "0x010200c1" +__date__ = "2021-02-28" __status__ = "Stable" __domain__ = "novelwriter.io" __url__ = "https://novelwriter.io" diff --git a/nw/assets/text/release_notes.htm b/nw/assets/text/release_notes.htm index 6ce8bf2c..ca2ecc7a 100644 --- a/nw/assets/text/release_notes.htm +++ b/nw/assets/text/release_notes.htm @@ -65,8 +65,7 @@ by up/down keypress or menu entries, and drag and drop moves.

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.

-

The full changelog is available -here.

+

See also the Releases page.

From ad92e2e5eb53c15550b99e4b8b54ec11c84b5544 Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Sat, 20 Feb 2021 17:09:47 +0100 Subject: [PATCH 2/5] Update changelog --- CHANGELOG.md | 37 ++++++++++++++++++++++++++----------- sample/nwProject.nwx | 6 +++--- 2 files changed, 29 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f0cdafea..be4f7f07 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,17 +4,8 @@ ### Release Notes -### Detailed Changelog - ----- - -## Version 1.2 Beta 1 [2021-02-11] - -### Release Notes - -This release is a beta release of 1.2. The release is intended for testing of new features. There -is a higher risk of encountering bugs in a beta release than a final release, so be extra careful -with backups if used on active writing projects. +This is the first release candidate of 1.2. The release is intended for testing of new features. +Please take this into account when working on your live projects. #### The Build Novel Project Tool @@ -73,6 +64,9 @@ logs regardless of whether the status bar clock displays this information or not #### Other Changes +The user dictionary of the project, where words added to the dictionary from the document editor +go, can now be viewed and edited with a new "Project Word List" tool in the "Tools" menu. + A small additional feature added is also the ability to undo the last move of an item in the 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 @@ -82,6 +76,27 @@ 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._ + +### Detailed Changelog + +**New Features** + +* Added a tool to edit the project's user dictionary. This is the dictionary where the "Add Word to + Dictionary" actions from the document editor go. The dialog tool allows for listing, removing and + adding words to this dictionary. Issue #665. PR #669. + +**User Interface** + +* Pressing the `F2` key when in the document editor will open the Item Editor for the open document + instead of the one selected in the project tree. PR #664. +* The shortcut for deleting an item in the project tree has been changed from `Ctrl+Del` to + `Ctrl+Shift+Del`. This change was also backported to version 1.1.1. Resolves #629. PR #664. + +---- + +## Version 1.2 Beta 1 [2021-02-11] + ### Detailed Changelog **New Features** diff --git a/sample/nwProject.nwx b/sample/nwProject.nwx index 3e1756e3..e4c5ca14 100644 --- a/sample/nwProject.nwx +++ b/sample/nwProject.nwx @@ -1,13 +1,13 @@ - + Sample Project Sample Project Jane Smith Jay Doh - 936 + 937 161 - 46791 + 46797 False From 36aa58b38e6eac9650ace08d55ed4c23f697ebd1 Mon Sep 17 00:00:00 2001 From: "Veronica B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Mon, 22 Feb 2021 09:36:09 +0100 Subject: [PATCH 3/5] Update changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 51ea7436..f1ec1003 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,7 @@ Please take this into account when working on your live projects. #### The Build Novel Project Tool -The main changes in this release are to the Build Novel Project tool. The Open Document export, as +The main changes for version 1.2 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 From 7125e9ecd5ab3289b784862147287680a7219558 Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Wed, 24 Feb 2021 22:44:01 +0100 Subject: [PATCH 4/5] Updated changelog --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f1ec1003..eef6daf6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -80,6 +80,13 @@ _These Release Notes also include the changes from 1.2 Beta 1._ ### Detailed Changelog +**Bugfixes** + +* If a tag or reference keyword was mistyped, it would still be indexed and put into the index. + This caused the index to be deemed invalid on the next loading of the project, triggering a + rebuild. A check has been added to the code parsing the lines starting with `@` to ensure only + valid keywords are written into the index. Issue #688. PR #690. + **New Features** * Added a tool to edit the project's user dictionary. This is the dictionary where the "Add Word to From fdd9186ae9217d04e8faf56c33c95029561dcc1d Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Tue, 2 Mar 2021 10:26:55 +0100 Subject: [PATCH 5/5] Update release notes and bumped release date --- CHANGELOG.md | 41 ++++++++++++++------------ nw/__init__.py | 2 +- nw/assets/text/release_notes.htm | 49 ++++++++++++++++++-------------- 3 files changed, 51 insertions(+), 41 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eef6daf6..d37eee96 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,12 @@ # novelWriter Changelog -## Version 1.2 RC 1 [2021-02-28] +## Version 1.2 RC 1 [2021-03-02] ### Release Notes -This is the first release candidate of 1.2. The release is intended for testing of new features. -Please take this into account when working on your live projects. +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. #### The Build Novel Project Tool @@ -13,12 +14,12 @@ The main changes for version 1.2 are to the Build Novel Project tool. The Open D 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 -of the document was dependent on the preview being generated, and that the exported document had -limited support for novelWriter-specific features and custom formatting. The new export tool should -generate a much better result, especially for the Open Document formats. The Open Document standard -is supported by Open Office, Libre Office, Google Docs, Microsoft Word, and probably a number of -other applications too. The Markdown export hasn't changed a lot, but should be a slight -improvement on the previous export feature. +of the document was dependent on the preview being generated first, and it also meant that the +exported document had limited support for novelWriter-specific features and custom formatting. The +new export class should generate a much better result, especially for the Open Document formats. +The Open Document standard is supported by Open Office, Libre Office, Google Docs, Microsoft Word, +and probably a number of other applications too. The Markdown export hasn't changed a lot, but +should be a slight improvement on the previous export feature. These changes to the build tool also imply that the saving process is now independent of the content of the preview window, meaning you don't have to rebuild the preview before saving, which @@ -34,33 +35,37 @@ unicode characters with appropriate html entities for html export. Among other changes in this release are a few improvements to the process of creating and changing documents. When a new document is first created, the header is generated from the assigned label -and layout. For some document layouts, when the user changes the header level of the first header +and layout. + +In addition, for some document layouts, when the user changes the header level of the first header of the document, the document layout setting is updated accordingly. This should reduce the need for the user to maintain two ways of assigning the role of a given document. This automation only applies to combinations of header level and current document layouts where there is no ambiguity. For instance, changing the header level in a "Scene" document from level 3 to 2 changes the document layout automatically to "Chapter". But changing the first header of a "Book" layout document from 1 to 2 does not change the document's layout as the "Book" layout is a generic -document layout. +document layout and it's perfectly reasonable for its first header to be a chapter header. Keep in mind that novelWriter treats documents with layout "Book", "Chapter" and "Scene" exactly the same during exports. The distinction is only meant as a way to indicate the purpose of a document in the project tree. This new automation is meant to assist in keeping this information up -to date. The other layouts do have an effect on formatting during export and are generally left +to date. The other layouts do have an effect on formatting during export, and are generally left alone. #### The Session Timer and Idle Time Another change that has been requested by a couple of users is to have the session timer in the -status bar stop counting when the user is inactive. This feature is optional, and can be controlled -from Preferences. The definition of idle here is either that the user is active in a different -application than novelWriter (loss of focus) or that the user has not made any changes to the -document open in the editor for a given amount of time. The time threshold is by default five -minutes, but can be altered in Preferences. +status bar stop counting when the user is inactive (idle). This feature is optional, and can be +controlled from Preferences. The definition of "idle" in this context is either that the user is +active in a different application than novelWriter (loss of focus) or that the user has not made +any changes to the current document for a given amount of time. The time threshold is by default +five minutes, but can be altered in Preferences. In addition, the idle time is also recorded in the session log, and can be viewed in the Writing Statistics dialog and exported with the rest of the information. The idle time is recorder in the -logs regardless of whether the status bar clock displays this information or not. +logs regardless of whether the status bar clock takes idle time into consideration or not. So even +if you turn off the idle time switch in Preferences, the other idle time setting still affects the +writing stats log entries. #### Other Changes diff --git a/nw/__init__.py b/nw/__init__.py index fb2cd9db..b64fce04 100644 --- a/nw/__init__.py +++ b/nw/__init__.py @@ -64,7 +64,7 @@ __maintainer__ = "Veronica Berglyd Olsen" __email__ = "code@vkbo.net" __version__ = "1.2rc1" __hexversion__ = "0x010200c1" -__date__ = "2021-02-28" +__date__ = "2021-03-02" __status__ = "Stable" __domain__ = "novelwriter.io" __url__ = "https://novelwriter.io" diff --git a/nw/assets/text/release_notes.htm b/nw/assets/text/release_notes.htm index ca2ecc7a..a519dc2f 100644 --- a/nw/assets/text/release_notes.htm +++ b/nw/assets/text/release_notes.htm @@ -2,23 +2,23 @@ -

Release Notes for 1.2 Beta 1

-

Released on 11 February 2021

-

This release is a beta release of 1.2. The release is intended for testing of new features. -There is a higher risk of encountering bugs in a beta release than a final release, so be extra -careful with backups if used on active writing projects.

+

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.

The Build Novel Project Tool

-

The main changes in this release are to the Build Novel Project tool. The Open Document export, +

The main changes for version 1.2 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 of the document was dependent on the preview being generated, and that the exported -document had limited support for novelWriter-specific features and custom formatting. The new -export tool should generate a much better result, especially for the Open Document formats. The -Open Document standard is supported by Open Office, Libre Office, Google Docs, Microsoft Word, and -probably a number of other applications too. The Markdown export hasn't changed a lot, but should -be a slight improvement on the previous export feature.

+content of the document was dependent on the preview being generated first, and it also meant that +the exported document had limited support for novelWriter-specific features and custom formatting. +The new export class should generate a much better result, especially for the Open Document +formats. The Open Document standard is supported by Open Office, Libre Office, Google Docs, +Microsoft Word, and probably a number of other applications too. The Markdown export hasn't changed +a lot, but should be a slight improvement on the previous export feature.

These changes to the build tool also imply that the saving process is now independent of the content of the preview window, meaning you don't have to rebuild the preview before saving, which was previously the case. To make this more consistent, the PDF export option has been moved to the @@ -31,34 +31,39 @@ unicode characters with appropriate html entities for html export.

Document Layout Automation

Among other changes in this release are a few improvements to the process of creating and changing documents. When a new document is first created, the header is generated from the assigned -label and layout. For some document layouts, when the user changes the header level of the first +label and layout.

+

In addition, for some document layouts, when the user changes the header level of the first header of the document, the document layout setting is updated accordingly. This should reduce the need for the user to maintain two ways of assigning the role of a given document. This automation only applies to combinations of header level and current document layouts where there is no ambiguity. For instance, changing the header level in a "Scene" document from level 3 to 2 changes the document layout automatically to "Chapter". But changing the first header of a "Book" layout document from 1 to 2 does not change the document's layout as the "Book" layout is a generic -document layout.

+document layout and it's perfectly reasonable for its first header to be a chapter header.

Keep in mind that novelWriter treats documents with layout "Book", "Chapter" and "Scene" exactly the same during exports. The distinction is only meant as a way to indicate the purpose of a document in the project tree. This new automation is meant to assist in keeping this information up -to date. The other layouts do have an effect on formatting during export and are generally left +to date. The other layouts do have an effect on formatting during export, and are generally left alone.

The Session Timer and Idle Time

Another change that has been requested by a couple of users is to have the session timer in the -status bar stop counting when the user is inactive. This feature is optional, and can be controlled -from Preferences. The definition of idle here is either that the user is active in a different -application than novelWriter (loss of focus) or that the user has not made any changes to the -document open in the editor for a given amount of time. The time threshold is by default five -minutes, but can be altered in Preferences.

+status bar stop counting when the user is inactive (idle). This feature is optional, and can be +controlled from Preferences. The definition of "idle" in this context is either that the user is +active in a different application than novelWriter (loss of focus) or that the user has not made +any changes to the current document for a given amount of time. The time threshold is by default +five minutes, but can be altered in Preferences.

In addition, the idle time is also recorded in the session log, and can be viewed in the Writing Statistics dialog and exported with the rest of the information. The idle time is recorder in the -logs regardless of whether the status bar clock displays this information or not.

+logs regardless of whether the status bar clock takes idle time into consideration or not. So even +if you turn off the idle time switch in Preferences, the other idle time setting still affects the +writing stats log entries.

Other Changes

+

The user dictionary of the project, where words added to the dictionary from the document editor +go, can now be viewed and edited with a new "Project Word List" tool in the "Tools" menu.

A small additional feature added is also the ability to undo the last move of an item in the -project tree. The keyboard shortcut for this is Ctrl+Shift+Z, or it can be accessed from the +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