From 5f80a6b4005a7649f5d22c05bfa60bf3f54def88 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Sun, 12 Nov 2023 15:33:05 +0100 Subject: [PATCH 1/3] Update PyPi info --- setup/description_pypi.md | 4 ++-- setup/novelwriter_text.png | Bin 17670 -> 19979 bytes 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/setup/description_pypi.md b/setup/description_pypi.md index 9ee924c8..1bd8cfef 100644 --- a/setup/description_pypi.md +++ b/setup/description_pypi.md @@ -10,9 +10,9 @@ synchronisation tools. All text is saved as plain text files with a meta data he project structure is stored in a single project XML file, and other meta data is primarily saved as JSON files. -The application is written with Python 3 (3.8+) using Qt5 and PyQt5 (5.3+). It is developed on +The application is written with Python 3 (3.8+) using Qt5 and PyQt5 (5.10+). It is developed on Linux, but should in principle work fine on other operating systems as well as long as dependencies -are met. It is regularly tested on Debian and Ubuntu Linux, Windows, and macOS. +are met. It is regularly tested on Debian and Ubuntu Linux, Windows, and MacOS. novelWriter is developed and maintained by [Veronica Berglyd Olsen](https://github.com/vkbo). diff --git a/setup/novelwriter_text.png b/setup/novelwriter_text.png index e7f169cdd19761c77eb22915121baa963c308e64..084ffbf296d0d072705b9fe99de212dbe204ba10 100644 GIT binary patch literal 19979 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 z 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 literal 17670 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 Date: Thu, 23 Nov 2023 20:44:47 +0100 Subject: [PATCH 2/3] Bump version for 2.2 RC1 --- novelwriter/__init__.py | 6 +++--- sample/nwProject.nwx | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/novelwriter/__init__.py b/novelwriter/__init__.py index 07eebb28..0d1df83a 100644 --- a/novelwriter/__init__.py +++ b/novelwriter/__init__.py @@ -42,9 +42,9 @@ __license__ = "GPLv3" __author__ = "Veronica Berglyd Olsen" __maintainer__ = "Veronica Berglyd Olsen" __email__ = "code@vkbo.net" -__version__ = "2.2-beta1" -__hexversion__ = "0x020200b1" -__date__ = "2023-11-12" +__version__ = "2.2-rc1" +__hexversion__ = "0x020200c1" +__date__ = "2023-11-26" __status__ = "Stable" __domain__ = "novelwriter.io" diff --git a/sample/nwProject.nwx b/sample/nwProject.nwx index f2f09e9c..365df168 100644 --- a/sample/nwProject.nwx +++ b/sample/nwProject.nwx @@ -1,6 +1,6 @@ - - + + Sample Project Sample Project Jane Smith From 9af7ff447b9c7928c4bcb3ffe33a9a93b9ec6f35 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Sun, 26 Nov 2023 14:29:53 +0100 Subject: [PATCH 3/3] Update changelog --- CHANGELOG.md | 68 +++++++++++++++++++++++ novelwriter/assets/text/release_notes.htm | 8 +-- sample/nwProject.nwx | 6 +- 3 files changed, 75 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2827210b..ac08cb89 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,73 @@ # novelWriter Changelog +## Version 2.2 RC 1 [2023-11-26] + +### Release Notes + +This is a release candidate of the next release version, and is intended for testing purposes. +Please be careful when using this version on live writing projects, and make sure you take frequent +backups. + +Please check the changelog for an overview of changes. The full release notes will be added to the +final release. + +### Detailed Changelog + +**Bugfixes** + +* Revert the change of keyboard shortcut to delete a project tree item made in 2.2 Beta 1 as it + blocks certain features in the editor. This is a regression. PR 1616. + +**Features** + +* The old References panel under the Document Viewer has been replaced with a completely new widget + with a lot more features. The Back-references panel is still there, but is now a scrollable list + with a lot more information. In addition, tabs for each category of tags are available when there + are tags defined for them. These panels list all available tags, with a good deal of information + about them that may be useful to the writer, as well as buttons to open them in the viewer or + editor. Issues #925 and #998. PR #1606. +* Multi-select is now possible in the project tree, with some limitations. Drag and drop is only + permitted if the selected items have the same parent item. Any other drag and drop selection will + be cancelled and the user notified. A new context menu has been added for the case when multiple + items are selected, with a reduced set of options that can be collectively applied to them. + Issues #1549 and #1592. PR #1612. +* The "Scroll Past End" setting in Preferences has been added back in. It is slightly different + than the old one, as this one uses the Qt Plain Text Editor implementation, which has some side + effects some users may want to avoid. Issue #1602. PR #1605. +* For Windows users, there is now an "Add Dictionaries" tool in the Tools menu where new spell + check dictionaries can be added. Links are provided to sources for these dictionaries, and a file + selector tool to import the files into novelWriter. Issue #982. PR #1610. +* You can now update the name of a document by right-clicking on any heading inside the document + and select "Set as Document Name". This will open the Rename dialog with the text of the heading + pre-filled. Issue #1503. PR #1614. +* A new special comment, called "Short" can be added to Project Notes. They are identical to + Synopsis comments, and are in fact just an alias for them. The "Short Description" will be + displayed alongside the tags in the new panel under the Document Viewer. Issues #1617 and #1621. + PRs #1617, #1619 and #1622. + +**Usability** + +* The feature to auto select word under cursor no longer uses the default Qt implementation, and + has instead been implemented by iterating backward and forward in the text to find the nearest + word boundaries. It will stop on characters that aren't Unicode alphanumeric as per Python's + definition. Toggling markup will also move the cursor to after the markup if it was already at + the end of the word. Otherwise it remains within the word at the same position. The word is not + selected after formatting if it wasn't selected before. If no selection was made, and no word is + auto selected, the formatting tags are inserted in-place with the cursor in the middle. + Issues #1333 and #1598. PR #1600. +* The auto complete context menu is now only triggered on actual user input consisting of adding or + removing a single character. PR #1601. +* Various improvements to the visibility of the cursor when the dimensions of the editor changes + have been added. Like for instance keeping the cursor visible when opening or closing the Viewer + panel, or toggling Focus Mode. Issues #1302 and #1478. PR #1608. +* The Manuscript Build dialog now has a button to open the output folder. Issue #1554. PR #1613. + +**Code Improvements** + +* Improve test coverage. PR #1607. + +---- + ## Version 2.2 Beta 1 [2023-11-11] ### Release Notes diff --git a/novelwriter/assets/text/release_notes.htm b/novelwriter/assets/text/release_notes.htm index 69e1eaab..ef4b9dde 100644 --- a/novelwriter/assets/text/release_notes.htm +++ b/novelwriter/assets/text/release_notes.htm @@ -2,11 +2,11 @@ -

Release Notes for 2.2 Beta 1

-

Released on 11 November 2023

+

Release Notes for 2.2 RC 1

+

Released on 26 November 2023

-

This is a beta release of the next release version, and is intended for testing purposes. Please -be careful when using this version on live writing projects, and make sure you take frequent +

This is a release candidate of the next release version, and is intended for testing purposes. +Please be careful when using this version on live writing projects, and make sure you take frequent backups.

Please check the changelog for an overview of changes. The full release notes will be added to the final release.

diff --git a/sample/nwProject.nwx b/sample/nwProject.nwx index 68445489..753b4d46 100644 --- a/sample/nwProject.nwx +++ b/sample/nwProject.nwx @@ -1,6 +1,6 @@ - - + + Sample Project Sample Project Jane Smith @@ -58,7 +58,7 @@ Chapter One - + Making a Scene