Merge 8e76ed7 into d0614df

LeonarddeR · web-flow · commit 1c278966fa73 · 2023-10-19T16:57:18.000+10:00
diff --git a/source/config/__init__.py b/source/config/__init__.py
@@ -291,10 +291,7 @@ def getStartAfterLogon() -> bool:
 	has been registered to start after logon on Windows 7
 	or by earlier NVDA versions.
 	"""
-	if (
-		easeOfAccess.canConfigTerminateOnDesktopSwitch
-		and easeOfAccess.willAutoStart(easeOfAccess.AutoStartContext.AFTER_LOGON)
-	):
+	if easeOfAccess.willAutoStart(easeOfAccess.AutoStartContext.AFTER_LOGON):
 		return True
 	try:
 		k = winreg.OpenKey(winreg.HKEY_CURRENT_USER, RegistryKey.RUN.value)
@@ -348,43 +345,34 @@ def setStartAfterLogon(enable: bool) -> None:
 	"""Not to be confused with setStartOnLogonScreen.
 	
 	Toggle if NVDA automatically starts after a logon.
-	Sets easeOfAccess related registry keys on Windows 8 or newer.
-
-	On Windows 7 this sets the registry run key.
+	Sets easeOfAccess related registry keys.
 
 	When toggling off, always delete the registry run key
-	in case it was set by an earlier version of NVDA or on Windows 7 or earlier.
+	in case it was set by an earlier version of NVDA.
 	"""
 	if getStartAfterLogon() == enable:
 		return
-	if easeOfAccess.canConfigTerminateOnDesktopSwitch:
-		easeOfAccess.setAutoStart(easeOfAccess.AutoStartContext.AFTER_LOGON, enable)
-		if enable:
-			return
-		# We're disabling, so ensure the run key is cleared,
-		# as it might have been set by an old version.
-		run = False
-	else:
-		run = enable
+	easeOfAccess.setAutoStart(easeOfAccess.AutoStartContext.AFTER_LOGON, enable)
+	if enable:
+		return
+	# We're disabling, so ensure the run key is cleared,
+	# as it might have been set by an old version.
 	k = winreg.OpenKey(winreg.HKEY_CURRENT_USER, RegistryKey.RUN.value, 0, winreg.KEY_WRITE)
-	if run:
-		winreg.SetValueEx(k, "nvda", None, winreg.REG_SZ, sys.argv[0])
-	else:
-		try:
-			winreg.QueryValue(k, "nvda")
-		except FileNotFoundError:
-			log.debug(
-				"The run registry key is not set for setStartAfterLogon."
-				"This is expected for Windows 8+ which uses ease of access"
-			)
-			return
-		try:
-			winreg.DeleteValue(k, "nvda")
-		except WindowsError:
-			log.error(
-				"Couldn't unset registry key for nvda to start after logon.",
-				exc_info=True
-			)
+	try:
+		winreg.QueryValue(k, "nvda")
+	except FileNotFoundError:
+		log.debug(
+			"The run registry key is not set for setStartAfterLogon."
+			"This is expected since ease of access is used"
+		)
+		return
+	try:
+		winreg.DeleteValue(k, "nvda")
+	except WindowsError:
+		log.error(
+			"Couldn't unset registry key for nvda to start after logon.",
+			exc_info=True
+		)
 
 
 SLAVE_FILENAME = os.path.join(globalVars.appDir, "nvda_slave.exe")
diff --git a/source/easeOfAccess.py b/source/easeOfAccess.py
@@ -13,11 +13,8 @@
 import NVDAState
 import winreg
 import winUser
-import winVersion
 
 
-# Windows >= 8
-canConfigTerminateOnDesktopSwitch: bool = winVersion.getWinVer() >= winVersion.WIN8
 _APP_KEY_NAME = "nvda_nvda_v1"
 
 
@@ -32,6 +29,9 @@ def __getattr__(attrName: str) -> Any:
 	if attrName == "APP_KEY_NAME" and NVDAState._allowDeprecatedAPI():
 		log.warning("APP_KEY_NAME is deprecated.")
 		return _APP_KEY_NAME
+	if attrName == "canConfigTerminateOnDesktopSwitch" and NVDAState._allowDeprecatedAPI():
+		log.warning("canConfigTerminateOnDesktopSwitch is deprecated.")
+		return True
 	raise AttributeError(f"module {repr(__name__)} has no attribute {repr(attrName)}")
 
 
diff --git a/user_docs/en/changes.t2t b/user_docs/en/changes.t2t
@@ -76,6 +76,7 @@ That method receives a ``DriverRegistrar`` object on which the ``addUsbDevices``
 - ``IoThread.autoDeleteApcReference`` has been removed. (#14924, @LeonarddeR)
 - To support capital pitch changes, synthesizers must now explicitly declare their support for the ``PitchCommand`` in the ``supportedCommands`` attribute on the driver. (#15433, @LeonarddeR)
 - ``speechDictHandler.speechDictVars`` has been removed. Use ``NVDAState.WritePaths.speechDictsDir`` instead of ``speechDictHandler.speechDictVars.speechDictsPath``. (#15614, @lukaszgo1)
+- ``easeOfAccess.canConfigTerminateOnDesktopSwitch`` has been removed, as it became obsolete since Windows 7 is no longer supported. (#15644, @LeonarddeR)
 - ``languageHandler.makeNpgettext`` and ``languageHandler.makePgettext`` have been removed.
 ``npgettext`` and ``pgettext`` are supported natively now. (#15546)
 % Insert new list items here as the alias appModule table should be kept at the bottom of this list
