Merge a2a0ba2 into b880d36

LeonarddeR · web-flow · commit 8dc7a359751b · 2025-02-20T10:23:05.000+01:00
diff --git a/source/config/configSpec.py b/source/config/configSpec.py
@@ -27,7 +27,7 @@
 	#possible log levels are DEBUG, IO, DEBUGWARNING, INFO
 	loggingLevel = string(default="INFO")
 	showWelcomeDialogAtStartup = boolean(default=true)
-	preventDisplayTurnOff = featureFlag(optionsEnum="BoolFlag", behaviorOfDefault="enabled")
+	preventDisplayTurningOff = boolean(default=true)
 
 # Speech settings
 [speech]
diff --git a/source/gui/settingsDialogs.py b/source/gui/settingsDialogs.py
@@ -983,18 +983,14 @@ def makeSettings(self, settingsSizer):
 			if globalVars.appArgs.secure:
 				mirrorBox.Disable()
 
-		self.preventDisplayTurnOffCombo: nvdaControls.FeatureFlagCombo = (
-			settingsSizerHelper.addLabeledControl(
-				labelText=_(
-					# Translators: This is a label for a combo-box in the general settings panel.
-					"Prevent &display from turning off during say all or reading with braille",
-				),
-				wxCtrlClass=nvdaControls.FeatureFlagCombo,
-				keyPath=["general", "preventDisplayTurnOff"],
-				conf=config.conf,
-			)
+		item = self.preventDisplayTurningOffCheckBox = wx.CheckBox(
+			self,
+			# Translators: The label of a checkbox in general settings.
+			label="Prevent &display from turning off during say all or reading with braille",
 		)
-		self.bindHelpEvent("PreventDisplayTurnOff", self.preventDisplayTurnOffCombo)
+		self.bindHelpEvent("PreventDisplayTurningOff", self.preventDisplayTurningOffCheckBox)
+		item.Value = config.conf["general"]["preventDisplayTurningOff"]
+		settingsSizerHelper.addItem(item)
 
 	def onChangeMirrorURL(self, evt: wx.CommandEvent | wx.KeyEvent):
 		"""Show the dialog to change the update mirror URL, and refresh the dialog in response to the URL being changed."""
@@ -1117,7 +1113,7 @@ def onSave(self):
 			updateCheck.terminate()
 			updateCheck.initialize()
 
-		self.preventDisplayTurnOffCombo.saveCurrentValueToConf()
+		config.conf["general"]["preventDisplayTurningOff"] = self.preventDisplayTurningOffCheckBox.IsChecked()
 
 	def onPanelActivated(self):
 		if updateCheck:
diff --git a/source/systemUtils.py b/source/systemUtils.py
@@ -247,21 +247,21 @@ def run(self):
 			log.debugWarning("task had errors", exc_info=True)
 
 
-def preventSystemIdle(preventDisplayTurnOff: bool | None = None, persistent: bool = False) -> None:
+def preventSystemIdle(preventDisplayTurningOff: bool | None = None, persistent: bool = False) -> None:
 	"""
 	Prevent the system from locking the screen or going to sleep.
-	:param preventDisplayTurnOff: If `True`, keep the display awake as well.
+	:param preventDisplayTurningOff: If `True`, keep the display awake as well.
 		if `False`, only avoid system sleep.
 		if `None`, the general setting "prevent display turn off" will be used.
 	:param persistent: If `True`, the state will be maintained until calling :func:`resetThreadExecutionState` is called.
 	"""
-	if preventDisplayTurnOff is None:
+	if preventDisplayTurningOff is None:
 		import config
 
-		preventDisplayTurnOff = bool(config.conf["general"]["preventDisplayTurnOff"])
+		preventDisplayTurningOff = config.conf["general"]["preventDisplayTurningOff"]
 	windll.kernel32.SetThreadExecutionState(
 		winKernel.ES_SYSTEM_REQUIRED
-		| (winKernel.ES_DISPLAY_REQUIRED if preventDisplayTurnOff else 0)
+		| (winKernel.ES_DISPLAY_REQUIRED if preventDisplayTurningOff else 0)
 		| (winKernel.ES_CONTINUOUS if persistent else 0),
 	)
 
diff --git a/user_docs/en/userGuide.md b/user_docs/en/userGuide.md
@@ -1846,18 +1846,13 @@ If you wish to change the update mirror, press the "Change..." button to open th
 Please note that when using an update mirror, the operator of the mirror has access to all [information sent with update checks](#GeneralSettingsCheckForUpdates).
 Contact the operator of the update mirror for details of their data handling policies to ensure you are comfortable with the way your information will be handled before setting an update mirror.
 
-##### Prevent display from turning off during say all or reading with braille {#PreventDisplayTurnOff}
+##### Prevent display from turning off during say all or reading with braille {#PreventDisplayTurningOff}
 
-This option ensures that the display stays on when reading with say all or with braille (e.g. when pressing scroll buttons).
+This check box, when enabled, ensures that the display stays on when reading with say all or with braille (e.g. when pressing scroll buttons).
 This avoids the situation where the screen unexpectedly locks during a say all.
 This option is enabled by default.
 Consider disabling this option if you are suffering from a shorter battery life.
 
-| . {.hideHeaderRow} |.|
-|---|---|
-|Options |Default (Enabled), Disabled, Enabled|
-|Default |Enabled|
-
 #### Speech Settings {#SpeechSettings}
 
 <!-- KC:setting -->
