Skip to content

Commit a944a66

Browse files
authored
Merge efde9c4 into f055abb
2 parents f055abb + efde9c4 commit a944a66

4 files changed

Lines changed: 77 additions & 12 deletions

File tree

source/globalCommands.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2972,6 +2972,16 @@ def script_activateBrailleDisplayDialog(self, gesture):
29722972
def script_activateBrailleSettingsDialog(self, gesture):
29732973
wx.CallAfter(gui.mainFrame.onBrailleSettingsCommand, None)
29742974

2975+
@script(
2976+
# Translators: Input help mode message for go to audio settings command.
2977+
description=_("Shows NVDA's audio settings"),
2978+
category=SCRCAT_CONFIG,
2979+
gesture="kb:NVDA+control+u"
2980+
)
2981+
@gui.blockAction.when(gui.blockAction.Context.MODAL_DIALOG_OPEN)
2982+
def script_activateAudioSettingsDialog(self, gesture):
2983+
wx.CallAfter(gui.mainFrame.onAudioSettingsCommand, None)
2984+
29752985
@script(
29762986
# Translators: Input help mode message for go to keyboard settings command.
29772987
description=_("Shows NVDA's keyboard settings"),

source/gui/__init__.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
# Be careful when removing, and only do in a compatibility breaking release.
4444
from .exit import ExitDialog
4545
from .settingsDialogs import (
46+
AudioPanel,
4647
BrailleDisplaySelectionDialog,
4748
BrailleSettingsPanel,
4849
BrowseModePanel,
@@ -297,6 +298,9 @@ def onSelectBrailleDisplayCommand(self,evt):
297298
def onBrailleSettingsCommand(self,evt):
298299
self.popupSettingsDialog(NVDASettingsDialog, BrailleSettingsPanel)
299300

301+
def onAudioSettingsCommand(self, evt: wx.CommandEvent):
302+
self.popupSettingsDialog(NVDASettingsDialog, AudioPanel)
303+
300304
def onKeyboardSettingsCommand(self,evt):
301305
self.popupSettingsDialog(NVDASettingsDialog, KeyboardSettingsPanel)
302306

user_docs/en/changes.t2t

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,12 @@ There's also been bug fixes for the Add-on Store, Microsoft Office, Microsoft Ed
1919

2020
== New Features ==
2121
- Enhanced sound management:
22-
- 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)
23-
- An option in Audio settings to separately configure the volume of NVDA sounds. (#1409, #15038)
22+
- A new Audio Settings panel:
23+
- This can be opened with ``NVDA+control+u``. (#15497)
24+
- 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)
25+
- An option in Audio settings to separately configure the volume of NVDA sounds. (#1409, #15038)
26+
- 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)
27+
-
2428
- 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)
2529
- Note: WASAPI is incompatible with some add-ons.
2630
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
5458
- The advanced setting to enable support for HID braille has been removed in favor of a new option.
5559
You can now disable specific drivers for braille display auto detection in the braille display selection dialog. (#15196)
5660
-
57-
- 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)
5861
- Add-on Store: Installed add-ons will now be listed in the Available Add-ons tab, if they are available in the store. (#15374)
5962
- Some shortcut keys have been updated in the NVDA menu. (#15364)
6063
-

user_docs/en/userGuide.t2t

Lines changed: 57 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1353,7 +1353,12 @@ If you frequently access categories that do not have dedicated shortcut keys, yo
13531353

13541354
The settings categories found in the NVDA Settings dialog will be outlined below.
13551355

1356-
+++ General (NVDA+control+g) +++[GeneralSettings]
1356+
+++ General +++[GeneralSettings]
1357+
%kc:beginInclude
1358+
|| Name | Key |
1359+
| Open General settings | ``NVDA+control+g`` |
1360+
%kc:endInclude
1361+
13571362
The General category of the NVDA Settings dialog sets NVDA's overall behaviour such as interface language and whether or not it should check for updates.
13581363
This category contains the following options:
13591364

@@ -1432,7 +1437,12 @@ This information greatly aides NV Access to prioritize future development of NVD
14321437
If this is enabled, NVDA will inform you when there is a pending update on startup, offering you the possibility to install it.
14331438
You can also manually install the pending update from the Exit NVDA dialog (if enabled), from the NVDA menu, or when you perform a new check from the Help menu.
14341439

1435-
+++ Speech Settings (NVDA+control+v) +++[SpeechSettings]
1440+
+++ Speech Settings +++[SpeechSettings]
1441+
%kc:beginInclude
1442+
|| Name | Key |
1443+
| Open Speech settings | ``NVDA+control+v`` |
1444+
%kc:endInclude
1445+
14361446
The Speech category in the NVDA Settings dialog contains options that lets you change the speech synthesizer as well as voice characteristics for the chosen synthesizer.
14371447
For a quicker alternative way of controlling speech parameters from anywhere, please see the [Synth Settings Ring #SynthSettingsRing] section.
14381448

@@ -1541,7 +1551,12 @@ This can be useful if it is hard to distinguish between pronunciation of symbols
15411551

15421552
The delayed character description will be cancelled if other text is spoken during that time, or if you press the ``control`` key.
15431553

1544-
+++ Select Synthesizer (NVDA+control+s) +++[SelectSynthesizer]
1554+
+++ Select Synthesizer +++[SelectSynthesizer]
1555+
%kc:beginInclude
1556+
|| Name | Key |
1557+
| Open Select Synthesizer dialog | ``NVDA+control+s`` |
1558+
%kc:endInclude
1559+
15451560
The Synthesizer dialog, which can be opened by activating the Change... button in the speech category of the NVDA settings dialog, allows you to select which Synthesizer NVDA should use to speak with.
15461561
Once you have selected your synthesizer of choice, you can press Ok and NVDA will load the selected Synthesizer.
15471562
If there is an error loading the synthesizer, NVDA will notify you with a message, and continue using the previous synthesizer.
@@ -1728,7 +1743,12 @@ Disabling this option may improve readability.
17281743

17291744
To toggle show selection from anywhere, please assign a custom gesture using the [Input Gestures dialog #InputGestures].
17301745

1731-
+++ Select Braille Display (NVDA+control+a) +++[SelectBrailleDisplay]
1746+
+++ Select Braille Display +++[SelectBrailleDisplay]
1747+
%kc:beginInclude
1748+
|| Name | Key |
1749+
| Open Select Braille Display dialog | ``NVDA+control+a`` |
1750+
%kc:endInclude
1751+
17321752
The Select Braille Display dialog, which can be opened by activating the Change... button in the Braille category of the NVDA settings dialog, allows you to select which Braille display NVDA should use for braille output.
17331753
Once you have selected your braille display of choice, you can press Ok and NVDA will load the selected display.
17341754
If there is an error loading the display driver, NVDA will notify you with a message, and continue using the previous display, if any.
@@ -1770,7 +1790,10 @@ Please note: If you connect multiple Braille Displays to your machine at the sam
17701790
it is currently impossible to tell NVDA which display to use.
17711791
Therefore it is recommended to only connect one Braille Display of a given type / manufacturer to your machine at a time.
17721792

1793+
%kc:setting
17731794
+++ Audio +++[AudioSettings]
1795+
Key: ``NVDA+control+u``
1796+
17741797
The Audio category in the NVDA Settings dialog contains options that let you change several aspects of audio output.
17751798

17761799
==== Output device ====[SelectSynthesizerOutputDevice]
@@ -1844,7 +1867,12 @@ Additional vision enhancement providers can be provided in [NVDA add-ons #Addons
18441867
When these providers have adjustable settings, they will be shown in this settings category in separate groupings.
18451868
For the supported settings per provider, please refer to the documentation for that provider.
18461869

1847-
+++ Keyboard (NVDA+control+k) +++[KeyboardSettings]
1870+
+++ Keyboard +++[KeyboardSettings]
1871+
%kc:beginInclude
1872+
|| Name | Key |
1873+
| Open Keyboard settings | ``NVDA+control+k`` |
1874+
%kc:endInclude
1875+
18481876
The Keyboard category in the NVDA Settings dialog contains options that set how NVDA behaves as you use and type on your keyboard.
18491877
This settings category contains the following options:
18501878

@@ -1902,7 +1930,12 @@ This option is only available if reporting of spelling errors is enabled in NVDA
19021930
This option allows the user to control if key presses generated by applications such as on-screen keyboards and speech recognition software should be processed by NVDA.
19031931
This option is on by default, though certain users may wish to turn this off, such as those typing Vietnamese with the UniKey typing software as it will cause incorrect character input.
19041932

1905-
+++ Mouse (NVDA+control+m) +++[MouseSettings]
1933+
+++ Mouse +++[MouseSettings]
1934+
%kc:beginInclude
1935+
|| Name | Key |
1936+
| Open Mouse settings | ``NVDA+control+m`` |
1937+
%kc:endInclude
1938+
19061939
The Mouse category in the NVDA Settings dialog allows NVDA to track the mouse, play mouse coordinate beeps and sets other mouse usage options.
19071940
This category contains the following options:
19081941

@@ -1978,7 +2011,12 @@ When enabled, NVDA will filter the hierarchy of objects that can be navigated to
19782011

19792012
To toggle simple review mode from anywhere, please assign a custom gesture using the [Input Gestures dialog #InputGestures].
19802013

1981-
+++ Object Presentation (NVDA+control+o) +++[ObjectPresentationSettings]
2014+
+++ Object Presentation +++[ObjectPresentationSettings]
2015+
%kc:beginInclude
2016+
|| Name | Key |
2017+
| Open Object Presentation settings | ``NVDA+control+o`` |
2018+
%kc:endInclude
2019+
19822020
The Object Presentation category in the NVDA Settings dialog is used to set how much information NVDA will present about controls such as description, position information and so on.
19832021
These options don't typically apply to browse mode.
19842022
These options typically apply to focus reporting and NVDA object navigation, but not reading text content e.g. browse mode.
@@ -2068,7 +2106,12 @@ After reading or precomposition data has been combined into a valid pictographic
20682106
This option allows you to choose whether or not NVDA should report new symbols as they appear in the composition string.
20692107
This option is on by default.
20702108

2071-
+++ Browse Mode (NVDA+control+b) +++[BrowseModeSettings]
2109+
+++ Browse Mode +++[BrowseModeSettings]
2110+
%kc:beginInclude
2111+
|| Name | Key |
2112+
| Open Browse Mode settings | ``NVDA+control+b`` |
2113+
%kc:endInclude
2114+
20722115
The Browse Mode category in the NVDA Settings dialog is used to configure NVDA's behaviour when you read and navigate complex documents such as web pages.
20732116
This category contains the following options:
20742117

@@ -2139,7 +2182,12 @@ This might result in faster browsing experience and better responsiveness in bro
21392182
The focus will yet be updated to the particular element when interacting with it (e.g. pressing a button, checking a check box).
21402183
Enabling this option may improve support for some websites at the cost of performance and stability.
21412184

2142-
+++ Document Formatting (NVDA+control+d) +++[DocumentFormattingSettings]
2185+
+++ Document Formatting +++[DocumentFormattingSettings]
2186+
%kc:beginInclude
2187+
|| Name | Key |
2188+
| Open Document Formatting settings | ``NVDA+control+d`` |
2189+
%kc:endInclude
2190+
21432191
Most of the options in this category are for configuring what type of formatting you wish to have reported as you move the cursor around documents.
21442192
For example, if you check the report font name checkbox, each time you arrow onto text with a different font, the name of the font will be announced.
21452193

0 commit comments

Comments
 (0)