diff --git a/README.md b/README.md index 4f3e65f9..6432fdb3 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ documentation. ## Implementation -novelWriter is written with Python 3 (3.10+) using Qt6 and PyQt6 (6.0+), and is released on +novelWriter is written with Python 3 (3.10+) using Qt6 and PyQt6 (6.4+), and is released on Linux, Windows and macOS. It can in principle run on any Operating System that also supports Qt, PyQt and Python. diff --git a/docs/source/index.rst b/docs/source/index.rst index 7c8d75c3..c10ea5e9 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -20,7 +20,7 @@ The project storage is suitable for version control software, and also well suit synchronisation tools. All text is saved as plain text files, and your project data as standard data formats in XML and JSON. See :ref:`a_storage` for more details. -Any operating system that has Python 3 and the Qt 5 libraries should be able to run novelWriter. +Any operating system that has Python 3 and the Qt 6 libraries should be able to run novelWriter. It runs fine on Linux, Windows and MacOS, and users have tested it on other platforms as well. See :ref:`a_started` for more details. diff --git a/docs/source/more_customise.rst b/docs/source/more_customise.rst index 0cedb82c..924a0ef7 100644 --- a/docs/source/more_customise.rst +++ b/docs/source/more_customise.rst @@ -144,7 +144,7 @@ In the Main section you must at least define the ``name`` and ``icontheme`` sett setting must match the icon theme's folder name. The Palette values correspond to the Qt enum values for ``QPalette::ColorRole``, see the -`Qt documentation `_ for more details. The +`Qt documentation `_ for more details. The colour values are RGB numbers on the format ``r, g, b`` where each is an integer from ``0`` to ``255``. Omitted values are not loaded and will use default values. If the ``helptext`` colour is not defined, it is computed as a colour between the ``window`` and ``windowtext`` colour. diff --git a/docs/source/tech_locations.rst b/docs/source/tech_locations.rst index 3cd09e60..cc4b612e 100644 --- a/docs/source/tech_locations.rst +++ b/docs/source/tech_locations.rst @@ -4,7 +4,7 @@ File Locations ************** -.. _QStandardPaths: https://doc.qt.io/qt-5/qstandardpaths.html +.. _QStandardPaths: https://doc.qt.io/qt-6/qstandardpaths.html novelWriter will create a few files on your system outside of the application folder itself. These file locations are described in this chapter. diff --git a/docs/source/usage_writing.rst b/docs/source/usage_writing.rst index b59ff19f..a82bdd06 100644 --- a/docs/source/usage_writing.rst +++ b/docs/source/usage_writing.rst @@ -136,12 +136,9 @@ document when reaching the end. There is also a switch that will try to match th when the replacement is made. That is, it will try to keep the word upper, lower, or capitalised to match the word being replaced. -The regular expression search is somewhat dependant on which version of Qt your system has. If you -have Qt 5.13 or higher, there is better support for Unicode symbols in the search. - .. seealso:: For more information on the capabilities of the Regular Expression option, see the Qt - documentation for the `QRegularExpression `_ + documentation for the `QRegularExpression `_ class. diff --git a/i18n/README.md b/i18n/README.md index b45439dd..b2df46f0 100644 --- a/i18n/README.md +++ b/i18n/README.md @@ -45,7 +45,7 @@ instance `en_GB` for British English. ## Qt GUI Localisation -You will need the translation tool Qt 5 Linguist on your system. +You will need the translation tool Qt Linguist on your system. For Ubuntu/Debian, run: @@ -53,7 +53,7 @@ For Ubuntu/Debian, run: sudo apt install qttools5-dev-tools ``` -See also [Qt Linguist Manual: Translators](https://doc.qt.io/qt-5/linguist-translators.html). +See also [Qt Linguist Manual: Translators](https://doc.qt.io/qt-6/linguist-translators.html). ### Workflow @@ -94,7 +94,7 @@ TS file format. On Debian/Ubuntu it is provided by the package `pyqt6-dev-tools` ### Edit the Translation File in Qt Linguist -The `i18n/nw_XX.ts` file can be edited with the Qt Linguist application provided by Qt 5. This is +The `i18n/nw_XX.ts` file can be edited with the Qt Linguist application provided by Qt. This is by far easier than manually editing the `.ts` file. Please select "English" and "United Kingdom" as the _source_ language if prompted by Qt Linguist. diff --git a/novelwriter/config.py b/novelwriter/config.py index 4a9fe6a5..14123d8a 100644 --- a/novelwriter/config.py +++ b/novelwriter/config.py @@ -534,7 +534,7 @@ class Config: self._dShortDateTime = self._dLocale.dateTimeFormat(QLocale.FormatType.ShortFormat) langList = [ - (self._qtLangPath, "qtbase"), # Qt 5.x + (self._qtLangPath, "qtbase"), # Qt (str(self._nwLangPath), "nw"), # novelWriter ] for lngPath, lngBase in langList: