From 81da35528425b7930f1cec8634d42bbc83878fac Mon Sep 17 00:00:00 2001 From: liuxinhao Date: Fri, 11 Aug 2023 11:28:17 +0800 Subject: [PATCH] fix(style): add ksl-server-gui and ks-scmc-gui to kiran-style-apps MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 添加ksl-server-gui以及ks-scmc-gui至KiranStyle白名单应用 --- ...l-server-gui-and-ks-scmc-gui-to-kira.patch | 43 +++++++++++++++++++ kiran-qt5-integration.spec | 9 +++- 2 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 0007-fix-style-add-ksl-server-gui-and-ks-scmc-gui-to-kira.patch diff --git a/0007-fix-style-add-ksl-server-gui-and-ks-scmc-gui-to-kira.patch b/0007-fix-style-add-ksl-server-gui-and-ks-scmc-gui-to-kira.patch new file mode 100644 index 0000000..e3a78fb --- /dev/null +++ b/0007-fix-style-add-ksl-server-gui-and-ks-scmc-gui-to-kira.patch @@ -0,0 +1,43 @@ +From 17ae19eafe45e506bcc5ffd6d6e5b37d3b4cada2 Mon Sep 17 00:00:00 2001 +From: liuxinhao +Date: Fri, 11 Aug 2023 11:11:14 +0800 +Subject: [PATCH] fix(style): add ksl-server-gui and ks-scmc-gui to + kiran-style-apps +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +- 添加ksl-server-gui和ks-scmc-gui至KiranStyle白名单应用 +--- + common/data/kiran-qt5-integration.ini | 2 +- + common/src/kiran-integration-settings.h | 3 +-- + 2 files changed, 2 insertions(+), 3 deletions(-) + +diff --git a/common/data/kiran-qt5-integration.ini b/common/data/kiran-qt5-integration.ini +index d0fd969..3bc4a53 100644 +--- a/common/data/kiran-qt5-integration.ini ++++ b/common/data/kiran-qt5-integration.ini +@@ -1,3 +1,3 @@ + [Style] + #启用kiran style的应用列表,已内置部分kiran桌面环境的组件，eg: kiran-*,kiran-panel +-kiran-style-apps= +\ No newline at end of file ++kiran-style-apps=ksl-os-gui,ksl-server-gui,ks-scmc-gui +\ No newline at end of file +diff --git a/common/src/kiran-integration-settings.h b/common/src/kiran-integration-settings.h +index 5ed96b1..22d7be4 100644 +--- a/common/src/kiran-integration-settings.h ++++ b/common/src/kiran-integration-settings.h +@@ -26,7 +26,6 @@ private: + "kiran-power-status-icon", + "kiran-network-status-icon", + "kiran-audio-status-icon", +- "kiran-flameshot", +- "ksl-os-gui" ++ "kiran-flameshot" + }; + }; +\ No newline at end of file +-- +2.33.0 + diff --git a/kiran-qt5-integration.spec b/kiran-qt5-integration.spec index 3e6864c..2fcbd3d 100644 --- a/kiran-qt5-integration.spec +++ b/kiran-qt5-integration.spec @@ -1,6 +1,6 @@ Name: kiran-qt5-integration Version: 2.4.0 -Release: 8 +Release: 10 Summary: Kiran desktop platform integration plugin. License: MulanPSL-2.0 @@ -12,6 +12,7 @@ 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 Patch0006: 0006-feat-cursor-theme-When-the-cursor-theme-changes-let-.patch +Patch0007: 0007-fix-style-add-ksl-server-gui-and-ks-scmc-gui-to-kira.patch BuildRequires: cmake >= 3.2 BuildRequires: gcc-c++ @@ -67,6 +68,12 @@ make %{?_smp_mflags} %{_libdir}/pkgconfig/kiran-style-helper.pc %changelog +* Fri Aug 11 2023 liuxinhao - 2.4.0-10 +- KYOS-F: add ksl-server-gui and ks-scmc-gui to kiran-style-apps + +* Thu Aug 10 2023 kpkg - 2.4.0-9 +- rebuild for KY3.4-3-KiranUI-2.4 + * Mon Aug 07 2023 liuxinhao - 2.4.0-8 - KYOS-F: When the cursor theme changes, let the Qt application cursor reload(#11637) -- Gitee