Skip to content

Commit d682370

Browse files
mltonymltony
authored
Merge 5f595fa into 96d59ec 
2 parents 96d59ec + 5f595fa commit d682370

5 files changed

Lines changed: 83 additions & 2 deletions

File tree

‎source/UIAHandler/browseMode.py‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -493,6 +493,13 @@ def _iterNodesByType(self,nodeType,direction="next",pos=None):
493493
UIAHandler.UIA_ControlTypePropertyId, UIAHandler.UIA_TabItemControlTypeId
494494
)
495495
return UIAControlQuicknavIterator(nodeType, self, pos, condition, direction)
496+
elif nodeType == "progressBar":
497+
condition = UIAHandler.handler.clientObject.createPropertyCondition(
498+
UIAHandler.UIA_ControlTypePropertyId,
499+
UIAHandler.UIA_ProgressBarControlTypeId
500+
)
501+
return UIAControlQuicknavIterator(nodeType, self, pos, condition, direction)
502+
496503
elif nodeType=="nonTextContainer":
497504
condition=createUIAMultiPropertyCondition({UIAHandler.UIA_ControlTypePropertyId:UIAHandler.UIA_ListControlTypeId,UIAHandler.UIA_IsKeyboardFocusablePropertyId:True},{UIAHandler.UIA_ControlTypePropertyId:UIAHandler.UIA_ComboBoxControlTypeId})
498505
return UIAControlQuicknavIterator(nodeType,self,pos,condition,direction)

‎source/browseMode.py‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1032,6 +1032,54 @@ def _get_disableAutoPassThrough(self):
10321032
# Translators: Message presented when the browse mode element is not found.
10331033
prevError=_("no previous figure")
10341034
)
1035+
qn(
1036+
"menuItem",
1037+
key=None,
1038+
# Translators: Input help message for a quick navigation command in browse mode.
1039+
nextDoc=_("moves to the next menu item"),
1040+
# Translators: Message presented when the browse mode element is not found.
1041+
nextError=_("no next menu item"),
1042+
# Translators: Input help message for a quick navigation command in browse mode.
1043+
prevDoc=_("moves to the previous menu item"),
1044+
# Translators: Message presented when the browse mode element is not found.
1045+
prevError=_("no previous menu item")
1046+
)
1047+
qn(
1048+
"toggleButton",
1049+
key=None,
1050+
# Translators: Input help message for a quick navigation command in browse mode.
1051+
nextDoc=_("moves to the next toggle button"),
1052+
# Translators: Message presented when the browse mode element is not found.
1053+
nextError=_("no next toggle button"),
1054+
# Translators: Input help message for a quick navigation command in browse mode.
1055+
prevDoc=_("moves to the previous toggle button"),
1056+
# Translators: Message presented when the browse mode element is not found.
1057+
prevError=_("no previous toggle button")
1058+
)
1059+
qn(
1060+
"progressBar",
1061+
key=None,
1062+
# Translators: Input help message for a quick navigation command in browse mode.
1063+
nextDoc=_("moves to the next progress bar"),
1064+
# Translators: Message presented when the browse mode element is not found.
1065+
nextError=_("no next progress bar"),
1066+
# Translators: Input help message for a quick navigation command in browse mode.
1067+
prevDoc=_("moves to the previous progress bar"),
1068+
# Translators: Message presented when the browse mode element is not found.
1069+
prevError=_("no previous progress bar")
1070+
)
1071+
qn(
1072+
"math",
1073+
key=None,
1074+
# Translators: Input help message for a quick navigation command in browse mode.
1075+
nextDoc=_("moves to the next math formula"),
1076+
# Translators: Message presented when the browse mode element is not found.
1077+
nextError=_("no next math formula"),
1078+
# Translators: Input help message for a quick navigation command in browse mode.
1079+
prevDoc=_("moves to the previous math formula"),
1080+
# Translators: Message presented when the browse mode element is not found.
1081+
prevError=_("no previous math formula")
1082+
)
10351083
qn(
10361084
"textParagraph",
10371085
key="p",

‎source/virtualBuffers/gecko_ia2.py‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -554,6 +554,22 @@ def _searchableAttribsForNodeType(self,nodeType):
554554
{"Iaccessible::role": [oleacc.ROLE_SYSTEM_GROUPING]},
555555
{"IAccessible2::attribute_xml-roles": [VBufStorage_findMatch_word("figure")]}
556556
]
557+
elif nodeType == "menuItem":
558+
attrs = [
559+
{"IAccessible::role": [oleacc.ROLE_SYSTEM_BUTTONMENU]}
560+
]
561+
elif nodeType == "toggleButton":
562+
attrs = [
563+
{"IAccessible::role": [IA2.IA2_ROLE_TOGGLE_BUTTON]}
564+
]
565+
elif nodeType == "progressBar":
566+
attrs = [
567+
{"IAccessible::role": [oleacc.ROLE_SYSTEM_PROGRESSBAR]}
568+
]
569+
elif nodeType == "math":
570+
attrs = [
571+
{"IAccessible::role": [oleacc.ROLE_SYSTEM_EQUATION]}
572+
]
557573
else:
558574
return None
559575
return attrs

‎user_docs/en/changes.t2t‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,14 @@ What's New in NVDA
88
== New Features ==
99
- New key commands:
1010
- New Quick Navigation command ``p`` for jumping to next/previous text paragraph in browse mode. (#15998, @mltony)
11-
- New unassigned Quick Navigation command to jump to the next/previous figure. (#10826)
12-
- New unassigned Quick Navigation command to jump to vertically aligned paragraphs. (#15999, @mltony)
11+
- New unassigned Quick Navigation commands, which can be used to jump to the next/previous:
12+
- figure (#10826)
13+
- vertically aligned paragraph (#15999, @mltony)
14+
- menu item (#16001, @mltony)
15+
- toggle button (#16001, @mltony)
16+
- progress bar (#16001, @mltony)
17+
- math formula (#16001, @mltony)
18+
-
1319
-
1420
- Reporting row and column headers is now supported in contenteditable HTML elements. (#14113)
1521
- Added the option to disable the reporting of figures and captions in Document Formatting settings. (#10826, #14349)

‎user_docs/en/userGuide.t2t‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -880,6 +880,10 @@ Here is a list of available commands:
880880
- Figure
881881
- Grouping
882882
- Tab
883+
- Menu item
884+
- Toggle button
885+
- Progress bar
886+
- Math formula
883887
- Vertically aligned paragraph
884888
-
885889

0 commit comments

Comments
 (0)