Merge branch 'main' into dialogue_highlight

novelwriter/guimain.py

@@ -1361,10 +1361,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]:

requirements-dev.txt

@@ -3,3 +3,4 @@ flake8-pep585
 flake8-pyproject
 flake8-annotations
 isort
+pyqt5-stubs

tests/test_dialogs/test_dlg_projectsettings.py

@@ -129,7 +129,7 @@ def testDlgProjSettings_SettingsPage(qtbot, monkeypatch, nwGUI, fncPath, projPat
     assert project.data.doBackup is False
 
     nwGUI._processProjectSettingsChanges(False)
-    assert nwGUI.windowTitle() == "novelWriter - Project Name"
+    assert nwGUI.windowTitle() == "Project Name - novelWriter"
 
     # qtbot.stop()