From 335ef3fb680632dbb1b82075e6b7bb680699b65d Mon Sep 17 00:00:00 2001
From: reionwong <reionwong@gmail.com>
Date: Fri, 3 Sep 2021 23:40:10 +0800
Subject: [PATCH] Using dock new interface

---
 src/appearance.cpp | 54 ++++++++++++++++++++++++++--------------------
 src/appearance.h   |  2 --
 2 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/src/appearance.cpp b/src/appearance.cpp
index e77f433..0664b1f 100644
--- a/src/appearance.cpp
+++ b/src/appearance.cpp
@@ -37,7 +37,6 @@ Appearance::Appearance(QObject *parent)
     , m_dockSettings(new QSettings(QSettings::UserScope, "cutefishos", "dock"))
     , m_kwinSettings(new QSettings(QStandardPaths::writableLocation(QStandardPaths::ConfigLocation) + "/kwinrc",
                                    QSettings::IniFormat))
-    , m_dockConfigWacher(new QFileSystemWatcher(this))
     , m_dockIconSize(0)
     , m_dockDirection(0)
     , m_dockVisibility(0)
@@ -52,19 +51,6 @@ Appearance::Appearance(QObject *parent)
     m_dockRoundedWindow = m_dockSettings->value("RoundedWindow").toBool();
     m_systemEffects = !m_kwinSettings->value("OpenGLIsUnsafe", false).toBool();
 
-    m_dockConfigWacher->addPath(m_dockSettings->fileName());
-    connect(m_dockConfigWacher, &QFileSystemWatcher::fileChanged, this, [=] {
-        m_dockSettings->sync();
-        m_dockIconSize = m_dockSettings->value("IconSize").toInt();
-        m_dockDirection = m_dockSettings->value("Direction").toInt();
-        m_dockConfigWacher->addPath(m_dockSettings->fileName());
-        m_dockRoundedWindow = m_dockSettings->value("RoundedWindow").toBool();
-
-        emit dockIconSizeChanged();
-        emit dockDirectionChanged();
-        emit dockRoundedWindowChanged();
-    });
-
     // Init
     if (m_interface.isValid()) {
         m_fontPointSize = m_interface.property("systemFontPointSize").toInt();
@@ -97,11 +83,18 @@ int Appearance::dockIconSize() const
 
 void Appearance::setDockIconSize(int dockIconSize)
 {
-    if (m_dockIconSize == dockIconSize)
-        return;
+    if (m_dockIconSize != dockIconSize) {
+        QDBusInterface iface("org.cutefish.Dock",
+                             "/Dock",
+                             "org.cutefish.Dock",
+                             QDBusConnection::sessionBus());
+        if (iface.isValid()) {
+            iface.asyncCall("setIconSize", dockIconSize);
+        }
 
-    m_dockIconSize = dockIconSize;
-    m_dockSettings->setValue("IconSize", m_dockIconSize);
+        m_dockIconSize = dockIconSize;
+        emit dockIconSizeChanged();
+    }
 }
 
 int Appearance::dockDirection() const
@@ -111,11 +104,18 @@ int Appearance::dockDirection() const
 
 void Appearance::setDockDirection(int dockDirection)
 {
-    if (m_dockDirection == dockDirection)
-        return;
+    if (m_dockDirection != dockDirection) {
+        QDBusInterface iface("org.cutefish.Dock",
+                             "/Dock",
+                             "org.cutefish.Dock",
+                             QDBusConnection::sessionBus());
+        if (iface.isValid()) {
+            iface.asyncCall("setDirection", dockDirection);
+        }
 
-    m_dockDirection = dockDirection;
-    m_dockSettings->setValue("Direction", m_dockDirection);
+        m_dockDirection = dockDirection;
+        emit dockDirectionChanged();
+    }
 }
 
 int Appearance::dockVisibility() const
@@ -127,7 +127,15 @@ void Appearance::setDockVisibility(int visibility)
 {
     if (m_dockVisibility != visibility) {
         m_dockVisibility = visibility;
-        m_dockSettings->setValue("Visibility", m_dockVisibility);
+
+        QDBusInterface iface("org.cutefish.Dock",
+                             "/Dock",
+                             "org.cutefish.Dock",
+                             QDBusConnection::sessionBus());
+        if (iface.isValid()) {
+            iface.asyncCall("setVisibility", visibility);
+        }
+
         emit dockVisibilityChanged();
     }
 }
diff --git a/src/appearance.h b/src/appearance.h
index 170ed36..b218bc7 100644
--- a/src/appearance.h
+++ b/src/appearance.h
@@ -22,7 +22,6 @@
 
 #include <QObject>
 #include <QSettings>
-#include <QFileSystemWatcher>
 #include <QDBusInterface>
 
 class Appearance : public QObject
@@ -85,7 +84,6 @@ private:
     QDBusInterface m_interface;
     QSettings *m_dockSettings;
     QSettings *m_kwinSettings;
-    QFileSystemWatcher *m_dockConfigWacher;
     bool m_dockRoundedWindow;
 
     int m_dockIconSize;