From 6ff1f2450e2a033308a626d4b439246e7147a372 Mon Sep 17 00:00:00 2001
From: qewer33 <yerdemergul@gmail.com>
Date: Mon, 20 Dec 2021 21:16:14 +0300
Subject: [PATCH] Made 24 hour setting work

---
 package/contents/config/main.xml                | 4 ++--
 package/contents/ui/config/configAppearance.qml | 2 ++
 package/contents/ui/main.qml                    | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/package/contents/config/main.xml b/package/contents/config/main.xml
index afd4a81..f1f6399 100644
--- a/package/contents/config/main.xml
+++ b/package/contents/config/main.xml
@@ -7,9 +7,9 @@
 
   <group name="Appearance">
       <!-- Clock Display Settings -->
-    <entry name="clockUse24hFormat" type="UInt">
+    <entry name="clockUse24hFormat" type="Bool">
       <label>Force the clock to use 12/24 hour time, instead of following the user locale.</label>
-      <default>1</default>
+      <default>true</default>
     </entry>
     <entry name="clockFontColor" type="Color">
       <label>Color of text</label>
diff --git a/package/contents/ui/config/configAppearance.qml b/package/contents/ui/config/configAppearance.qml
index 1dbbd2f..b0fcefe 100644
--- a/package/contents/ui/config/configAppearance.qml
+++ b/package/contents/ui/config/configAppearance.qml
@@ -104,6 +104,8 @@ Item {
             QtControls.CheckBox {
                 id: use24hFormat
                 text: i18n("Use 24-hour clock")
+                tristate: false
+                checked: cfg_clockUse24hFormat
             }
 
             QtLayouts.RowLayout {
diff --git a/package/contents/ui/main.qml b/package/contents/ui/main.qml
index 6a0d62d..f335d21 100644
--- a/package/contents/ui/main.qml
+++ b/package/contents/ui/main.qml
@@ -71,7 +71,8 @@ Item {
                 id: clockLabel
                 anchors.centerIn: parent
 
-                text: Qt.formatTime(currentDateTime).replace(":", ".")
+                text: if (plasmoid.configuration.clockUse24hFormat) Qt.formatTime(currentDateTime, "hh.mm")
+                      else Qt.formatTime(currentDateTime, "hh.mm AP")
 
                 color: plasmoid.configuration.clockFontColor
                 font.family: if (plasmoid.configuration.clockFontFamily === "ccdefault") fontOutfitBold.name