From cb0591fe5f90dbbd4f8a4714496d9702c114effe Mon Sep 17 00:00:00 2001
From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com>
Date: Sat, 27 Mar 2021 15:38:48 +0100
Subject: [PATCH 1/2] Bump version to 1.2.2 and update changelog

---
 CHANGELOG.md        | 27 +++++++++++++++++++++++++++
 docs/source/conf.py |  4 ++--
 nw/__init__.py      |  6 +++---
 3 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9af3972d..6c302d9b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,32 @@
 # novelWriter Changelog
 
+## Version 1.2.2 [2021-03-28]
+
+### Release Notes
+
+### Detailed Changelog
+
+**Bugfixes**
+
+* The way Focus Mode worked when activated through the menu and through the document header button
+  were inconsistent. The header button would deactivate the edit, search and close buttons, while
+  the menu entry would not. These two methods now call the same set of functions to ensure the
+  behaviour is consistent. PR #717.
+* Closing the document while in Focus Mode now ends Focus Mode. Previously, the editor would be
+  left stuck in Focus Mode with no way to exit. PR #717.
+
+**User Interface**
+
+* The keyboard shortcuts for the search and replace tool now also work in Focus Mode. Previously,
+  the menu entries and their shortcuts were deactivated in this mode. Issue #716. PR #717.
+
+**Installation**
+
+* The setup script command do build minimal install archive files now also generate SHA 256 file
+  sum files. PR #724.
+
+----
+
 ## Version 1.2.1 [2021-03-21]
 
 ### Release Notes
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 7cf8bf39..33e77da1 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.1"
+version = "1.2.2"
 # The full version, including alpha/beta/rc tags
-release = "1.2.1"
+release = "1.2.2"
 
 
 # -- General configuration ---------------------------------------------------
diff --git a/nw/__init__.py b/nw/__init__.py
index c1184649..4b7a05e3 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.1"
-__hexversion__ = "0x010201f0"
-__date__       = "2021-03-21"
+__version__    = "1.2.2"
+__hexversion__ = "0x010202f0"
+__date__       = "2021-03-28"
 __status__     = "Stable"
 __domain__     = "novelwriter.io"
 __url__        = "https://novelwriter.io"

From 6afc34e47e09453315472c343fd0cbdf3f794498 Mon Sep 17 00:00:00 2001
From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com>
Date: Sat, 27 Mar 2021 22:31:15 +0100
Subject: [PATCH 2/2] Update changelog and release notes

---
 CHANGELOG.md                     | 11 +++++++++--
 nw/assets/text/release_notes.htm | 13 +++++++++++--
 sample/nwProject.nwx             |  6 +++---
 3 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6c302d9b..8f3a0e73 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,11 @@
 
 ### Release Notes
 
+This patch release is a bug fix release addressing some inconsistencies and issues with the
+document header buttons when Focus Mode is active. The keyboard shortcuts for search and replace
+should now also work in Focus Mode. In addition, the setup script for novelWriter has been improved
+when installing on Windows.
+
 ### Detailed Changelog
 
 **Bugfixes**
@@ -22,8 +27,10 @@
 
 **Installation**
 
-* The setup script command do build minimal install archive files now also generate SHA 256 file
-  sum files. PR #724.
+* The setup script command do build minimal install archive files now also generate SHA 256 sum
+  files. PR #724.
+* The setup script will now copy the `novelWriter.py` file to `novelWriter.pyw` if it doesn't exist
+  when the `win-install` command is run. Issue #727. PR #728.
 
 ----
 
diff --git a/nw/assets/text/release_notes.htm b/nw/assets/text/release_notes.htm
index c610131c..864521b1 100644
--- a/nw/assets/text/release_notes.htm
+++ b/nw/assets/text/release_notes.htm
@@ -3,6 +3,17 @@
 <body>
 
 
+<h2>Release Notes for 1.2.2</h2>
+<p><i>Released on 28 March 2021</i></p>
+<p>This patch release is a bug fix release addressing some inconsistencies and issues with the
+document header buttons when Focus Mode is active. The keyboard shortcuts for search and replace
+should now also work in Focus Mode. In addition, the setup script for novelWriter has been improved
+when installing on Windows.</p>
+
+<p><i>See also the <a href="https://github.com/vkbo/novelWriter/releases">Releases</a> page.</i></p>
+
+<hr/>
+
 <h2>Release Notes for 1.2.1</h2>
 <p><i>Released on 21 March 2021</i></p>
 <p>This patch release is a bug fix release addressing issues with the document editor's search and
@@ -10,8 +21,6 @@ replace tool. Due to some recently added restrictions on when various tools are
 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.</p>
 
-<p><i>See also the <a href="https://github.com/vkbo/novelWriter/releases">Releases</a> page.</i></p>
-
 <hr/>
 
 <h2>Release Notes for 1.2</h2>
diff --git a/sample/nwProject.nwx b/sample/nwProject.nwx
index fca1e3af..b673da8e 100644
--- a/sample/nwProject.nwx
+++ b/sample/nwProject.nwx
@@ -1,13 +1,13 @@
 <?xml version='1.0' encoding='utf-8'?>
-<novelWriterXML appVersion="1.2.1" hexVersion="0x010201f0" fileVersion="1.2" timeStamp="2021-03-21 17:08:18">
+<novelWriterXML appVersion="1.2.2" hexVersion="0x010202f0" fileVersion="1.2" timeStamp="2021-03-27 22:31:03">
   <project>
     <name>Sample Project</name>
     <title>Sample Project</title>
     <author>Jane Smith</author>
     <author>Jay Doh</author>
-    <saveCount>938</saveCount>
+    <saveCount>943</saveCount>
     <autoCount>161</autoCount>
-    <editTime>46831</editTime>
+    <editTime>47016</editTime>
   </project>
   <settings>
     <doBackup>False</doBackup>