Merge aa91895 into c85254b

seanbudd · web-flow · commit 734cad2ad463 · 2023-09-22T15:08:49.000+10:00
diff --git a/source/globalCommands.py b/source/globalCommands.py
@@ -2972,6 +2972,16 @@ def script_activateBrailleDisplayDialog(self, gesture):
 	def script_activateBrailleSettingsDialog(self, gesture):
 		wx.CallAfter(gui.mainFrame.onBrailleSettingsCommand, None)
 
+	@script(
+		# Translators: Input help mode message for go to audio settings command.
+		description=_("Shows NVDA's audio settings"),
+		category=SCRCAT_CONFIG,
+		gesture="kb:NVDA+control+u"
+	)
+	@gui.blockAction.when(gui.blockAction.Context.MODAL_DIALOG_OPEN)
+	def script_activateAudioSettingsDialog(self, gesture):
+		wx.CallAfter(gui.mainFrame.onAudioSettingsCommand, None)
+
 	@script(
 		# Translators: Input help mode message for go to keyboard settings command.
 		description=_("Shows NVDA's keyboard settings"),
diff --git a/source/gui/__init__.py b/source/gui/__init__.py
@@ -43,6 +43,7 @@
 # Be careful when removing, and only do in a compatibility breaking release.
 from .exit import ExitDialog
 from .settingsDialogs import (
+	AudioPanel,
 	BrailleDisplaySelectionDialog,
 	BrailleSettingsPanel,
 	BrowseModePanel,
@@ -297,6 +298,9 @@ def onSelectBrailleDisplayCommand(self,evt):
 	def onBrailleSettingsCommand(self,evt):
 		self.popupSettingsDialog(NVDASettingsDialog, BrailleSettingsPanel)
 
+	def onAudioSettingsCommand(self, evt: wx.CommandEvent):
+		self.popupSettingsDialog(NVDASettingsDialog, AudioPanel)
+
 	def onKeyboardSettingsCommand(self,evt):
 		self.popupSettingsDialog(NVDASettingsDialog, KeyboardSettingsPanel)
 
diff --git a/user_docs/en/changes.t2t b/user_docs/en/changes.t2t
@@ -19,8 +19,12 @@ There's also been bug fixes for the Add-on Store, Microsoft Office, Microsoft Ed
 
 == New Features ==
 - Enhanced sound management:
-  - An option in Audio settings to have the volume of NVDA sounds and beeps follow the volume setting of the voice you are using. (#1409)
-  - An option in Audio settings to separately configure the volume of NVDA sounds. (#1409, #15038)
+  - A new Audio Settings panel:
+    - This can be opened with ``NVDA+control+u``. (#15497)
+    - An option in Audio settings to have the volume of NVDA sounds and beeps follow the volume setting of the voice you are using. (#1409)
+    - An option in Audio settings to separately configure the volume of NVDA sounds. (#1409, #15038)
+    - The settings to change audio output device and toggle audio ducking have been moved to the new Audio settings panel from the Select Synthesizer dialog. (#8711)
+    -
   - NVDA will now output audio via the Windows Audio Session API (WASAPI), which may improve the responsiveness, performance and stability of NVDA speech and sounds. (#14697, #11169, #11615, #5096, #10185, #11061)
   - Note: WASAPI is incompatible with some add-ons.
   Compatible updates are available for these add-ons, please update them before updating NVDA.
@@ -54,7 +58,6 @@ There's also been bug fixes for the Add-on Store, Microsoft Office, Microsoft Ed
   - The advanced setting to enable support for HID braille has been removed in favor of a new option.
   You can now disable specific drivers for braille display auto detection in the braille display selection dialog. (#15196)
   -
-- The settings to change audio output device and toggle audio ducking have been moved to the new Audio settings panel from the Select Synthesizer dialog. (#8711)
 - Add-on Store: Installed add-ons will now be listed in the Available Add-ons tab, if they are available in the store. (#15374)
 - Some shortcut keys have been updated in the NVDA menu. (#15364)
 -
diff --git a/user_docs/en/userGuide.t2t b/user_docs/en/userGuide.t2t
@@ -1770,7 +1770,10 @@ Please note: If you connect multiple Braille Displays to your machine at the sam
 it is currently impossible to tell NVDA which display to use.
 Therefore it is recommended to only connect one Braille Display of a given type / manufacturer to your machine at a time.
 
+%kc:setting
 +++ Audio +++[AudioSettings]
+Key: ``NVDA+control+u``
+
 The Audio category in the NVDA Settings dialog contains options that let you change several aspects of audio output.
 
 ==== Output device ====[SelectSynthesizerOutputDevice]
