Bumped version for 1.2

CHANGELOG.md

@@ -1,6 +1,6 @@
 # novelWriter Changelog
 
-## Version 1.2 RC 1 [2021-03-02]
+## Version 1.2 [2021-03-14]
 
 ### Release Notes
 
@@ -81,7 +81,17 @@ Lastly, a new keyword has been added to mark characters in the story. The new ke
 to tag a character as the focus character for a chapter or scene. This is useful for stories where
 the point-of-view character and the focus character are different.
 
-_These Release Notes also include the changes from 1.2 Beta 1._
+_These Release Notes also include the changes from 1.2 Beta 1 and RC 1._
+
+### Detailed Changelog
+
+----
+
+## Version 1.2 RC 1 [2021-03-02]
+
+### Release Notes
+
+_The Release Notes have been moved and merged into the 1.2 notes._
 
 ### Detailed Changelog
 
@@ -107,60 +117,11 @@ _These Release Notes also include the changes from 1.2 Beta 1._
 
 ----
 
-## Version 1.1.1 [2021-02-21]
+## Version 1.2 Beta 1 [2021-02-11]
 
 ### Release Notes
 
-This patch makes a couple of minor improvements to the GUI. The keyboard shortcut for deleting
+_The Release Notes have been moved and merged into the 1.2 RC 1 notes._
-entries in the project tree has been changed from `Ctrl+Del` to `Ctrl+Shift+Del` to free up that
-shortcut for the document editor. It is now possible to use the shortcut for deleting the word in
-front of the cursor, a common and useful feature of many text editors.
-
-The way the negative word count filter option works on the Writing Statistics tool has been changed
-to be more intuitive. Enabling this filter now appears to remove all negative entries without
-altering the other entries. Previously, the removed negative counts would be included in the
-following entries to make it consistent with the total word count. In addition, writing sessions
-shorter than five minutes, and with no change in the word count, are no longer recorded in the
-session log file.
-
-Other changes include improving the speed of the internal spell checker, used when the Enchant
-spell check library isn't available. The internal spell checker is no longer significantly slower,
-but is still lacking in functionality compared to Enchant.
-
-### Detailed Changelog
-
-**User Interface**
-
-* The default GUI font on Windows is now Arial. It works better with the Qt framework than the
-  default system font. If Arial is missing, it falls back to the bundled font Cantarell. PR #655.
-* The way word changes are calculated on the Writing Statistics tool has changed when the option to
-  exclude negative word counts is active. Previously, the entries with negative counts were
-  filtered out, but the change in count was still applied to the next line, altering the value.
-  Now, the GUI will instead just drop the lines that are negative and keep the other lines
-  unchanged. This is more intutitive, but it also means that the total count now longer matches the
-  sum of the lines. PR #659.
-* The keyboard shortcut for deleting entries in the project tree has been changed from `Ctrl+Del`
-  to `Ctrl+Shift+Del`. The `Ctrl+Del` shortcut is thus free to be used exclusively by the editor to
-  delete the word in front of the cursor. Having the same shortcut do different things depending on
-  which area of the GUI has focus is a bit confusing. Related to #529. PR #666.
-
-**Other Improvements**
-
-* The internal spell checker, which is used when the Enchant library isn't available, has been
-  given a significant speed improvement by caching the imported dictionary as a Python `set`
-  instead of a `list`. The `set` has a hashed key lookup algorithm that is significantly faster.
-  PR #668.
-* Sessions shortar than 5 minutes, and with no word count changes, are no longer recorded in the
-  session stats log file. PR #685.
-
-**Installation**
-
-* The PyPi packages now include the `setup.py` file, which makes it possible to install icon
-  launchers for novelWriter on both Linux and Windows after installing with `pip`. PR #655.
-
-----
-
-## Version 1.2 Beta 1 [2021-02-11]
 
 ### Detailed Changelog
 
@@ -226,6 +187,59 @@ but is still lacking in functionality compared to Enchant.
 
 ----
 
+## Version 1.1.1 [2021-02-21]
+
+### Release Notes
+
+This patch makes a couple of minor improvements to the GUI. The keyboard shortcut for deleting
+entries in the project tree has been changed from `Ctrl+Del` to `Ctrl+Shift+Del` to free up that
+shortcut for the document editor. It is now possible to use the shortcut for deleting the word in
+front of the cursor, a common and useful feature of many text editors.
+
+The way the negative word count filter option works on the Writing Statistics tool has been changed
+to be more intuitive. Enabling this filter now appears to remove all negative entries without
+altering the other entries. Previously, the removed negative counts would be included in the
+following entries to make it consistent with the total word count. In addition, writing sessions
+shorter than five minutes, and with no change in the word count, are no longer recorded in the
+session log file.
+
+Other changes include improving the speed of the internal spell checker, used when the Enchant
+spell check library isn't available. The internal spell checker is no longer significantly slower,
+but is still lacking in functionality compared to Enchant.
+
+### Detailed Changelog
+
+**User Interface**
+
+* The default GUI font on Windows is now Arial. It works better with the Qt framework than the
+  default system font. If Arial is missing, it falls back to the bundled font Cantarell. PR #655.
+* The way word changes are calculated on the Writing Statistics tool has changed when the option to
+  exclude negative word counts is active. Previously, the entries with negative counts were
+  filtered out, but the change in count was still applied to the next line, altering the value.
+  Now, the GUI will instead just drop the lines that are negative and keep the other lines
+  unchanged. This is more intutitive, but it also means that the total count now longer matches the
+  sum of the lines. PR #659.
+* The keyboard shortcut for deleting entries in the project tree has been changed from `Ctrl+Del`
+  to `Ctrl+Shift+Del`. The `Ctrl+Del` shortcut is thus free to be used exclusively by the editor to
+  delete the word in front of the cursor. Having the same shortcut do different things depending on
+  which area of the GUI has focus is a bit confusing. Related to #529. PR #666.
+
+**Other Improvements**
+
+* The internal spell checker, which is used when the Enchant library isn't available, has been
+  given a significant speed improvement by caching the imported dictionary as a Python `set`
+  instead of a `list`. The `set` has a hashed key lookup algorithm that is significantly faster.
+  PR #668.
+* Sessions shortar than 5 minutes, and with no word count changes, are no longer recorded in the
+  session stats log file. PR #685.
+
+**Installation**
+
+* The PyPi packages now include the `setup.py` file, which makes it possible to install icon
+  launchers for novelWriter on both Linux and Windows after installing with `pip`. PR #655.
+
+----
+
 ## Version 1.1 [2021-02-07]
 
 ### Release Notes

docs/source/conf.py

@@ -27,7 +27,7 @@ author = "Veronica Berglyd Olsen"
 # The short X.Y version
 version = "1.2"
 # The full version, including alpha/beta/rc tags
-release = "1.2-rc1"
+release = "1.2"
 
 
 # -- General configuration ---------------------------------------------------

nw/__init__.py

@@ -62,9 +62,9 @@ __license__    = "GPLv3"
 __author__     = "Veronica Berglyd Olsen"
 __maintainer__ = "Veronica Berglyd Olsen"
 __email__      = "code@vkbo.net"
-__version__    = "1.2rc1"
+__version__    = "1.2"
-__hexversion__ = "0x010200c1"
+__hexversion__ = "0x010200f0"
-__date__       = "2021-03-02"
+__date__       = "2021-03-14"
 __status__     = "Stable"
 __domain__     = "novelwriter.io"
 __url__        = "https://novelwriter.io"