Merge branch 'main' into feature/status_shapes

novelwriter/dialogs/projectsettings.py

@@ -263,17 +263,17 @@ class _SettingsPage(NScrollableForm):
         )
 
         # Project Language
+        projLang = data.language or CONFIG.guiLocale
         self.projLang = NComboBox(self)
         self.projLang.setMinimumWidth(xW)
         for tag, language in CONFIG.listLanguages(CONFIG.LANG_PROJ):
             self.projLang.addItem(language, tag)
+        self.projLang.setCurrentData(projLang, projLang)
         self.addRow(
             self.tr("Project language"), self.projLang,
             self.tr("Only used when building the manuscript."),
             stretch=(3, 2)
         )
-        if (idx := self.projLang.findData(data.language)) != -1:
-            self.projLang.setCurrentIndex(idx)
 
         # Spell Check Language
         self.spellLang = NComboBox(self)

novelwriter/dialogs/wordlist.py

@@ -190,7 +190,7 @@ class GuiWordList(QDialog):
         ))
         ffilter = formatFileFilter(["*.txt", "*"])
         path, _ = QFileDialog.getOpenFileName(
-            self, self.tr("Import File"), str(Path.home()), filter=ffilter
+            self, self.tr("Import File"), str(CONFIG.homePath()), filter=ffilter
         )
         if path:
             try:
@@ -207,7 +207,7 @@ class GuiWordList(QDialog):
     def _exportWords(self) -> None:
         """Export words to file."""
         path, _ = QFileDialog.getSaveFileName(
-            self, self.tr("Export File"), str(Path.home())
+            self, self.tr("Export File"), str(CONFIG.homePath())
         )
         if path:
             try: