Fix the theme to other color when the system theme is dark. See: KangLin/RabbitRemoteControl#68

Author: KangLin

ChangeLog.md

@@ -7,6 +7,7 @@
   - QTextBrowser replace QTextEdit
   - Package MacOS to end
   - Fix Unable to change "Icon theme" after disabling it. See: https://github.com/KangLin/RabbitRemoteControl/issues/69
+  - Fix the theme to other color when the system theme is dark. See: https://github.com/KangLin/RabbitRemoteControl/pull/68
 
 ### Version v2.3.3
   - CAdminAuthorization: Add pkexec in linux

ChangeLog_zh_CN.md

@@ -7,6 +7,7 @@
   - 用　QTextBrowser 替换 QTextEdit
   - 完成　MacOS 打包
   - 修复禁用“图标主题”后，不能选择的错误。 See: https://github.com/KangLin/RabbitRemoteControl/issues/69
+  - 修复在黑暗主题下系统托盘图标为白色. See: https://github.com/KangLin/RabbitRemoteControl/pull/68
 
 ### 版本： v2.3.3
   - 修改在 linux 下用管理员权限启动程序。增加 pkexec

Src/Style/FrmStyle.cpp

@@ -8,6 +8,11 @@
 
 #include <QSettings>
 #include <QLoggingCategory>
+#include <QPalette>
+#include <QIcon>
+#include <QStyleHints>
+#include <QApplication>
+#include <QMessageBox>
 
 #include "FrmStyle.h"
 #include "ui_FrmStyle.h"
@@ -113,9 +118,27 @@ CFrmStyle::~CFrmStyle()
 
 void CFrmStyle::on_pbOK_clicked()
 {
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+    const auto colorScheme = QGuiApplication::styleHints()->colorScheme();
+    QRegularExpression re("black|[Dd]ark");
+    QRegularExpressionMatch match = re.match(ui->cbIconTheme->currentText());
+    if (Qt::ColorScheme::Dark == colorScheme && match.hasMatch()) {
+        QString szThemeName;
+        QString szInfo = tr("Current system theme is dark, current select theme is ")
+                         + QString("\"") + ui->cbIconTheme->currentText() + "\". \n";
+        szInfo += tr("it's almost impossible to find the icon because it matches the color.") + "\n"
+                  + tr("Are you sure you want to modify it?");
+        auto ret = QMessageBox::information(nullptr, tr("Change theme"),
+                                            szInfo,
+                                            QMessageBox::Ok | QMessageBox::No,
+                                            QMessageBox::No);
+        if(QMessageBox::No == ret)
+            return;
+    }
+#endif // QT_VERSION
+
     QSettings set(RabbitCommon::CDir::Instance()->GetFileUserConfigure(),
                   QSettings::IniFormat);
-
     bool bIconTheme = ui->gpIconTheme->isChecked();
     set.setValue("Style/Icon/Theme/Enable", bIconTheme);
     if(bIconTheme) {

Src/Style/FrmStyle.h

@@ -99,9 +99,8 @@ private Q_SLOTS:
     void on_pbCancel_clicked();
     void on_pbBrowse_clicked();
     void on_pbDefault_clicked();
-    
     void on_gpIconTheme_clicked();
-    
+
 private:
     Ui::CFrmStyle *ui;
 };

Src/Style/Style.cpp

@@ -13,6 +13,8 @@
 #include <QColor>
 #include <QPalette>
 #include <QIcon>
+#include <QStyleHints>
+#include <QMessageBox>
 
 namespace RabbitCommon {
 
@@ -48,6 +50,14 @@ CStyle::CStyle(QObject *parent) : QObject(parent)
         << "Fallback search paths:" << QIcon::fallbackSearchPaths() << "\n"
         #endif // QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
         ;
+
+    bool check = false;
+    if(QApplication::instance()) {
+        check = connect(QApplication::styleHints(),
+                        SIGNAL(colorSchemeChanged(Qt::ColorScheme)),
+                        this, SLOT(slotColorSchemeChanged(Qt::ColorScheme)));
+        Q_ASSERT(check);
+    }
 }
 
 CStyle* CStyle::Instance()
@@ -79,8 +89,27 @@ int CStyle::LoadStyle()
         QString szThemeName = QIcon::themeName();
         if(szThemeName.isEmpty())
             szThemeName = m_szDefaultIconTheme;
-        QIcon::setThemeName(set.value("Style/Icon/Theme",
-                                      szThemeName).toString());
+        szThemeName = set.value("Style/Icon/Theme", szThemeName).toString();
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+        const auto scheme = QGuiApplication::styleHints()->colorScheme();
+        //qDebug(log) << "Scheme:" << scheme;
+        QRegularExpression re("black|[Dd]ark");
+        QRegularExpressionMatch match = re.match(szThemeName);
+        if (Qt::ColorScheme::Dark == scheme && match.hasMatch()) {
+            QString szInfo = tr("Current system theme is dark, current theme is ") + QString("\"") + szThemeName + "\". ";
+            szInfo += tr("it's almost impossible to find the icon because it matches the color.");
+#if defined(Q_OS_WIN)
+            szThemeName = "rabbit-green";
+#else
+            szThemeName = "rabbit-white";
+#endif
+            szInfo += " " + tr("change to ") + szThemeName;
+            qInfo(log) << szInfo;
+        }
+#endif // QT_VERSION
+
+        QIcon::setThemeName(szThemeName);
 
 #if QT_VERSION >= QT_VERSION_CHECK(5, 12, 0) && !defined(Q_OS_WINDOWS)
         QIcon::setFallbackSearchPaths(
@@ -207,4 +236,32 @@ QString CStyle::GetStyleFile()
     return m_szFile;
 }
 
+void CStyle::slotColorSchemeChanged(Qt::ColorScheme colorScheme)
+{
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+    QRegularExpression re("black|[Dd]ark");
+    QRegularExpressionMatch match = re.match(QIcon::themeName());
+    if (Qt::ColorScheme::Dark == colorScheme && match.hasMatch()) {
+        QString szThemeName;
+        QString szInfo = tr("Current system theme is dark, current theme is ") + QString("\"") + QIcon::themeName() + "\". ";
+        szInfo += tr("it's almost impossible to find the icon because it matches the color.");
+#if defined(Q_OS_WIN)
+        szThemeName = "rabbit-green";
+#else
+        szThemeName = "rabbit-white";
+#endif
+        szInfo += " " + tr("change to ") + "\"" + szThemeName + "\"?";
+        auto ret = QMessageBox::information(nullptr, tr("Change theme"), szInfo,
+                                            QMessageBox::Ok | QMessageBox::No,
+                                            QMessageBox::Ok);
+        if(QMessageBox::Ok == ret) {
+            QSettings set(RabbitCommon::CDir::Instance()->GetFileUserConfigure(),
+                          QSettings::IniFormat);
+            QIcon::setThemeName(szThemeName);
+            szThemeName = set.value("Style/Icon/Theme", szThemeName).toString();
+        }
+    }
+#endif // QT_VERSION
+}
+
 } //namespace RabbitCommon

Src/Style/Style.h

@@ -42,6 +42,9 @@ class CStyle : public QObject
     void SetFile(const QString& file);
     QString GetStyleFile();
 
+private Q_SLOTS:
+    void slotColorSchemeChanged(Qt::ColorScheme colorScheme);
+
 private:
     CStyle(QObject *parent = nullptr);