!4 [sync] PR-3: update to 2.2.1
From: @openeuler-sync-bot Reviewed-by: @doudou19 Signed-off-by: @doudou19
This commit is contained in:
openeuler-ci-bot
Gitee
commit
f7bfc95c18
@ -1,62 +0,0 @@
|
||||
From 2028295df5882c450820d8f7d1f9463d28a7e8f8 Mon Sep 17 00:00:00 2001
|
||||
From: yuanxing <yuanxing@kylinos.com.cn>
|
||||
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 @@
|
||||
<translation>等宽字体设置</translation>
|
||||
</message>
|
||||
<message>
|
||||
- <location filename="../src/pages/font/fonts.cpp" line="62"/>
|
||||
<source>None</source>
|
||||
- <translation>暂无</translation>
|
||||
+ <translation type="vanished">暂无</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
@@ -173,14 +172,14 @@
|
||||
<context>
|
||||
<name>QObject</name>
|
||||
<message>
|
||||
- <location filename="../src/pages/font/fonts.cpp" line="154"/>
|
||||
+ <location filename="../src/pages/font/fonts.cpp" line="143"/>
|
||||
<location filename="../src/pages/theme/themes.cpp" line="140"/>
|
||||
<location filename="../src/pages/theme/themes.cpp" line="185"/>
|
||||
<source>Failed</source>
|
||||
<translation>失败</translation>
|
||||
</message>
|
||||
<message>
|
||||
- <location filename="../src/pages/font/fonts.cpp" line="155"/>
|
||||
+ <location filename="../src/pages/font/fonts.cpp" line="144"/>
|
||||
<source>Set font failed!</source>
|
||||
<translation>设置字体失败!</translation>
|
||||
</message>
|
||||
--
|
||||
2.27.0
|
||||
|
||||
@ -1,24 +0,0 @@
|
||||
From 61f05899fdcf418a718aa44d5b97c9b6f8b4e852 Mon Sep 17 00:00:00 2001
|
||||
From: kylinsecos_admin <gitee@kylinos.com.cn>
|
||||
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 <math.h>
|
||||
#include <QPainter>
|
||||
#include <QVBoxLayout>
|
||||
+#include <QPainterPath>
|
||||
#include "../wallpaper-def.h"
|
||||
|
||||
PreviewLabel::PreviewLabel(int wallpaperType, QString imgPath, QWidget *parent) : QLabel(parent)
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
Binary file not shown.
BIN
kiran-cpanel-appearance-2.2.1.tar.gz
Normal file
BIN
kiran-cpanel-appearance-2.2.1.tar.gz
Normal file
Binary file not shown.
@ -1,14 +1,12 @@
|
||||
Name: kiran-cpanel-appearance
|
||||
Version: 2.2.0
|
||||
Release: 2.kb3
|
||||
Version: 2.2.1
|
||||
Release: 3
|
||||
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
|
||||
@ -32,6 +30,7 @@ Requires: kiran-session-daemon >= 2.0.7
|
||||
Requires: kiran-log-qt5
|
||||
Requires: kiran-cpanel-launcher
|
||||
Requires: libXcursor
|
||||
Requires: gtk-update-icon-cache
|
||||
|
||||
%description
|
||||
This program provide personalized settings for wallpaper, theme and font.
|
||||
@ -71,8 +70,23 @@ fi
|
||||
rm -rf %{buildroot}
|
||||
|
||||
%changelog
|
||||
* Tue Mar 01 2022 longcheng <longcheng@kylinos.com.cn> - 2.2.1-3
|
||||
- KYOS-B: Add Requires gtk-update-icon-cache
|
||||
|
||||
* Sat Feb 26 2022 longcheng <longcheng@kylinos.com.cn> - 2.2.1-2
|
||||
- KYOS-R: rebuild for KY3.4-3-LS-dev
|
||||
|
||||
* Sat Feb 26 2022 longcheng <longcheng@kylinos.com.cn> - 2.2.1-1
|
||||
- KYOS-B: fix build error in KY3.4-3-LS
|
||||
|
||||
* Thu Feb 24 2022 chendingjian <chendingjian@kylinos.com.cn> - 2.2.0-3
|
||||
- rebuild for KY3.4-MATE-modules-dev
|
||||
|
||||
* Thu Feb 17 2022 yuanxing <yuanxing@kylinos.com.cn> - 2.2.0-2.kb4
|
||||
- KYOS-F: seach other image with appoint icon name when iconname.format don't exit in Adwaita (#48450)
|
||||
|
||||
* Mon Jan 24 2022 longcheng <longcheng@kylinos.com.cn> - 2.2.0-2.kb3
|
||||
- KYOS-B: fix compilation errors on OpenEuler
|
||||
- KYOS-B: fix compilation errors on OpenEuler (#49472)
|
||||
|
||||
* Wed Jan 12 2022 caoyuanji <caoyuanji@kylinos.com.cn> - 2.2.0-2.kb2
|
||||
- rebuild for KY3.4-5-KiranUI-2.2
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user