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

!18 修复kiranui2.3第一轮测试中系统信息页相关问题

Browse Source 
From: @liubuguiii 
Reviewed-by: @tangjie02 
Signed-off-by: @tangjie02
This commit is contained in:
openeuler-ci-bot 2022-08-05 05:38:38 +00:00 committed by Gitee
commit 6340fd2f28
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 315 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
0001-fix-system-buttons-on-the-system-information-page-ar.patch Normal file
View File

@ -0,0 +1,71 @@
From 7dda81e40d5e5e18b0138d93b8b5c1785e45040b Mon Sep 17 00:00:00 2001
From: liuxinhao <liuxinhao@kylinsec.com.cn>
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 @@
<property name="minimumSize">
<size>
<width>56</width>
- <height>24</height>
+ <height>28</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>56</width>
- <height>24</height>
+ <height>28</height>
</size>
</property>
<property name="text">
@@ -460,13 +460,13 @@
<property name="minimumSize">
<size>
<width>56</width>
- <height>24</height>
+ <height>28</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>56</width>
- <height>24</height>
+ <height>28</height>
</size>
</property>
<property name="text">
@@ -532,13 +532,13 @@
<property name="minimumSize">
<size>
<width>56</width>
- <height>24</height>
+ <height>28</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>56</width>
- <height>24</height>
+ <height>28</height>
</size>
</property>
<property name="text">
--
2.33.0

236
0002-refactor-systeminfo-update-systeminfo-plugin-dialog-.patch Normal file
View File

@ -0,0 +1,236 @@
From 01ff81b4cfe1749f685f33798c3394f62180353f Mon Sep 17 00:00:00 2001
From: liuxinhao <liuxinhao@kylinsec.com.cn>
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 @@
<widget class="QWidget" name="widget_2" native="true">
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="spacing">
- <number>58</number>
+ <number>0</number>
</property>
<property name="leftMargin">
<number>0</number>
@@ -136,18 +136,31 @@
<property name="bottomMargin">
<number>0</number>
</property>
+ <item>
+ <spacer name="horizontalSpacer_2">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
<item>
<widget class="QPushButton" name="btn_save">
<property name="minimumSize">
<size>
- <width>192</width>
- <height>60</height>
+ <width>110</width>
+ <height>40</height>
</size>
</property>
<property name="maximumSize">
<size>
- <width>192</width>
- <height>60</height>
+ <width>110</width>
+ <height>40</height>
</size>
</property>
<property name="text">
@@ -155,18 +168,34 @@
</property>
</widget>
</item>
+ <item>
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
<item>
<widget class="QPushButton" name="btn_cancel">
<property name="minimumSize">
<size>
- <width>192</width>
- <height>60</height>
+ <width>110</width>
+ <height>40</height>
</size>
</property>
<property name="maximumSize">
<size>
- <width>192</width>
- <height>60</height>
+ <width>110</width>
+ <height>40</height>
</size>
</property>
<property name="text">
@@ -174,6 +203,19 @@
</property>
</widget>
</item>
+ <item>
+ <spacer name="horizontalSpacer_3">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
</layout>
</widget>
</item>
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 @@
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Noto Sans CJK SC'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Noto Sans CJK SC'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot;-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;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="spacing">
- <number>24</number>
+ <number>0</number>
</property>
<property name="leftMargin">
<number>24</number>
@@ -92,18 +92,31 @@ p, li { white-space: pre-wrap; }
<property name="rightMargin">
<number>24</number>
</property>
+ <item>
+ <spacer name="horizontalSpacer_2">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
<item>
<widget class="QPushButton" name="btn_license_export">
<property name="minimumSize">
<size>
- <width>252</width>
- <height>60</height>
+ <width>110</width>
+ <height>40</height>
</size>
</property>
<property name="maximumSize">
<size>
- <width>252</width>
- <height>60</height>
+ <width>110</width>
+ <height>40</height>
</size>
</property>
<property name="text">
@@ -116,6 +129,9 @@ p, li { white-space: pre-wrap; }
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
+ </property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
@@ -134,14 +150,14 @@ p, li { white-space: pre-wrap; }
</property>
<property name="minimumSize">
<size>
- <width>252</width>
- <height>60</height>
+ <width>110</width>
+ <height>40</height>
</size>
</property>
<property name="maximumSize">
<size>
- <width>252</width>
- <height>60</height>
+ <width>110</width>
+ <height>40</height>
</size>
</property>
<property name="text">
@@ -149,6 +165,19 @@ p, li { white-space: pre-wrap; }
</property>
</widget>
</item>
+ <item>
+ <spacer name="horizontalSpacer_3">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
</layout>
</item>
</layout>
--
2.33.0

10
kiran-control-panel.spec
View File

@ -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 <liuxinhao@kylinsec.com.cn> - 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 <luoqing@kylinsec.com.cn> - 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)