Skip to content
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

Jump to bottom

NVDA menu: add explicit shortcut keys and avoid collisions #15364

Merged
merged 5 commits into from
Sep 6, 2023
Merged

NVDA menu: add explicit shortcut keys and avoid collisions #15364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
73e3219
NVDA menu: add explicit shortcut keys and avoid collisions
CyrilleB79 Sep 4, 2023
0294693
fix linting error
CyrilleB79 Sep 4, 2023
98e6ba1
Address review
CyrilleB79 Sep 6, 2023
ea9860e
Merge remote-tracking branch 'origin/beta' into menuShortcuts
seanbudd Sep 6, 2023
76a6a86
update changes
seanbudd Sep 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
24 changes: 12 additions & 12 deletions source/gui/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,17 +494,17 @@ def __init__(self, frame: MainFrame):
menu_tools = self.toolsMenu = wx.Menu()
if not globalVars.appArgs.secure:
# Translators: The label for the menu item to open NVDA Log Viewer.
item = menu_tools.Append(wx.ID_ANY, _("View log"))
item = menu_tools.Append(wx.ID_ANY, _("View &log"))
self.Bind(wx.EVT_MENU, frame.onViewLogCommand, item)
# Translators: The label for the menu item to toggle Speech Viewer.
item = self.menu_tools_toggleSpeechViewer = menu_tools.AppendCheckItem(wx.ID_ANY, _("Speech viewer"))
item = self.menu_tools_toggleSpeechViewer = menu_tools.AppendCheckItem(wx.ID_ANY, _("&Speech viewer"))
item.Check(speechViewer.isActive)
self.Bind(wx.EVT_MENU, frame.onToggleSpeechViewerCommand, item)

self.menu_tools_toggleBrailleViewer: wx.MenuItem = menu_tools.AppendCheckItem(
wx.ID_ANY,
# Translators: The label for the menu item to toggle Braille Viewer.
_("Braille viewer")
_("&Braille viewer")
)
item = self.menu_tools_toggleBrailleViewer
self.Bind(wx.EVT_MENU, frame.onToggleBrailleViewerCommand, item)
Expand All @@ -514,31 +514,31 @@ def __init__(self, frame: MainFrame):

if not config.isAppX and NVDAState.shouldWriteToDisk():
# Translators: The label of a menu item to open the Add-on store
item = menu_tools.Append(wx.ID_ANY, _("Add-on &store..."))
item = menu_tools.Append(wx.ID_ANY, _("&Add-on store..."))
self.Bind(wx.EVT_MENU, frame.onAddonStoreCommand, item)

if not globalVars.appArgs.secure and not config.isAppX:
# Translators: The label for the menu item to open NVDA Python Console.
item = menu_tools.Append(wx.ID_ANY, _("Python console"))
item = menu_tools.Append(wx.ID_ANY, _("&Python console"))
self.Bind(wx.EVT_MENU, frame.onPythonConsoleCommand, item)

if not globalVars.appArgs.secure and not config.isAppX and not NVDAState.isRunningAsSource():
# Translators: The label for the menu item to create a portable copy of NVDA from an installed or another portable version.
item = menu_tools.Append(wx.ID_ANY, _("Create portable copy..."))
item = menu_tools.Append(wx.ID_ANY, _("&Create portable copy..."))
self.Bind(wx.EVT_MENU, frame.onCreatePortableCopyCommand, item)
if not config.isInstalledCopy():
# Translators: The label for the menu item to install NVDA on the computer.
item = menu_tools.Append(wx.ID_ANY, _("&Install NVDA..."))
self.Bind(wx.EVT_MENU, frame.onInstallCommand, item)
# Translators: The label for the menu item to run the COM registration fix tool
item = menu_tools.Append(wx.ID_ANY, _("Run COM Registration Fixing tool..."))
item = menu_tools.Append(wx.ID_ANY, _("&Run COM Registration Fixing tool..."))
seanbudd marked this conversation as resolved.
Show resolved Hide resolved
self.Bind(wx.EVT_MENU, frame.onRunCOMRegistrationFixesCommand, item)
if not config.isAppX:
# Translators: The label for the menu item to reload plugins.
item = menu_tools.Append(wx.ID_ANY, _("Reload plugins"))
item = menu_tools.Append(wx.ID_ANY, _("R&eload plugins"))
self.Bind(wx.EVT_MENU, frame.onReloadPluginsCommand, item)
# Translators: The label for the Tools submenu in NVDA menu.
self.menu.AppendSubMenu(menu_tools,_("Tools"))
self.menu.AppendSubMenu(menu_tools, _("&Tools"))

menu_help = self.helpMenu = wx.Menu()
if not globalVars.appArgs.secure:
Expand Down Expand Up @@ -576,7 +576,7 @@ def __init__(self, frame: MainFrame):
item = menu_help.Append(wx.ID_ANY, _("&Check for update..."))
self.Bind(wx.EVT_MENU, frame.onCheckForUpdateCommand, item)
# Translators: The label for the menu item to open About dialog to get information about NVDA.
item = menu_help.Append(wx.ID_ABOUT, _("About..."), _("About NVDA"))
item = menu_help.Append(wx.ID_ABOUT, _("&About..."), _("About NVDA"))
self.Bind(wx.EVT_MENU, frame.onAboutCommand, item)
# Translators: The label for the Help submenu in NVDA menu.
self.menu.AppendSubMenu(menu_help,_("&Help"))
Expand All @@ -586,7 +586,7 @@ def __init__(self, frame: MainFrame):
if not globalVars.appArgs.secure:
self.menu.AppendSeparator()
# Translators: The label for the menu item to open donate page.
item = self.menu.Append(wx.ID_ANY, _("Donate"))
item = self.menu.Append(wx.ID_ANY, _("&Donate"))
self.Bind(wx.EVT_MENU, lambda evt: os.startfile(DONATE_URL), item)
self.installPendingUpdateMenuItemPos = self.menu.GetMenuItemCount()
item = self.installPendingUpdateMenuItem = self.menu.Append(wx.ID_ANY,
Expand Down Expand Up @@ -673,7 +673,7 @@ def _appendConfigManagementSection(self, frame: wx.Frame) -> None:
wx.ID_ANY,
# Translators: The label for the menu item to reset settings to default settings.
# Here, default settings means settings that were there when the user first used NVDA.
_("&Reset configuration to factory defaults"),
_("Reset configuration to &factory defaults"),
# Translators: The help text for the menu item to reset settings to default settings.
# Here, default settings means settings that were there when the user first used NVDA.
_("Reset all settings to default state")
Expand Down
1 change: 1 addition & 0 deletions user_docs/en/changes.t2t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ What's New in NVDA
You can now disable specific drivers for braille display auto detection in the braille display selection dialog. (#15196)
-
- Rich edit controls in applications such as Wordpad now use UI Automation (UIA) when the application advertises native support for this. (#15314)
- Some shortcut keys have been updated in the NVDA menu. (#15364)
-


Expand Down