feat: 使用dbus支持kde的暗色模式

src/backend/ThemeChecker.cpp

@@ -0,0 +1,44 @@
+#include "ThemeChecker.h"
+#include <QTimer>
+#include <QProcess>
+#include <QDebug>
+
+ThemeChecker::ThemeChecker(QObject *parent) : QObject(parent), lastColorSchema(-1) {
+    timer = new QTimer(this);
+    connect(timer, SIGNAL(timeout()), this, SLOT(checkThemeChange()));
+    timer->start(1000);
+}
+
+void ThemeChecker::checkThemeChange() {
+
+
+    QProcess process;
+    QStringList parameters;
+    parameters << "-c" << "dbus-send --session --print-reply=literal --reply-timeout=1000 --dest=org.freedesktop.portal.Desktop /org/freedesktop/portal/desktop org.freedesktop.portal.Settings.Read string:'org.freedesktop.appearance' string:'color-scheme'";
+    process.start("/bin/sh", parameters);
+
+    if (process.waitForFinished(-1)) {
+        QString errorOutput = QString(process.readAllStandardError()).trimmed();
+        if (!errorOutput.isEmpty()) {
+            qWarning() << "检测到DBus错误:" << errorOutput;
+            return;
+        }
+
+        QString output = QString(process.readAll()).trimmed();
+        int systemColorSchema = output.right(1).toInt();
+
+        if(systemColorSchema != lastColorSchema) {
+            lastColorSchema = systemColorSchema;
+            qDebug() << "主题已更改，新的主题是：" << systemColorSchema;
+            if(systemColorSchema == 1){
+                emit themeChanged(true);
+            }
+            else if(systemColorSchema == 0 || systemColorSchema == 2){
+                emit themeChanged(false);
+            }
+        }
+    } else {
+        qWarning() << "DBus调用未能完成";
+    }
+}
+

src/backend/ThemeChecker.h

@@ -0,0 +1,26 @@
+#ifndef THEMECHECKER_H
+#define THEMECHECKER_H
+
+#include <QObject>
+#include <QTimer>
+
+
+class ThemeChecker : public QObject
+{
+    Q_OBJECT
+public:
+    explicit ThemeChecker(QObject *parent = nullptr);
+
+signals:
+    void themeChanged(bool isDark);
+
+public slots:
+    void checkThemeChange();
+
+
+private:
+    int lastColorSchema;
+    QTimer *timer;
+};
+
+#endif // THEMECHECKER_H

src/mainwindow-dtk.cpp

@@ -16,6 +16,8 @@
 #include <QtConcurrent>
 #include <unistd.h>
 
+#include <backend/ThemeChecker.h>
+
 #define AppPageApplist 0
 #define AppPageSearchlist 1
 #define AppPageAppdetail 2
@@ -267,57 +269,85 @@ void MainWindow::initTrayIcon()
     trayIcon->show();
 }
 
