Add time format

src/datetime/time.cpp

@@ -21,10 +21,17 @@
 #include "timedated_interface.h"
 
 #include <QDateTime>
+#include <QSettings>
+
+#define FORMAT24H "HH:mm:ss"
+#define FORMAT12H "h:mm:ss ap"
 
 Time::Time(QObject *parent)
     : QObject(parent)
+    , m_settings("cutefishos", "locale")
 {
+    m_twentyFour = m_settings.value("twentyFour", false).toBool();
+
     OrgFreedesktopTimedate1Interface iface(QStringLiteral("org.freedesktop.timedate1"),
                                            QStringLiteral("/org/freedesktop/timedate1"),
                                            QDBusConnection::systemBus());
@@ -88,3 +95,20 @@ void Time::setCurrentDate(const QDate &currentDate)
         emit currentDateChanged();
     }
 }
+
+bool Time::twentyFour() const
+{
+    return m_twentyFour;
+}
+
+void Time::setTwentyFour(bool t)
+{
+    if (m_twentyFour != t) {
+        m_twentyFour = t;
+        m_settings.setValue("twentyFour", m_twentyFour);
+
+        QDBusInterface("com.cutefish.Statusbar", "/Statusbar").call("setTwentyFourTime", m_twentyFour);
+
+        emit twentyFourChanged();
+    }
+}

src/datetime/time.h

@@ -23,6 +23,7 @@
 #include <QObject>
 #include <QTime>
 #include <QDate>
+#include <QSettings>
 
 class Time : public QObject
 {
@@ -30,6 +31,7 @@ class Time : public QObject
     Q_PROPERTY(bool useNtp READ useNtp WRITE setUseNtp NOTIFY useNtpChanged)
     Q_PROPERTY(QTime currentTime READ currentTime WRITE setCurrentTime NOTIFY currentTimeChanged)
     Q_PROPERTY(QDate currentDate READ currentDate WRITE setCurrentDate NOTIFY currentDateChanged)
+    Q_PROPERTY(bool twentyFour READ twentyFour WRITE setTwentyFour NOTIFY twentyFourChanged)
 
 public:
     explicit Time(QObject *parent = nullptr);
@@ -45,15 +47,21 @@ public:
     QDate currentDate() const;
     void setCurrentDate(const QDate &currentDate);
 
+    bool twentyFour() const;
+    void setTwentyFour(bool t);
+
 signals:
     void useNtpChanged();
     void currentTimeChanged();
     void currentDateChanged();
+    void twentyFourChanged();
 
 private:
     bool m_useNtp;
+    bool m_twentyFour;
     QTime m_currentTime;
     QDate m_currentDate;
+    QSettings m_settings;
 };
 
 #endif // TIME_H

src/qml/DateTime/Main.qml

@@ -49,6 +49,8 @@ ItemPage {
             spacing: FishUI.Units.largeSpacing
 
             RoundedItem {
+                spacing: FishUI.Units.largeSpacing * 1.5
+
                 RowLayout {
                     Label {
                         text: qsTr("Auto Sync")
@@ -62,10 +64,28 @@ ItemPage {
                         Layout.fillHeight: true
                         rightPadding: 0
                         rightInset: 0
-                        Component.onCompleted: checked = time.useNtp
+                        checked: time.useNtp
                         onCheckedChanged: time.useNtp = checked
                     }
                 }
+
+                RowLayout {
+                    Label {
+                        text: qsTr("24-Hour Time")
+                    }
+
+                    Item {
+                        Layout.fillWidth: true
+                    }
+
+                    Switch {
+                        Layout.fillHeight: true
+                        rightPadding: 0
+                        rightInset: 0
+                        checked: time.twentyFour
+                        onCheckedChanged: time.twentyFour = checked
+                    }
+                }
             }
 
             StandardButton {

translations/en_US.ts

@@ -573,12 +573,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qml/DateTime/Main.qml" line="54"/>
+        <location filename="../src/qml/DateTime/Main.qml" line="56"/>
         <source>Auto Sync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qml/DateTime/Main.qml" line="83"/>
+        <location filename="../src/qml/DateTime/Main.qml" line="74"/>
+        <source>24-Hour Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qml/DateTime/Main.qml" line="103"/>
         <source>Time Zone</source>
         <translation type="unfinished"></translation>
     </message>

translations/zh_CN.ts

@@ -573,12 +573,17 @@
         <translation>日期和时间</translation>
     </message>
     <message>
-        <location filename="../src/qml/DateTime/Main.qml" line="54"/>
+        <location filename="../src/qml/DateTime/Main.qml" line="56"/>
         <source>Auto Sync</source>
         <translation>自动同步</translation>
     </message>
     <message>
-        <location filename="../src/qml/DateTime/Main.qml" line="83"/>
+        <location filename="../src/qml/DateTime/Main.qml" line="74"/>
+        <source>24-Hour Time</source>
+        <translation>24小时制</translation>
+    </message>
+    <message>
+        <location filename="../src/qml/DateTime/Main.qml" line="103"/>
         <source>Time Zone</source>
         <translation>时区</translation>
     </message>