Merge 6438110 into 87d5b5a

codeofdusk · web-flow · commit 16dd4443fb16 · 2023-09-25T16:40:06.000+10:00
diff --git a/source/gui/settingsDialogs.py b/source/gui/settingsDialogs.py
@@ -18,7 +18,6 @@
 import typing
 import wx
 from NVDAState import WritePaths
-from buildVersion import version_year
 
 from vision.providerBase import VisionEnhancementProviderSettings
 from wx.lib.expando import ExpandoTextCtrl
@@ -1109,8 +1108,6 @@ def makeSettings(self, settingsSizer):
 		self.synthList = settingsSizerHelper.addLabeledControl(synthListLabelText, wx.Choice, choices=[])
 		self.bindHelpEvent("SelectSynthesizerSynthesizer", self.synthList)
 		self.updateSynthesizerList()
-		if version_year < 2024:
-			AudioPanel._addAudioCombos(self, settingsSizerHelper)
 
 	def postInit(self):
 		# Finally, ensure that focus is on the synthlist
@@ -1133,8 +1130,6 @@ def onOk(self, evt):
 			# The list of synths has not been populated yet, so we didn't change anything in this panel
 			return
 
-		config.conf["speech"]["outputDevice"] = self.deviceList.GetStringSelection()
-
 		newSynth = self.synthNames[self.synthList.GetSelection()]
 		if not setSynth(newSynth):
 			_synthWarningDialog(newSynth)
@@ -2586,8 +2581,9 @@ class AudioPanel(SettingsPanel):
 	title = _("Audio")
 	helpId = "AudioSettings"
 
-	@staticmethod
-	def _addAudioCombos(panel: SettingsPanel, sHelper: guiHelper.BoxSizerHelper):
+	def makeSettings(self, settingsSizer: wx.BoxSizer) -> None:
+		sHelper = guiHelper.BoxSizerHelper(self, sizer=settingsSizer)
+
 		# Translators: This is the label for the select output device combo in NVDA audio settings.
 		# Examples of an output device are default soundcard, usb headphones, etc.
 		deviceListLabelText = _("Audio output &device:")
@@ -2596,31 +2592,26 @@ def _addAudioCombos(panel: SettingsPanel, sHelper: guiHelper.BoxSizerHelper):
 		if deviceNames[0] in ("", "Microsoft Sound Mapper"):
 			# Translators: name for default (Microsoft Sound Mapper) audio output device.
 			deviceNames[0] = _("Microsoft Sound Mapper")
-		panel.deviceList = sHelper.addLabeledControl(deviceListLabelText, wx.Choice, choices=deviceNames)
-		panel.bindHelpEvent("SelectSynthesizerOutputDevice", panel.deviceList)
+		self.deviceList = sHelper.addLabeledControl(deviceListLabelText, wx.Choice, choices=deviceNames)
+		self.bindHelpEvent("SelectSynthesizerOutputDevice", self.deviceList)
 		try:
 			selection = deviceNames.index(config.conf["speech"]["outputDevice"])
 		except ValueError:
 			selection = 0
-		panel.deviceList.SetSelection(selection)
+		self.deviceList.SetSelection(selection)
 
 		# Translators: This is a label for the audio ducking combo box in the Audio Settings dialog.
 		duckingListLabelText = _("Audio d&ucking mode:")
-		panel.duckingList = sHelper.addLabeledControl(
+		self.duckingList = sHelper.addLabeledControl(
 			duckingListLabelText,
 			wx.Choice,
 			choices=[mode.displayString for mode in audioDucking.AudioDuckingMode]
 		)
-		panel.bindHelpEvent("SelectSynthesizerDuckingMode", panel.duckingList)
+		self.bindHelpEvent("SelectSynthesizerDuckingMode", self.duckingList)
 		index = config.conf["audio"]["audioDuckingMode"]
-		panel.duckingList.SetSelection(index)
+		self.duckingList.SetSelection(index)
 		if not audioDucking.isAudioDuckingSupported():
-			panel.duckingList.Disable()
-
-	def makeSettings(self, settingsSizer: wx.BoxSizer) -> None:
-		sHelper = guiHelper.BoxSizerHelper(self, sizer=settingsSizer)
-
-		AudioPanel._addAudioCombos(self, sHelper)
+			self.duckingList.Disable()
 
 		# Translators: This is the label for a checkbox control in the
 		# Audio settings panel.