-void MainWindow::initConnections()
+void MainWindow::refreshTheme(bool isDarkMode)
 {
-    // 主题切换
+    // 使用isDarkMode变量来判断是否是深色模式
-    connect(DGuiApplicationHelper::instance(), &DGuiApplicationHelper::themeTypeChanged, this, [=](DGuiApplicationHelper::ColorType themeType)
+    if (isDarkMode) {
-            {
+        //深色模式
-        if (themeType == DGuiApplicationHelper::DarkType) {
+        setMaskColor(QColor("#2a2b2b"));
-            //深色模式
+        backButton->setIcon(QIcon(":/icon/dark/back.svg"));
-            setMaskColor(QColor("#2a2b2b"));
+        downloadButton->setIcon(":/icon/dark/download.svg");
-            backButton->setIcon(QIcon(":/icon/dark/back.svg"));
+        downloadButton->setBackgroundColor(QColor("#444444"));
-            downloadButton->setIcon(":/icon/dark/download.svg");
+        downloadButton->setColor(QColor("#66CCFF"));
-            downloadButton->setBackgroundColor(QColor("#444444"));
+        ui->pushButton_14->setIcon(QIcon(":/icon/dark/update.svg"));
-            downloadButton->setColor(QColor("#66CCFF"));
+        for (int i = 0; i < ui->buttonGroup->buttons().size(); i++) {
-            ui->pushButton_14->setIcon(QIcon(":/icon/dark/update.svg"));
+            ui->buttonGroup->buttons()[i]->setIcon(QIcon(":/icon/dark/leftbutton_" + QString::number(i) + ".svg"));
-            for (int i = 0; i < ui->buttonGroup->buttons().size(); i++) {
+            if (QLocale::system().name() == "zh_CN") {
-                ui->buttonGroup->buttons()[i]->setIcon(QIcon(":/icon/dark/leftbutton_" + QString::number(i) + ".svg"));
+                ui->buttonGroup->buttons()[i]->setStyleSheet("QPushButton{background-color:transparent;}\
-                if (QLocale::system().name() == "zh_CN") {
+                                                                QPushButton:hover{background-color:#7a7a7a;border:0px;border-radius:8px;}\
-                    ui->buttonGroup->buttons()[i]->setStyleSheet("QPushButton{background-color:transparent;}\
+                                                                QPushButton:checked{background-color:#6e6e6e;border:0px;border-radius:8px;}");
-                                                                  QPushButton:hover{background-color:#7a7a7a;border:0px;border-radius:8px;}\
+            } else {
-                                                                  QPushButton:checked{background-color:#6e6e6e;border:0px;border-radius:8px;}");
+                ui->buttonGroup->buttons()[i]->setStyleSheet("QPushButton{background-color:transparent;text-align: left; padding-left: 15px;}\
-                } else {
+                                                                QPushButton:hover{background-color:#7a7a7a;border:0px;border-radius:8px;text-align: left; padding-left: 15px;}\
-                    ui->buttonGroup->buttons()[i]->setStyleSheet("QPushButton{background-color:transparent;text-align: left; padding-left: 15px;}\
+                                                                QPushButton:checked{background-color:#6e6e6e;border:0px;border-radius:8px;text-align: left; padding-left: 15px;}");
-                                                                  QPushButton:hover{background-color:#7a7a7a;border:0px;border-radius:8px;text-align: left; padding-left: 15px;}\
-                                                                  QPushButton:checked{background-color:#6e6e6e;border:0px;border-radius:8px;text-align: left; padding-left: 15px;}");
-                }
-            }
-        } else {
-            //亮色模式
-            setMaskColor(QColor("#f3f7f8"));
-            backButton->setIcon(QIcon(":/icon/light/back.svg"));
-            downloadButton->setBackgroundColor(QColor("#e3e4e4"));
-            downloadButton->setColor(QColor("#66CCFF"));
-            downloadButton->setIcon(":/icon/light/download.svg");
-            ui->pushButton_14->setIcon(QIcon(":/icon/light/update.svg"));
-            for (int i = 0; i < ui->buttonGroup->buttons().size(); i++) {
-                ui->buttonGroup->buttons()[i]->setIcon(QIcon(":/icon/light/leftbutton_" + QString::number(i) + ".svg"));
-                if (QLocale::system().name() == "zh_CN") {
-                    ui->buttonGroup->buttons()[i]->setStyleSheet("QPushButton{background-color:transparent;}\
-                                                                  QPushButton:hover{background-color:#eAeAeA;border:0px;border-radius:8px;}\
-                                                                  QPushButton:checked{background-color:#dddddd;border:0px;border-radius:8px;}");
-                } else {
-                    ui->buttonGroup->buttons()[i]->setStyleSheet("QPushButton{background-color:transparent;text-align: left; padding-left: 15px;}\
-                                                                  QPushButton:hover{background-color:#eAeAeA;border:0px;border-radius:8px;text-align: left; padding-left: 15px;}\
-                                                                  QPushButton:checked{background-color:#dddddd;border:0px;border-radius:8px;text-align: left; padding-left: 15px;}");
-                }
             }
         }
-        ui->pushButton_14->setStyleSheet(ui->pushButton_4->styleSheet());
+    } else {
-        ui->applistpage->setTheme(themeType == DGuiApplicationHelper::DarkType);
+        //亮色模式
-        ui->applistpage_1->setTheme(themeType == DGuiApplicationHelper::DarkType);
+        setMaskColor(QColor("#f3f7f8"));
-        ui->appintopage->setTheme(themeType == DGuiApplicationHelper::DarkType);
+        backButton->setIcon(QIcon(":/icon/light/back.svg"));
-        ui->settingspage->setTheme(themeType == DGuiApplicationHelper::DarkType); });
+        downloadButton->setBackgroundColor(QColor("#e3e4e4"));
+        downloadButton->setColor(QColor("#66CCFF"));
+        downloadButton->setIcon(":/icon/light/download.svg");
+        ui->pushButton_14->setIcon(QIcon(":/icon/light/update.svg"));
+        for (int i = 0; i < ui->buttonGroup->buttons().size(); i++) {
+            ui->buttonGroup->buttons()[i]->setIcon(QIcon(":/icon/light/leftbutton_" + QString::number(i) + ".svg"));
+            if (QLocale::system().name() == "zh_CN") {
+                ui->buttonGroup->buttons()[i]->setStyleSheet("QPushButton{background-color:transparent;}\
+                                                                QPushButton:hover{background-color:#eAeAeA;border:0px;border-radius:8px;}\
+                                                                QPushButton:checked{background-color:#dddddd;border:0px;border-radius:8px;}");
+            } else {
+                ui->buttonGroup->buttons()[i]->setStyleSheet("QPushButton{background-color:transparent;text-align: left; padding-left: 15px;}\
+                                                                QPushButton:hover{background-color:#eAeAeA;border:0px;border-radius:8px;text-align: left; padding-left: 15px;}\
+                                                                QPushButton:checked{background-color:#dddddd;border:0px;border-radius:8px;text-align: left; padding-left: 15px;}");
+            }
+        }
+    }
+    ui->pushButton_14->setStyleSheet(ui->pushButton_4->styleSheet());
+    ui->applistpage->setTheme(isDarkMode);
+    ui->applistpage_1->setTheme(isDarkMode);
+    ui->appintopage->setTheme(isDarkMode);
+    ui->settingspage->setTheme(isDarkMode); 
+}
+
+void MainWindow::onThemeChanged(bool isDark) {
+    DGuiApplicationHelper::ColorType currentTheme = DGuiApplicationHelper::instance()->themeType();
+
+    // 检查是否用户手动设置为暗色模式
+    bool isUserSetDark = (currentTheme == DGuiApplicationHelper::DarkType);
+    bool isUserSetWhite = !(currentTheme == DGuiApplicationHelper::LightType);
+
+    if (!isUserSetDark && !isUserSetWhite) {
+        // 否则，根据传入的 isDark 值设置
+        refreshTheme(isDark);
+    }
+}
+
+
+void MainWindow::initConnections()
+{
+    
+    // 主题切换
+    connect(DGuiApplicationHelper::instance(), &DGuiApplicationHelper::themeTypeChanged, this, [=](DGuiApplicationHelper::ColorType themeType)
+        {
+            bool isDarkMode = (themeType == DGuiApplicationHelper::ColorType::DarkType);   
+            refreshTheme(isDarkMode); 
+        });
+    
+    ThemeChecker *themeChecker = new ThemeChecker(this);
+    connect(themeChecker, SIGNAL(themeChanged(bool)), this, SLOT(onThemeChanged(bool)));
+
+   
 
     // appintopage按下下载按钮时标题栏下载列表按钮抖动
     connect(ui->appintopage, &AppIntoPage::clickedDownloadBtn, [=]()

src/mainwindow-dtk.h

@@ -30,6 +30,8 @@ public:
     void openUrl(const QString &url);
 
     bool isCloseWindowAnimation();
+    void refreshTheme(bool isDarkMode);
+
 
 protected:
     void closeEvent(QCloseEvent *event) override;
@@ -48,6 +50,7 @@ private:
 
 public slots:
     void notify(QObject *receiver, QEvent *event);
+    void onThemeChanged(bool isDark);
 
 private slots:
     //接受来自dbus的url

src/spark-store.pro

@@ -35,6 +35,7 @@ PKGCONFIG += dtkcore dtkgui dtkwidget
 
 SOURCES += \
         backend/DataCollectorAndUploader.cpp \
+        backend/ThemeChecker.cpp \
         backend/downloadworker.cpp \
         backend/image_show.cpp \
         backend/sparkapi.cpp \
@@ -60,6 +61,7 @@ SOURCES += \
 
 HEADERS += \
         backend/DataCollectorAndUploader.h \
+        backend/ThemeChecker.h \
         backend/downloadworker.h \
         backend/image_show.h \
         backend/sparkapi.h \