packages/ukui-control-center
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!77 解决设置中主题图标为空的问题

Browse Source 
From: @pei-jiankang 
Reviewed-by: @dou33 
Signed-off-by: @dou33
This commit is contained in:
openeuler-ci-bot 2022-04-07 02:05:37 +00:00 committed by Gitee
commit a086cd5452
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
0007-modify-icon-theme-not-display.patch Normal file
View File

@ -0,0 +1,28 @@
From 0f33449dc1c22e97331265a6410e9a0a5466d39c Mon Sep 17 00:00:00 2001
From: pei-jiankang <peijiankang@kylinos.cn>
Date: Wed, 6 Apr 2022 17:29:15 +0800
Subject: [PATCH] modify icon theme not display
---
plugins/personalized/theme/theme.cpp | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/plugins/personalized/theme/theme.cpp b/plugins/personalized/theme/theme.cpp
index 893db27..59f66af 100644
--- a/plugins/personalized/theme/theme.cpp
+++ b/plugins/personalized/theme/theme.cpp
@@ -443,8 +443,9 @@ void Theme::initIconTheme() {
foreach (QString themedir, themesDir.entryList(QDir::Dirs)) {
- if ((Utils::isCommunity() && (!themedir.compare("ukui") || !themedir.compare("ukui-classical")))
- || (!Utils::isCommunity() && themedir.startsWith("ukui-icon-theme-"))) {
+ if ((Utils::isCommunity() && (!themedir.compare("ukui") || !themedir.compare("ukui-classical")) )
+ || (!Utils::isCommunity() && themedir.startsWith("ukui-icon-theme-"))
+ || (!Utils::isCommunity() && (!themedir.compare("ukui") || !themedir.compare("ukui-classical") || !themedir.compare("ukui-fashion")))) {
QDir appsDir = QDir(ICONTHEMEPATH + themedir + "/48x48/apps/");
QDir placesDir = QDir(ICONTHEMEPATH + themedir + "/48x48/places/");
QDir devicesDir = QDir(ICONTHEMEPATH + themedir + "/48x48/devices/");
--
2.33.0

7
ukui-control-center.spec
View File

@ -1,7 +1,7 @@
%define debug_package %{nil} %define debug_package %{nil}
Name: ukui-control-center Name: ukui-control-center
Version: 3.0.4 Version: 3.0.4
Release: 8 Release: 9
Summary: utilities to configure the UKUI desktop Summary: utilities to configure the UKUI desktop
License: GPL-2+ License: GPL-2+
URL: http://www.ukui.org URL: http://www.ukui.org
@ -12,6 +12,7 @@ Patch03: 0003-fix-power-missing-issue.patch
Patch04: 0004-disable-the-str-of-password-check.patch Patch04: 0004-disable-the-str-of-password-check.patch
Patch05: 0005-Fix-the-problem-of-displaying-none-in-the-interface-version-information.patch Patch05: 0005-Fix-the-problem-of-displaying-none-in-the-interface-version-information.patch
Patch06: 0006-fix-the-problem-that-the-new-user-in-the-control-panel-is-stuck.patch Patch06: 0006-fix-the-problem-that-the-new-user-in-the-control-panel-is-stuck.patch
Patch07: 0007-modify-icon-theme-not-display.patch
BuildRequires: qt5-qtsvg-devel BuildRequires: qt5-qtsvg-devel
BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qtbase-devel
@ -115,6 +116,7 @@ Suggests: ukui-settings-daemon
%patch4 -p1 %patch4 -p1
%patch5 -p1 %patch5 -p1
%patch6 -p1 %patch6 -p1
%patch7 -p1
%build %build
qmake-qt5 qmake-qt5
@ -163,6 +165,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Wed Apr 6 2022 pei-jiankang <peijiankang@kylinos.cn> - 3.0.4-9
- modify icon theme not display
* Fri Mar 11 2022 huayadong <huayadong@kylinos.cn> - 3.0.4-8 * Fri Mar 11 2022 huayadong <huayadong@kylinos.cn> - 3.0.4-8
- add patch6: 0006-fix-the-problem-that-the-new-user-in-the-control-panel-is-stuck.patch - add patch6: 0006-fix-the-problem-that-the-new-user-in-the-control-panel-is-stuck.patch