Merge aa32f5c into 345154a

CyrilleB79 · web-flow · commit 7b192d834592 · 2023-05-03T18:20:25.000+02:00
diff --git a/source/globalCommands.py b/source/globalCommands.py
@@ -2577,12 +2577,13 @@ def script_reportStatusLine(self, gesture):
 	def script_reportFocusObjectAccelerator(self, gesture: inputCore.InputGesture) -> None:
 		obj = api.getFocusObject()
 		if obj.keyboardShortcut:
-			res = obj.keyboardShortcut
+			shortcut = obj.keyboardShortcut
+			speech.speak(speech.getKeyboardShortcutSpeech(shortcut))
+			braille.handler.message(shortcut)
 		else:
 			# Translators: reported when a user requests the accelerator key
 			# of the currently focused object, but there is none set.
-			res = _("No shortcut key")
-		ui.message(res)
+			ui.message(_("No shortcut key"))
 
 	@script(
 		# Translators: Input help mode message for toggle mouse tracking command.
diff --git a/source/speech/__init__.py b/source/speech/__init__.py
@@ -1,8 +1,8 @@
 # A part of NonVisual Desktop Access (NVDA)
 # This file is covered by the GNU General Public License.
 # See the file COPYING for more details.
-# Copyright (C) 2006-2021 NV Access Limited, Peter Vágner, Aleksey Sadovoy, Babbage B.V., Bill Dengler,
-# Julien Cochuyt
+# Copyright (C) 2006-2023 NV Access Limited, Peter Vágner, Aleksey Sadovoy, Babbage B.V., Bill Dengler,
+# Julien Cochuyt, Cyrille Bougot
 
 from .speech import (
 	_extendSpeechSequence_addMathForTextInfo,
@@ -25,6 +25,7 @@
 	getCurrentLanguage,
 	getFormatFieldSpeech,
 	getIndentationSpeech,
+	getKeyboardShortcutSpeech,
 	getObjectPropertiesSpeech,
 	getObjectSpeech,
 	getPreselectedTextSpeech,
diff --git a/source/speech/speech.py b/source/speech/speech.py
@@ -1725,8 +1725,7 @@ def getPropertiesSpeech(  # noqa: C901
 		textList.append(description)
 	# sometimes keyboardShortcut key is present but value is None
 	keyboardShortcut: Optional[str] = propertyValues.get('keyboardShortcut')
-	if keyboardShortcut:
-		textList.append(keyboardShortcut)
+	textList.extend(getKeyboardShortcutSpeech(keyboardShortcut))
 	if includeTableCellCoords and cellCoordsText:
 		textList.append(cellCoordsText)
 	if cellCoordsText or rowNumber or columnNumber:
@@ -1861,6 +1860,58 @@ def getPropertiesSpeech(  # noqa: C901
 	return textList
 
 
+def getKeyboardShortcutSpeech(keyboardShortcut: Optional[str]) -> SpeechSequence:
+	log.info(f'Calling getKeyboardShortcutSequence with keyboardShortcut={keyboardShortcut}')
+	SHORTCUT_KEY_LIST_SEPARATOR = '  '
+	seq = []
+	if not keyboardShortcut:
+		return seq
+	locale = getCurrentLanguage()
+	for shortcut in keyboardShortcut.split(SHORTCUT_KEY_LIST_SEPARATOR):
+		if len(seq) > 0:
+			seq.append(SHORTCUT_KEY_LIST_SEPARATOR)
+		keyList, separator = splitShortcut(shortcut)
+		log.info(f'keyList={keyList}, separator={separator}')
+		seqShortcut = []
+		for key in keyList:
+			if len(seqShortcut) > 0:
+				seqShortcut.append(separator)
+			if len(key) > 1:
+				seqShortcut.append(key)
+				continue
+			keySymbol = characterProcessing.processSpeechSymbol(locale, key)
+			if keySymbol != key:
+				seqShortcut.append(keySymbol)
+				continue
+			seqShortcut.append(CharacterModeCommand(True))
+			seqShortcut.append(key)
+			seqShortcut.append(CharacterModeCommand(False))
+		seq.extend(seqShortcut)
+	seqOut = []
+	for item in seq:
+		if len(seqOut) > 0 and isinstance(seqOut[-1], str) and isinstance(item, str):
+			seqOut[-1] = seqOut[-1] + SHORTCUT_KEY_LIST_SEPARATOR + item
+		else:
+			seqOut.append(item)
+	return seqOut
+
+
+def splitShortcut(shortcut):
+	if ', ' in shortcut:
+		separator = ', '
+	elif ' + ' in shortcut:
+		separator = ' + '
+	elif '+' in shortcut:
+		separator = '+'
+	else:
+		separator = None
+	if separator:
+		keyList = shortcut.split(separator)
+	else:
+		keyList = [shortcut]
+	return keyList, separator
+
+
 def _shouldSpeakContentFirst(
 		reason: OutputReason,
 		role: int,
