Skip to content

Commit d91ae17

Browse files
LeonarddeRLeonarddeR
authored
Merge 37fef03 into 5d1b0e8 
2 parents 5d1b0e8 + 37fef03 commit d91ae17

2 files changed

Lines changed: 20 additions & 5 deletions

File tree

‎source/globalCommands.py‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3782,7 +3782,11 @@ def script_reportLinkDestinationInWindow(self, gesture: inputCore.InputGesture)
37823782
# Translators: Input help mode message for a touchscreen gesture.
37833783
description=_("Moves to the next object in a flattened view of the object navigation hierarchy"),
37843784
category=SCRCAT_OBJECTNAVIGATION,
3785-
gesture="ts(object):flickright"
3785+
gestures=(
3786+
"ts(object):flickright",
3787+
"kb(desktop):NVDA+numpad3",
3788+
"kb(laptop):shift+NVDA+]",
3789+
),
37863790
)
37873791
def script_navigatorObject_nextInFlow(self, gesture: inputCore.InputGesture):
37883792
curObject=api.getNavigatorObject()
@@ -3816,7 +3820,11 @@ def script_navigatorObject_nextInFlow(self, gesture: inputCore.InputGesture):
38163820
# Translators: Input help mode message for a touchscreen gesture.
38173821
description=_("Moves to the previous object in a flattened view of the object navigation hierarchy"),
38183822
category=SCRCAT_OBJECTNAVIGATION,
3819-
gesture="ts(object):flickleft"
3823+
gestures=(
3824+
"ts(object):flickleft",
3825+
"kb(desktop):NVDA+numpad9",
3826+
"kb(laptop):shift+NVDA+[",
3827+
),
38203828
)
38213829
def script_navigatorObject_previousInFlow(self, gesture: inputCore.InputGesture):
38223830
curObject=api.getNavigatorObject()

‎user_docs/en/userGuide.t2t‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -592,6 +592,12 @@ Moving to a list item's containing object will take you back to the list.
592592
You can then move past the list if you wish to access other objects.
593593
Similarly, a toolbar contains controls, so you must move inside the toolbar to access the controls in the toolbar.
594594

595+
If you yet prefer to move back and forth between every single object on the system, you can use commands to move to the previous/next object in a flattened view.
596+
For example, if you move to the next object in this flattened view and the current object contains other objects, NVDA will automatically move to the first object that contains it.
597+
Alternatively, if the current object doesn't contain any objects, NVDA will move to the next object at the current level of the hierarchy.
598+
If there is no such next object, NVDA will try to find the next object in the hierarchy based on containing objects until there are no more objects to move to.
599+
The same rules apply to moving backwards in the hierarchy.
600+
595601
The object currently being reviewed is called the navigator object.
596602
Once you navigate to an object, you can review its content using the [text review commands #ReviewingText] while in [Object review mode #ObjectReview].
597603
When [Visual Highlight #VisionFocusHighlight] is enabled, the location of the current navigator object is also exposed visually.
@@ -605,8 +611,10 @@ To navigate by object, use the following commands:
605611
|| Name | Desktop key | Laptop key | Touch | Description |
606612
| Report current object | NVDA+numpad5 | NVDA+shift+o | none | Reports the current navigator object. Pressing twice spells the information, and pressing 3 times copies this object's name and value to the clipboard. |
607613
| Move to containing object | NVDA+numpad8 | NVDA+shift+upArrow | flick up (object mode) | Moves to the object containing the current navigator object |
608-
| Move to previous object | NVDA+numpad4 | NVDA+shift+leftArrow | flick left (object mode) | Moves to the object before the current navigator object |
609-
| Move to next object | NVDA+numpad6 | NVDA+shift+rightArrow | flick right (object mode) | Moves to the object after the current navigator object |
614+
| Move to previous object | NVDA+numpad4 | NVDA+shift+leftArrow | none | Moves to the object before the current navigator object |
615+
| Move to previous object in flattened view | NVDA+numpad9 | NVDA+shift+[ | flick left (object mode) | Moves to the previous object in a flattened view of the object navigation hierarchy |
616+
| Move to next object | NVDA+numpad6 | NVDA+shift+rightArrow | none | Moves to the object after the current navigator object |
617+
| Move to next object in flattened view | NVDA+numpad3 | NVDA+shift+] | flick right (object mode) | Moves to the next object in a flattened view of the object navigation hierarchy |
610618
| Move to first contained object | NVDA+numpad2 | NVDA+shift+downArrow | flick down (object mode) | Moves to the first object contained by the current navigator object |
611619
| Move to focus object | NVDA+numpadMinus | NVDA+backspace | none | Moves to the object that currently has the system focus, and also places the review cursor at the position of the System caret, if it is showing |
612620
| Activate current navigator object | NVDA+numpadEnter | NVDA+enter | double-tap | Activates the current navigator object (similar to clicking with the mouse or pressing space when it has the system focus) |
@@ -664,7 +672,6 @@ The layout is illustrated as follows:
664672

665673
++ Review Modes ++[ReviewModes]
666674
NVDA's [text review commands #ReviewingText] can review content within the current navigator object, current document or screen, depending on the review mode selected.
667-
Review modes are a replacement for the older Flat Review concept found in NVDA.
668675

669676
The following commands switch between review modes:
670677
%kc:beginInclude

0 commit comments

Comments
 (0)