Merge branch 'main' into dev

2021-05-08 21:41:36 +02:00
parent c1544ab374 486676baa5
commit 6ef8611a0a
12 changed files with 87 additions and 21 deletions
@@ -2,6 +2,18 @@
 <html>
 <body>

+<h2>Release Notes for 1.3.1</h2>
+<p><i>Released on 6 May 2021</i></p>
+<p>This is a patch release primarily to fix a problem with the Qt translation library used to make
+novelWriter available in multiple languages. One of the function calls made to the library was
+added recently, in Qt 5.15, which many users on Linux will not have installed on their system. The
+issue could be resolved by updating the library, but it's an unnecessary and inconvenient
+restriction.</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.3</h2>
 <p><i>Released on 2 May 2021</i></p>
 <p>The main feature of the 1.3 release is internationalisation. The release introduces support for
@@ -24,7 +36,5 @@ provided the translation file for chapter numbers in German.</p>
 <p>The work to rewrite novelWriter to allow for internationalisation was done by Bruno Meneguello
 and Veronica Berglyd Olsen.</p>

-<p><i>See also the <a href="https://github.com/vkbo/novelWriter/releases">Releases</a> page.</i></p>
-
 </body>
 </html>
@@ -391,7 +391,7 @@ class Config:
                lngFile = "%s_%s" % (lngBase, lngCode.replace("-", "_"))
                if lngFile not in self.qtTrans:
                    if qTrans.load(lngFile, lngPath):
-                        logger.debug("Loaded: %s" % qTrans.filePath())
+                        logger.debug("Loaded: %s" % os.path.join(lngPath, lngFile))
                        nwApp.installTranslator(qTrans)
                        self.qtTrans[lngFile] = qTrans

@@ -77,6 +77,7 @@ class NWTree():
        self._treeChanged = False # True if tree structure has changed

        self._handleSeed  = None  # Used for generating handles for testing
+        self._handleCount = 0     # A counter that is added to the handle generator

        return

@@ -515,7 +516,8 @@ class NWTree():
        handle requests come faster than the clock resolution.
        """
        if self._handleSeed is None:
-            newSeed = str(time()) + addSeed
+            newSeed = "%s_%d_%s" % (str(time()), self._handleCount, addSeed)
+            self._handleCount += 1
        else:
            # This is used for debugging
            newSeed = str(self._handleSeed)
@@ -371,9 +371,9 @@ class GuiMain(QMainWindow):

        logger.info("Creating new project")
        if self.theProject.newProject(projData):
+            self.hasProject = True
            self.rebuildTrees()
            self.saveProject()
-            self.hasProject = True
            self.docEditor.setDictionaries()
            self.rebuildIndex(beQuiet=True)
            self.statusBar.setRefTime(self.theProject.projOpened)