novelWriter 2.4.4__py3-none-any.whl → 2.5__py3-none-any.whl

novelwriter/guimain.py

@@ -23,18 +23,18 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 """
 from __future__ import annotations
 
-import sys
 import logging
+import sys
 
-from time import time
-from pathlib import Path
 from datetime import datetime
+from pathlib import Path
+from time import time
 
 from PyQt5.QtCore import Qt, QTimer, pyqtSlot
 from PyQt5.QtGui import QCloseEvent, QCursor, QIcon
 from PyQt5.QtWidgets import (
-    QApplication, QFileDialog, QHBoxLayout, QMainWindow, QMessageBox, QShortcut, QSplitter,
-    QStackedWidget, QVBoxLayout, QWidget
+    QApplication, QFileDialog, QHBoxLayout, QMainWindow, QMessageBox,
+    QShortcut, QSplitter, QStackedWidget, QVBoxLayout, QWidget
 )
 
 from novelwriter import CONFIG, SHARED, __hexversion__, __version__
@@ -44,7 +44,7 @@ from novelwriter.dialogs.about import GuiAbout
 from novelwriter.dialogs.preferences import GuiPreferences
 from novelwriter.dialogs.projectsettings import GuiProjectSettings
 from novelwriter.dialogs.wordlist import GuiWordList
-from novelwriter.enum import nwDocAction, nwDocInsert, nwDocMode, nwItemType, nwWidget, nwView
+from novelwriter.enum import nwDocAction, nwDocInsert, nwDocMode, nwFocus, nwItemType, nwView
 from novelwriter.gui.doceditor import GuiDocEditor
 from novelwriter.gui.docviewer import GuiDocViewer
 from novelwriter.gui.docviewerpanel import GuiDocViewerPanel
@@ -210,66 +210,68 @@ class GuiMain(QMainWindow):
         # Connect Signals
         # ===============
 
-        SHARED.projectStatusChanged.connect(self.mainStatus.updateProjectStatus)
-        SHARED.projectStatusMessage.connect(self.mainStatus.setStatusMessage)
-        SHARED.spellLanguageChanged.connect(self.mainStatus.setLanguage)
         SHARED.focusModeChanged.connect(self._focusModeChanged)
+        SHARED.indexAvailable.connect(self.docViewerPanel.indexHasAppeared)
+        SHARED.indexChangedTags.connect(self.docEditor.updateChangedTags)
         SHARED.indexChangedTags.connect(self.docViewerPanel.updateChangedTags)
+        SHARED.indexCleared.connect(self.docViewerPanel.indexWasCleared)
         SHARED.indexScannedText.connect(self.docViewerPanel.projectItemChanged)
-        SHARED.indexScannedText.connect(self.projView.updateItemValues)
         SHARED.indexScannedText.connect(self.itemDetails.updateViewBox)
-        SHARED.indexCleared.connect(self.docViewerPanel.indexWasCleared)
-        SHARED.indexAvailable.connect(self.docViewerPanel.indexHasAppeared)
+        SHARED.indexScannedText.connect(self.projView.updateItemValues)
         SHARED.mainClockTick.connect(self._timeTick)
+        SHARED.projectStatusChanged.connect(self.mainStatus.updateProjectStatus)
+        SHARED.projectStatusMessage.connect(self.mainStatus.setStatusMessage)
+        SHARED.spellLanguageChanged.connect(self.mainStatus.setLanguage)
 
         self.mainMenu.requestDocAction.connect(self._passDocumentAction)
         self.mainMenu.requestDocInsert.connect(self._passDocumentInsert)
         self.mainMenu.requestDocInsertText.connect(self._passDocumentInsert)
         self.mainMenu.requestDocKeyWordInsert.connect(self.docEditor.insertKeyWord)
-        self.mainMenu.requestFocusChange.connect(self.switchFocus)
+        self.mainMenu.requestFocusChange.connect(self._switchFocus)
         self.mainMenu.requestViewChange.connect(self._changeView)
 
         self.sideBar.requestViewChange.connect(self._changeView)
 
-        self.projView.selectedItemChanged.connect(self.itemDetails.updateViewBox)
         self.projView.openDocumentRequest.connect(self._openDocument)
-        self.projView.wordCountsChanged.connect(self._updateStatusWordCount)
+        self.projView.projectSettingsRequest.connect(self.showProjectSettingsDialog)
+        self.projView.rootFolderChanged.connect(self.novelView.updateRootItem)
+        self.projView.rootFolderChanged.connect(self.outlineView.updateRootItem)
+        self.projView.rootFolderChanged.connect(self.projView.updateRootItem)
+        self.projView.selectedItemChanged.connect(self.itemDetails.updateViewBox)
         self.projView.treeItemChanged.connect(self.docEditor.updateDocInfo)
         self.projView.treeItemChanged.connect(self.docViewer.updateDocInfo)
-        self.projView.treeItemChanged.connect(self.itemDetails.updateViewBox)
         self.projView.treeItemChanged.connect(self.docViewerPanel.projectItemChanged)
-        self.projView.rootFolderChanged.connect(self.outlineView.updateRootItem)
-        self.projView.rootFolderChanged.connect(self.novelView.updateRootItem)
-        self.projView.rootFolderChanged.connect(self.projView.updateRootItem)
-        self.projView.projectSettingsRequest.connect(self.showProjectSettingsDialog)
+        self.projView.treeItemChanged.connect(self.itemDetails.updateViewBox)
+        self.projView.wordCountsChanged.connect(self._updateStatusWordCount)
 
-        self.novelView.selectedItemChanged.connect(self.itemDetails.updateViewBox)
         self.novelView.openDocumentRequest.connect(self._openDocument)
+        self.novelView.selectedItemChanged.connect(self.itemDetails.updateViewBox)
 
         self.projSearch.openDocumentSelectRequest.connect(self._openDocumentSelection)
         self.projSearch.selectedItemChanged.connect(self.itemDetails.updateViewBox)
 
-        self.docEditor.editedStatusChanged.connect(self.mainStatus.updateDocumentStatus)
+        self.docEditor.closeDocumentRequest.connect(self.closeDocEditor)
         self.docEditor.docCountsChanged.connect(self.itemDetails.updateCounts)
         self.docEditor.docCountsChanged.connect(self.projView.updateCounts)
+        self.docEditor.docTextChanged.connect(self.projSearch.textChanged)
+        self.docEditor.editedStatusChanged.connect(self.mainStatus.updateDocumentStatus)
         self.docEditor.loadDocumentTagRequest.connect(self._followTag)
-        self.docEditor.novelStructureChanged.connect(self.novelView.refreshTree)
         self.docEditor.novelItemMetaChanged.connect(self.novelView.updateNovelItemMeta)
-        self.docEditor.statusMessage.connect(self.mainStatus.setStatusMessage)
+        self.docEditor.novelStructureChanged.connect(self.novelView.refreshTree)
+        self.docEditor.requestNewNoteCreation.connect(self.projView.createNewNote)
+        self.docEditor.requestNextDocument.connect(self.openNextDocument)
+        self.docEditor.requestProjectItemRenamed.connect(self.projView.renameTreeItem)
+        self.docEditor.requestProjectItemSelected.connect(self.projView.setSelectedHandle)
         self.docEditor.spellCheckStateChanged.connect(self.mainMenu.setSpellCheckState)
-        self.docEditor.closeDocumentRequest.connect(self.closeDocEditor)
+        self.docEditor.statusMessage.connect(self.mainStatus.setStatusMessage)
         self.docEditor.toggleFocusModeRequest.connect(self.toggleFocusMode)
-        self.docEditor.requestProjectItemSelected.connect(self.projView.setSelectedHandle)
-        self.docEditor.requestProjectItemRenamed.connect(self.projView.renameTreeItem)
-        self.docEditor.requestNewNoteCreation.connect(self.projView.createNewNote)
-        self.docEditor.docTextChanged.connect(self.projSearch.textChanged)
 
+        self.docViewer.closeDocumentRequest.connect(self.closeDocViewer)
         self.docViewer.documentLoaded.connect(self.docViewerPanel.updateHandle)
         self.docViewer.loadDocumentTagRequest.connect(self._followTag)
-        self.docViewer.closeDocumentRequest.connect(self.closeDocViewer)
         self.docViewer.reloadDocumentRequest.connect(self._reloadViewer)
-        self.docViewer.togglePanelVisibility.connect(self._toggleViewerPanelVisibility)
         self.docViewer.requestProjectItemSelected.connect(self.projView.setSelectedHandle)
+        self.docViewer.togglePanelVisibility.connect(self._toggleViewerPanelVisibility)
 
         self.docViewerPanel.loadDocumentTagRequest.connect(self._followTag)
         self.docViewerPanel.openDocumentRequest.connect(self._openDocument)
@@ -303,9 +305,6 @@ class GuiMain(QMainWindow):
         self.keyEscape.setKey(Qt.Key.Key_Escape)
         self.keyEscape.activated.connect(self._keyPressEscape)
 
-        # Check that config loaded fine
-        self.reportConfErr()
-
         # Initialise Main GUI
         self.initMain()
         self.asProjTimer.start()
@@ -327,6 +326,15 @@ class GuiMain(QMainWindow):
 
     def postLaunchTasks(self, cmdOpen: str | None) -> None:
         """Process tasks after the main window has been created."""
+        QApplication.processEvents()
+        app = QApplication.instance()
+        if isinstance(app, QApplication):
+            app.focusChanged.connect(self._appFocusChanged)
+
+        # Check that config loaded fine
+        if CONFIG.hasError:
+            SHARED.error(CONFIG.errorText())
+
         if cmdOpen:
             QApplication.processEvents()
             logger.info("Command line path: %s", cmdOpen)
@@ -369,9 +377,7 @@ class GuiMain(QMainWindow):
             if not msgYes:
                 return False
 
-        if self.docEditor.docChanged:
-            self.saveDocument()
-
+        self.saveDocument()
         saveOK = self.saveProject()
         doBackup = False
         if SHARED.project.data.doBackup and CONFIG.backupOnClose:
@@ -514,9 +520,7 @@ class GuiMain(QMainWindow):
             # Disable focus mode if it is active
             if SHARED.focusMode:
                 SHARED.setFocusMode(False)
-            self.docEditor.saveCursorPosition()
-            if self.docEditor.docChanged:
-                self.saveDocument()
+            self.saveDocument()
             self.docEditor.clearEditor()
             if not beforeOpen:
                 self.novelView.setActiveHandle(None)
@@ -553,42 +557,43 @@ class GuiMain(QMainWindow):
 
         return True
 
-    def openNextDocument(self, tHandle: str, wrapAround: bool = False) -> bool:
+    @pyqtSlot(str, bool)
+    def openNextDocument(self, tHandle: str, wrapAround: bool) -> None:
         """Open the next document in the project tree, following the
         document with the given handle. Stop when reaching the end.
         """
-        if not SHARED.hasProject:
-            logger.error("No project open")
-            return False
-
-        nHandle = None   # The next handle after tHandle
-        fHandle = None   # The first file handle we encounter
-        foundIt = False  # We've found tHandle, pick the next we see
-        for tItem in SHARED.project.tree:
-            if not tItem.isFileType():
-                continue
-            if fHandle is None:
-                fHandle = tItem.itemHandle
-            if tItem.itemHandle == tHandle:
-                foundIt = True
-            elif foundIt:
-                nHandle = tItem.itemHandle
-                break
-
-        if nHandle is not None:
-            self.openDocument(nHandle, tLine=1, doScroll=True)
-            return True
-        elif wrapAround:
-            self.openDocument(fHandle, tLine=1, doScroll=True)
-            return False
-
-        return False
+        if SHARED.hasProject:
+            nHandle = None   # The next handle after tHandle
+            fHandle = None   # The first file handle we encounter
+            foundIt = False  # We've found tHandle, pick the next we see
+            for tItem in SHARED.project.tree:
+                if not tItem.isFileType():
+                    continue
+                if fHandle is None:
+                    fHandle = tItem.itemHandle
+                if tItem.itemHandle == tHandle:
+                    foundIt = True
+                elif foundIt:
+                    nHandle = tItem.itemHandle
+                    break
+            if nHandle is not None:
+                self.openDocument(nHandle, tLine=1, doScroll=True)
+            elif wrapAround:
+                self.openDocument(fHandle, tLine=1, doScroll=True)
+        return
 
-    @pyqtSlot()
-    def saveDocument(self) -> None:
+    def saveDocument(self, force: bool = False) -> None:
         """Save the current documents."""
         if SHARED.hasProject:
-            self.docEditor.saveText()
+            self.docEditor.saveCursorPosition()
+            if force or self.docEditor.docChanged:
+                self.docEditor.saveText()
+        return
+
+    @pyqtSlot()
+    def forceSaveDocument(self) -> None:
+        """Save document even of it has not changed."""
+        self.saveDocument(force=True)
         return
 
     def viewDocument(self, tHandle: str | None = None, sTitle: str | None = None) -> bool:
@@ -618,6 +623,10 @@ class GuiMain(QMainWindow):
         # Make sure main tab is in Editor view
         self._changeView(nwView.EDITOR)
 
+        # If we're loading the document in the editor, it may need to be saved
+        if tHandle == self.docEditor.docHandle and self.docEditor.docChanged:
+            self.saveDocument()
+
         logger.debug("Viewing document with handle '%s'", tHandle)
         updateHistory = tHandle != self.docViewer.docHandle
         if self.docViewer.loadText(tHandle, updateHistory=updateHistory):
@@ -649,7 +658,7 @@ class GuiMain(QMainWindow):
             logger.error("No project open")
             return False
 
-        lastPath = CONFIG.lastPath()
+        lastPath = CONFIG.lastPath("import")
         ffilter = formatFileFilter(["*.txt", "*.md", "*.nwd", "*"])
         loadFile, _ = QFileDialog.getOpenFileName(
             self, self.tr("Import File"), str(lastPath), filter=ffilter
@@ -664,7 +673,7 @@ class GuiMain(QMainWindow):
         try:
             with open(loadFile, mode="rt", encoding="utf-8") as inFile:
                 text = inFile.read()
-            CONFIG.setLastPath(loadFile)
+            CONFIG.setLastPath("import", loadFile)
         except Exception as exc:
             SHARED.error(self.tr(
                 "Could not read file. The file must be an existing text file."
@@ -721,14 +730,6 @@ class GuiMain(QMainWindow):
 
         return
 
-    def editItemLabel(self, tHandle: str | None = None) -> None:
-        """Open the edit item dialog."""
-        if SHARED.hasProject:
-            if tHandle is None and (self.docEditor.anyFocus() or SHARED.focusMode):
-                tHandle = self.docEditor.docHandle
-            self.projView.renameTreeItem(tHandle)
-        return
-
     def rebuildTrees(self) -> None:
         """Rebuild the project tree."""
         self.projView.populateTree()
@@ -750,7 +751,6 @@ class GuiMain(QMainWindow):
             self.mainStatus.setStatusMessage(
                 self.tr("Indexing completed in {0} ms").format(f"{(tEnd - tStart)*1000.0:.1f}")
             )
-            self.docEditor.updateTagHighLighting()
             self._updateStatusWordCount()
             QApplication.restoreOverrideCursor()
 
@@ -794,10 +794,7 @@ class GuiMain(QMainWindow):
         """Open the novel details dialog."""
         if SHARED.hasProject:
             dialog = GuiNovelDetails(self)
-            dialog.setModal(True)
-            dialog.show()
-            dialog.raise_()
-            QApplication.processEvents()
+            dialog.activateDialog()
             dialog.updateValues()
         return
 
@@ -805,12 +802,9 @@ class GuiMain(QMainWindow):
     def showBuildManuscriptDialog(self) -> None:
         """Open the build manuscript dialog."""
         if SHARED.hasProject:
-            if (dialog := SHARED.findTopLevelWidget(GuiManuscript)) is None:
+            if not (dialog := SHARED.findTopLevelWidget(GuiManuscript)):
                 dialog = GuiManuscript(self)
-            dialog.setModal(False)
-            dialog.show()
-            dialog.raise_()
-            QApplication.processEvents()
+            dialog.activateDialog()
             dialog.loadContent()
         return
 
@@ -827,12 +821,9 @@ class GuiMain(QMainWindow):
     def showWritingStatsDialog(self) -> None:
         """Open the session stats dialog."""
         if SHARED.hasProject:
-            if (dialog := SHARED.findTopLevelWidget(GuiWritingStats)) is None:
+            if not (dialog := SHARED.findTopLevelWidget(GuiWritingStats)):
                 dialog = GuiWritingStats(self)
-            dialog.setModal(False)
-            dialog.show()
-            dialog.raise_()
-            QApplication.processEvents()
+            dialog.activateDialog()
             dialog.populateGUI()
         return
 
@@ -840,11 +831,7 @@ class GuiMain(QMainWindow):
     def showAboutNWDialog(self) -> None:
         """Show the novelWriter about dialog."""
         dialog = GuiAbout(self)
-        dialog.setModal(True)
-        dialog.show()
-        dialog.raise_()
-        QApplication.processEvents()
-        dialog.populateGUI()
+        dialog.exec()
         return
 
     @pyqtSlot()
@@ -858,24 +845,12 @@ class GuiMain(QMainWindow):
     def showDictionariesDialog(self) -> None:
         """Show the download dictionaries dialog."""
         dialog = GuiDictionaries(self)
-        dialog.setModal(True)
-        dialog.show()
-        dialog.raise_()
-        QApplication.processEvents()
+        dialog.activateDialog()
         if not dialog.initDialog():
             dialog.close()
             SHARED.error(self.tr("Could not initialise the dialog."))
         return
 
-    def reportConfErr(self) -> None:
-        """Checks if the Config module has any errors to report, and let
-        the user know if this is the case. The Config module caches
-        errors since it is initialised before the GUI itself.
-        """
-        if CONFIG.hasError:
-            SHARED.error(CONFIG.errorText())
-        return
-
     ##
     #  Main Window Actions
     ##
@@ -906,9 +881,7 @@ class GuiMain(QMainWindow):
 
         if SHARED.hasProject:
             self.closeProject(True)
-
         CONFIG.saveConfig()
-        self.reportConfErr()
 
         QApplication.quit()
 
@@ -976,14 +949,37 @@ class GuiMain(QMainWindow):
             SHARED.setFocusMode(not SHARED.focusMode)
         return
 
+    ##
+    #  Private Slots
+    ##
+
+    @pyqtSlot("QWidget*", "QWidget*")
+    def _appFocusChanged(self, old: QWidget, new: QWidget) -> None:
+        """Alert main widgets that they have received or lost focus."""
+        if isinstance(new, QWidget):
+            docEditor = False
+            docViewer = False
+            if self.docEditor.isAncestorOf(new):
+                docEditor = True
+            elif self.docViewer.isAncestorOf(new):
+                docViewer = True
+
+            self.docEditor.changeFocusState(docEditor)
+            self.docViewer.changeFocusState(docViewer)
+
+            logger.debug("Main focus switched to: %s", type(new).__name__)
+
+        return
+
     @pyqtSlot(bool)
     def _focusModeChanged(self, focusMode: bool) -> None:
-        """Handle change of focus mode. The Main GUI Focus Mode hides tree,
-        view, statusbar and menu.
+        """Handle change of focus mode. The Main GUI Focus Mode hides
+        tree, view, statusbar and menu.
         """
         if focusMode:
             logger.debug("Activating Focus Mode")
