From 5e00ef5052d2d323bae2dde57ee999cb39730e8a Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Tue, 18 Aug 2020 21:09:09 +0200 Subject: [PATCH 01/13] Bumped version to 1.0b1 --- docs/source/conf.py | 4 ++-- nw/__init__.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/source/conf.py b/docs/source/conf.py index 1ae52da3..b61862dd 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -26,9 +26,9 @@ copyright = "2018-2020, Veronica Berglyd Olsen" author = "Veronica Berglyd Olsen" # The short X.Y version -version = "0.12.1" +version = "1.0" # The full version, including alpha/beta/rc tags -release = "0.12.1" +release = "1.0-beta1" # -- General configuration --------------------------------------------------- diff --git a/nw/__init__.py b/nw/__init__.py index c6f815e7..1864b163 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__ = "0.12.1" -__hexversion__ = "0x001201f0" -__date__ = "2020-08-16" +__version__ = "1.0b1" +__hexversion__ = "0x010000b1" +__date__ = "2020-08-23" __maintainer__ = "Veronica Berglyd Olsen" __email__ = "code@vkbo.net" __status__ = "Beta" From 0839662e68f45a0b710cfac98f43b4192dd215d3 Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Tue, 18 Aug 2020 21:40:17 +0200 Subject: [PATCH 02/13] Updated changelog --- CHANGELOG.md | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index cc1cd2b9..768edbd1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,29 @@ # novelWriter ChangeLog +## Version 1.0 Beta 1 [2020-08-23] + +**Bugfixes** + +* Not technically a bug, but the clearing of the document editor footer bar, both during start-up and when a document was closed, would print two ERROR messages to the terminal window. These were benign, but are now prevented from occurring by a slight change in the logic. Issue #418, PR #420. + +**New Features** + +* A new root folder has been added. It is named "Outtakes" by default, and functions as an archive folder for any file that the user wants to take out of the main project tree. The file retains its meta data, is editable, and is always excluded from builds. It is not possible to create files in this folder, but you can create subfolders for organising them. PRs #415, #416 and #419. + +**Feature Improvements** + +* The way the enter and tab keys work in the document editor have been improved. If the search or replace text box has focus, the tab key switches between them, and the enter key always triggers the button that is to the right of the box with focus. If the editor has focus, the tab and enter keys work as expected for a text editor. PRs #412 and #413. +* The keyboard sequence `Ctrl+Shift+Z` is now again an alternative to `Ctrl+Y` for the redo functionality. PR #413. +* It is now possible to drag and drop files into the Trash folder. PR #415. +* Files moved to Outtakes or Trash are now cleared from the index, except their word counts. All tags and references are thus out of the project. They are automatically put back in when the file is dragged into the main project tree again. PR #416. +* Tabs and tab stops are now rendered properly in the document viewer. Since the `setHtml` function of the Qt widget used here strips tabs, they were previously just converted to eight spaces. This prevented the tabs from aligning vertically like they do in the editor. The stripping of tabs is now bypassed by replacing them with a placeholder text, and reverting the replacement after the document content has been set. This change also applies to the preview in the Build Novel Project tool, and therefore also the print and print to PDF functions. PR #419. + +**Other Changes** + +* A hard maximum project tree folder depth of 30 has been added. Level 28 is the last level where a folder can be created, to allow for one more level of files. There is no particular reason for the number 30, it was mostly a matter of picking a number. 30 is assumed to be excessive. It is hard to navigate a project tree with that many folders. The value was set because many places in the code there was a soft limit of 200. If you created more, various parts of the code would stop working. PR #416. +* The dialog for reporting unhandled errors has been changed and a new custom Qt subclass written. It does essentially the same thing as the standard QErrorMessage box did, but adds the feature of a clickable link to the issues tracker on GitHub, and a monospace formatted traceback for the issues ticket. In addition, a crash that pops this dialog will now trigger an attempted controlled shutdown of novelWriter. Before, it would try to keep running, but often leave novelWriter in a half defunct state. PR #417. + + ## Version 0.12.1 [2020-08-16] **Bugfixes** From 0e5f0cb6e6bfffe5efdacbbbdd3837a107a07fc2 Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Thu, 20 Aug 2020 21:30:56 +0200 Subject: [PATCH 03/13] Fixed badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7adc676f..3bbe3976 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # novelWriter -[![PyTest + Coverage](https://github.com/vkbo/novelWriter/workflows/PyTest%20+%20Coverage/badge.svg?branch=main)](https://github.com/vkbo/novelWriter/actions) +[![PyTest](https://github.com/vkbo/novelWriter/workflows/PyTest/badge.svg)](https://github.com/vkbo/novelWriter/actions) [![codecov](https://codecov.io/gh/vkbo/novelWriter/branch/main/graph/badge.svg)](https://codecov.io/gh/vkbo/novelWriter) [![Documentation Status](https://readthedocs.org/projects/novelwriter/badge/?version=latest)](https://novelwriter.readthedocs.io/en/latest/?badge=latest) [![Flake8 Checks](https://github.com/vkbo/novelWriter/workflows/Flake8%20Checks/badge.svg)](https://github.com/vkbo/novelWriter/actions) From 197c370beb1592dab6ff30dc4c59b4e69b3f7728 Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Thu, 20 Aug 2020 21:31:33 +0200 Subject: [PATCH 04/13] Also include push to main --- .github/workflows/pytest_cov.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/pytest_cov.yml b/.github/workflows/pytest_cov.yml index 8e60f72b..ceffa275 100644 --- a/.github/workflows/pytest_cov.yml +++ b/.github/workflows/pytest_cov.yml @@ -1,6 +1,8 @@ name: PyTest on: + push: + branches: [ main ] pull_request: branches: [ main, dev ] From 114824e5c8c6c3bd868b82ccdd611cec6589300d Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Thu, 20 Aug 2020 21:33:25 +0200 Subject: [PATCH 05/13] Renamed Flake8 Checks to Flake8 --- .github/workflows/syntax.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/syntax.yml b/.github/workflows/syntax.yml index 20736e91..980bef02 100644 --- a/.github/workflows/syntax.yml +++ b/.github/workflows/syntax.yml @@ -1,4 +1,4 @@ -name: Flake8 Checks +name: Flake8 on: push: From 8c9f6740502b3c2963fae1e6cf0cd44afaa42c48 Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Thu, 20 Aug 2020 21:35:06 +0200 Subject: [PATCH 06/13] Updated badges again --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3bbe3976..92c134ac 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ [![PyTest](https://github.com/vkbo/novelWriter/workflows/PyTest/badge.svg)](https://github.com/vkbo/novelWriter/actions) [![codecov](https://codecov.io/gh/vkbo/novelWriter/branch/main/graph/badge.svg)](https://codecov.io/gh/vkbo/novelWriter) [![Documentation Status](https://readthedocs.org/projects/novelwriter/badge/?version=latest)](https://novelwriter.readthedocs.io/en/latest/?badge=latest) -[![Flake8 Checks](https://github.com/vkbo/novelWriter/workflows/Flake8%20Checks/badge.svg)](https://github.com/vkbo/novelWriter/actions) +[![Flake8](https://github.com/vkbo/novelWriter/workflows/Flake8/badge.svg)](https://github.com/vkbo/novelWriter/actions) [![PyPI](https://img.shields.io/pypi/v/novelwriter)](https://pypi.org/project/novelWriter/) [![Python Version](https://img.shields.io/pypi/pyversions/novelwriter)](https://pypi.org/project/novelWriter/) From c2685f4df72b25dcfef5e989be4ce47bcabe1434 Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Thu, 20 Aug 2020 21:42:48 +0200 Subject: [PATCH 07/13] Don't runn full tests on push to master --- .github/workflows/pytest_cov.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/pytest_cov.yml b/.github/workflows/pytest_cov.yml index ceffa275..8e60f72b 100644 --- a/.github/workflows/pytest_cov.yml +++ b/.github/workflows/pytest_cov.yml @@ -1,8 +1,6 @@ name: PyTest on: - push: - branches: [ main ] pull_request: branches: [ main, dev ] From df50ef887798304c8faf76f75cab2ad869324d3d Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Thu, 20 Aug 2020 21:46:01 +0200 Subject: [PATCH 08/13] Use lower case test names --- .github/workflows/pytest_cov.yml | 2 +- .github/workflows/syntax.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pytest_cov.yml b/.github/workflows/pytest_cov.yml index 8e60f72b..e46773a4 100644 --- a/.github/workflows/pytest_cov.yml +++ b/.github/workflows/pytest_cov.yml @@ -1,4 +1,4 @@ -name: PyTest +name: pytest on: pull_request: diff --git a/.github/workflows/syntax.yml b/.github/workflows/syntax.yml index 980bef02..f697c4ec 100644 --- a/.github/workflows/syntax.yml +++ b/.github/workflows/syntax.yml @@ -1,4 +1,4 @@ -name: Flake8 +name: flake8 on: push: From 97bed81c9e13b38c2dd9e0f36e6956c44ed8a161 Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Thu, 20 Aug 2020 21:50:33 +0200 Subject: [PATCH 09/13] Updated badges on readme and in docs --- README.md | 10 +++++----- docs/source/index.rst | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 92c134ac..78849745 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ # novelWriter -[![PyTest](https://github.com/vkbo/novelWriter/workflows/PyTest/badge.svg)](https://github.com/vkbo/novelWriter/actions) +[![pytest](https://github.com/vkbo/novelWriter/workflows/pytest/badge.svg)](https://github.com/vkbo/novelWriter/actions) [![codecov](https://codecov.io/gh/vkbo/novelWriter/branch/main/graph/badge.svg)](https://codecov.io/gh/vkbo/novelWriter) -[![Documentation Status](https://readthedocs.org/projects/novelwriter/badge/?version=latest)](https://novelwriter.readthedocs.io/en/latest/?badge=latest) -[![Flake8](https://github.com/vkbo/novelWriter/workflows/Flake8/badge.svg)](https://github.com/vkbo/novelWriter/actions) -[![PyPI](https://img.shields.io/pypi/v/novelwriter)](https://pypi.org/project/novelWriter/) -[![Python Version](https://img.shields.io/pypi/pyversions/novelwriter)](https://pypi.org/project/novelWriter/) +[![docs](https://readthedocs.org/projects/novelwriter/badge/?version=latest)](https://novelwriter.readthedocs.io/en/latest/?badge=latest) +[![flake8](https://github.com/vkbo/novelWriter/workflows/flake8/badge.svg)](https://github.com/vkbo/novelWriter/actions) +[![pypi](https://img.shields.io/pypi/v/novelwriter)](https://pypi.org/project/novelWriter/) +[![python](https://img.shields.io/pypi/pyversions/novelwriter)](https://pypi.org/project/novelWriter/) diff --git a/docs/source/index.rst b/docs/source/index.rst index 152c6666..8ac56990 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -2,11 +2,11 @@ novelWriter |release| ##################### -.. image:: https://travis-ci.com/vkbo/novelWriter.svg?branch=master - :target: https://travis-ci.com/vkbo/novelWriter - :alt: Build Status +.. image:: https://github.com/vkbo/novelWriter/workflows/pytest/badge.svg + :target: https://github.com/vkbo/novelWriter/actions + :alt: Python Tests -.. image:: https://codecov.io/gh/vkbo/novelWriter/branch/master/graph/badge.svg +.. image:: https://codecov.io/gh/vkbo/novelWriter/branch/main/graph/badge.svg :target: https://codecov.io/gh/vkbo/novelWriter :alt: Code Coverage From 55a6afd022fb7c25b9b8704c8b98e44eb8d94122 Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Thu, 20 Aug 2020 21:58:47 +0200 Subject: [PATCH 10/13] Updated changelog --- CHANGELOG.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 768edbd1..d01be229 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,9 +20,14 @@ **Other Changes** -* A hard maximum project tree folder depth of 30 has been added. Level 28 is the last level where a folder can be created, to allow for one more level of files. There is no particular reason for the number 30, it was mostly a matter of picking a number. 30 is assumed to be excessive. It is hard to navigate a project tree with that many folders. The value was set because many places in the code there was a soft limit of 200. If you created more, various parts of the code would stop working. PR #416. +* A hard maximum project tree folder depth of 30 has been added. Level 28 is the last level where a folder can be created, to allow for one more level of files. There is no particular reason for the number 30, it was mostly a matter of picking a number. 30 is assumed to be excessive. It is hard to navigate a project tree with that many folders. The value was set because many places in the code there was a soft limit of 200. If you created more, various parts of the code would stop working. PRs #416 and #421. * The dialog for reporting unhandled errors has been changed and a new custom Qt subclass written. It does essentially the same thing as the standard QErrorMessage box did, but adds the feature of a clickable link to the issues tracker on GitHub, and a monospace formatted traceback for the issues ticket. In addition, a crash that pops this dialog will now trigger an attempted controlled shutdown of novelWriter. Before, it would try to keep running, but often leave novelWriter in a half defunct state. PR #417. +**Test Suite** + +* Added better test coverage of the Project Load dialog and the Project Outline tool. PR #423. +* Switched from Travis-CI to GitHub actions for running Python tests. PRs #424, #425 and #426. + ## Version 0.12.1 [2020-08-16] From eb1407ed62d276256db382c94d860f314b0bc592 Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Thu, 20 Aug 2020 23:38:12 +0200 Subject: [PATCH 11/13] Changed date format in docs --- docs/source/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/conf.py b/docs/source/conf.py index b61862dd..9aa5ae29 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -43,7 +43,7 @@ extensions = [ templates_path = ["_templates"] source_suffix = ".rst" master_doc = "index" -today_fmt = "%A, %B %d %Y at %H:%M" +today_fmt = "%A, %d %B %Y at %H:%M" language = None exclude_patterns = [] pygments_style = None From e6830f10bb6bf519ae7fd9ca688137a6f740b2de Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Fri, 28 Aug 2020 16:39:24 +0200 Subject: [PATCH 12/13] Updated changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d01be229..6b257ea1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,10 +5,12 @@ **Bugfixes** * Not technically a bug, but the clearing of the document editor footer bar, both during start-up and when a document was closed, would print two ERROR messages to the terminal window. These were benign, but are now prevented from occurring by a slight change in the logic. Issue #418, PR #420. +* Fixed spell check highlighting for words separated by a forward slash, which was treated as a single word. Issue #427, PR #428. **New Features** * A new root folder has been added. It is named "Outtakes" by default, and functions as an archive folder for any file that the user wants to take out of the main project tree. The file retains its meta data, is editable, and is always excluded from builds. It is not possible to create files in this folder, but you can create subfolders for organising them. PRs #415, #416 and #419. +* Support an alternative apostrophe. There is a unicode character defined for this, but the regular right hand single quote symbol is the recommended character. However, sometimes this confuses the syntax highlighter. The alternative character bypasses this, and may also be useful for languages that don't use the same type of symbol for these. PRs #429 and #430. **Feature Improvements** @@ -17,6 +19,7 @@ * It is now possible to drag and drop files into the Trash folder. PR #415. * Files moved to Outtakes or Trash are now cleared from the index, except their word counts. All tags and references are thus out of the project. They are automatically put back in when the file is dragged into the main project tree again. PR #416. * Tabs and tab stops are now rendered properly in the document viewer. Since the `setHtml` function of the Qt widget used here strips tabs, they were previously just converted to eight spaces. This prevented the tabs from aligning vertically like they do in the editor. The stripping of tabs is now bypassed by replacing them with a placeholder text, and reverting the replacement after the document content has been set. This change also applies to the preview in the Build Novel Project tool, and therefore also the print and print to PDF functions. PR #419. +* The syntax highlighter is now better at detecting what is a single quoted string and what is an apostrophe in a word. PR #430. **Other Changes** @@ -27,6 +30,7 @@ * Added better test coverage of the Project Load dialog and the Project Outline tool. PR #423. * Switched from Travis-CI to GitHub actions for running Python tests. PRs #424, #425 and #426. +* All tests can now be run independently of other tests on a function level. Before, this was only possible on a test file level. Issue #431, PR #432. ## Version 0.12.1 [2020-08-16] From 4fec7136af1ec48dce2f42dd7ff4a2fab3d17845 Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Sun, 30 Aug 2020 17:07:34 +0200 Subject: [PATCH 13/13] Changed the release date before release --- CHANGELOG.md | 2 +- nw/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6b257ea1..30d3dc5f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # novelWriter ChangeLog -## Version 1.0 Beta 1 [2020-08-23] +## Version 1.0 Beta 1 [2020-08-30] **Bugfixes** diff --git a/nw/__init__.py b/nw/__init__.py index 1864b163..23ed8da0 100644 --- a/nw/__init__.py +++ b/nw/__init__.py @@ -43,7 +43,7 @@ __copyright__ = "Copyright 2018–2020, Veronica Berglyd Olsen" __license__ = "GPLv3" __version__ = "1.0b1" __hexversion__ = "0x010000b1" -__date__ = "2020-08-23" +__date__ = "2020-08-30" __maintainer__ = "Veronica Berglyd Olsen" __email__ = "code@vkbo.net" __status__ = "Beta"