From faba92327c920bcc1edbb4c1580b7c1d7deb01ae Mon Sep 17 00:00:00 2001
From: xibowen <xibowen@kylinos.cn>
Date: Mon, 11 Mar 2024 20:30:22 +0800
Subject: [PATCH] Remove ApplicationStyleSettings

---
 .../ukui-config-style.cpp                     | 42 +++++++++----------
 .../qt5-config-style-ukui/ukui-config-style.h |  4 +-
 ukui-styles/ukui-style-plugin.cpp             | 12 +++---
 3 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/ukui-styles/qt5-config-style-ukui/ukui-config-style.cpp b/ukui-styles/qt5-config-style-ukui/ukui-config-style.cpp
index 547a01b..110e65c 100644
--- a/ukui-styles/qt5-config-style-ukui/ukui-config-style.cpp
+++ b/ukui-styles/qt5-config-style-ukui/ukui-config-style.cpp
@@ -163,27 +163,27 @@ UKUIConfigStyle::UKUIConfigStyle(bool dark, bool useDefault, QString type) : QPr
 
     m_window_manager = new WindowManager(this);
 
-    m_app_style_settings = ApplicationStyleSettings::getInstance();
-    if (m_app_style_settings) {
-        connect(m_app_style_settings, &ApplicationStyleSettings::colorStretageChanged, [=](const ApplicationStyleSettings::ColorStretagy &stretagy) {
-          ////todo implemet palette switch.
-            switch (stretagy) {
-            case ApplicationStyleSettings::System: {
-                break;
-            }
-            case ApplicationStyleSettings::Bright: {
-                break;
-            }
-            case ApplicationStyleSettings::Dark: {
-                break;
-            }
-            default:
-                break;
-            }
-        });
-    } else {
-        qWarning("org.ukui.style is null!");
-    }
+//    m_app_style_settings = ApplicationStyleSettings::getInstance();
+//    if (m_app_style_settings) {
+//        connect(m_app_style_settings, &ApplicationStyleSettings::colorStretageChanged, [=](const ApplicationStyleSettings::ColorStretagy &stretagy) {
+//          ////todo implemet palette switch.
+//            switch (stretagy) {
+//            case ApplicationStyleSettings::System: {
+//                break;
+//            }
+//            case ApplicationStyleSettings::Bright: {
+//                break;
+//            }
+//            case ApplicationStyleSettings::Dark: {
+//                break;
+//            }
+//            default:
+//                break;
+//            }
+//        });
+//    } else {
+//        qWarning("org.ukui.style is null!");
+//    }
 
     if (QGSettings::isSchemaInstalled("org.ukui.peripherals-mouse")) {
         QGSettings *settings = new QGSettings("org.ukui.peripherals-mouse");
diff --git a/ukui-styles/qt5-config-style-ukui/ukui-config-style.h b/ukui-styles/qt5-config-style-ukui/ukui-config-style.h
index 6a4b64f..ba8fa44 100644
--- a/ukui-styles/qt5-config-style-ukui/ukui-config-style.h
+++ b/ukui-styles/qt5-config-style-ukui/ukui-config-style.h
@@ -46,7 +46,7 @@ class BlurHelper;
 class GestureHelper;
 class WindowManager;
 
-class ApplicationStyleSettings;
+//class ApplicationStyleSettings;
 //QT_BEGIN_NAMESPACE
 //namespace UKUIConfigStyleSpace { class UKUIConfigStyle; }
 //QT_END_NAMESPACE
@@ -201,7 +201,7 @@ private:
     GestureHelper *m_gesture_helper = nullptr;
     WindowManager *m_window_manager = nullptr;
 
-    ApplicationStyleSettings *m_app_style_settings = nullptr;
+//    ApplicationStyleSettings *m_app_style_settings = nullptr;
 
     bool m_blink_cursor = true;
     int m_blink_cursor_time = 1200;
diff --git a/ukui-styles/ukui-style-plugin.cpp b/ukui-styles/ukui-style-plugin.cpp
index 9b56722..32f6930 100644
--- a/ukui-styles/ukui-style-plugin.cpp
+++ b/ukui-styles/ukui-style-plugin.cpp
@@ -53,9 +53,9 @@ UKUIStylePlugin::UKUIStylePlugin(QObject *parent) :
                 if (QApplication::style()->inherits("InternalStyle"))
                     return;
 
-                auto appStyleSettings = ApplicationStyleSettings::getInstance();
-                if (appStyleSettings->currentStyleStretagy() != ApplicationStyleSettings::Default)
-                    return;
+//                auto appStyleSettings = ApplicationStyleSettings::getInstance();
+//                if (appStyleSettings->currentStyleStretagy() != ApplicationStyleSettings::Default)
+//                    return;
 
                 auto styleName = settings->get("styleName").toString();
                 auto widgetThemeName = settings->get("widgetThemeName").toString();
@@ -191,9 +191,9 @@ void UKUIStylePlugin::tableModeChanged(bool isTableMode)
     if (QApplication::style()->inherits("InternalStyle"))
         return;
 
-    auto appStyleSettings = ApplicationStyleSettings::getInstance();
-    if (appStyleSettings->currentStyleStretagy() != ApplicationStyleSettings::Default)
-        return;
+//    auto appStyleSettings = ApplicationStyleSettings::getInstance();
+//    if (appStyleSettings->currentStyleStretagy() != ApplicationStyleSettings::Default)
+//        return;
 
     auto settings = UKUIStyleSettings::globalInstance();
     auto styleName = settings->get("styleName").toString();