Merge branch 'main' into release_2.0rc1

novelwriter/__init__.py

@@ -214,14 +214,14 @@ def main(sysArgs=None):
             "At least Python 3.7 is required, found %s" % CONFIG.verPyString
         )
         errorCode |= 0x04
-    if CONFIG.verQtValue < 50300:
+    if CONFIG.verQtValue < 51000:
         errorData.append(
-            "At least Qt5 version 5.3 is required, found %s" % CONFIG.verQtString
+            "At least Qt5 version 5.10 is required, found %s" % CONFIG.verQtString
         )
         errorCode |= 0x08
-    if CONFIG.verPyQtValue < 50300:
+    if CONFIG.verPyQtValue < 51000:
         errorData.append(
-            "At least PyQt5 version 5.3 is required, found %s" % CONFIG.verPyQtString
+            "At least PyQt5 version 5.10 is required, found %s" % CONFIG.verPyQtString
         )
         errorCode |= 0x10
 

novelwriter/config.py

@@ -220,8 +220,8 @@ class Config:
             self.osUnknown = True
 
         # Other System Info
-        self.hostName  = "Unknown"
-        self.kernelVer = "Unknown"
+        self.hostName  = QSysInfo.machineHostName()
+        self.kernelVer = QSysInfo.kernelVersion()
 
         # Packages
         self.hasEnchant = False  # The pyenchant package
@@ -264,10 +264,7 @@ class Config:
             self.confPath = confPath
 
         if dataPath is None:
-            if self.verQtValue >= 50400:
-                dataRoot = QStandardPaths.writableLocation(QStandardPaths.AppDataLocation)
-            else:
-                dataRoot = QStandardPaths.writableLocation(QStandardPaths.DataLocation)
+            dataRoot = QStandardPaths.writableLocation(QStandardPaths.AppDataLocation)
             self.dataPath = os.path.join(os.path.abspath(dataRoot), self.appHandle)
         else:
             logger.info("Setting data path from alternative path: %s", dataPath)
@@ -347,11 +344,6 @@ class Config:
                     self.errData.append(formatException(exc))
                     self.dataPath = None
 
-        # Host and Kernel
-        if self.verQtValue >= 50600:
-            self.hostName  = QSysInfo.machineHostName()
-            self.kernelVer = QSysInfo.kernelVersion()
-
         # Load recent projects cache
         self.loadRecentCache()
 

novelwriter/gui/doceditor.py

@@ -303,10 +303,7 @@ class GuiDocEditor(QTextEdit):
             self.setHorizontalScrollBarPolicy(Qt.ScrollBarAsNeeded)
 
         # Refresh the tab stops
-        if self.mainConf.verQtValue >= 51000:
-            self.setTabStopDistance(self.mainConf.getTabWidth())
-        else:  # pragma: no cover
-            self.setTabStopWidth(self.mainConf.getTabWidth())
+        self.setTabStopDistance(self.mainConf.getTabWidth())
 
         # Initialise the syntax highlighter
         self.highLight.initHighlighter()
@@ -604,19 +601,15 @@ class GuiDocEditor(QTextEdit):
     ##
 
     def getText(self):
-        """Get the text content of the current document. This method
-        uses QTextEdit->toPlainText for Qt versions lower than 5.9, and
-        the QTextDocument->toRawText for higher version. The latter
-        preserves non-breaking spaces, which the former does not.
-        We still want to get rid of page and line separators though.
+        """Get the text content of the current document. This method uses
+        QTextDocument->toRawText instead of toPlainText(). The former preserves
+        non-breaking spaces, the latter does not. We still want to get rid of
+        page and line separators though.
         See: https://doc.qt.io/qt-5/qtextdocument.html#toPlainText
         """
-        if self.mainConf.verQtValue >= 50900:
-            theText = self.document().toRawText()
-            theText = theText.replace(nwUnicode.U_LSEP, "\n")  # Line separators
-            theText = theText.replace(nwUnicode.U_PSEP, "\n")  # Paragraph separators
-        else:
-            theText = self.toPlainText()
+        theText = self.document().toRawText()
+        theText = theText.replace(nwUnicode.U_LSEP, "\n")  # Line separators
+        theText = theText.replace(nwUnicode.U_PSEP, "\n")  # Paragraph separators
         return theText
 
     def getCursorPosition(self):
@@ -2478,7 +2471,8 @@ class GuiDocEditSearch(QFrame):
                 self._alertSearchValid(theRegEx.isValid())
                 return theRegEx
 
-            else:  # >= 50300 to < 51300
+            else:  # pragma: no cover
+                # >= 50300 to < 51300
                 if self.isCaseSense:
                     rxOpt = Qt.CaseSensitive
                 else:

novelwriter/gui/docviewer.py

@@ -150,10 +150,7 @@ class GuiDocViewer(QTextBrowser):
             self.setHorizontalScrollBarPolicy(Qt.ScrollBarAsNeeded)
 
         # Refresh the tab stops
-        if self.mainConf.verQtValue >= 51000:
-            self.setTabStopDistance(self.mainConf.getTabWidth())
-        else:
-            self.setTabStopWidth(self.mainConf.getTabWidth())
+        self.setTabStopDistance(self.mainConf.getTabWidth())
 
         # If we have a document open, we should reload it in case the font changed
         if self._docHandle is not None:
@@ -193,10 +190,7 @@ class GuiDocViewer(QTextBrowser):
             return False
 
         # Refresh the tab stops
-        if self.mainConf.verQtValue >= 51000:
-            self.setTabStopDistance(self.mainConf.getTabWidth())
-        else:
-            self.setTabStopWidth(self.mainConf.getTabWidth())
+        self.setTabStopDistance(self.mainConf.getTabWidth())
 
         # Must be before setHtml
         if updateHistory:

novelwriter/tools/build.py

@@ -1265,10 +1265,7 @@ class GuiBuildNovelDocView(QTextBrowser):
         self.setFont(theFont)
 
         # Set the tab stops
-        if self.mainConf.verQtValue >= 51000:
-            self.setTabStopDistance(self.mainConf.getTabWidth())
-        else:
-            self.setTabStopWidth(self.mainConf.getTabWidth())
+        self.setTabStopDistance(self.mainConf.getTabWidth())
 
         docPalette = self.palette()
         docPalette.setColor(QPalette.Base, QColor(255, 255, 255))