From f95c9b76d4932ad2e389504128e43fd8cdb64ebb Mon Sep 17 00:00:00 2001
From: LemmyCook <studio@quadbyte.net>
Date: Sun, 7 Sep 2025 14:40:33 -0400
Subject: [PATCH] Clock fully migrated to new user settings

---
 Commons/Settings.qml                                   |  2 +-
 Modules/Bar/Widgets/Clock.qml                          | 10 +++++-----
 .../SettingsPanel/Extras/BarWidgetSettingsDialog.qml   |  9 +++++++++
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/Commons/Settings.qml b/Commons/Settings.qml
index d0e94dd..24e83d4 100644
--- a/Commons/Settings.qml
+++ b/Commons/Settings.qml
@@ -124,7 +124,7 @@ Singleton {
       widget.showDate = adapter.location.showDateWithClock
       widget.use12HourClock = adapter.location.use12HourClock
       widget.reverseDayMonth = adapter.location.reverseDayMonth
-      widget.showSeconds = BarWidgetRegistry.widgetMetadata[widget.id].reverseDayMonth
+      widget.showSeconds = BarWidgetRegistry.widgetMetadata[widget.id].showSeconds
       break
     }
   }
diff --git a/Modules/Bar/Widgets/Clock.qml b/Modules/Bar/Widgets/Clock.qml
index a9bb3de..3067e7c 100644
--- a/Modules/Bar/Widgets/Clock.qml
+++ b/Modules/Bar/Widgets/Clock.qml
@@ -28,13 +28,13 @@ Rectangle {
   }
 
   // Resolve settings: try user settings or defaults from BarWidgetRegistry
-  readonly property bool showDate: widgetSettings.showDate || BarWidgetRegistry.widgetMetadata["Clock"].showDate
+  readonly property bool showDate: widgetSettings.showDate
+                                   !== undefined ? widgetSettings.showDate : BarWidgetRegistry.widgetMetadata["Clock"].showDate
   readonly property bool use12h: widgetSettings.use12HourClock
-                                 || BarWidgetRegistry.widgetMetadata["Clock"].use12HourClock
+                                 !== undefined ? widgetSettings.use12HourClock : BarWidgetRegistry.widgetMetadata["Clock"].use12HourClock
   readonly property bool showSeconds: widgetSettings.showSeconds
-                                      || BarWidgetRegistry.widgetMetadata["Clock"].showSeconds
-  readonly property bool reverseDayMonth: widgetSettings.reverseDayMonth
-                                          || BarWidgetRegistry.widgetMetadata["Clock"].reverseDayMonth
+                                      !== undefined ? widgetSettings.showSeconds : BarWidgetRegistry.widgetMetadata["Clock"].showSeconds
+  readonly property bool reverseDayMonth: widgetSettings.reverseDayMonth !== undefined ? widgetSettings.reverseDayMonth : BarWidgetRegistry.widgetMetadata["Clock"].reverseDayMonth
 
   implicitWidth: clock.width + Style.marginM * 2 * scaling
   implicitHeight: Math.round(Style.capsuleHeight * scaling)
diff --git a/Modules/SettingsPanel/Extras/BarWidgetSettingsDialog.qml b/Modules/SettingsPanel/Extras/BarWidgetSettingsDialog.qml
index 2bf2d83..b35d3ce 100644
--- a/Modules/SettingsPanel/Extras/BarWidgetSettingsDialog.qml
+++ b/Modules/SettingsPanel/Extras/BarWidgetSettingsDialog.qml
@@ -273,12 +273,15 @@ Popup {
                                  !== undefined ? settingsPopup.widgetData.use12HourClock : BarWidgetRegistry.widgetMetadata["Clock"].use12HourClock
       property bool valueShowSeconds: settingsPopup.widgetData.showSeconds
                                       !== undefined ? settingsPopup.widgetData.showSeconds : BarWidgetRegistry.widgetMetadata["Clock"].showSeconds
+      property bool valueReverseDayMonth: settingsPopup.widgetData.reverseDayMonth
+                                          !== undefined ? settingsPopup.widgetData.reverseDayMonth : BarWidgetRegistry.widgetMetadata["Clock"].reverseDayMonth
 
       function saveSettings() {
         var settings = Object.assign({}, settingsPopup.widgetData)
         settings.showDate = valueShowDate
         settings.use12HourClock = valueUse12h
         settings.showSeconds = valueShowSeconds
+        settings.reverseDayMonth = valueReverseDayMonth
         return settings
       }
 
@@ -299,6 +302,12 @@ Popup {
         checked: valueShowSeconds
         onToggled: checked => valueShowSeconds = checked
       }
+
+      NCheckbox {
+        label: "Reverse day and month"
+        checked: valueReverseDayMonth
+        onToggled: checked => valueReverseDayMonth = checked
+      }
     }
   }