-            self.switchFocus(nwWidget.EDITOR)
+            self._changeView(nwView.EDITOR)
+            self.docEditor.setFocus()
         else:
             logger.debug("Deactivating Focus Mode")
 
@@ -1006,39 +1002,53 @@ class GuiMain(QMainWindow):
             self.docEditor.ensureCursorVisibleNoCentre()
         return
 
-    @pyqtSlot(nwWidget)
-    def switchFocus(self, paneNo: nwWidget) -> None:
+    @pyqtSlot(nwFocus)
+    def _switchFocus(self, paneNo: nwFocus) -> None:
         """Switch focus between main GUI views."""
-        if paneNo == nwWidget.TREE:
-            if self.projStack.currentWidget() is self.projView:
-                if self.projView.treeHasFocus():
-                    self._changeView(nwView.NOVEL)
-                    self.novelView.setTreeFocus()
-                else:
-                    self.projView.setTreeFocus()
-            elif self.projStack.currentWidget() is self.novelView:
-                if self.novelView.treeHasFocus():
-                    self._changeView(nwView.PROJECT)
-                    self.projView.setTreeFocus()
-                else:
-                    self.novelView.setTreeFocus()
+        if paneNo == nwFocus.TREE:
+            # Decision Matrix
+            #  vM | vP | fP | vN | fN | Focus
+            # ----|----|----|----|----|---------
+            #  T  | T  | T  | F  | F  | Novel
+            #  T  | T  | F  | F  | F  | Project
+            #  T  | F  | F  | T  | T  | Project
+            #  T  | F  | F  | T  | F  | Novel
+            #  T  | F  | F  | F  | F  | Project
+            #  F  | T  | T  | F  | F  | Project
+            #  F  | T  | F  | F  | F  | Project
+            #  F  | F  | F  | T  | T  | Novel
+            #  F  | F  | F  | T  | F  | Novel
+            #  F  | F  | F  | F  | F  | Project
+
+            vM = self.mainStack.currentWidget() is self.splitMain
+            vP = self.projStack.currentWidget() is self.projView
+            vN = self.projStack.currentWidget() is self.novelView
+            fP = self.projView.treeHasFocus()
+            fN = self.novelView.treeHasFocus()
+
+            self._changeView(nwView.EDITOR)
+            if (vM and (vP and fP or vN and not fN)) or (not vM and vN):
+                self._changeView(nwView.NOVEL)
+                self.novelView.setTreeFocus()
             else:
                 self._changeView(nwView.PROJECT)
                 self.projView.setTreeFocus()
