Merge 8fbb8d4 into b47fdc5

cary-rowen · web-flow · commit 4fdf7880a88c · 2024-07-03T22:23:14.000Z
diff --git a/source/NVDAObjects/IAccessible/winword.py b/source/NVDAObjects/IAccessible/winword.py
@@ -317,13 +317,16 @@ def script_caret_moveByCell(self, gesture: inputCore.InputGesture) -> None:
 		braille.handler.handleCaretMove(self)
 
 	@script(
-		# Translators: a description for a script
-		description=_("Reports the text of the comment where the system caret is located."),
+		description=_(
+			# Translators: a description for a script
+			"Reports the text of the comment where the system caret is located."
+			"If pressed twice, presents the information in browse mode."
+		),
 		gesture="kb:NVDA+alt+c",
 		category=SCRCAT_SYSTEMCARET,
 		speakOnDemand=True,
 	)
-	def script_reportCurrentComment(self,gesture):
+	def script_reportCurrentComment(self, gesture: "inputCore.InputGesture") -> None:
 		info=self.makeTextInfo(textInfos.POSITION_CARET)
 		info.expand(textInfos.UNIT_CHARACTER)
 		fields=info.getTextWithFields(formatConfig={'reportComments':True})
@@ -338,7 +341,15 @@ def script_reportCurrentComment(self,gesture):
 					except COMError:
 						break
 					if text:
-						ui.message(text)
+						repeats = scriptHandler.getLastScriptRepeatCount()
+						if repeats == 0:
+							ui.message(text)
+						elif repeats == 1:
+							ui.browseableMessage(
+								text,
+								# Translators: title for Word comment dialog.
+								_("Comment")
+							)
 						return
 		# Translators: a message when there is no comment to report in Microsoft Word
 		ui.message(_("No comments"))
diff --git a/source/NVDAObjects/UIA/wordDocument.py b/source/NVDAObjects/UIA/wordDocument.py
@@ -11,7 +11,9 @@
 
 import enum
 from comtypes import COMError
+import inputCore
 import mathPres
+import scriptHandler
 from scriptHandler import isScriptWaiting
 import textInfos
 import UIAHandler
@@ -611,15 +613,28 @@ def _caretMoveBySentenceHelper(self, gesture, direction):
 	@script(
 		gesture="kb:NVDA+alt+c",
 		# Translators: a description for a script that reports the comment at the caret.
-		description=_("Reports the text of the comment where the system caret is located."),
+		description=_(
+			# Translators: a description for a script that reports the comment at the caret.
+			"Reports the text of the comment where the system caret is located."
+			" If pressed twice, presents the information in a browsable message"
+		),
 		category=SCRCAT_SYSTEMCARET,
 		speakOnDemand=True,
 	)
-	def script_reportCurrentComment(self,gesture):
+	def script_reportCurrentComment(self, gesture: "inputCore.InputGesture") -> None:
 		caretInfo=self.makeTextInfo(textInfos.POSITION_CARET)
 		commentInfo = getCommentInfoFromPosition(caretInfo)
 		if commentInfo is not None:
-			ui.message(getPresentableCommentInfoFromPosition(commentInfo))
+			text = getPresentableCommentInfoFromPosition(commentInfo)
+			repeats = scriptHandler.getLastScriptRepeatCount()
+			if repeats == 0:
+				ui.message(text)
+			elif repeats == 1:
+				ui.browseableMessage(
+					text,
+					# Translators: title for Word comment dialog.
+					_("Comment")
+				)
 		else:
 			# Translators: a message when there is no comment to report in Microsoft Word
 			ui.message(_("No comments"))
diff --git a/user_docs/en/changes.md b/user_docs/en/changes.md
@@ -6,6 +6,8 @@
 
 ### New Features
 
+* Enhanced Microsoft Word comment command: press twice to present comment content in browsable message. (#16800, @Cary-Rowen)
+
 ### Bug Fixes
 
 ### Changes for Developers
diff --git a/user_docs/en/userGuide.md b/user_docs/en/userGuide.md
@@ -1487,7 +1487,8 @@ The Elements List can list headings, links, annotations (which includes comments
 #### Reporting Comments {#WordReportingComments}
 
 <!-- KC:beginInclude -->
-To report any comments at the current caret position, press NVDA+alt+c.
+To report any comments at the current caret position, press `NVDA+alt+c`.
+Pressing twice shows the information in a browsable message.
 <!-- KC:endInclude -->
 All comments for the document, along with other tracked changes, can also be listed in the NVDA Elements List  when selecting Annotations as the type.
 
