Skip to content

Commit 094318c

Browse files
authored
Merge be29fcb into f055abb
2 parents f055abb + be29fcb commit 094318c

8 files changed

Lines changed: 101 additions & 19 deletions

File tree

appveyor/scripts/setSconsArgs.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
$ErrorActionPreference = "Stop";
2-
$sconsOutTargets = "launcher developerGuide changes userGuide client"
2+
$sconsOutTargets = "launcher developerGuide changes userGuide keyCommands client"
33
if(!$env:APPVEYOR_PULL_REQUEST_NUMBER) {
44
$sconsOutTargets += " appx"
55
}

sconstruct

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -434,10 +434,19 @@ outputStylesFile=env.Command(outputDir.File("styles.css"),userDocsDir.File('styl
434434
changesFile=env.Command(outputDir.File("%s_changes.html" % outFilePrefix),userDocsDir.File('en/changes.html'),Copy('$TARGET','$SOURCE'))
435435
env.Depends(changesFile, outputStylesFile)
436436
env.Alias('changes',changesFile)
437+
437438
userGuideFile=env.Command(outputDir.File("userGuide.html"),userDocsDir.File('en/userGuide.html'),Copy('$TARGET','$SOURCE'))
438439
env.Depends(userGuideFile, outputStylesFile)
439440
env.Alias('userGuide',userGuideFile)
440441

442+
keyCommandsFile = env.Command(
443+
outputDir.File("keyCommands.html"),
444+
userDocsDir.File('en/keyCommands.html'),
445+
Copy('$TARGET', '$SOURCE')
446+
)
447+
env.Depends(keyCommandsFile, outputStylesFile)
448+
env.Depends(keyCommandsFile, userGuideFile)
449+
env.Alias('keyCommands', keyCommandsFile)
441450

442451
def makePotSourceFileList(target, sourceFiles, env):
443452
potSourceFiles = [

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

source/gui/settingsDialogs.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1098,7 +1098,7 @@ class SynthesizerSelectionDialog(SettingsDialog):
10981098
# Translators: This is the label for the synthesizer selection dialog
10991099
title = _("Select Synthesizer")
11001100
helpId = "SynthesizerSelection"
1101-
synthNames = []
1101+
synthNames: List[str] = []
11021102

11031103
def makeSettings(self, settingsSizer):
11041104
settingsSizerHelper = guiHelper.BoxSizerHelper(self, sizer=settingsSizer)
@@ -1130,9 +1130,9 @@ def onOk(self, evt):
11301130
# The list of synths has not been populated yet, so we didn't change anything in this panel
11311131
return
11321132

1133-
newSynth=self.synthNames[self.synthList.GetSelection()]
1133+
newSynth = self.synthNames[self.synthList.GetSelection()]
11341134
if not setSynth(newSynth):
1135-
_synthWarningDialog(newSynth.name)
1135+
_synthWarningDialog(newSynth)
11361136
return
11371137

11381138
# Reinitialize the tones module to update the audio device

source/synthDriverHandler.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,13 @@
66

77
import pkgutil
88
import importlib
9-
from typing import Optional, OrderedDict, Set
9+
from typing import (
10+
List,
11+
Optional,
12+
OrderedDict,
13+
Set,
14+
Tuple,
15+
)
1016
from locale import strxfrm
1117

1218
import config
@@ -395,10 +401,10 @@ def _getSynthDriver(name) -> SynthDriver:
395401
return importlib.import_module("synthDrivers.%s" % name, package="synthDrivers").SynthDriver
396402

397403

398-
def getSynthList():
404+
def getSynthList() -> List[Tuple[str, str]]:
399405
from synthDrivers.silence import SynthDriver as SilenceSynthDriver
400406

401-
synthList = []
407+
synthList: List[Tuple[str, str]] = []
402408
# The synth that should be placed at the end of the list.
403409
lastSynth = None
404410
for loader, name, isPkg in pkgutil.iter_modules(synthDrivers.__path__):

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: 59 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+
1358+
%kc:setting
1359+
==== Open General settings ====
1360+
Key: ``NVDA+control+g``
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+
1442+
%kc:setting
1443+
==== Open Speech settings ====
1444+
Key: ``NVDA+control+v``
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+
1556+
%kc:setting
1557+
==== Open Select Synthesizer dialog ====
1558+
Key: ``NVDA+control+s``
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+
1748+
%kc:setting
1749+
==== Open Select Braille Display dialog ====
1750+
Key: ``NVDA+control+a``
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.
@@ -1771,6 +1791,11 @@ 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

17731793
+++ Audio +++[AudioSettings]
1794+
1795+
%kc:setting
1796+
==== Open Audio settings ====
1797+
Key: ``NVDA+control+u``
1798+
17741799
The Audio category in the NVDA Settings dialog contains options that let you change several aspects of audio output.
17751800

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

1847-
+++ Keyboard (NVDA+control+k) +++[KeyboardSettings]
1872+
+++ Keyboard +++[KeyboardSettings]
1873+
1874+
%kc:setting
1875+
==== Open Keyboard settings ====
1876+
Key: ``NVDA+control+k``
1877+
18481878
The Keyboard category in the NVDA Settings dialog contains options that set how NVDA behaves as you use and type on your keyboard.
18491879
This settings category contains the following options:
18501880

@@ -1902,7 +1932,12 @@ This option is only available if reporting of spelling errors is enabled in NVDA
19021932
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.
19031933
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.
19041934

1905-
+++ Mouse (NVDA+control+m) +++[MouseSettings]
1935+
+++ Mouse +++[MouseSettings]
1936+
1937+
%kc:setting
1938+
==== Open Mouse settings ====
1939+
Key: ``NVDA+control+m``
1940+
19061941
The Mouse category in the NVDA Settings dialog allows NVDA to track the mouse, play mouse coordinate beeps and sets other mouse usage options.
19071942
This category contains the following options:
19081943

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

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

1981-
+++ Object Presentation (NVDA+control+o) +++[ObjectPresentationSettings]
2016+
+++ Object Presentation +++[ObjectPresentationSettings]
2017+
2018+
%kc:setting
2019+
==== Open Object Presentation settings ====
2020+
Key: ``NVDA+control+o``
2021+
19822022
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.
19832023
These options don't typically apply to browse mode.
19842024
These options typically apply to focus reporting and NVDA object navigation, but not reading text content e.g. browse mode.
@@ -2068,7 +2108,12 @@ After reading or precomposition data has been combined into a valid pictographic
20682108
This option allows you to choose whether or not NVDA should report new symbols as they appear in the composition string.
20692109
This option is on by default.
20702110

2071-
+++ Browse Mode (NVDA+control+b) +++[BrowseModeSettings]
2111+
+++ Browse Mode +++[BrowseModeSettings]
2112+
2113+
%kc:setting
2114+
==== Open Browse Mode settings ====
2115+
Key: ``NVDA+control+b``
2116+
20722117
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.
20732118
This category contains the following options:
20742119

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

2142-
+++ Document Formatting (NVDA+control+d) +++[DocumentFormattingSettings]
2187+
+++ Document Formatting +++[DocumentFormattingSettings]
2188+
2189+
%kc:setting
2190+
==== Open Document Formatting settings ====
2191+
Key: ``NVDA+control+d``
2192+
21432193
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.
21442194
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.
21452195

0 commit comments

Comments
 (0)