Merge 482e8ca into 3f89b60

LeonarddeR · web-flow · commit 50daecbd68a2 · 2023-06-28T17:28:09.000+10:00
diff --git a/source/globalCommands.py b/source/globalCommands.py
@@ -3781,7 +3781,15 @@ def script_reportLinkDestinationInWindow(self, gesture: inputCore.InputGesture)
 		# Translators: Input help mode message for a touchscreen gesture.
 		description=_("Moves to the next object in a flattened view of the object navigation hierarchy"),
 		category=SCRCAT_OBJECTNAVIGATION,
-		gesture="ts(object):flickright"
+		gestures=(
+			"ts(object):flickright",
+			"kb(desktop):NVDA+numpad3",
+			"kb(laptop):shift+NVDA+'",
+			# In the US International keyboard layout,
+			# the apostrophe has special behavior to be able to type accented letters.
+			# In that layout, it is regarded to as acute/cedilla.
+			"kb(laptop):shift+NVDA+acute/cedilla"
+		),
 	)
 	def script_navigatorObject_nextInFlow(self, gesture: inputCore.InputGesture):
 		curObject=api.getNavigatorObject()
@@ -3815,7 +3823,11 @@ def script_navigatorObject_nextInFlow(self, gesture: inputCore.InputGesture):
 		# Translators: Input help mode message for a touchscreen gesture.
 		description=_("Moves to the previous object in a flattened view of the object navigation hierarchy"),
 		category=SCRCAT_OBJECTNAVIGATION,
-		gesture="ts(object):flickleft"
+		gestures=(
+			"ts(object):flickleft",
+			"kb(desktop):NVDA+numpad9",
+			"kb(laptop):shift+NVDA+;"
+		),
 	)
 	def script_navigatorObject_previousInFlow(self, gesture: inputCore.InputGesture):
 		curObject=api.getNavigatorObject()
diff --git a/user_docs/en/userGuide.t2t b/user_docs/en/userGuide.t2t
@@ -605,8 +605,10 @@ To navigate by object, use the following commands:
 || Name | Desktop key | Laptop key | Touch | Description |
 | 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. |
 | Move to containing object | NVDA+numpad8 | NVDA+shift+upArrow | flick up (object mode) | Moves to the object containing the current navigator object |
-| Move to previous object | NVDA+numpad4 | NVDA+shift+leftArrow | flick left (object mode) | Moves to the object before the current navigator object |
-| Move to next object | NVDA+numpad6 | NVDA+shift+rightArrow | flick right (object mode) | Moves to the object after the current navigator object |
+| Move to previous object | NVDA+numpad4 | NVDA+shift+leftArrow | none | Moves to the object before the current navigator object |
+| 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 |
+| Move to next object | NVDA+numpad6 | NVDA+shift+rightArrow | none | Moves to the object after the current navigator object |
+| 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 |
 | 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 |
 | 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 |
 | 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) |
