Try to handle timezones with timedatectl provided by systemd instead …

…of liboobs.

lxqt-admin-time/CMakeLists.txt

@@ -10,13 +10,15 @@ set ( lxqt-admin-time_HDRS
     timeadmindialog.h
     datetime.h
     timezone.h
+    timedatectl.h
 )
 
 set ( lxqt-admin-time_SRCS
     main.cpp
     timeadmindialog.cpp
     datetime.cpp
     timezone.cpp
+    timedatectl.cpp
 )
 
 set ( lxqt-admin-time_MOCS

lxqt-admin-time/timeadmindialog.cpp

@@ -31,11 +31,11 @@
 #include <QMessageBox>
 #include <QDateTime>
 #include <QMap>
+#include <QDebug>
 
 #include "datetime.h"
 #include "timezone.h"
 
-
 #define ZONETAB_PATH "/usr/share/zoneinfo/zone.tab"
 
 TimeAdminDialog::TimeAdminDialog(QWidget *parent):
@@ -107,6 +107,8 @@ void TimeAdminDialog::closeEvent(QCloseEvent *event)
 
 void TimeAdminDialog::loadTimeZones(QStringList & timeZones, QString & currentTimezone)
 {
+    currentTimezone = mTimeDateCtl.timeZone();
+
     timeZones.clear();
     QFile file(ZONETAB_PATH);
     if(file.open(QIODevice::ReadOnly))
@@ -124,17 +126,18 @@ void TimeAdminDialog::loadTimeZones(QStringList & timeZones, QString & currentTi
         }
         file.close();
     }
-    currentTimezone = QString::fromLatin1(oobs_time_config_get_timezone(mTimeConfig));
 }
 
 
 
 void TimeAdminDialog::saveChangesToSystem()
 {
-    QByteArray timeZone = mTimezoneWidget->timezone().toLatin1();
+    QString timeZone = mTimezoneWidget->timezone();
     // FIXME: currently timezone settings does not work. is this a bug of system-tools-backend?
-    if(!timeZone.isEmpty() && mWidgetsModified.testFlag(M_TIMEZONE))
-        oobs_time_config_set_timezone(mTimeConfig, timeZone.constData());
+    if(!timeZone.isEmpty() && mWidgetsModified.testFlag(M_TIMEZONE)) {
+        mTimeDateCtl.setTimeZone(timeZone);
+        mTimeDateCtl.commit();
+    }
 
     if(mWidgetsModified.testFlag(M_TIMEDATE))
     {

lxqt-admin-time/timeadmindialog.h

@@ -30,6 +30,8 @@
 #include <oobs/oobs-timeconfig.h>
 #include <oobs/oobs-ntpconfig.h>
 #include <oobs/oobs-ntpserver.h>
+#include "timedatectl.h"
+
 
 class DateTime;
 class Timezone;
@@ -59,6 +61,7 @@ private Q_SLOTS:
     void showChangedStar();
 
 private:
+    TimeDateCtl mTimeDateCtl;
     OobsTimeConfig* mTimeConfig;
     DateTime * mDateTimeWidget;
     Timezone * mTimezoneWidget;

lxqt-admin-time/timedatectl.cpp

@@ -0,0 +1,35 @@
+#include "timedatectl.h"
+#include <QProcess>
+#include <QDebug>
+
+TimeDateCtl::TimeDateCtl()
+{
+    QProcess timedatectl;
+    timedatectl.start(QStringLiteral("timedatectl"));
+    timedatectl.waitForFinished();
+    while(!timedatectl.atEnd()) {
+        QString line = timedatectl.readLine().trimmed();
+        int findTZ = line.indexOf(QLatin1String("Time zone:"));
+        if(findTZ != -1) {
+            findTZ += 10;
+            while(line[findTZ] == ' ')
+                ++findTZ;
+            int space = line.indexOf(' ', findTZ);
+            mTimeZone = line.mid(findTZ, space - findTZ);
+            break;
+        }
+    }
+    timedatectl.close();
+}
+
+bool TimeDateCtl::commit()
+{
+    QProcess timedatectl;
+    QStringList args;
+    if(mTimeZoneChanged) {
+        args << "set-timezone" << mTimeZone;
+    }
+    timedatectl.start(QStringLiteral("timedatectl"), args);
+    timedatectl.waitForFinished();
+    return timedatectl.exitCode() == 0;
+}

lxqt-admin-time/timedatectl.h

@@ -0,0 +1,36 @@
+#ifndef TIMEDATECTL_H
+#define TIMEDATECTL_H
+
+#include <QString>
+#include <QDateTime>
+
+class TimeDateCtl
+{
+public:
+    explicit TimeDateCtl();
+
+    QString timeZone() const {
+        return mTimeZone;
+    }
+
+    void setTimeZone(QString timeZone) {
+        mTimeZone = timeZone;
+        mTimeZoneChanged = true;
+    }
+
+    void setDateTime(QDateTime dateTime) {
+        mDateTime = dateTime;
+        mTimeChanged = true;
+    }
+
+    // really commit the changes to the system
+    bool commit();
+
+private:
+    bool mTimeZoneChanged;
+    QString mTimeZone;
+    bool mTimeChanged;
+    QDateTime mDateTime;
+};
+
+#endif // TIMEDATECTL_H