From 93965138da8b1f33bbae20aa2e6e2a97e587c26e Mon Sep 17 00:00:00 2001
From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com>
Date: Wed, 17 Mar 2021 17:23:20 +0100
Subject: [PATCH 1/4] Bump version and update changelog for patch 1.2.1
---
CHANGELOG.md | 15 +++++++++++++++
docs/source/conf.py | 4 ++--
nw/__init__.py | 6 +++---
3 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index db32fcdc..6246994c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,20 @@
# novelWriter Changelog
+## Version 1.2.1 [2021-03-21]
+
+### Release Notes
+
+### Detailed Changelog
+
+**Bugfixes**
+
+* Fixed an issue with the search bar where the button and shortcut actions would be blocked unless
+ the document itself had focus. This focus check was added for all the text altering functions,
+ but should not affect search and replace. The search and replace actions now bypass the regular
+ action pipeline with the focus check. Issue #708. PR #709.
+
+----
+
## Version 1.2 [2021-03-14]
### Release Notes
diff --git a/docs/source/conf.py b/docs/source/conf.py
index b6ab9f0b..7cf8bf39 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -25,9 +25,9 @@ copyright = "2018–2021, Veronica Berglyd Olsen"
author = "Veronica Berglyd Olsen"
# The short X.Y version
-version = "1.2"
+version = "1.2.1"
# The full version, including alpha/beta/rc tags
-release = "1.2"
+release = "1.2.1"
# -- General configuration ---------------------------------------------------
diff --git a/nw/__init__.py b/nw/__init__.py
index 129f97a1..c1184649 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.2"
-__hexversion__ = "0x010200f0"
-__date__ = "2021-03-14"
+__version__ = "1.2.1"
+__hexversion__ = "0x010201f0"
+__date__ = "2021-03-21"
__status__ = "Stable"
__domain__ = "novelwriter.io"
__url__ = "https://novelwriter.io"
From 48bbe288b7d6d842f71e04b8efbdca517bc4a787 Mon Sep 17 00:00:00 2001
From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com>
Date: Sun, 21 Mar 2021 16:50:10 +0100
Subject: [PATCH 2/4] Clarify the install instructions for Linux
---
docs/source/setup_linux.rst | 42 ++++++++++++++++++++++++++++---------
1 file changed, 32 insertions(+), 10 deletions(-)
diff --git a/docs/source/setup_linux.rst b/docs/source/setup_linux.rst
index 4a34cc45..55daeb70 100644
--- a/docs/source/setup_linux.rst
+++ b/docs/source/setup_linux.rst
@@ -42,34 +42,56 @@ can install them with:
Step 2: Install Package (Optional)
----------------------------------
-You can install novelWriter to the correct location for Python packages with:
+You can install novelWriter to the default location for Python packages using setuptools. This step
+is optional as you can also just put the novelWriter program folder wherever you like. For instance
+to ``/opt/novelWriter`` and run Step 3 to set up icons and launcher.
+
+To install novelWriter to the default location, it requires that you have setuptools installed on
+your system. If you don't have setuptools, it can usually be installed from your distro's
+repository. For Debian and Ubuntu this is achieved with:
.. code-block:: console
- ./setup.py install
+ sudo apt install python3-setuptools
+
+The package is also available from PyPi:
+
+.. code-block:: console
+
+ pip3 install --user setuptools
+
+With setuptools in place, novelWriter can be installed to the user space with:
+
+.. code-block:: console
+
+ ./setup.py install --user
+
+This should install novelWriter as ``~/.local/bin/novelWriter``. If you instead want to install for
+all users, i.e. as ``/usr/local/bin/novelWriter``, run:
+
+.. code-block:: console
+
+ sudo ./setup.py install
This is equivalent to what the ``pip`` installer does. It puts novelWriter in the location on your
system where Python packages are usually kept. This is not really the best suited location for a
GUI application like novelWriter, so you may instead copy the entire source to a suiteable location
yourself.
-This should install novelWriter to either ``~/.local/bin/novelWriter`` if installed for local user
-only, or to ``/usr/local/bin/novelWriter`` if installed for all users (with the ``sudo`` command).
-
Step 3: Create Launcher Icons
-----------------------------
-Regardless of where you extract or install the source files, you can easily set up a standard icon
-and launcher. To set up this desktop launcher, the needed icons, and the project file association,
-run:
+Regardless of where you extract or install the source files, you can set up a standard icon and a
+launcher. To set up this desktop launcher, the needed icons, and the project file association,
+run the following from inside the novelWriter folder:
.. code-block:: console
./setup.py xdg-install
-By default, these commands install novelWriter and its icons for the current user only. To install
-for all users, run the script with the ``sudo`` command.
+By default, this command installs the launcher and icons for the current user only. To install for
+all users, run the script with the ``sudo`` command.
.. tip::
All options of the setup script can be listed with: ``./setup.py help``.
From d4c61e7ec90bf1a4390a2235153c1df2405ef56e Mon Sep 17 00:00:00 2001
From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com>
Date: Sun, 21 Mar 2021 16:54:53 +0100
Subject: [PATCH 3/4] Update Linux setup for consistency and add more details
for macOS
---
docs/source/setup_linux.rst | 12 ++++++------
docs/source/setup_mac.rst | 17 ++++++++++++-----
2 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/docs/source/setup_linux.rst b/docs/source/setup_linux.rst
index 55daeb70..229d3079 100644
--- a/docs/source/setup_linux.rst
+++ b/docs/source/setup_linux.rst
@@ -42,12 +42,12 @@ can install them with:
Step 2: Install Package (Optional)
----------------------------------
-You can install novelWriter to the default location for Python packages using setuptools. This step
-is optional as you can also just put the novelWriter program folder wherever you like. For instance
-to ``/opt/novelWriter`` and run Step 3 to set up icons and launcher.
+You can install novelWriter to the default location for Python packages using ``setuptools``. This
+step is optional as you can also just put the novelWriter program folder wherever you like. For
+instance to ``/opt/novelWriter`` and run Step 3 to set up icons and launcher.
-To install novelWriter to the default location, it requires that you have setuptools installed on
-your system. If you don't have setuptools, it can usually be installed from your distro's
+To install novelWriter to the default location, it requires that you have ``setuptools`` installed
+on your system. If you don't have it installed, it can usually be installed from your distro's
repository. For Debian and Ubuntu this is achieved with:
.. code-block:: console
@@ -60,7 +60,7 @@ The package is also available from PyPi:
pip3 install --user setuptools
-With setuptools in place, novelWriter can be installed to the user space with:
+With ``setuptools`` in place, novelWriter can be installed to the user space with:
.. code-block:: console
diff --git a/docs/source/setup_mac.rst b/docs/source/setup_mac.rst
index 5b738865..6bc439d9 100644
--- a/docs/source/setup_mac.rst
+++ b/docs/source/setup_mac.rst
@@ -52,12 +52,19 @@ You can install novelWriter to the correct location for Python packages with:
.. code-block:: console
- ./setup.py install
+ ./setup.py install --user
-This is equivalent to what the ``pip`` installer does. It puts novelWriter in the location on your
-system where Python packages are usually kept. This is not really the best suited location for a
-GUI application like novelWriter, so you may instead copy the entire source to a suiteable location
-yourself.
+This requires that the package ``setuptools`` is installed on your system. If not, it can be
+installed with:
+
+.. code-block:: console
+
+ pip3 install --user setuptools
+
+This is method of install is equivalent to what the ``pip`` installer does. It puts novelWriter in
+the location on your system where Python packages are usually kept. This is not really the best
+suited location for a GUI application like novelWriter, so you may instead copy the entire source
+to a suiteable location yourself.
After this, you should be able to launch novelWriter by running ``novelWriter`` in a command line
window.
From 88d69f6fd4d751e6ce0d29c128308f7c2de2e1bd Mon Sep 17 00:00:00 2001
From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com>
Date: Sun, 21 Mar 2021 17:08:51 +0100
Subject: [PATCH 4/4] Update changelog and release notes
---
CHANGELOG.md | 12 ++++++++++++
nw/assets/text/release_notes.htm | 14 ++++++++++++--
sample/nwProject.nwx | 6 +++---
3 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6246994c..9af3972d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,11 @@
### Release Notes
+This patch release is a bug fix release addressing issues with the document editor's search and
+replace tool. Due to some recently added restrictions on when various tools are active, depending
+on which part of the main window has the user's focus, the search tool keyboard shortcuts and
+buttons were blocked when they shouldn't. This release resolves these issues.
+
### Detailed Changelog
**Bugfixes**
@@ -13,6 +18,13 @@
but should not affect search and replace. The search and replace actions now bypass the regular
action pipeline with the focus check. Issue #708. PR #709.
+**Documentation**
+
+* Improve the instructions for setup on Linux when manually installing using the `setup.py` script.
+ Previously, the documentation wasn't very clear on the difference between a user space install
+ and a system wide install. Neither did it explain how to install `setuptools` if the package is
+ missing. Issue #714. PR #715.
+
----
## Version 1.2 [2021-03-14]
diff --git a/nw/assets/text/release_notes.htm b/nw/assets/text/release_notes.htm
index fbbcdb5b..c610131c 100644
--- a/nw/assets/text/release_notes.htm
+++ b/nw/assets/text/release_notes.htm
@@ -2,6 +2,18 @@
+
+Release Notes for 1.2.1
+Released on 21 March 2021
+This patch release is a bug fix release addressing issues with the document editor's search and
+replace tool. Due to some recently added restrictions on when various tools are active, depending
+on which part of the main window has the user's focus, the search tool keyboard shortcuts and
+buttons were blocked when they shouldn't. This release resolves these issues.
+
+See also the Releases page.
+
+
+
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
@@ -79,7 +91,5 @@ indexer now checks that a keyword (tag or reference) is valid before saving it t
Previously, an invalid keyword could be saved to the index and potentially crash the application.
-See also the Releases page.
-
diff --git a/sample/nwProject.nwx b/sample/nwProject.nwx
index e4c5ca14..fca1e3af 100644
--- a/sample/nwProject.nwx
+++ b/sample/nwProject.nwx
@@ -1,13 +1,13 @@
-
+
Sample Project
Sample Project
Jane Smith
Jay Doh
- 937
+ 938
161
- 46797
+ 46831
False