!24 添加ksl-os-gui进入Kiran主题默认白名单

From: @liubuguiii 
Reviewed-by: @tangjie02 
Signed-off-by: @tangjie02
This commit is contained in:
openeuler-ci-bot 2023-07-03 06:17:35 +00:00 committed by Gitee
commit 17dd0ef767
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 52 additions and 1 deletions

View File

@ -0,0 +1,47 @@
From ba894473941af81a2c23f623f6213f81e8264419 Mon Sep 17 00:00:00 2001
From: liuxinhao <liuxinhao@kylinsec.com.cn>
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<QString> getKiranStyleApps();
static bool appKiranStyleAvailable(const QString& app);
private:
KiranIntegrationSettings();
void init();
-
+
private:
QSet<QString> 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

View File

@ -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 <liuxinhao@kylinsec.com.cn> - 2.4.0-7
- KYOS-F: add ksl-os-gui to kiran style white list
* Mon Jun 05 2023 liuxinhao <liuxinhao@kylinsec.com.cn> - 2.4.0-6
- KYOS-F: Adjust the topic configuration to whitelist