fix: update systeminfo ui

update systeminfo ui Log: update systeminfo ui pms: BUG-292137
linuxdeepin · Dec 24, 2024 · 92d3a90 · 92d3a90
1 parent ab8cce9
commit 92d3a90
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 29 deletions.
diff --git a/src/plugin-systeminfo/operation/qrc/icons/edit.dci b/src/plugin-systeminfo/operation/qrc/icons/edit.dci
diff --git a/src/plugin-systeminfo/operation/qrc/systeminfo.qrc b/src/plugin-systeminfo/operation/qrc/systeminfo.qrc
@@ -1,4 +1,3 @@
-<!DOCTYPE RCC>
 <RCC>
     <qresource prefix="/icons/deepin/builtin">
         <file>icons/dcc_nav_systeminfo_42px.svg</file>
@@ -11,6 +10,7 @@
         <file>light/icons/icon_about_laptop_128px.svg</file>
         <file>dark/icons/icon_about_pc_128px.svg</file>
         <file>dark/icons/icon_about_laptop_128px.svg</file>
+        <file>icons/edit.dci</file>
     </qresource>
     <qresource prefix="/systeminfo">
         <file>gpl/gpl-3.0-zh_CN-body.txt</file>

diff --git a/src/plugin-systeminfo/qml/NativeInfoPage.qml b/src/plugin-systeminfo/qml/NativeInfoPage.qml
@@ -20,7 +20,6 @@ DccObject {
         visible: !dccData.systemInfoMode().showDetail
         page: RowLayout {
             Image {
-                // source: "qrc:/icons/deepin/builtin/icons/dcc_nav_systeminfo_84px.svg"
                 source: "file://" + DTK.deepinDistributionOrgLogo
             }
 
@@ -33,7 +32,6 @@ DccObject {
                 }
 
                 Label {
-                    font: DTK.fontManager.t6
                     horizontalAlignment: Text.AlignLeft
                     text: dccData.systemInfoMode().systemCopyright
                 }
@@ -49,18 +47,15 @@ DccObject {
         backgroundType: DccObject.Normal
         visible: dccData.systemInfoMode().showDetail
         page: ColumnLayout{
-            Layout.topMargin: 10
-            Layout.bottomMargin: 10
             Image {
-                Layout.topMargin: 10
+                Layout.topMargin: 25
                 Layout.alignment: Qt.AlignHCenter
                 source: "file://" + dccData.systemInfoMode().logoPath
             }
             Label {
                 Layout.alignment: Qt.AlignHCenter
-                font: DTK.fontManager.t6
                 text: dccData.systemInfoMode().systemCopyright
-                Layout.bottomMargin: 10
+                Layout.bottomMargin: 25
             }
         }
     }
@@ -72,7 +67,6 @@ DccObject {
         pageType: DccObject.Item
         page: ColumnLayout {
             DccGroupView {
-                Layout.topMargin: 10
             }
         }
         DccObject {
@@ -89,21 +83,16 @@ DccObject {
                     id: hostNameLabel
                     Layout.alignment: Qt.AlignRight | Qt.AlignTop
                     text: dccData.systemInfoMode().hostName
-                    font: DTK.fontManager.t6
                 }
 
                 IconButton {
                     id: editBtn
-                    icon.name: "qrc:/icons/deepin/builtin/texts/dcc_edit_12px.svg"
-                    icon.width: 12
-                    icon.height: 12
+                    icon.name: "dcc_systemInfo_edit"
+                    icon.width: 16
+                    icon.height: 16
                     implicitWidth: 20
                     implicitHeight: 20
-                    background: Rectangle {
-                        color: "transparent" // 背景透明
-                        border.color: "transparent" // 边框透明
-                        border.width: 0
-                    }
+                    flat: !hovered
                     onClicked: {
                         editBtn.visible = false
                         hostNameLabel.visible = false
@@ -167,7 +156,6 @@ DccObject {
             page: Label {
                 Layout.alignment: Qt.AlignRight | Qt.AlignTop
                 text: dccData.systemInfoMode().productName
-                font: DTK.fontManager.t6
             }
         }
         DccObject {
@@ -177,7 +165,6 @@ DccObject {
             pageType: DccObject.Editor
             displayName: qsTr("Version") + ":"
             page: Label {
-                font: DTK.fontManager.t6
                 horizontalAlignment: Text.AlignLeft
                 text: dccData.systemInfoMode().versionNumber
             }
@@ -189,7 +176,6 @@ DccObject {
             pageType: DccObject.Editor
             displayName: qsTr("Edition") + ":"
             page: Label {
-                font: DTK.fontManager.t6
                 horizontalAlignment: Text.AlignLeft
                 text: dccData.systemInfoMode().version
             }
@@ -201,7 +187,6 @@ DccObject {
             pageType: DccObject.Editor
             displayName: qsTr("Type") + ":"
             page: Label {
-                font: DTK.fontManager.t6
                 horizontalAlignment: Text.AlignLeft
                 text: dccData.systemInfoMode().type+ "-" + qsTr("bit")
             }
@@ -217,15 +202,13 @@ DccObject {
             page: RowLayout {
                 Label {
                     color: dccData.systemInfoMode().licenseStatusColor
-                    font: DTK.fontManager.t6
                     horizontalAlignment: Text.AlignLeft
                     text: dccData.systemInfoMode().licenseStatusText
                 }
 
                 ToolButton {
                     text: dccData.systemInfoMode().licenseActionText
                     ColorSelector.family: Palette.CommonColor
-                    font: DTK.fontManager.t6
                     flat: false
                     visible: dccData.systemInfoMode().showDetail
                     opacity: 0.7
@@ -244,7 +227,6 @@ DccObject {
             pageType: DccObject.Editor
             displayName: qsTr("System installation time") + ":"
             page: Label {
-                font: DTK.fontManager.t6
                 horizontalAlignment: Text.AlignLeft
                 text: dccData.systemInfoMode().systemInstallationDate
             }
@@ -257,7 +239,6 @@ DccObject {
             pageType: DccObject.Editor
             displayName: qsTr("Kernel") + ":"
             page: Label {
-                font: DTK.fontManager.t6
                 horizontalAlignment: Text.AlignLeft
                 text: dccData.systemInfoMode().kernel
             }
@@ -271,7 +252,6 @@ DccObject {
             visible: dccData.systemInfoMode().showGraphicsPlatform()
             displayName: qsTr("Graphics Platform") + ":"
             page: Label {
-                font: DTK.fontManager.t6
                 horizontalAlignment: Text.AlignLeft
                 text: dccData.systemInfoMode().graphicsPlatform
             }
@@ -284,7 +264,6 @@ DccObject {
             pageType: DccObject.Editor
             displayName: qsTr("Processor") + ":"
             page: Label {
-                font: DTK.fontManager.t6
                 horizontalAlignment: Text.AlignLeft
                 text: dccData.systemInfoMode().processor
             }
@@ -297,7 +276,6 @@ DccObject {
             pageType: DccObject.Editor
             displayName: qsTr("Memory") + ":"
             page: Label {
-                font: DTK.fontManager.t6
                 horizontalAlignment: Text.AlignLeft
                 text: dccData.systemInfoMode().memory
             }

diff --git a/src/plugin-systeminfo/qml/dcc_systemInfo_edit.dci b/src/plugin-systeminfo/qml/dcc_systemInfo_edit.dci