diff --git a/CHANGELOG.md b/CHANGELOG.md
index bb76cf829..32ca42a50 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,45 @@
# novelWriter Changelog
+## Version 2.4 RC 1 [2024-04-06]
+
+### Release Notes
+
+This is a release candidate of the next release version, and is intended for testing purposes.
+Please be careful when using this version on writing projects, and make frequent backups.
+
+### Detailed Changelog
+
+**Bugfixes**
+
+* A number of issues GUI icon scaling has been fixed. Icons and buttons are supposed to scale
+ relative to the GUI font size, but several of them were not. Issue #1787. PR #1788.
+* The persistence of button state for the editor search box has been improved. The present state
+ was only saved when the search box was actively closed, and there were several scenarios where
+ this didn't happen. The button states are now tracked in the central config, and will always be
+ preserved. Issue #1794. PR #1795.
+
+**Other Improvements**
+
+* A placeholder icon has been added for cases where users have their own icon theme, and icons are
+ missing. Issue #1780. PR #1781.
+* The project search now refreshes the search results for the currently open document when it's
+ being edited. PR #1782.
+* When activating project search from the editor while text is selected, the search box is
+ populated with this text. Issue #1789. PR #1790.
+
+**Packaging**
+
+* The project has moved from using a `setup.cfg` to only using the `pyproject.toml` meta data file
+ for packaging. This is the preferred file format now. PR #1791.
+
+**Code Improvements**
+
+* The part of the code related to Qt widgets and flags has been updated and refactored in
+ preparation for the eventual move to the Qt6 framework. Part of issue #1142. PR #1792.
+* The Open Document writer class has been refactored and improved. PR #1796.
+
+----
+
## Version 2.4 Beta 1 [2024-03-26]
### Release Notes
@@ -7,9 +47,6 @@
This is a beta release of the next release version, and is intended for testing purposes. Please be
careful when using this version on live writing projects, and make sure you take frequent backups.
-Please check the changelog for an overview of changes. The full release notes will be added to the
-final release.
-
### Detailed Changelog
**Major Features**
diff --git a/i18n/nw_base.ts b/i18n/nw_base.ts
index 067a11fd4..c6fc3e6ec 100644
--- a/i18n/nw_base.ts
+++ b/i18n/nw_base.ts
@@ -4,215 +4,235 @@
Builds
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
Common
@@ -290,375 +310,375 @@
Constant
-
-
-
+
+
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
-
+
-
+
-
+
-
-
+
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -684,38 +704,38 @@
GuiBuildSettings
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -723,47 +743,47 @@
GuiDictionaries
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -771,55 +791,50 @@
GuiDocEditFooter
-
-
-
-
-
-
+
-
+
-
-
-
-
-
-
+
-
-
+
+
GuiDocEditHeader
-
+
-
+
+
+
+
+
+
-
+
-
+
@@ -827,58 +842,58 @@
GuiDocEditSearch
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -886,150 +901,145 @@
GuiDocEditor
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
+
GuiDocMerge
-
+
-
+
-
+
-
+
@@ -1037,52 +1047,52 @@
GuiDocSplit
-
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
+
-
+
@@ -1090,47 +1100,52 @@
GuiDocToolBar
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
-
+
@@ -1138,27 +1153,27 @@
GuiDocViewFooter
-
+
-
+
-
+
-
+
-
+
@@ -1166,22 +1181,27 @@
GuiDocViewHeader
-
+
+
+
+
+
+
-
+
-
+
-
+
@@ -1189,27 +1209,27 @@
GuiDocViewer
-
+
-
+
-
+
-
+
-
+
@@ -1217,12 +1237,12 @@
GuiDocViewerPanel
-
+
-
+
@@ -1230,12 +1250,12 @@
GuiEditLabel
-
+
-
+
@@ -1243,37 +1263,37 @@
GuiItemDetails
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -1281,27 +1301,27 @@
GuiLipsum
-
+
-
+
-
+
-
+
-
+
@@ -1309,103 +1329,103 @@
GuiMain
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -1413,642 +1433,657 @@
GuiMainMenu
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
+
-
+
+
+
+
+
+
-
+
-
+
-
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -2095,53 +2130,59 @@
GuiManuscript
-
+
-
+
-
+
-
+
-
+
-
-
+
+
+
-
-
+
+
-
-
+
+
+
+
+
+
+
-
+
-
-
+
+
@@ -2149,57 +2190,57 @@
GuiManuscriptBuild
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -2207,18 +2248,18 @@
GuiNovelDetails
-
-
+
+
-
+
-
+
@@ -2226,58 +2267,58 @@
GuiNovelToolBar
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
@@ -2285,7 +2326,7 @@
GuiNovelTree
-
+
@@ -2293,64 +2334,64 @@
GuiOutlineDetails
-
-
-
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -2358,7 +2399,7 @@
GuiOutlineHeaderMenu
-
+
@@ -2366,17 +2407,17 @@
GuiOutlineToolBar
-
+
-
+
-
+
@@ -2384,7 +2425,7 @@
GuiOutlineTree
-
+
@@ -2392,13 +2433,13 @@
GuiPreferences
-
-
+
+
-
+
@@ -2413,561 +2454,589 @@
-
+
-
-
-
+
+
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+ GuiProjectSearch
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
GuiProjectSettings
-
-
+
+
-
+
-
+
-
+
-
+
@@ -2975,47 +3044,47 @@
GuiProjectToolBar
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -3023,118 +3092,118 @@
GuiProjectTree
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
@@ -3142,37 +3211,42 @@
GuiSideBar
-
+
-
+
-
-
+
+
+
+
+
+
+
-
+
-
+
-
+
@@ -3180,37 +3254,37 @@
GuiWelcome
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -3218,33 +3292,33 @@
GuiWordList
-
-
+
+
-
+
-
+
-
+
-
+
-
+
@@ -3252,147 +3326,147 @@
GuiWritingStats
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -3400,153 +3474,153 @@
NWProject
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -3562,89 +3636,89 @@
ProjectBuilder
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
@@ -3840,17 +3914,17 @@
SharedData
-
+
-
+
-
+
@@ -3901,57 +3975,57 @@
_ContentsPage
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -3959,30 +4033,35 @@
_DetailsWidget
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
_FilterTab
@@ -4012,12 +4091,12 @@
-
+
-
+
@@ -4025,22 +4104,22 @@
_GuiAlert
-
+
-
+
-
+
-
+
@@ -4048,193 +4127,211 @@
_HeadingsTab
-
-
+
-
-
+
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
_NewProjectForm
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -4242,7 +4339,7 @@
_NewProjectPage
-
+
@@ -4250,27 +4347,27 @@
_OpenProjectPage
-
+
-
+
-
+
-
+
-
+
@@ -4278,54 +4375,54 @@
_OverviewPage
-
+
-
-
+
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
@@ -4333,27 +4430,27 @@
_PreviewWidget
-
+
-
+
-
+
-
+
-
+
@@ -4361,12 +4458,12 @@
_ProjectListModel
-
+
-
+
@@ -4374,27 +4471,27 @@
_ReplacePage
-
+
-
+
-
+
-
+
-
+
@@ -4402,117 +4499,177 @@
_SettingsPage
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
-
+
+
-
+
+
+ _StatsWidget
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
_StatusPage
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -4520,133 +4677,128 @@
_TreeContextMenu
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
-
-
-
-
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
+
@@ -4654,7 +4806,7 @@
_UpdatableMenu
-
+
@@ -4662,12 +4814,12 @@
_ViewPanelBackRefs
-
+
-
+
@@ -4675,27 +4827,27 @@
_ViewPanelKeyWords
-
+
-
+
-
+
-
+
-
+
diff --git a/novelwriter/__init__.py b/novelwriter/__init__.py
index 336634eb5..5bd809a87 100644
--- a/novelwriter/__init__.py
+++ b/novelwriter/__init__.py
@@ -42,9 +42,9 @@
__author__ = "Veronica Berglyd Olsen"
__maintainer__ = "Veronica Berglyd Olsen"
__email__ = "code@vkbo.net"
-__version__ = "2.4b1"
-__hexversion__ = "0x020400b1"
-__date__ = "2024-03-26"
+__version__ = "2.4rc1"
+__hexversion__ = "0x020400c1"
+__date__ = "2024-04-06"
__status__ = "Stable"
__domain__ = "novelwriter.io"
diff --git a/sample/nwProject.nwx b/sample/nwProject.nwx
index bc4b4a7bd..24170a341 100644
--- a/sample/nwProject.nwx
+++ b/sample/nwProject.nwx
@@ -1,6 +1,6 @@
-
-
+
+
Sample Project
Jane Smith