-        elif paneNo == nwWidget.EDITOR:
-            self._changeView(nwView.EDITOR)
-            self.docEditor.setFocus()
-        elif paneNo == nwWidget.VIEWER:
+
+        elif paneNo == nwFocus.DOCUMENT:
             self._changeView(nwView.EDITOR)
-            self.docViewer.setFocus()
-        elif paneNo == nwWidget.OUTLINE:
+            hasViewer = self.splitView.isVisible()
+            if hasViewer and self.docEditor.anyFocus():
+                self.docViewer.setFocus()
+            elif hasViewer and self.docViewer.anyFocus():
+                self.docEditor.setFocus()
+            else:
+                self.docEditor.setFocus()
+
+        elif paneNo == nwFocus.OUTLINE:
             self._changeView(nwView.OUTLINE)
             self.outlineView.setTreeFocus()
-        return
 
-    ##
-    #  Private Slots
-    ##
+        return
 
     @pyqtSlot(bool, bool, bool, bool)
     def _processConfigChanges(self, restart: bool, tree: bool, theme: bool, syntax: bool) -> None:
@@ -1148,7 +1158,7 @@ class GuiMain(QMainWindow):
     @pyqtSlot()
     def _reloadViewer(self) -> None:
         """Reload the document in the viewer."""
