packages/kiran-control-panel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
kiran-control-panel/0002-refactor-systeminfo-update-systeminfo-plugin-dialog-.patch
liuxinhao a874478c79 fix systeminfo plugin some bugs 
- 更新统一系统信息页面插件弹窗风格样式，系统信息页面按钮为了避免显示不全恢复之前的大小
2022-08-04 01:17:11 +08:00

237 lines
7.6 KiB
Diff
Raw Blame History

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
Reference in New Issue View Git Blame Copy Permalink