From 6e2c5be14e26851bbfb762183dd52b660820c15a Mon Sep 17 00:00:00 2001
From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com>
Date: Tue, 12 Mar 2024 22:02:23 +0100
Subject: [PATCH] Allow fallback values for appearance preferences

---
 novelwriter/dialogs/preferences.py | 9 +++------
 novelwriter/extensions/modified.py | 6 ++++++
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/novelwriter/dialogs/preferences.py b/novelwriter/dialogs/preferences.py
index 690ad08e..142b837d 100644
--- a/novelwriter/dialogs/preferences.py
+++ b/novelwriter/dialogs/preferences.py
@@ -151,8 +151,7 @@ class GuiPreferences(QDialog):
         self.guiLocale.setMinimumWidth(minWidth)
         for lang, name in CONFIG.listLanguages(CONFIG.LANG_NW):
             self.guiLocale.addItem(name, lang)
-        if (idx := self.guiLocale.findData(CONFIG.guiLocale)) != -1:
-            self.guiLocale.setCurrentIndex(idx)
+        self.guiLocale.setCurrentData(CONFIG.guiLocale, "en_GB")
 
         self.mainForm.addRow(
             self.tr("Display language"), self.guiLocale,
@@ -164,8 +163,7 @@ class GuiPreferences(QDialog):
         self.guiTheme.setMinimumWidth(minWidth)
         for theme, name in SHARED.theme.listThemes():
             self.guiTheme.addItem(name, theme)
-        if (idx := self.guiTheme.findData(CONFIG.guiTheme)) != -1:
-            self.guiTheme.setCurrentIndex(idx)
+        self.guiTheme.setCurrentData(CONFIG.guiTheme, "default")
 
         self.mainForm.addRow(
             self.tr("Colour theme"), self.guiTheme,
@@ -226,8 +224,7 @@ class GuiPreferences(QDialog):
         self.guiSyntax.setMinimumWidth(CONFIG.pxInt(200))
         for syntax, name in SHARED.theme.listSyntax():
             self.guiSyntax.addItem(name, syntax)
-        if (idx := self.guiSyntax.findData(CONFIG.guiSyntax)) != -1:
-            self.guiSyntax.setCurrentIndex(idx)
+        self.guiSyntax.setCurrentData(CONFIG.guiSyntax, "default_light")
 
         self.mainForm.addRow(
             self.tr("Document colour theme"), self.guiSyntax,
diff --git a/novelwriter/extensions/modified.py b/novelwriter/extensions/modified.py
index cebb8b74..39416b23 100644
--- a/novelwriter/extensions/modified.py
+++ b/novelwriter/extensions/modified.py
@@ -44,6 +44,12 @@ class NComboBox(QComboBox):
             event.ignore()
         return
 
+    def setCurrentData(self, data: str, default: str) -> None:
+        """Set the current index from data, with a fallback."""
+        idx = self.findData(data)
+        self.setCurrentIndex(self.findData(default) if idx < 0 else idx)
+        return
+
 # END Class NComboBox