Skip to content

Commit

Permalink
Change 'On' to 'Everywhere'
Browse files Browse the repository at this point in the history
  • Loading branch information
cary-rowen committed Dec 19, 2024
1 parent 2b7adf2 commit d648052
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 16 deletions.
4 changes: 2 additions & 2 deletions source/config/configFlags.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ class TypingEcho(DisplayStringIntEnum):
"""

OFF = 0
ON = 1
EVERYWHERE = 1
EDIT_CONTROLS = 2

@property
Expand All @@ -63,7 +63,7 @@ def _displayStringLabels(self):
# Translators: One of the choices for typing echo in keyboard settings
TypingEcho.OFF: _("Off"),
# Translators: One of the choices for typing echo in keyboard settings
TypingEcho.ON: _("On"),
TypingEcho.EVERYWHERE: _("Everywhere"),
# Translators: One of the choices for typing echo in keyboard settings
TypingEcho.EDIT_CONTROLS: _("Only in edit controls"),
}
Expand Down
4 changes: 2 additions & 2 deletions source/config/configSpec.py
Original file line number Diff line number Diff line change
Expand Up @@ -178,9 +178,9 @@
# Default = 6: NumpadInsert + ExtendedInsert
NVDAModifierKeys = integer(1, 7, default=6)
keyboardLayout = string(default="desktop")
# 0: Off, 1: on, 2: Only in edit controls
# 0: Off, 1: Everywhere, 2: Only in edit controls
speakTypedCharacters = integer(default=1,min=0,max=2)
# 0: Off, 1: on, 2: Only in edit controls
# 0: Off, 1: Everywhere, 2: Only in edit controls
speakTypedWords = integer(default=1,min=0,max=2)
beepForLowercaseWithCapslock = boolean(default=true)
speakCommandKeys = boolean(default=false)
Expand Down
4 changes: 2 additions & 2 deletions source/speech/speech.py
Original file line number Diff line number Diff line change
Expand Up @@ -1388,7 +1388,7 @@ def speakTypedCharacters(ch: str):
if (
typingEchoMode == TypingEcho.EDIT_CONTROLS.value
and is_editableControl()
or typingEchoMode == TypingEcho.ON.value
or typingEchoMode == TypingEcho.EVERYWHERE.value
):
speakText(typedWord)
if _speechState._suppressSpeakTypedCharactersNumber > 0:
Expand All @@ -1408,7 +1408,7 @@ def speakTypedCharacters(ch: str):
if (
typingEchoMode == TypingEcho.EDIT_CONTROLS.value
and is_editableControl()
or typingEchoMode == TypingEcho.ON.value
or typingEchoMode == TypingEcho.EVERYWHERE.value
):
speakSpelling(realChar)

Expand Down
14 changes: 4 additions & 10 deletions user_docs/en/userGuide.md
Original file line number Diff line number Diff line change
Expand Up @@ -247,8 +247,8 @@ The actual commands will not execute while in input help mode.

| Name |Desktop key |Laptop key |Description|
|---|---|---|---|
|Speak typed characters |`NVDA+2` |`NVDA+2` |Controls how NVDA announces characters you type. Options: Off, On, Only in edit controls.|keyboard.|
|Speak typed words |`NVDA+3` |`NVDA+3` |Controls how NVDA announces words you type. Options: Off, On, Only in edit controls.|
|Speak typed characters |`NVDA+2` |`NVDA+2` |Controls how NVDA announces characters you type. Options: Off, Everywhere, Only in edit controls.|keyboard.|
|Speak typed words |`NVDA+3` |`NVDA+3` |Controls how NVDA announces words you type. Options: Off, Everywhere, Only in edit controls.|
|Speak command keys |`NVDA+4` |`NVDA+4` |When enabled, NVDA will announce all non-character keys you type on the keyboard. This includes key combinations such as control plus another letter.|
|Enable mouse tracking |`NVDA+m` |`NVDA+m` |When enabled, NVDA will announce the text currently under the mouse pointer, as you move it around the screen. This allows you to find things on the screen, by physically moving the mouse, rather than trying to find them through object navigation.|

Expand Down Expand Up @@ -2590,21 +2590,15 @@ If no key is chosen as the NVDA key it may be impossible to access many NVDA com

Key: NVDA+2

This combo box controls how NVDA announces characters you type on the keyboard. Options are:
* Off: NVDA will not announce any characters you type.
* On: NVDA will announce all characters you type.
* Only in edit controls: NVDA will only announce characters typed in edit controls and other areas where text can be typed.
This option controls how NVDA announces characters you type on the keyboard. Options are: Off: NVDA will not announce any characters you type. Everywhere: NVDA will announce all characters you type. Only in edit controls: NVDA will only announce characters typed in edit controls and other areas where text can be typed.

<!-- KC:setting -->

##### Speak Typed Words {#KeyboardSettingsSpeakTypedWords}

Key: NVDA+3

This combo box controls how NVDA announces words you type. Options are:
* Off: NVDA will not announce any words you type.
* On: NVDA will announce all words you type.
* Only in edit controls: NVDA will only announce words typed in edit controls and other areas where text can be typed.
This option controls how NVDA announces words you type. Options are: Off: NVDA will not announce any words you type. Everywhere: NVDA will announce all words you type. Only in edit controls: NVDA will only announce words typed in edit controls and other areas where text can be typed.

##### Speech interrupt for typed characters {#KeyboardSettingsSpeechInteruptForCharacters}

Expand Down

0 comments on commit d648052

Please sign in to comment.