Conf and GUI/Settings: renamed config item and removed what's new ent…

…ry (review by jteh). re #834.
nvaccess · May 26, 2014 · 80277e3 · 80277e3
1 parent 6a5a60b
commit 80277e3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/source/config/__init__.py b/source/config/__init__.py
@@ -59,7 +59,7 @@ def validateConfig(configObj,validator,validationResult=None,keyList=None):
 	language = string(default="Windows")
 	saveConfigurationOnExit = boolean(default=True)
 	askToExit = boolean(default=true)
-	playStartAndExitSound = boolean(default=true)
+	playStartAndExitSounds = boolean(default=true)
 	#possible log levels are DEBUG, IO, DEBUGWARNING, INFO
 	loggingLevel = string(default="INFO")
 	showWelcomeDialogAtStartup = boolean(default=true)

diff --git a/source/gui/settingsDialogs.py b/source/gui/settingsDialogs.py
@@ -155,10 +155,9 @@ def makeSettings(self, settingsSizer):
 		self.askToExitCheckBox.SetValue(config.conf["general"]["askToExit"])
 		settingsSizer.Add(self.askToExitCheckBox,border=10,flag=wx.BOTTOM)
 		# Translators: The label for a setting in general settings to play sounds when NVDA starts or exits.
-		self.playStartAndExitSoundCheckBox=wx.CheckBox(self,wx.NewId(),label=_("&Play sounds when starting or exiting NVDA"))
-		self.playStartAndExitSoundCheckBox.SetValue(config.conf["general"]["playStartAndExitSound"])
-		settingsSizer.Add(self.playStartAndExitSoundCheckBox,border=10,flag=wx.BOTTOM)
-
+		self.playStartAndExitSoundsCheckBox=wx.CheckBox(self,wx.NewId(),label=_("&Play sounds when starting or exiting NVDA"))
+		self.playStartAndExitSoundsCheckBox.SetValue(config.conf["general"]["playStartAndExitSounds"])
+		settingsSizer.Add(self.playStartAndExitSoundsCheckBox,border=10,flag=wx.BOTTOM)
 		logLevelSizer=wx.BoxSizer(wx.HORIZONTAL)
 		# Translators: The label for a setting in general settings to select logging level of NVDA as it runs (available options and what they are logged are found under comments for the logging level messages themselves).
 		logLevelLabel=wx.StaticText(self,-1,label=_("L&ogging level:"))

diff --git a/user_docs/en/changes.t2t b/user_docs/en/changes.t2t
@@ -11,7 +11,6 @@
 - In accessible Java applications, keyboard shortcuts are now announced for controls that have them. (#3881)
 - In browse mode, labels on landmarks are now reported. They are also included in the Elements List dialog. (#1195)
 - In browse mode, labelled regions are now treated as landmarks. (#3741)
-- A new option in General Settings to play sounds when NVDA starts or exits. (#834)
 
 
 == Bug Fixes ==