Skip to content

Commit fd8d439

Browse files
XLTechieXLTechie
authored
Merge 3756b05 into 180c9f2 
2 parents 180c9f2 + 3756b05 commit fd8d439

2 files changed

Lines changed: 49 additions & 2 deletions

File tree

‎source/globalCommands.py‎

Lines changed: 48 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
# A part of NonVisual Desktop Access (NVDA)
33
# This file is covered by the GNU General Public License.
44
# See the file COPYING for more details.
5-
# Copyright (C) 2006-2022 NV Access Limited, Peter Vágner, Aleksey Sadovoy, Rui Batista, Joseph Lee,
5+
# Copyright (C) 2006-2023 NV Access Limited, Peter Vágner, Aleksey Sadovoy, Rui Batista, Joseph Lee,
66
# Leonard de Ruijter, Derek Riemer, Babbage B.V., Davy Kager, Ethan Holliger, Łukasz Golonka, Accessolutions,
7-
# Julien Cochuyt, Jakub Lukowicz, Bill Dengler, Cyrille Bougot, Rob Meredith
7+
# Julien Cochuyt, Jakub Lukowicz, Bill Dengler, Cyrille Bougot, Rob Meredith, Luke Davis
88

99
import itertools
1010
from typing import (
@@ -3628,6 +3628,52 @@ def script_reloadPlugins(self, gesture):
36283628
# Translators: Presented when plugins (app modules and global plugins) are reloaded.
36293629
ui.message(_("Plugins reloaded"))
36303630

3631+
@script(
3632+
description=_(
3633+
# Translators: input help mode message for Report destination URL of navigator link command
3634+
"Report the destination URL of the link in the navigator object. "
3635+
"If pressed twice, shows the URL in a window for easier review."
3636+
),
3637+
gesture="kb:NVDA+k",
3638+
category=SCRCAT_TOOLS
3639+
)
3640+
def script_reportLinkDestination(self, gesture: inputCore.InputGesture, forceBrowseable: bool = False) -> None:
3641+
"""Generates a ui.message or ui.browseableMessage of a link's destination, if the navigator
3642+
object is a link, or an element with an included link such as a graphic.
3643+
@param forceBrowseable: skips the press once check, and displays the browseableMessage version.
3644+
"""
3645+
obj = api.getNavigatorObject()
3646+
if (
3647+
obj.role == controlTypes.role.Role.LINK # If it's a link, or
3648+
or controlTypes.state.State.LINKED in obj.states # if it isn't a link but contains one
3649+
):
3650+
if (
3651+
forceBrowseable # If a browseable message is preferred unconditionally, or
3652+
or scriptHandler.getLastScriptRepeatCount() > 0 # if pressed more than once
3653+
):
3654+
# Translators: Informs the user that the window contains the destination of the
3655+
# link with given title
3656+
ui.browseableMessage(obj.value, title=_("Destination of: {name}").format(name=obj.name))
3657+
else:
3658+
ui.message(obj.value) # Speak the link
3659+
else:
3660+
# Translators: Tell user that the command has been run on something that is not a link
3661+
ui.message(_("Not a link."))
3662+
3663+
@script(
3664+
description=_(
3665+
# Translators: input help mode message for Report URL of navigator link in a window command
3666+
"Reports the destination URL of the link in the navigator object in a window, "
3667+
"instead of just speaking it. May be preferred by braille users."
3668+
),
3669+
category=SCRCAT_TOOLS
3670+
)
3671+
def script_reportLinkDestinationInWindow(self, gesture: inputCore.InputGesture) -> None:
3672+
"""Uses the forceBrowseable flag of script_reportLinkDestination, to generate a
3673+
ui.browseableMessage of a link's destination.
3674+
"""
3675+
self.script_reportLinkDestination(gesture, True)
3676+
36313677
@script(
36323678
# Translators: Input help mode message for a touchscreen gesture.
36333679
description=_("Moves to the next object in a flattened view of the object navigation hierarchy"),

‎user_docs/en/userGuide.t2t‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,7 @@ The actual commands will not execute while in input help mode.
222222
| Read status bar | ``NVDA+end`` | ``NVDA+shift+end`` | Reports the Status Bar if NVDA finds one. Pressing twice will spell the information. Pressing three times will copy it to the clipboard |
223223
| Read time | ``NVDA+f12`` | ``NVDA+f12`` | Pressing once reports the current time, pressing twice reports the date |
224224
| Report text formatting | ``NVDA+f`` | ``NVDA+f`` | Reports text formatting. Pressing twice shows the information in a window |
225+
| Report link destination | ``NVDA+k`` | ``NVDA+k`` | Pressing once speaks the destination URL of the link in the [navigator object #ObjectNavigation]. Pressing twice shows it in a window for more careful review |
225226

226227
+++ Toggle which information NVDA reads +++[ToggleWhichInformationNVDAReads]
227228
|| Name | Desktop key | Laptop key | Description |

0 commit comments

Comments
 (0)