Merge b1c6435 into 7402acd

Emil-18 · web-flow · commit ac2dd66ff65f · 2023-12-07T20:32:17.000+01:00
diff --git a/source/globalCommands.py b/source/globalCommands.py
@@ -20,6 +20,7 @@
 )
 
 import audioDucking
+
 import touchHandler
 import keyboardHandler
 import mouseHandler
@@ -258,7 +259,8 @@ def script_toggleRightMouseButton(self,gesture):
 			# Translators: Input help mode message for report current selection command.
 			"Announces the current selection in edit controls and documents. "
 			"Pressing twice spells this information. "
-			"Pressing three times spells it using character descriptions."
+			"Pressing three times spells it using character descriptions. "
+			"Pressing four times shows it in a browseable message."
 		),
 		category=SCRCAT_SYSTEMCARET,
 		gestures=("kb(desktop):NVDA+shift+upArrow", "kb(laptop):NVDA+shift+s"),
@@ -274,15 +276,25 @@ def script_reportCurrentSelection(self,gesture):
 		except (RuntimeError, NotImplementedError):
 			info=None
 		if not info or info.isCollapsed:
-			speech.speakMessage(_("No selection"))
+			# Translators: The message reported when there is no selection
+			ui.message(_("No selection"))
 		else:
 			scriptCount = scriptHandler.getLastScriptRepeatCount()
+			# Translators: The message reported after selected text
+			selectMessage = speech.speech._getSelectionMessageSpeech(_('%s selected'), info.text)[0]
 			if scriptCount == 0:
 				speech.speakTextSelected(info.text)
+				braille.handler.message(selectMessage)
+
+			elif scriptCount == 3:
+				ui.browseableMessage(info.text)
+				return
+
 			elif len(info.text) < speech.speech.MAX_LENGTH_FOR_SELECTION_REPORTING:
 				speech.speakSpelling(info.text, useCharacterDescriptions=scriptCount > 1)
 			else:
 				speech.speakTextSelected(info.text)
+				braille.handler.message(selectMessage)
 
 	@script(
 		# Translators: Input help mode message for report date and time command.
@@ -1159,7 +1171,12 @@ def script_navigatorObject_current(self, gesture: inputCore.InputGesture):
 				else:
 					api.copyToClip(text, notify=True)
 		else:
-			speech.speakObject(curObject, reason=controlTypes.OutputReason.QUERY)
+			speechList = speech.getObjectSpeech(curObject, reason=controlTypes.OutputReason.QUERY)
+			speech.speech.speak(speechList)
+			text = ' '.join(s for s in speechList if isinstance(s, str))
+
+			braille.handler.message(text)
+
 
 	@staticmethod
 	def _reportLocationText(objs: Tuple[Union[None, NVDAObject, textInfos.TextInfo], ...]) -> None:
@@ -2488,7 +2505,12 @@ def script_reportCurrentFocus(self, gesture: inputCore.InputGesture):
 
 		repeatCount = scriptHandler.getLastScriptRepeatCount()
 		if repeatCount == 0:
-			speech.speakObject(focusObject, reason=controlTypes.OutputReason.QUERY)
+			speechList = speech.getObjectSpeech(focusObject, reason=controlTypes.OutputReason.QUERY)
+			speech.speech.speak(speechList)
+			brailleList = speechList.copy()
+			text = ' '.join(s for s in speechList if isinstance(s, str))
+
+			braille.handler.message(text)
 		else:
 			speech.speakSpelling(focusObject.name, useCharacterDescriptions=repeatCount > 1)
 
diff --git a/user_docs/en/changes.t2t b/user_docs/en/changes.t2t
@@ -48,7 +48,8 @@ Windows 8.1 is the minimum Windows version supported. (#15544)
 - Key Commands:
   - The following commands now support two and three presses to spell the reported information and spell with character descriptions: report selection, report clipboard text and report focused object. (#15449, @CyrilleB79)
   - The command to toggle the screen curtain now has a default gesture: ``NVDA+control+escape``. (#10560, @CyrilleB79)
-  -
+  - When pressed four times, the report selection command now shows the selection in a browseable message(@Emil-18)
+  - 
 - Microsoft Office:
   - When requesting formatting information on Excel cells, borders and background will only be reported if there is such formatting. (#15560, @CyrilleB79)
   - NVDA will again no longer report unlabelled groupings such as in recent versions of Microsoft Office 365 menus. (#15638)
@@ -82,6 +83,7 @@ Users of Poedit 1 are encouraged to update to Poedit 3 if they want to rely on e
   - More objects which contain useful text are detected, and text content is displayed in braille. (#15605)
   - Contracted braille input works properly again. (#15773, @aaclause)
   - Braille is now updated when moving the navigator object between table cells in more situations (#15755, @Emil-18)
+  - The result of reporting current focus, current navigator object, and current selection commands is now shown in braille. (#15844, @Emil-18)
   -
 - LibreOffice:
   - Words deleted using the ``control+backspace`` keyboard shortcut are now also properly announced when the deleted word is followed by whitespace (like spaces and tabs). (#15436, @michaelweghorn)