-        if self.docEditor.docChanged and self.docEditor.docHandle == self.docViewer.docHandle:
+        if self.docEditor.docHandle == self.docViewer.docHandle:
             # If the two panels have the same document, save any changes in the editor
             self.saveDocument()
         self.docViewer.reloadText()
@@ -1178,16 +1188,13 @@ class GuiMain(QMainWindow):
 
     @pyqtSlot(nwDocAction)
     def _passDocumentAction(self, action: nwDocAction) -> None:
-        """Pass on a document action to the document viewer if it has
-        focus, or pass it to the document editor if it or any of its
-        child widgets have focus. If neither has focus, ignore it.
+        """Pass on a document action to the editor or viewer based on
+        which one has focus, or if neither has focus, ignore it.
         """
-        if self.docViewer.hasFocus():
-            self.docViewer.docAction(action)
-        elif self.docEditor.hasFocus():
+        if self.docEditor.hasFocus():
             self.docEditor.docAction(action)
-        else:
-            logger.debug("Action cancelled as neither editor nor viewer has focus")
+        elif self.docViewer.hasFocus():
+            self.docViewer.docAction(action)
         return
 
     @pyqtSlot(str)
@@ -1228,7 +1235,7 @@ class GuiMain(QMainWindow):
         doSave &= SHARED.project.projChanged
         doSave &= SHARED.project.storage.isOpen()
         if doSave:
-            logger.debug("Autosaving project")
+            logger.debug("Auto-saving project")
             self.saveProject(autoSave=True)
         return
 
@@ -1236,7 +1243,7 @@ class GuiMain(QMainWindow):
     def _autoSaveDocument(self) -> None:
         """Autosave of the document. This is a timer-activated slot."""
         if SHARED.hasProject and self.docEditor.docChanged:
-            logger.debug("Autosaving document")
+            logger.debug("Auto-saving document")
             self.saveDocument()
         return
 
@@ -1395,10 +1402,7 @@ class GuiMain(QMainWindow):
 
     def _updateWindowTitle(self, projName: str | None = None) -> None:
         """Set the window title and add the project's name."""
-        winTitle = CONFIG.appName
-        if projName is not None:
-            winTitle += " - %s" % projName
-        self.setWindowTitle(winTitle)
+        self.setWindowTitle(" - ".join(filter(None, [projName, CONFIG.appName])))
         return
 
     def _getTagSource(self, tag: str) -> tuple[str | None, str | None]:
@@ -1416,5 +1420,3 @@ class GuiMain(QMainWindow):
             ))
             return None, None
         return tHandle, sTitle
-
-# END Class GuiMain