Merge 151f735 into 68c24da

hwf1324 · web-flow · commit 426cb62a01a1 · 2023-12-24T20:17:19.000+08:00
diff --git a/source/gui/settingsDialogs.py b/source/gui/settingsDialogs.py
@@ -4,7 +4,7 @@
 # Derek Riemer, Babbage B.V., Davy Kager, Ethan Holliger, Bill Dengler, Thomas Stivers,
 # Julien Cochuyt, Peter Vágner, Cyrille Bougot, Mesar Hameed, Łukasz Golonka, Aaron Cannon,
 # Adriani90, André-Abush Clause, Dawid Pieper, Heiko Folkerts, Takuya Nishimoto, Thomas Stivers,
-# jakubl7545, mltony, Rob Meredith, Burman's Computer and Education Ltd.
+# jakubl7545, mltony, Rob Meredith, Burman's Computer and Education Ltd, hwf1324.
 # This file is covered by the GNU General Public License.
 # See the file COPYING for more details.
 import logging
@@ -1649,6 +1649,7 @@ def _appendSpeechModesList(self, settingsSizerHelper: guiHelper.BoxSizerHelper)
 		self.speechModesList.Checked = [
 			mIndex for mIndex in range(len(self._allSpeechModes)) if mIndex not in excludedModes
 		]
+		self.speechModesList.Bind(wx.EVT_CHECKLISTBOX, self.onSpeechModesListChange)
 		self.speechModesList.Select(0)
 
 	def _appendDelayedCharacterDescriptions(self, settingsSizerHelper: guiHelper.BoxSizerHelper) -> None:
@@ -1686,20 +1687,11 @@ def onSave(self):
 			mIndex for mIndex in range(len(self._allSpeechModes)) if mIndex not in self.speechModesList.CheckedItems
 		]
 
-	def isValid(self) -> bool:
-		enabledSpeechModes = self.speechModesList.CheckedItems
-		if len(enabledSpeechModes) < 2:
-			log.debugWarning("Too few speech modes enabled.")
-			gui.messageBox(
-				# Translators: Message shown when not enough speech modes are enabled.
-				_("At least two speech modes have to be checked."),
-				# Translators: The title of the message box
-				_("Error"),
-				wx.OK | wx.ICON_ERROR,
-				self,
-			)
-			return False
-		if self._allSpeechModes.index(speech.SpeechMode.talk) not in enabledSpeechModes:
+	def onSpeechModesListChange(self, evt):
+		if (
+			evt.GetInt() == self._allSpeechModes.index(speech.SpeechMode.talk)
+			and not self.speechModesList.IsChecked(evt.GetInt())
+		):
 			if gui.messageBox(
 				_(
 					# Translators: Warning shown when 'talk' speech mode is disabled in settings.
@@ -1714,7 +1706,24 @@ def isValid(self) -> bool:
 				wx.YES | wx.NO | wx.ICON_WARNING,
 				self,
 			) == wx.NO:
-				return False
+				self.speechModesList.SetCheckedItems(
+					list(self.speechModesList.GetCheckedItems())
+					+ [self._allSpeechModes.index(speech.SpeechMode.talk)]
+				)
+
+	def isValid(self) -> bool:
+		enabledSpeechModes = self.speechModesList.CheckedItems
+		if len(enabledSpeechModes) < 2:
+			log.debugWarning("Too few speech modes enabled.")
+			gui.messageBox(
+				# Translators: Message shown when not enough speech modes are enabled.
+				_("At least two speech modes have to be checked."),
+				# Translators: The title of the message box
+				_("Error"),
+				wx.OK | wx.ICON_ERROR,
+				self,
+			)
+			return False
 		return super().isValid()
 
 
