Merge 44f18c0 into 2fe9cb2

codeofdusk · web-flow · commit 32f11a2d1675 · 2023-09-21T08:46:03.000+10:00
diff --git a/source/gui/settingsDialogs.py b/source/gui/settingsDialogs.py
@@ -1109,6 +1109,24 @@ def makeSettings(self, settingsSizer):
 		self.bindHelpEvent("SelectSynthesizerSynthesizer", self.synthList)
 		self.updateSynthesizerList()
 
+		# Translators: This is the label for the select output
+		# device combo in the synthesizer dialog. Examples of
+		# of an output device are default soundcard, usb
+		# headphones, etc.
+		deviceListLabelText = _("Audio output  &device:")
+		deviceNames=nvwave.getOutputDeviceNames()
+		# #11349: On Windows 10 20H1 and 20H2, Microsoft Sound Mapper returns an empty string.
+		if deviceNames[0] in ("", "Microsoft Sound Mapper"):
+			# Translators: name for default (Microsoft Sound Mapper) audio output device.
+			deviceNames[0] = _("Microsoft Sound Mapper")
+		self.deviceList = settingsSizerHelper.addLabeledControl(deviceListLabelText, wx.Choice, choices=deviceNames)
+		self.bindHelpEvent("SelectSynthesizerOutputDevice", self.deviceList)
+		try:
+			selection = deviceNames.index(config.conf["speech"]["outputDevice"])
+		except ValueError:
+			selection = 0
+		self.deviceList.SetSelection(selection)
+
 	def postInit(self):
 		# Finally, ensure that focus is on the synthlist
 		self.synthList.SetFocus()
@@ -1130,9 +1148,13 @@ 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.name)
+			# Translators: This message is presented when
+			# NVDA is unable to load the selected
+			# synthesizer.
+			gui.messageBox(_("Could not load the %s synthesizer.")%newSynth,_("Synthesizer Error"),wx.OK|wx.ICON_WARNING,self)
 			return
 
 		# Reinitialize the tones module to update the audio device
