Show reset config as a menu item in secure mode (#13547)

seanbudd · web-flow · commit ad5666b1b4d2 · 2022-03-28T17:06:47.000+11:00
Summary of the issue:
Currently a user can temporarily reset to factory defaults in secure mode by pressing the default input gesture NVDA+control+r 3 times.
A user using NVDA in a shared kiosk may find this command helpful to temporarily use NVDA with factory settings, so that they can log in and then use their own settings profile.

This is safe, as resetting to factory defaults doesn't save the settings profile to disk. Users can revert to the saved configuration for secure screens by:
- using the menu
- NVDA+control+r
- restarting NVDA

The feature "reset configuration to factory defaults" is hidden from the NVDA menu in secure mode, even though it is exposed through a default input gesture.

Description of how this pull request fixes the issue:
Show "reset configuration to factory defaults" as a menu item in secure mode

Testing strategy:

Change a preference in NVDA preferences
Copy your configuration to secure screens
From a secure screen
- Note that the menu item is visible
- Close the preference dialog
- Reset configuration to factory defaults using the menu item
- Confirm that the changed preference has been reset to the factory default
Restart the machine
on the sign-in screen, confirm that the preference has been restored to the saved config - not the factory default
diff --git a/source/gui/__init__.py b/source/gui/__init__.py
@@ -507,21 +507,10 @@ def __init__(self, frame: MainFrame):
 		self.Bind(wx.EVT_MENU, frame.onAboutCommand, item)
 		# Translators: The label for the Help submenu in NVDA menu.
 		self.menu.AppendSubMenu(menu_help,_("&Help"))
-		self.menu.AppendSeparator()
-		# Translators: The label for the menu item to open the Configuration Profiles dialog.
-		item = self.menu.Append(wx.ID_ANY, _("&Configuration profiles..."))
-		self.Bind(wx.EVT_MENU, frame.onConfigProfilesCommand, item)
-		# Translators: The label for the menu item to revert to saved configuration.
-		item = self.menu.Append(wx.ID_ANY, _("&Revert to saved configuration"),_("Reset all settings to saved state"))
-		self.Bind(wx.EVT_MENU, frame.onRevertToSavedConfigurationCommand, item)
+
+		self._appendConfigManagementSection(frame)
+
 		if not globalVars.appArgs.secure:
-			# 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.
-			item = self.menu.Append(wx.ID_ANY, _("&Reset configuration to factory defaults"),_("Reset all settings to default state"))
-			self.Bind(wx.EVT_MENU, frame.onRevertToDefaultConfigurationCommand, item)
-			# Translators: The label for the menu item to save current settings.
-			item = self.menu.Append(wx.ID_SAVE, _("&Save configuration"), _("Write the current configuration to nvda.ini"))
-			self.Bind(wx.EVT_MENU, frame.onSaveConfigurationCommand, item)
 			self.menu.AppendSeparator()
 			# Translators: The label for the menu item to open donate page.
 			item = self.menu.Append(wx.ID_ANY, _("Donate"))
@@ -585,6 +574,38 @@ def _createSpeechDictsSubMenu(self, frame: wx.Frame) -> wx.Menu:
 		self.Bind(wx.EVT_MENU, frame.onTemporaryDictionaryCommand, item)
 		return subMenu_speechDicts
 
+	def _appendConfigManagementSection(self, frame: wx.Frame) -> None:
+		self.menu.AppendSeparator()
+		# Translators: The label for the menu item to open the Configuration Profiles dialog.
+		item = self.menu.Append(wx.ID_ANY, _("&Configuration profiles..."))
+		self.Bind(wx.EVT_MENU, frame.onConfigProfilesCommand, item)
+		item = self.menu.Append(
+			wx.ID_ANY,
+			# Translators: The label for the menu item to revert to saved configuration.
+			_("&Revert to saved configuration"),
+			# Translators: The help text for the menu item to revert to saved configuration.
+			_("Reset all settings to saved state")
+		)
+		self.Bind(wx.EVT_MENU, frame.onRevertToSavedConfigurationCommand, item)
+		item = self.menu.Append(
+			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"),
+			# 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")
+		)
+		self.Bind(wx.EVT_MENU, frame.onRevertToDefaultConfigurationCommand, item)
+		if not globalVars.appArgs.secure:
+			item = self.menu.Append(
+				wx.ID_SAVE,
+				# Translators: The label for the menu item to save current settings.
+				_("&Save configuration"),
+				# Translators: The help text for the menu item to save current settings.
+				_("Write the current configuration to nvda.ini")
+			)
+			self.Bind(wx.EVT_MENU, frame.onSaveConfigurationCommand, item)
 
 def initialize():
 	global mainFrame
diff --git a/tests/checkPot.py b/tests/checkPot.py
@@ -61,9 +61,6 @@
 	'right',
 	'Recognition failed',
 	'NVDA &web site',
-	'Reset all settings to saved state',
-	'Reset all settings to default state',
-	'Write the current configuration to nvda.ini',
 	'E&xit',
 	'Error renaming profile.',
 	'Use this profile for:',
diff --git a/user_docs/en/changes.t2t b/user_docs/en/changes.t2t
@@ -27,6 +27,7 @@ What's New in NVDA
 - The cursor does not switch row or column anymore when using table navigation to navigate through merged cells. (#7278)
 -  NVDA will no longer incorrectly remove text from Java widgets when presenting to the user. (#13102)
 - When reading non-interactive PDFs in Adobe Reader, the type and state of form fields (such as checkboxes and radio buttons) are now reported. (#13285)
+- "Reset configuration to factory defaults" is now accessible in the NVDA menu during secure mode. (#13547)
 -
 
 

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ What's New in NVDA`
`27`	`27`	`- The cursor does not switch row or column anymore when using table navigation to navigate through merged cells. (#7278)`
`28`	`28`	`- NVDA will no longer incorrectly remove text from Java widgets when presenting to the user. (#13102)`
`29`	`29`	`- When reading non-interactive PDFs in Adobe Reader, the type and state of form fields (such as checkboxes and radio buttons) are now reported. (#13285)`
	`30`	`+- "Reset configuration to factory defaults" is now accessible in the NVDA menu during secure mode. (#13547)`
`30`	`31`	`-`
`31`	`32`
`32`	`33`