Fix GTK3 Dark theme. (#17)

* Create devcontainer.json

* Update devcontainer.json

* Change icon theme in setDarkMode

* Added dbus interface darkIconTheme and setDarkIconTheme.

* Clean up

* Fix DarkIconTheme

Author: elysia-best

settings-daemon/theme/com.lingmo.Theme.xml

@@ -63,6 +63,9 @@
     </method>
     <method name="setIconTheme">
         <arg name="type" type="s" direction="in"/>
+    </method>    
+    <method name="setDarkIconTheme">
+        <arg name="type" type="s" direction="in"/>
     </method>
 
     <method name="applyXResources"></method>
@@ -88,7 +91,8 @@
     <property name="backgroundColor" type="s" access="read"/>
     <property name="cursorTheme" type="s" access="read"/>
     <property name="cursorSize" type="i" access="read"/>
-    <property name="iconTheme" type="s" access="read"/>
+    <property name="iconTheme" type="s" access="read"/>    
+    <property name="darkIconTheme" type="s" access="read"/>
 
     <signal name="darkModeChanged">
         <arg type="b"/>

settings-daemon/theme/thememanager.cpp

@@ -85,6 +85,7 @@ ThemeManager::ThemeManager(QObject *parent)
     m_cursorTheme = m_settings->value("CursorTheme", "default").toString();
     m_cursorSize = m_settings->value("CursorSize", 24).toInt();
     m_iconTheme = m_settings->value("IconTheme", "Crule").toString();
+    m_darkIconTheme = m_settings->value("DarkIconTheme", "Crule-dark").toString();
 
     // Start the DE and need to update the settings again.
     updateGtk3Config();
@@ -456,7 +457,7 @@ void ThemeManager::updateGtk3Config()
     // dark mode
     settings.setValue("gtk-application-prefer-dark-theme", isDarkMode());
     // icon theme
-    settings.setValue("gtk-icon-theme-name", isDarkMode() ? "Crule-dark" : "Crule");
+    settings.setValue("gtk-icon-theme-name", isDarkMode() ? m_darkIconTheme : m_iconTheme);
     // other
     settings.setValue("gtk-enable-animations", true);
     // theme
@@ -617,3 +618,19 @@ void ThemeManager::setIconTheme(const QString &iconTheme)
     updateGtk3Config();
     emit iconThemeChanged();
 }
+
+QString ThemeManager::darkIconTheme() const
+{
+    return m_darkIconTheme;
+}
+
+void ThemeManager::setDarkIconTheme(const QString &iconTheme)
+{
+    if (m_darkIconTheme == iconTheme)
+        return;
+
+    m_darkIconTheme = iconTheme;
+    m_settings->setValue("DarkIconTheme", m_iconTheme);
+    updateGtk3Config();
+    emit iconThemeChanged();
+}

settings-daemon/theme/thememanager.h

@@ -47,6 +47,7 @@ class ThemeManager : public QObject
     Q_PROPERTY(QString cursorTheme READ cursorTheme WRITE setCursorTheme NOTIFY cursorThemeChanged)
     Q_PROPERTY(int cursorSize READ cursorSize WRITE setCursorSize NOTIFY cursorSizeChanged)
     Q_PROPERTY(QString iconTheme READ iconTheme WRITE setIconTheme NOTIFY iconThemeChanged)
+    Q_PROPERTY(QString darkIconTheme READ darkIconTheme WRITE setDarkIconTheme NOTIFY iconThemeChanged)
 
 public:
     static ThemeManager *self();
@@ -114,6 +115,9 @@ class ThemeManager : public QObject
     QString iconTheme() const;
     void setIconTheme(const QString &iconTheme);
 
+    QString darkIconTheme() const;
+    void setDarkIconTheme(const QString &iconTheme);
+
     void updateFontConfig();
 
 signals:
@@ -152,7 +156,9 @@ class ThemeManager : public QObject
     QString m_cursorTheme;
     int m_cursorSize;
 
-    QString m_iconTheme;
+    QString m_iconTheme = "Crule";
+
+    QString m_darkIconTheme = "Crule-dark";
 };
 
 #endif