From 8425c8c9be622f5ab3353926235ff5951b68e4e0 Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Tue, 11 Aug 2020 23:03:10 +0200 Subject: [PATCH 1/7] Bumped version to 0.12 --- 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 a57814b7..c2ef1e31 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -24,9 +24,9 @@ copyright = "2018-2020, Veronica Berglyd Olsen" author = "Veronica Berglyd Olsen" # The short X.Y version -version = "0.11.1" +version = "0.12.0" # The full version, including alpha/beta/rc tags -release = "0.11.1" +release = "0.12.0" # -- General configuration --------------------------------------------------- diff --git a/nw/__init__.py b/nw/__init__.py index c3fbf7c0..3efc4ce2 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.11.1" -__hexversion__ = "0x001101f0" -__date__ = "2020-08-09" +__version__ = "0.12.0" +__hexversion__ = "0x001200f0" +__date__ = "2020-08-16" __maintainer__ = "Veronica Berglyd Olsen" __email__ = "code@vkbo.net" __status__ = "Beta" From b4497b133c083e469c3aefc84de4a2cc933b51f6 Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Tue, 11 Aug 2020 23:05:54 +0200 Subject: [PATCH 2/7] Updated changelog --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 563384ec..24bb8d4f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # novelWriter ChangeLog +## Version 0.12 [2020-08-16] + +**User Interface** + +* Added a New Project Wizard that can, in addition to create the previous minimal new project, also create a project with pre-defined root folders and chapter and scenes. It is also possible to create a copy of the example project from the source code. Either from the `sample` folder in the source, or from a `sample.zip` file generated by the `setup.py` script and saved to the `nw/assets` folder. PR #366. + + ## Version 0.11.1 [2020-08-09] **Bugfixes** From bfb5f55e24d9b7a64e6f34b49fb453537a59ec05 Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Wed, 12 Aug 2020 22:05:14 +0200 Subject: [PATCH 3/7] Updated changelog with PR #394 --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 24bb8d4f..ec0c5bad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ * Added a New Project Wizard that can, in addition to create the previous minimal new project, also create a project with pre-defined root folders and chapter and scenes. It is also possible to create a copy of the example project from the source code. Either from the `sample` folder in the source, or from a `sample.zip` file generated by the `setup.py` script and saved to the `nw/assets` folder. PR #366. +**Other Changes** + +* Cleaned up code using `flake8` tool and added it as a permanent check on pull requests. The tool filtered out a number of unused variables and imports, which wastes CPU time and memory. Every bit helps. PR #394. + ## Version 0.11.1 [2020-08-09] From 2c04130e27ec600504836c36b11932794fad8697 Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Thu, 13 Aug 2020 22:38:20 +0200 Subject: [PATCH 4/7] Updated changelog with PR 397 and 398 --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ec0c5bad..7f879695 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,8 @@ **Other Changes** -* Cleaned up code using `flake8` tool and added it as a permanent check on pull requests. The tool filtered out a number of unused variables and imports, which wastes CPU time and memory. Every bit helps. PR #394. +* Cleaned up code using `flake8` tool and added it as a permanent check on pull requests. The tool filtered out a number of unused variables and imports, which wastes CPU time and memory. Every bit helps. PRs #394 and #397. +* Added contributing guide, code of conduct and issue templates. Direct push to main, and PR #398. ## Version 0.11.1 [2020-08-09] From 774eb8edf740c98757663dd152c684ae2016986d Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Fri, 14 Aug 2020 20:21:59 +0200 Subject: [PATCH 5/7] Updated changelog with latest PR --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7f879695..d77eab70 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ **Other Changes** -* Cleaned up code using `flake8` tool and added it as a permanent check on pull requests. The tool filtered out a number of unused variables and imports, which wastes CPU time and memory. Every bit helps. PRs #394 and #397. +* Cleaned up code using `flake8` tool and added it as a permanent check on pull requests. The tool filtered out a number of unused variables and imports, which wastes CPU time and memory. Every bit helps. PRs #394, #397 and #401. * Added contributing guide, code of conduct and issue templates. Direct push to main, and PR #398. From 0b8e5e3ef27d644170f23f099ea96d0e9ec3cc9a Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Sat, 15 Aug 2020 15:17:27 +0200 Subject: [PATCH 6/7] Changed release date to today --- CHANGELOG.md | 2 +- nw/__init__.py | 2 +- sample/nwProject.nwx | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d77eab70..a5a5baab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # novelWriter ChangeLog -## Version 0.12 [2020-08-16] +## Version 0.12 [2020-08-15] **User Interface** diff --git a/nw/__init__.py b/nw/__init__.py index 51a50e8b..d49506c8 100644 --- a/nw/__init__.py +++ b/nw/__init__.py @@ -43,7 +43,7 @@ __copyright__ = "Copyright 2018–2020, Veronica Berglyd Olsen" __license__ = "GPLv3" __version__ = "0.12.0" __hexversion__ = "0x001200f0" -__date__ = "2020-08-16" +__date__ = "2020-08-15" __maintainer__ = "Veronica Berglyd Olsen" __email__ = "code@vkbo.net" __status__ = "Beta" diff --git a/sample/nwProject.nwx b/sample/nwProject.nwx index d52d4f27..76458cfd 100644 --- a/sample/nwProject.nwx +++ b/sample/nwProject.nwx @@ -1,13 +1,13 @@ - + Sample Project Sample Project Jane Smith Jay Doh - 676 + 677 122 - 32870 + 32872 False From bc1d238965158f2e7d02de3ccb2ae458985de144 Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Sat, 15 Aug 2020 15:27:01 +0200 Subject: [PATCH 7/7] Updated changelog with issue 395 fix --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a5a5baab..9fe8b3ad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ **User Interface** * Added a New Project Wizard that can, in addition to create the previous minimal new project, also create a project with pre-defined root folders and chapter and scenes. It is also possible to create a copy of the example project from the source code. Either from the `sample` folder in the source, or from a `sample.zip` file generated by the `setup.py` script and saved to the `nw/assets` folder. PR #366. +* When the user clicked cancel on the colour dialog in Project Settins, the icon would be reset to black. Instead, the colour should remain unchanged. A check that the user actually selected a colour has now been added. Issue #395, PR #403. **Other Changes**