diff --git a/quickshell/Common/SettingsData.qml b/quickshell/Common/SettingsData.qml index ea79da04..3e3cb399 100644 --- a/quickshell/Common/SettingsData.qml +++ b/quickshell/Common/SettingsData.qml @@ -876,7 +876,7 @@ Singleton { if (use24HourClock) { return showSeconds ? "hh:mm:ss" : "hh:mm"; } else { - return showSeconds ? "h:mm:ss AP" : "h:mm AP"; + return showSeconds ? "hh:mm:ss AP" : "hh:mm AP"; } } diff --git a/quickshell/Modules/Greetd/GreetdSettings.qml b/quickshell/Modules/Greetd/GreetdSettings.qml index 8faeaf65..900f6667 100644 --- a/quickshell/Modules/Greetd/GreetdSettings.qml +++ b/quickshell/Modules/Greetd/GreetdSettings.qml @@ -40,6 +40,7 @@ Singleton { property string widgetBackgroundColor: "sch" property string lockDateFormat: "" property bool lockScreenShowPowerActions: true + property bool lockScreenShowProfileImage: true property var screenPreferences: ({}) property int animationSpeed: 2 property string wallpaperFillMode: "Fill" @@ -72,6 +73,7 @@ Singleton { widgetBackgroundColor = settings.widgetBackgroundColor !== undefined ? settings.widgetBackgroundColor : "sch"; lockDateFormat = settings.lockDateFormat !== undefined ? settings.lockDateFormat : ""; lockScreenShowPowerActions = settings.lockScreenShowPowerActions !== undefined ? settings.lockScreenShowPowerActions : true; + lockScreenShowProfileImage = settings.lockScreenShowProfileImage !== undefined ? settings.lockScreenShowProfileImage : true; screenPreferences = settings.screenPreferences !== undefined ? settings.screenPreferences : ({}); animationSpeed = settings.animationSpeed !== undefined ? settings.animationSpeed : 2; wallpaperFillMode = settings.wallpaperFillMode !== undefined ? settings.wallpaperFillMode : "Fill"; @@ -89,6 +91,14 @@ Singleton { } } + function getEffectiveTimeFormat() { + if (use24HourClock) { + return showSeconds ? "hh:mm:ss" : "hh:mm"; + } else { + return showSeconds ? "hh:mm:ss AP" : "hh:mm AP"; + } + } + function getEffectiveLockDateFormat() { return lockDateFormat && lockDateFormat.length > 0 ? lockDateFormat : Locale.LongFormat; } diff --git a/quickshell/Modules/Greetd/GreeterContent.qml b/quickshell/Modules/Greetd/GreeterContent.qml index 34e986a9..d112f130 100644 --- a/quickshell/Modules/Greetd/GreeterContent.qml +++ b/quickshell/Modules/Greetd/GreeterContent.qml @@ -218,7 +218,7 @@ Item { spacing: 0 property string fullTimeStr: { - const format = GreetdSettings.use24HourClock ? (GreetdSettings.showSeconds ? "HH:mm:ss" : "HH:mm") : (GreetdSettings.showSeconds ? "h:mm:ss AP" : "h:mm AP"); + const format = GreetdSettings.getEffectiveTimeFormat(); return systemClock.date.toLocaleTimeString(Qt.locale(), format); } property var timeParts: fullTimeStr.split(':') @@ -368,6 +368,7 @@ Item { return PortalService.profileImage; } fallbackIcon: "person" + visible: GreetdSettings.lockScreenShowProfileImage } Rectangle {