Merge pull request #35 from actlaboratory/fix/reload-dialog-only-on-engine-change

fix: show reload dialog only when speech engine changes

Author: yncat

addon/globalPlugins/UML/__init__.py

@@ -21,17 +21,17 @@ def _(x): return x
 
 
 # Define conspec here too. Looks like it fails to access some values when UML is not set as speech synthesizer.
-confspec = {
-    "primaryLanguage": "string(default=ja)",
-    "strategy": "string(default=sentence)",
-    "japanese": "string(default=_)",
-    "fallback": "string(default=_)",
-    "checkForUpdatesOnStartup": "boolean(default=True)",
-    "volumeOffset_ja": "integer(default=0, min=-100, max=100)",
-    "volumeOffset_en": "integer(default=0, min=-100, max=100)",
-    "rateOffset_ja": "integer(default=0, min=-100, max=100)",
-    "rateOffset_en": "integer(default=0, min=-100, max=100)",
-}
+confspec = {
+    "primaryLanguage": "string(default=ja)",
+    "strategy": "string(default=sentence)",
+    "japanese": "string(default=_)",
+    "fallback": "string(default=_)",
+    "checkForUpdatesOnStartup": "boolean(default=True)",
+    "volumeOffset_ja": "integer(default=0, min=-100, max=100)",
+    "volumeOffset_en": "integer(default=0, min=-100, max=100)",
+    "rateOffset_ja": "integer(default=0, min=-100, max=100)",
+    "rateOffset_en": "integer(default=0, min=-100, max=100)",
+}
 config.conf.spec["UML_global"] = confspec
 
 class GlobalPlugin(globalPluginHandler.GlobalPlugin):
@@ -87,15 +87,15 @@ def settings(self, evt):
             "ja": config.conf["UML_global"]["japanese"],
             "en": config.conf["UML_global"]["fallback"],
         }
-        opts = {
-            "primary_language": config.conf["UML_global"]["primaryLanguage"],
-            "strategy": config.conf["UML_global"]["strategy"],
-            "engineMap": engineMap,
-            "volumeOffset_ja": config.conf["UML_global"]["volumeOffset_ja"],
-            "volumeOffset_en": config.conf["UML_global"]["volumeOffset_en"],
-            "rateOffset_ja": config.conf["UML_global"]["rateOffset_ja"],
-            "rateOffset_en": config.conf["UML_global"]["rateOffset_en"],
-        }
+        opts = {
+            "primary_language": config.conf["UML_global"]["primaryLanguage"],
+            "strategy": config.conf["UML_global"]["strategy"],
+            "engineMap": engineMap,
+            "volumeOffset_ja": config.conf["UML_global"]["volumeOffset_ja"],
+            "volumeOffset_en": config.conf["UML_global"]["volumeOffset_en"],
+            "rateOffset_ja": config.conf["UML_global"]["rateOffset_ja"],
+            "rateOffset_en": config.conf["UML_global"]["rateOffset_en"],
+        }
         dlg = SettingsDialog(opts)
         ret = dlg.ShowModal()
         if ret == wx.ID_OK:
@@ -105,19 +105,25 @@ def settings(self, evt):
     def _saveSettings(self, data):
         # If the new settings fail, revert to the previous one.
         backup = list(config.conf["UML_global"].items())
+        old_japanese = config.conf["UML_global"]["japanese"]
+        old_fallback = config.conf["UML_global"]["fallback"]
         config.conf["UML_global"]["primaryLanguage"] = data["primary_language"]
-        config.conf["UML_global"]["strategy"] = data["strategy"]
-        config.conf["UML_global"]["japanese"] = data["engineMap"]["ja"]
-        config.conf["UML_global"]["fallback"] = data["engineMap"]["en"]
-        config.conf["UML_global"]["volumeOffset_ja"] = data["volumeOffset_ja"]
-        config.conf["UML_global"]["volumeOffset_en"] = data["volumeOffset_en"]
-        config.conf["UML_global"]["rateOffset_ja"] = data["rateOffset_ja"]
-        config.conf["UML_global"]["rateOffset_en"] = data["rateOffset_en"]
-        synth = synthDriverHandler.getSynth()
-        if synth and synth.name == "UML":
-            synth._applySettings()
-        if synthDriverHandler.getSynth().name == "UML":
-            self._askHotReload(backup)
+        config.conf["UML_global"]["strategy"] = data["strategy"]
+        config.conf["UML_global"]["japanese"] = data["engineMap"]["ja"]
+        config.conf["UML_global"]["fallback"] = data["engineMap"]["en"]
+        config.conf["UML_global"]["volumeOffset_ja"] = data["volumeOffset_ja"]
+        config.conf["UML_global"]["volumeOffset_en"] = data["volumeOffset_en"]
+        config.conf["UML_global"]["rateOffset_ja"] = data["rateOffset_ja"]
+        config.conf["UML_global"]["rateOffset_en"] = data["rateOffset_en"]
+        synth = synthDriverHandler.getSynth()
+        if synth and synth.name == "UML":
+            synth._applySettings()
+        engine_changed = (
+            data["engineMap"]["ja"] != old_japanese
+            or data["engineMap"]["en"] != old_fallback
+        )
+        if engine_changed and synthDriverHandler.getSynth().name == "UML":
+            self._askHotReload(backup)
 
     def _askHotReload(self, backup):
         ret = yesno(_("You are currently using Universal Multilingual.\nDo you want to reload Universal Multilingual and apply the new settings now?"), _("Confirmation"))