From 15691a9a3bd3a1c31af7c34b9808cfd982fb7ab8 Mon Sep 17 00:00:00 2001 From: liuxinhao Date: Mon, 3 Jul 2023 10:03:42 +0800 Subject: [PATCH] add ksl-os-gui to kiran style white list --- ...dd-ksl-os-gui-to-the-Style-whitelist.patch | 47 +++++++++++++++++++ kiran-qt5-integration.spec | 6 ++- 2 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 0005-fix-style-add-ksl-os-gui-to-the-Style-whitelist.patch diff --git a/0005-fix-style-add-ksl-os-gui-to-the-Style-whitelist.patch b/0005-fix-style-add-ksl-os-gui-to-the-Style-whitelist.patch new file mode 100644 index 0000000..d0f207a --- /dev/null +++ b/0005-fix-style-add-ksl-os-gui-to-the-Style-whitelist.patch @@ -0,0 +1,47 @@ +From ba894473941af81a2c23f623f6213f81e8264419 Mon Sep 17 00:00:00 2001 +From: liuxinhao +Date: Thu, 29 Jun 2023 17:44:42 +0800 +Subject: [PATCH] fix(style): add ksl-os-gui to the Style whitelist +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +- 添加ksl-os-gui进入Kiran主题白名单 +--- + common/src/kiran-integration-settings.h | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/common/src/kiran-integration-settings.h b/common/src/kiran-integration-settings.h +index ff99929..5ed96b1 100644 +--- a/common/src/kiran-integration-settings.h ++++ b/common/src/kiran-integration-settings.h +@@ -8,14 +8,14 @@ class KiranIntegrationSettings + public: + static KiranIntegrationSettings* instance(); + ~KiranIntegrationSettings(); +- ++ + QSet getKiranStyleApps(); + static bool appKiranStyleAvailable(const QString& app); + + private: + KiranIntegrationSettings(); + void init(); +- ++ + private: + QSet m_kiranStyleApps = { + "kiran-control-panel", +@@ -26,6 +26,7 @@ private: + "kiran-power-status-icon", + "kiran-network-status-icon", + "kiran-audio-status-icon", +- "kiran-flameshot" ++ "kiran-flameshot", ++ "ksl-os-gui" + }; + }; +\ No newline at end of file +-- +2.33.0 + diff --git a/kiran-qt5-integration.spec b/kiran-qt5-integration.spec index 210608d..8886f36 100644 --- a/kiran-qt5-integration.spec +++ b/kiran-qt5-integration.spec @@ -1,6 +1,6 @@ Name: kiran-qt5-integration Version: 2.4.0 -Release: 6 +Release: 7 Summary: Kiran desktop platform integration plugin. License: MulanPSL-2.0 @@ -10,6 +10,7 @@ Patch0001: 0001-fix-Memory-leak-Fix-the-memory-leak-of-allocating-QP.patch Patch0002: 0002-fix-arrow-Adjust-the-theme-drawing-arrow.patch Patch0003: 0003-build-qt5.11.1-Adaptation-Qt5.11.1.patch Patch0004: 0004-feat-style-app-Adjust-the-topic-configuration-to-whi.patch +Patch0005: 0005-fix-style-add-ksl-os-gui-to-the-Style-whitelist.patch BuildRequires: cmake >= 3.2 BuildRequires: gcc-c++ @@ -65,6 +66,9 @@ make %{?_smp_mflags} %{_libdir}/pkgconfig/kiran-style-helper.pc %changelog +* Mon Jul 03 2023 liuxinhao - 2.4.0-7 +- KYOS-F: add ksl-os-gui to kiran style white list + * Mon Jun 05 2023 liuxinhao - 2.4.0-6 - KYOS-F: Adjust the topic configuration to whitelist -- Gitee