Salastil/DankMaterialShell
1
0
Fork 0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-08-01 19:18:28 -04:00
Code Packages Releases Activity

time: add follow-locale option and squash separate greeter time options

Browse Source 
port 1.5
This commit is contained in:
bbedward
2026-07-13 08:53:09 -04:00
parent 8a0ed8a50f
commit f4f47c0bc5
6 changed files with 72 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickshell/Common/SettingsData.qml
+11 -4
View File
@@ -190,7 +190,12 @@ Singleton {
property int firstDayOfWeek: -1
property bool showWeekNumber: false
property string calendarBackend: "auto"
property bool use24HourClock: true
property string clockFormat: "auto"
readonly property bool localeUses24Hour: {
const fmt = Qt.locale().timeFormat(Locale.ShortFormat).replace(/'[^']*'/g, "");
return !/[aA]/.test(fmt);
}
readonly property bool use24HourClock: clockFormat === "24h" ? true : (clockFormat === "12h" ? false : localeUses24Hour)
property bool showSeconds: false
property bool padHours12Hour: false
property bool useFahrenheit: false
@@ -492,9 +497,6 @@ Singleton {
property bool greeterEnableFprint: false
property bool greeterEnableU2f: false
property string greeterWallpaperPath: ""
property bool greeterUse24HourClock: true
property bool greeterShowSeconds: false
property bool greeterPadHours12Hour: false
property string greeterLockDateFormat: ""
property string greeterFontFamily: ""
property string greeterWallpaperFillMode: ""
@@ -1752,6 +1754,11 @@ Singleton {
delete obj.lockScreenActiveMonitor;
}
if (obj?.use24HourClock !== undefined && obj?.clockFormat === undefined) {
obj.clockFormat = obj.use24HourClock ? "24h" : "12h";
delete obj.use24HourClock;
}
Store.parse(root, obj);
if (obj?.directionalAnimationMode === 3 && frameMode !== "connected")
quickshell/Common/settings/SettingsSpec.js
+3 -6
View File
@@ -42,9 +42,9 @@ var SPEC = {
firstDayOfWeek: { def: -1 },
showWeekNumber: { def: false },
calendarBackend: { def: "auto" },
use24HourClock: { def: true },
showSeconds: { def: false },
padHours12Hour: { def: false },
clockFormat: { def: "auto", onChange: "markGreeterSyncPending" },
showSeconds: { def: false, onChange: "markGreeterSyncPending" },
padHours12Hour: { def: false, onChange: "markGreeterSyncPending" },
useFahrenheit: { def: false },
windSpeedUnit: { def: "kmh" },
nightModeEnabled: { def: false },
@@ -230,9 +230,6 @@ var SPEC = {
greeterEnableFprint: { def: false, onChange: "scheduleAuthApply" },
greeterEnableU2f: { def: false, onChange: "scheduleAuthApply" },
greeterWallpaperPath: { def: "", onChange: "markGreeterSyncPending" },
greeterUse24HourClock: { def: true, onChange: "markGreeterSyncPending" },
greeterShowSeconds: { def: false, onChange: "markGreeterSyncPending" },
greeterPadHours12Hour: { def: false, onChange: "markGreeterSyncPending" },
greeterLockDateFormat: { def: "", onChange: "markGreeterSyncPending" },
greeterFontFamily: { def: "", onChange: "markGreeterSyncPending" },
greeterWallpaperFillMode: { def: "", onChange: "markGreeterSyncPending" },