From 00ea5d6bdd78b7f1727d3c1e43081361654d0f57 Mon Sep 17 00:00:00 2001 From: liuxinhao Date: Thu, 4 Aug 2022 00:26:12 +0800 Subject: [PATCH] fix systeminfo plugin some bugs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 更新统一系统信息页面插件弹窗风格样式，系统信息页面按钮为了避免显示不全恢复之前的大小 (cherry picked from commit a874478c79abe1d51a92786647bb59d9c2a256fb) --- ...ns-on-the-system-information-page-ar.patch | 71 ++++++ ...nfo-update-systeminfo-plugin-dialog-.patch | 236 ++++++++++++++++++ kiran-control-panel.spec | 10 +- 3 files changed, 315 insertions(+), 2 deletions(-) create mode 100644 0001-fix-system-buttons-on-the-system-information-page-ar.patch create mode 100644 0002-refactor-systeminfo-update-systeminfo-plugin-dialog-.patch diff --git a/0001-fix-system-buttons-on-the-system-information-page-ar.patch b/0001-fix-system-buttons-on-the-system-information-page-ar.patch new file mode 100644 index 0000000..529cbaf --- /dev/null +++ b/0001-fix-system-buttons-on-the-system-information-page-ar.patch @@ -0,0 +1,71 @@ +From 7dda81e40d5e5e18b0138d93b8b5c1785e45040b Mon Sep 17 00:00:00 2001 +From: liuxinhao +Date: Wed, 3 Aug 2022 11:36:32 +0800 +Subject: [PATCH 1/2] fix(system): buttons on the system information page are + not fully displayed +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +- 系统信息页面按钮为了避免显示不全恢复之前的大小 + +Closes #I5H229 +--- + .../pages/system-information/system-information.ui | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/plugins/system/src/pages/system-information/system-information.ui b/plugins/system/src/pages/system-information/system-information.ui +index a930da2..5beafd2 100644 +--- a/plugins/system/src/pages/system-information/system-information.ui ++++ b/plugins/system/src/pages/system-information/system-information.ui +@@ -187,13 +187,13 @@ + + + 56 +- 24 ++ 28 + + + + + 56 +- 24 ++ 28 + + + +@@ -460,13 +460,13 @@ + + + 56 +- 24 ++ 28 + + + + + 56 +- 24 ++ 28 + + + +@@ -532,13 +532,13 @@ + + + 56 +- 24 ++ 28 + + + + + 56 +- 24 ++ 28 + + + +-- +2.33.0 + diff --git a/0002-refactor-systeminfo-update-systeminfo-plugin-dialog-.patch b/0002-refactor-systeminfo-update-systeminfo-plugin-dialog-.patch new file mode 100644 index 0000000..4a87e36 --- /dev/null +++ b/0002-refactor-systeminfo-update-systeminfo-plugin-dialog-.patch @@ -0,0 +1,236 @@ +From 01ff81b4cfe1749f685f33798c3394f62180353f Mon Sep 17 00:00:00 2001 +From: liuxinhao +Date: Wed, 3 Aug 2022 17:15:21 +0800 +Subject: [PATCH 2/2] refactor(systeminfo): update systeminfo plugin dialog + style +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +- 更新统一系统信息页面插件弹窗风格样式 + +Closes #I5H3YX +--- + .../change-host-name-widget.ui | 60 ++++++++++++++++--- + .../system-information/license-agreement.ui | 51 ++++++++++++---- + 2 files changed, 91 insertions(+), 20 deletions(-) + +diff --git a/plugins/system/src/pages/system-information/change-host-name-widget.ui b/plugins/system/src/pages/system-information/change-host-name-widget.ui +index f56bb94..a677bbc 100644 +--- a/plugins/system/src/pages/system-information/change-host-name-widget.ui ++++ b/plugins/system/src/pages/system-information/change-host-name-widget.ui +@@ -122,7 +122,7 @@ + + + +- 58 ++ 0 + + + 0 +@@ -136,18 +136,31 @@ + + 0 + ++ ++ ++ ++ Qt::Horizontal ++ ++ ++ ++ 40 ++ 20 ++ ++ ++ ++ + + + + +- 192 +- 60 ++ 110 ++ 40 + + + + +- 192 +- 60 ++ 110 ++ 40 + + + +@@ -155,18 +168,34 @@ + + + ++ ++ ++ ++ Qt::Horizontal ++ ++ ++ QSizePolicy::Fixed ++ ++ ++ ++ 40 ++ 20 ++ ++ ++ ++ + + + + +- 192 +- 60 ++ 110 ++ 40 + + + + +- 192 +- 60 ++ 110 ++ 40 + + + +@@ -174,6 +203,19 @@ + + + ++ ++ ++ ++ Qt::Horizontal ++ ++ ++ ++ 40 ++ 20 ++ ++ ++ ++ + + + +diff --git a/plugins/system/src/pages/system-information/license-agreement.ui b/plugins/system/src/pages/system-information/license-agreement.ui +index 83f20d2..727cc85 100644 +--- a/plugins/system/src/pages/system-information/license-agreement.ui ++++ b/plugins/system/src/pages/system-information/license-agreement.ui +@@ -76,15 +76,15 @@ + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> + p, li { white-space: pre-wrap; } +-</style></head><body style=" font-family:'Noto Sans CJK SC'; font-size:9pt; font-weight:400; font-style:normal;"> +-<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p></body></html> ++</style></head><body style=" font-family:'Noto Sans CJK SC'; font-size:10pt; font-weight:400; font-style:normal;"> ++<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:9pt;"><br /></p></body></html> + + + + + + +- 24 ++ 0 + + + 24 +@@ -92,18 +92,31 @@ p, li { white-space: pre-wrap; } + + 24 + ++ ++ ++ ++ Qt::Horizontal ++ ++ ++ ++ 40 ++ 20 ++ ++ ++ ++ + + + + +- 252 +- 60 ++ 110 ++ 40 + + + + +- 252 +- 60 ++ 110 ++ 40 + + + +@@ -116,6 +129,9 @@ p, li { white-space: pre-wrap; } + + Qt::Horizontal + ++ ++ QSizePolicy::Fixed ++ + + + 40 +@@ -134,14 +150,14 @@ p, li { white-space: pre-wrap; } + + + +- 252 +- 60 ++ 110 ++ 40 + + + + +- 252 +- 60 ++ 110 ++ 40 + + + +@@ -149,6 +165,19 @@ p, li { white-space: pre-wrap; } + + + ++ ++ ++ ++ Qt::Horizontal ++ ++ ++ ++ 40 ++ 20 ++ ++ ++ ++ + + + +-- +2.33.0 + diff --git a/kiran-control-panel.spec b/kiran-control-panel.spec index 1419580..41c3773 100644 --- a/kiran-control-panel.spec +++ b/kiran-control-panel.spec @@ -1,11 +1,13 @@ Name: kiran-control-panel Version: 2.3.4 -Release: 1 +Release: 2 Summary: Kiran Control Panel Summary(zh_CN): Kiran桌面控制面板 -License: Mulan PSL v2 +License: MulanPSL-2.0 Source0: %{name}-%{version}.tar.gz +Patch0001: 0001-fix-system-buttons-on-the-system-information-page-ar.patch +Patch0002: 0002-refactor-systeminfo-update-systeminfo-plugin-dialog-.patch BuildRequires: gcc-c++ BuildRequires: cmake >= 3.2 @@ -164,6 +166,10 @@ make %{?_smp_mflags} rm -rf %{buildroot} %changelog +* Thu Aug 04 2022 liuxinhao - 2.3.4-2 +- KYOS-B: update systeminfo plugin dialog style(#I5H3YX) +- KYOS-B: buttons on system information page are not fully dispalyed(#I5H229) + * Mon Aug 01 2022 luoqing - 2.3.4-1 - KYOS-B: fix no notification when connecting to the hidden network(#I5IS25) - KYOS-B: the tray network icon changes as the primary connection changes(#I5IPBG) -- Gitee