diff --git a/0000-fix-theme-set-metacity-theme-when-user-change-theme-2028295d.patch b/0000-fix-theme-set-metacity-theme-when-user-change-theme-2028295d.patch new file mode 100644 index 0000000..9fccd9f --- /dev/null +++ b/0000-fix-theme-set-metacity-theme-when-user-change-theme-2028295d.patch @@ -0,0 +1,62 @@ +From 2028295df5882c450820d8f7d1f9463d28a7e8f8 Mon Sep 17 00:00:00 2001 +From: yuanxing +Date: Thu, 25 Nov 2021 15:44:45 +0800 +Subject: [PATCH] fix(theme):set metacity theme when user change theme +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +- 当用户切换主题时设置窗口主题 +--- + src/pages/theme/themes.cpp | 2 ++ + translations/kiran-cpanel-appearance.zh_CN.ts | 7 +++---- + 2 files changed, 5 insertions(+), 4 deletions(-) + +diff --git a/src/pages/theme/themes.cpp b/src/pages/theme/themes.cpp +index d737cfe..9c6e8f1 100644 +--- a/src/pages/theme/themes.cpp ++++ b/src/pages/theme/themes.cpp +@@ -316,6 +316,8 @@ void Themes::createThemeWidget() + return; + if (!AppearanceGlobalInfo::instance()->setTheme(APPEARANCE_THEME_TYPE_GTK, theme)) + return; ++ if (!AppearanceGlobalInfo::instance()->setTheme(APPEARANCE_THEME_TYPE_METACITY, theme)) ++ return; + KLOG_INFO() << "set themes successful:" << theme; + }); + } +diff --git a/translations/kiran-cpanel-appearance.zh_CN.ts b/translations/kiran-cpanel-appearance.zh_CN.ts +index 1dd67ca..24a99f0 100644 +--- a/translations/kiran-cpanel-appearance.zh_CN.ts ++++ b/translations/kiran-cpanel-appearance.zh_CN.ts +@@ -73,9 +73,8 @@ + 等宽字体设置 + + +- + None +- 暂无 ++ 暂无 + + + +@@ -173,14 +172,14 @@ + + QObject + +- ++ + + + Failed + 失败 + + +- ++ + Set font failed! + 设置字体失败! + +-- +2.27.0 + diff --git a/0001-fix-build-fix-incomplete-type-class-QPainterPath-bui.patch b/0001-fix-build-fix-incomplete-type-class-QPainterPath-bui.patch new file mode 100644 index 0000000..bf11428 --- /dev/null +++ b/0001-fix-build-fix-incomplete-type-class-QPainterPath-bui.patch @@ -0,0 +1,24 @@ +From 61f05899fdcf418a718aa44d5b97c9b6f8b4e852 Mon Sep 17 00:00:00 2001 +From: kylinsecos_admin +Date: Mon, 24 Jan 2022 09:57:14 +0800 +Subject: [PATCH] fix(build): fix incomplete type 'class QPainterPath' build + +--- + src/pages/wallpaper/widget/preview-label.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/pages/wallpaper/widget/preview-label.cpp b/src/pages/wallpaper/widget/preview-label.cpp +index c134997..566dec1 100644 +--- a/src/pages/wallpaper/widget/preview-label.cpp ++++ b/src/pages/wallpaper/widget/preview-label.cpp +@@ -17,6 +17,7 @@ + #include + #include + #include ++#include + #include "../wallpaper-def.h" + + PreviewLabel::PreviewLabel(int wallpaperType, QString imgPath, QWidget *parent) : QLabel(parent) +-- +1.8.3.1 + diff --git a/kiran-cpanel-appearance-2.2.0.tar.gz b/kiran-cpanel-appearance-2.2.0.tar.gz new file mode 100644 index 0000000..75a981a Binary files /dev/null and b/kiran-cpanel-appearance-2.2.0.tar.gz differ diff --git a/kiran-cpanel-appearance.spec b/kiran-cpanel-appearance.spec new file mode 100644 index 0000000..562cb1f --- /dev/null +++ b/kiran-cpanel-appearance.spec @@ -0,0 +1,105 @@ +Name: kiran-cpanel-appearance +Version: 2.2.0 +Release: 2.kb3 +Summary: This program provide personalized settings for wallpaper, theme and font. + +Group: System Environment/Base +License: Mulan PSL v2 +URL: http://gitlab.kylinos.com.cn/os/kiran-cpanel-appearance +Source0: %{name}-%{version}.tar.gz +Patch1001: 0000-fix-theme-set-metacity-theme-when-user-change-theme-2028295d.patch +Patch1002: 0001-fix-build-fix-incomplete-type-class-QPainterPath-bui.patch + +BuildRequires: qt5-qtsvg-devel +BuildRequires: cmake +BuildRequires: gettext +BuildRequires: gcc-c++ +BuildRequires: qt5-qtbase-devel +BuildRequires: qt5-linguist +BuildRequires: kiran-widgets-qt5-devel +BuildRequires: kiran-cc-daemon-devel >= 2.0.7 +BuildRequires: libstdc++-devel +BuildRequires: kiran-log-qt5-devel +BuildRequires: kiran-control-panel-devel +BuildRequires: kiran-qdbusxml2cpp +BuildRequires: libXcursor-devel + +Requires: gcc +Requires: qt5-qtbase +Requires: qt5-qtsvg +Requires: kiran-widgets-qt5 +Requires: kiran-session-daemon >= 2.0.7 +Requires: kiran-log-qt5 +Requires: kiran-cpanel-launcher +Requires: libXcursor + +%description +This program provide personalized settings for wallpaper, theme and font. + +%prep +%autosetup -p1 + +%build +%{__mkdir} -p %{buildroot} +%cmake +make %{?_smp_mflags} + +%install +%make_install + +%post +gtk-update-icon-cache -f /usr/share/icons/hicolor/ + +%posttrans +%define link_source %{_datadir}/kiran-control-panel/plugins/desktop/%{name}.desktop +%define link_target %{_datadir}/applications/%{name}.desktop +if [ ! -e %{link_target} ];then +ln -sf %{link_source} %{link_target} +echo "link %{link_source} -> %{link_target}" +fi + +%files +%doc +%{_datadir}/kiran-control-panel/plugins/libs/libkiran-cpanel-appearance.so* +%{_datadir}/%{name}/icons/* +%{_datadir}/icons/hicolor/* +%{_datadir}/%{name}/translations/* +%{_datadir}/kiran-control-panel/plugins/desktop/* +%{_datadir}/applications/kiran-cpanel-appearance.desktop + +%clean +rm -rf %{buildroot} + +%changelog +* Mon Jan 24 2022 longcheng - 2.2.0-2.kb3 +- KYOS-B: fix compilation errors on OpenEuler + +* Wed Jan 12 2022 caoyuanji - 2.2.0-2.kb2 +- rebuild for KY3.4-5-KiranUI-2.2 + +* Wed Dec 29 2021 kpkg - 2.2.0-2.kb1 +- rebuild for KY3.4-MATE-modules-dev + +* Wed Dec 29 2021 caoyuanji - 2.2.0-2 +- Upgrade version number for easy upgrade + +* Mon Dec 20 2021 caoyuanji - 2.2.0-1.kb4 +- rebuild for KY3.4-4-KiranUI-2.2 + +* Mon Dec 20 2021 caoyuanji - 2.2.0-1.kb3 +- rebuild for KY3.4-4-KiranUI-2.2 + +* Mon Nov 29 2021 yuanxing - 2.2.0.kb2 +- KYOS-F: set metacity theme when user change theme + +* Fri Nov 12 2021 yuanxing - 2.2.0.kb1 +- KYOS-F: Adjust the DBUS generation mode, connect the DBUS signal changes +- KYOS-F: Add custom image storage and loading methods +- KYOS-F: Add selectable icons, cursor themes +- KYOS-F: When the system does not find the font, the display is none + +* Fri Aug 6 2021 yuanxing - 2.1.0.kb1 +- Initial build + + +