nvaccess · seanbudd · Aug 12, 2024 · Mar 28, 2024 · Mar 28, 2024 · Apr 6, 2024
@@ -2391,7 +2391,10 @@ def _reportFormattingHelper(self, info, browseable=False):
 			ui.browseableMessage(
 				message,
 				# Translators: title for formatting information dialog.
-				_("Formatting")
+				_("Formatting"),
+				copyButton=True,
+				# Translators: Close button label
+				closeButtonText=_("Close")
 			)
 
 	@staticmethod
@@ -4052,7 +4055,7 @@ def script_reportLinkDestination(
 	) -> None:
 		"""Generates a ui.message or ui.browseableMessage of a link's destination, if focus or caret is
 		positioned on a link, or an element with an included link such as a graphic.
-		@param forceBrowseable: skips the press once check, and displays the browseableMessage version.
+		:param forceBrowseable: skips the press once check, and displays the browseableMessage version.
 		"""
 		try:
 			ti: textInfos.TextInfo = api.getCaretPosition()
@@ -4089,7 +4092,10 @@ def script_reportLinkDestination(
 					linkDestination,
 					# Translators: Informs the user that the window contains the destination of the
 					# link with given title
-					title=_("Destination of: {name}").format(name=obj.name)
+					title=_("Destination of: {name}").format(name=obj.name),
+					# Translators: Close button label, recommending to press escape to close the message.
+					closeButtonText=_("Press escape to close"),
+					copyButton=True
 				)
 			elif presses == 0:  # One press
 				ui.message(linkDestination)  # Speak the link

@@ -9,19 +9,51 @@
 	if(e.keyCode == 27){ // code for escape
 		window.close();
 	}
-};
+}
+
+function onCopyButtonPress() {
+	// Copy code came from http://www.codestore.net/store.nsf/unid/DOMM-4QHQE8/
+	var rng = document.body.createTextRange();
+	rng.moveToElementText(messageID);
+	rng.scrollIntoView();
+	rng.select();
+	rng.execCommand("Copy");
+	rng.collapse(false);
+	rng.select();
+}
+
+function onCloseButtonPress() {
+	//window.open('', '_self', '');  // Only enable if window.close() stops working in a future version, may fix.
+	window.close();
+}
 
 function windowOnLoad() {
 	var args = window.dialogArguments;
 	if (args) {
 		document.title = args.item('title');
 		messageID.innerHTML = args.item('message');
+		// If caller wants a close button
+		if (args.item('closeButtonText') != null) {
+			closeButton.innerHTML = args.item('closeButtonText');  // Assign the (translated) label
+			closeButton.style.display = 'inline';  // Display the button
+			buttonDiv.style.display = 'block';  // Display the div
+		}
+		// If caller wants a copy to clip button
+		if (args.item('copyButtonText') != null) {
+			copyButton.innerHTML = args.item('copyButtonText');  // Assign the (translated) label
+			copyButtonSpan.style.display = 'inline';  // Display the button
+			buttonDiv.style.display = 'block';  // Display the div
+		}
 	}
 } 
 //-->
 </SCRIPT>
 </HEAD>
 <BODY tabindex='0' id='main_body' style="margin:1em" LANGUAGE=javascript onload="return windowOnLoad()" onkeypress="return escapeKeyPress()" >
 <div id=messageID></div>
+<div id="buttonDiv" style="display: none;"><hr>
+<span id="copyButtonSpan" style="display: none;"><button id="copyButton" onclick="onCopyButtonPress();"></button>&nbsp;</span>
+<span><button id="closeButton" style="display: none;" onclick="onCloseButtonPress();"></button></span>
+</div>
 </body>
 </html>
@@ -89,12 +89,20 @@ def _warnBrowsableMessageNotAvailableOnSecureScreens(title: Optional[str]) -> No
 	)
 
 
-def browseableMessage(message: str, title: Optional[str] = None, isHtml: bool = False) -> None:
+def browseableMessage(
+		message: str,
+		title: Optional[str] = None,
+		isHtml: bool = False,
+		closeButtonText: Optional[str] = None,
+		copyButton: bool = False
+) -> None:
 	"""Present a message to the user that can be read in browse mode.
 	The message will be presented in an HTML document.
-	@param message: The message in either html or text.
-	@param title: The title for the message.
-	@param isHtml: Whether the message is html
+	:param message: The message in either html or text.
+	:param title: The title for the message, defaults to "NVDA Message".
+	:param isHtml: Whether the message is html, defaults to False.
+	:param closeButtonText: Text to use as label for a "close" button, defaults to None, meaning no close button.
+	:param copyButton: Whether to include a "copy" (to clipboard) button, defaults to False.
 	"""
 	if isRunningOnSecureDesktop():
 		import wx  # Late import to prevent circular dependency.
@@ -106,7 +114,7 @@ def browseableMessage(message: str, title: Optional[str] = None, isHtml: bool =
 		raise LookupError(htmlFileName )
 	moniker = POINTER(IUnknown)()
 	windll.urlmon.CreateURLMonikerEx(0, htmlFileName, byref(moniker), URL_MK_UNIFORM)
-	if not title:
+	if title is None:
 		# Translators: The title for the dialog used to present general NVDA messages in browse mode.
 		title = _("NVDA Message")
 	if not isHtml:
@@ -123,6 +131,11 @@ def browseableMessage(message: str, title: Optional[str] = None, isHtml: bool =
 		return
 	d.add("title", title)
 	d.add("message", message)
+	if closeButtonText is not None:
+		d.add("closeButtonText", closeButtonText)
+	if copyButton:
+		# Translators: The text of a button to copy the text of the window to the clipboard.
+		d.add("copyButtonText", _("Copy"))
 	dialogArgsVar = automation.VARIANT(d)
 	gui.mainFrame.prePopup() 
 	windll.mshtml.ShowHTMLDialogEx( 

@@ -43,6 +43,7 @@ Unicode CLDR has also been updated.
 * In the Python console, the last unexecuted command will no longer be lost when moving in the input history. (#16653, @CyrilleB79)
 * A unique anonymous ID is now sent as part of optional NVDA usage statistics gathering. (#16266)
 * By default, a new folder will be created when making a portable copy. Warnings have been added when writing to a non-empty directory. (#16684)
+* The Report link destination and character formatting information windows, now include "Close" and "Copy" buttons for user convenience. (#16369, @XLTechie)
 
 ### Bug Fixes
 * Windows 11 fixes:
@@ -81,6 +82,7 @@ It is especially useful to read the error location markers in tracebacks. (#1632
   Jobs are scheduled with a delay to avoid conflicts.
   * `scheduleThread.scheduleDailyJob` and `scheduleJob` can be used to schedule jobs at custom times, where a `JobClashError` will be raised on a known job scheduling clash.
 * It is now possible to create app modules for apps hosting Edge WebView2 (msedgewebview2.exe) controls. (#16705, @josephsl)
+* `ui.browseableMessage` may now be called with options to present a button for copying to clipboard, and also an optional close button which may have its name customized. (#16369, @XLTechie)
 
 #### Deprecations