From bef0739471f2dd91c88c546a6c47406594918012 Mon Sep 17 00:00:00 2001 From: end-4 <97237370+end-4@users.noreply.github.com> Date: Thu, 5 Jun 2025 13:27:38 +0200 Subject: [PATCH] config option for time format --- .config/quickshell/modules/common/ConfigOptions.qml | 6 ++++++ .../quickshell/modules/sidebarRight/BottomWidgetGroup.qml | 2 +- .config/quickshell/services/DateTime.qml | 8 +++----- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.config/quickshell/modules/common/ConfigOptions.qml b/.config/quickshell/modules/common/ConfigOptions.qml index 44e26bf5..91ba7040 100644 --- a/.config/quickshell/modules/common/ConfigOptions.qml +++ b/.config/quickshell/modules/common/ConfigOptions.qml @@ -103,6 +103,12 @@ Singleton { } } + property QtObject time: QtObject { + // https://doc.qt.io/qt-6/qtime.html#toString + property string format: "hh:mm" + property string dateFormat: "dddd, dd/MM" + } + property QtObject hacks: QtObject { property int arbitraryRaceConditionDelay: 20 // milliseconds } diff --git a/.config/quickshell/modules/sidebarRight/BottomWidgetGroup.qml b/.config/quickshell/modules/sidebarRight/BottomWidgetGroup.qml index 882d3a03..a29ddded 100644 --- a/.config/quickshell/modules/sidebarRight/BottomWidgetGroup.qml +++ b/.config/quickshell/modules/sidebarRight/BottomWidgetGroup.qml @@ -97,7 +97,7 @@ Rectangle { property int remainingTasks: Todo.list.filter(task => !task.done).length; Layout.margins: 10 Layout.leftMargin: 0 - text: `${DateTime.day} ${DateTime.month} ${DateTime.year} • ${remainingTasks} task${remainingTasks > 1 ? "s" : ""}` + text: `${DateTime.collapsedCalendarFormat} • ${remainingTasks} task${remainingTasks > 1 ? "s" : ""}` font.pixelSize: Appearance.font.pixelSize.large color: Appearance.colors.colOnLayer1 } diff --git a/.config/quickshell/services/DateTime.qml b/.config/quickshell/services/DateTime.qml index 36eb7a4a..4f24e944 100644 --- a/.config/quickshell/services/DateTime.qml +++ b/.config/quickshell/services/DateTime.qml @@ -9,11 +9,9 @@ pragma ComponentBehavior: Bound * A nice wrapper for date and time strings. */ Singleton { - property string time: Qt.formatDateTime(clock.date, "hh:mm") - property string date: Qt.formatDateTime(clock.date, "dddd, dd/MM") - property string day: Qt.formatDateTime(clock.date, "dd") - property string month: Qt.formatDateTime(clock.date, "MMMM") - property string year: Qt.formatDateTime(clock.date, "yyyy") + property string time: Qt.formatDateTime(clock.date, ConfigOptions?.time.format ?? "hh:mm") + property string date: Qt.formatDateTime(clock.date, ConfigOptions?.time.dateFormat ?? "dddd, dd/MM") + property string collapsedCalendarFormat: Qt.formatDateTime(clock.date, "dd MMMM yyyy") property string uptime: "0h, 0m" SystemClock {