10000 Beta to master by seanbudd · Pull Request #18051 · nvaccess/nvda · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Beta to master #18051

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 4, 2025
Merged

Beta to master #18051

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f83c971
Fix definition of controlling and controlled computers being swapped …
SaschaCowley May 4, 2025
a0d3947
Update user_docs/en/userGuide.xliff
actions-user May 4, 2025
e7a800b
Always focus remote connection dialog (#18050)
SaschaCowley May 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8000
7 changes: 7 additions & 0 deletions source/_remoteClient/dialogs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,7 @@ def __init__(self, parent: wx.Window, id: int, title: str, hostnames: list[str]
self.Fit()
self.CenterOnScreen()
self._connectionModeControl.SetFocus()
self.Bind(wx.EVT_SHOW, self._onShow)

def _onClientOrServer(self, evt: wx.CommandEvent) -> None:
"""Respond to changing between using a control server or hosting it locally"""
Expand Down Expand Up @@ -415,6 +416,12 @@ def getConnectionInfo(self) -> ConnectionInfo:
insecure=insecure,
)

def _onShow(self, evt: wx.ShowEvent):
"""Make sure this dialog is focused when opened."""
self.Raise()
self.SetFocus()
evt.Skip()


class CertificateUnauthorizedDialog(wx.MessageDialog):
def __init__(self, parent: wx.Window | None, fingerprint: str | None = None):
Expand Down
4 changes: 2 additions & 2 deletions user_docs/en/userGuide.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3141,8 +3141,8 @@ This option is only available when [Automatically connect after NVDA starts](#Re

|Option |Behaviour |
|---|---|
|Allow this machine to be controlled |Use this computer as the "controlling" computer. This allows you to execute commands on the remote computer. |
|Control another machine |Use this computer as the "controlled" computer. This allows the operator of the "controlling" computer to use this computer as if they were sitting in front of it. |
|Allow this computer to be controlled |Use this computer as the "controlled" computer. This allows the operator of the "controlling" computer to use this computer as if they were sitting in front of it. |
|Control another computer |Use this computer as the "controlling" computer. This allows you to execute commands on the remote computer. |

##### Server {#RemoteAutoconnectServer}

Expand Down
14 changes: 7 additions & 7 deletions user_docs/en/userGuide.xliff
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:2.0" version="2.0" srcLang="en">
<file id="userGuide.md" original="https://raw.githubusercontent.com/nvaccess/nvda/6d113892b26475d5663f675a1d24947eb0a78c4c/user_docs/en/userGuide.md">
<file id="userGuide.md" original="https://raw.githubusercontent.com/nvaccess/nvda/f83c97105e9c575b3cb0451ab3eae1de819478ea/user_docs/en/userGuide.md">
<skeleton>
# $(ID:f5169acb-2803-46c6-8e4c-7c1aaf973723)

Expand Down Expand Up @@ -3145,8 +3145,8 @@ $(ID:f92b4b86-c3b5-4ce6-b4e4-2bf81ec20d86)

|$(ID:cd41a94e-2ad8-4085-8167-bba3b861b438)|
|---|---|
|$(ID:ba9de544-6ae0-44fb-8da7-06c7fe807a4b)|
|$(ID:fda47399-3911-4349-8520-fdf517b7aa87)|
|$(ID:fc75148d-f685-4daf-a643-aa0e7ded2ee0)|
|$(ID:b9e02315-fd92-42e4-941a-68e452bb789f)|

##### $(ID:af02981e-74c9-4832-be1a-9596b2b1ad2a) {#RemoteAutoconnectServer}

Expand Down Expand Up @@ -23398,24 +23398,24 @@ $(ID:061d7d61-cfab-44b3-a92c-4e65cf63213b)
<source>Option |Behaviour </source>
</segment>
</unit>
<unit id="ba9de544-6ae0-44fb-8da7-06c7fe807a4b">
<unit id="fc75148d-f685-4daf-a643-aa0e7ded2ee0">
<notes>
<note appliesTo="source">line: 3145</note>
<note appliesTo="source">prefix: |</note>
<note appliesTo="source">suffix: |</note>
</notes>
<segment>
<source>Allow this machine to be controlled |Use this computer as the "controlling" computer. This allows you to execute commands on the remote computer. </source>
<source>Allow this computer to be controlled |Use this computer as the "controlled" computer. This allows the operator of the "controlling" computer to use this computer as if they were sitting in front of it. </source>
</segment>
</unit>
<unit id="fda47399-3911-4349-8520-fdf517b7aa87">
<unit id="b9e02315-fd92-42e4-941a-68e452bb789f">
<notes>
<note appliesTo="source">line: 3146</note>
<note appliesTo="source">prefix: |</note>
<note appliesTo="source">suffix: |</note>
</notes>
<segment>
<source>Control another machine |Use this computer as the "controlled" computer. This allows the operator of the "controlling" computer to use this computer as if they were sitting in front of it. </source>
<source>Control another computer |Use this computer as the "controlling" computer. This allows you to execute commands on the remote computer. </source>
</segment>
</unit>
<unit id="af02981e-74c9-4832-be1a-9596b2b1ad2a">
Expand Down
0