Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion quickshell/Common/SettingsData.qml
Original file line number Diff line number Diff line change
Expand Up @@ -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";
}
}

Expand Down
10 changes: 10 additions & 0 deletions quickshell/Modules/Greetd/GreetdSettings.qml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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";
Expand All @@ -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;
}
Expand Down
3 changes: 2 additions & 1 deletion quickshell/Modules/Greetd/GreeterContent.qml
Original file line number Diff line number Diff line change
Expand Up @@ -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(':')
Expand Down Expand Up @@ -368,6 +368,7 @@ Item {
return PortalService.profileImage;
}
fallbackIcon: "person"
visible: GreetdSettings.lockScreenShowProfileImage
}

Rectangle {
Expand Down