Skip to content

Commit a7325c6

Browse files
seanbuddseanbudd
authored
Merge da6591b into 153f500 
2 parents 153f500 + da6591b commit a7325c6

1 file changed

Lines changed: 35 additions & 14 deletions

File tree

‎source/gui/__init__.py‎

Lines changed: 35 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -497,21 +497,10 @@ def __init__(self, frame: MainFrame):
497497
self.Bind(wx.EVT_MENU, frame.onAboutCommand, item)
498498
# Translators: The label for the Help submenu in NVDA menu.
499499
self.menu.AppendSubMenu(menu_help,_("&Help"))
500-
self.menu.AppendSeparator()
501-
# Translators: The label for the menu item to open the Configuration Profiles dialog.
502-
item = self.menu.Append(wx.ID_ANY, _("&Configuration profiles..."))
503-
self.Bind(wx.EVT_MENU, frame.onConfigProfilesCommand, item)
504-
# Translators: The label for the menu item to revert to saved configuration.
505-
item = self.menu.Append(wx.ID_ANY, _("&Revert to saved configuration"),_("Reset all settings to saved state"))
506-
self.Bind(wx.EVT_MENU, frame.onRevertToSavedConfigurationCommand, item)
500+
501+
self._appendConfigManagementSection(frame)
502+
507503
if not globalVars.appArgs.secure:
508-
# Translators: The label for the menu item to reset settings to default settings.
509-
# Here, default settings means settings that were there when the user first used NVDA.
510-
item = self.menu.Append(wx.ID_ANY, _("&Reset configuration to factory defaults"),_("Reset all settings to default state"))
511-
self.Bind(wx.EVT_MENU, frame.onRevertToDefaultConfigurationCommand, item)
512-
# Translators: The label for the menu item to save current settings.
513-
item = self.menu.Append(wx.ID_SAVE, _("&Save configuration"), _("Write the current configuration to nvda.ini"))
514-
self.Bind(wx.EVT_MENU, frame.onSaveConfigurationCommand, item)
515504
self.menu.AppendSeparator()
516505
# Translators: The label for the menu item to open donate page.
517506
item = self.menu.Append(wx.ID_ANY, _("Donate"))
@@ -575,6 +564,38 @@ def _createSpeechDictsSubMenu(self, frame: wx.Frame) -> wx.Menu:
575564
self.Bind(wx.EVT_MENU, frame.onTemporaryDictionaryCommand, item)
576565
return subMenu_speechDicts
577566

567+
def _appendConfigManagementSection(self, frame: wx.Frame) -> None:
568+
self.menu.AppendSeparator()
569+
# Translators: The label for the menu item to open the Configuration Profiles dialog.
570+
item = self.menu.Append(wx.ID_ANY, _("&Configuration profiles..."))
571+
self.Bind(wx.EVT_MENU, frame.onConfigProfilesCommand, item)
572+
item = self.menu.Append(
573+
wx.ID_ANY,
574+
# Translators: The label for the menu item to revert to saved configuration.
575+
_("&Revert to saved configuration"),
576+
# Translators: The help text for the menu item to revert to saved configuration.
577+
_("Reset all settings to saved state")
578+
)
579+
self.Bind(wx.EVT_MENU, frame.onRevertToSavedConfigurationCommand, item)
580+
item = self.menu.Append(
581+
wx.ID_ANY,
582+
# Translators: The label for the menu item to reset settings to default settings.
583+
# Here, default settings means settings that were there when the user first used NVDA.
584+
_("&Reset configuration to factory defaults"),
585+
# Translators: The help text for the menu item to reset settings to default settings.
586+
# Here, default settings means settings that were there when the user first used NVDA.
587+
_("Reset all settings to default state")
588+
)
589+
self.Bind(wx.EVT_MENU, frame.onRevertToDefaultConfigurationCommand, item)
590+
if not globalVars.appArgs.secure:
591+
item = self.menu.Append(
592+
wx.ID_SAVE,
593+
# Translators: The label for the menu item to save current settings.
594+
_("&Save configuration"),
595+
# Translators: The help text for the menu item to save current settings.
596+
_("Write the current configuration to nvda.ini")
597+
)
598+
self.Bind(wx.EVT_MENU, frame.onSaveConfigurationCommand, item)
578599

579600
def initialize():
580601
global mainFrame

0 commit comments

Comments
 (0)