Merge 389287a into 861c690

cary-rowen · web-flow · commit cf580cb9ac90 · 2023-05-31T16:24:39.000+10:00
diff --git a/source/globalCommands.py b/source/globalCommands.py
@@ -33,6 +33,7 @@
 import globalVars
 from logHandler import log
 import gui
+import systemUtils
 import wx
 import config
 from config.configFlags import TetherTo
@@ -263,7 +264,7 @@ def script_reportCurrentSelection(self,gesture):
 			speech.speakMessage(_("No selection"))
 		else:
 			speech.speakTextSelected(info.text)
-
+
 	@script(
 		# Translators: Input help mode message for report date and time command.
 		description=_("If pressed once, reports the current time. If pressed twice, reports the current date"),
@@ -272,7 +273,10 @@ def script_reportCurrentSelection(self,gesture):
 	)
 	def script_dateTime(self,gesture):
 		if scriptHandler.getLastScriptRepeatCount()==0:
-			text=winKernel.GetTimeFormatEx(winKernel.LOCALE_NAME_USER_DEFAULT, winKernel.TIME_NOSECONDS, None, None)
+			if systemUtils._isSystemClockSecondsVisible():
+				text = winKernel.GetTimeFormatEx(winKernel.LOCALE_NAME_USER_DEFAULT, None, None, None)
+			else:
+				text = winKernel.GetTimeFormatEx(winKernel.LOCALE_NAME_USER_DEFAULT, winKernel.TIME_NOSECONDS, None, None)
 		else:
 			text=winKernel.GetDateFormatEx(winKernel.LOCALE_NAME_USER_DEFAULT, winKernel.DATE_LONGDATE, None, None)
 		ui.message(text)
@@ -2747,7 +2751,6 @@ def script_log_markStartThenCopy(self, gesture):
 	)
 	@gui.blockAction.when(gui.blockAction.Context.SECURE_MODE)
 	def script_openUserConfigurationDirectory(self, gesture):
-		import systemUtils
 		systemUtils.openUserConfigurationDirectory()
 
 	@script(
diff --git a/source/systemUtils.py b/source/systemUtils.py
@@ -13,6 +13,7 @@
 	windll,
 )
 import winKernel
+import winreg
 import shellapi
 import winUser
 import functools
@@ -189,3 +190,22 @@ def _displayTextFileWorkaround(file: str) -> None:
 	# Since this may be a bug in Python 3.7's os.startfile, or the underlying Win32 function, it may be
 	# possible to deprecate this workaround after a Python upgrade.
 	startfile(file, operation="edit")
+
+def _isSystemClockSecondsVisible() -> bool:
+	"""
+	Query the value of 'ShowSecondsInSystemClock' DWORD32 value in the Windows registry under
+	the path HKEY_CURRENT_USER\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Advanced.
+	If the value is 1, return True, if the value is 0 or the key does not exist, return False.
+
+	@return: True if the 'ShowSecondsInSystemClock' value is 1, False otherwise.
+	"""
+	registry_path = r"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced"
+	value_name = "ShowSecondsInSystemClock"
+	try:
+		with winreg.OpenKey(winreg.HKEY_CURRENT_USER, registry_path) as key:
+			value, value_type = winreg.QueryValueEx(key, value_name)
+			return value == 1 and value_type == winreg.REG_DWORD
+	except FileNotFoundError:
+		return False
+	except OSError:
+		return False
