From ed6614a71269b4b2da274d71eaf8b91de5f72f25 Mon Sep 17 00:00:00 2001 From: zhanghongyuan Date: Sat, 21 Mar 2026 13:17:52 +0800 Subject: [PATCH] style(qml): optimize UI styling and fix copyright year MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Correct SPDX copyright year from 2024-2027 to 2024-2026 and optimize label styling in network settings pages. 修正SPDX版权年份并优化网络设置页面的标签样式。 Log: 修正版权年份并优化UI样式 PMS: BUG-353881 Influence: 优化网络设置页面的UI显示效果,修正版权信息错误。 --- dcc-network/qml/PageDetails.qml | 11 ++++++++--- dcc-network/qml/SectionDNS.qml | 4 +++- dcc-network/qml/SectionIPv4.qml | 4 +++- dcc-network/qml/SectionIPv6.qml | 4 +++- 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/dcc-network/qml/PageDetails.qml b/dcc-network/qml/PageDetails.qml index 72aff0c3..f160e971 100644 --- a/dcc-network/qml/PageDetails.qml +++ b/dcc-network/qml/PageDetails.qml @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2024 - 2027 UnionTech Software Technology Co., Ltd. +// SPDX-FileCopyrightText: 2024 - 2026 UnionTech Software Technology Co., Ltd. // SPDX-License-Identifier: GPL-3.0-or-later import QtQuick 2.15 import QtQuick.Controls 2.15 @@ -47,11 +47,16 @@ DccObject { pageType: DccObject.Item page: RowLayout { DccLabel { + property D.Palette textColor: D.Palette { + normal: Qt.rgba(0, 0, 0, 0.9) + normalDark: Qt.rgba(1, 1, 1, 0.9) + } Layout.alignment: Qt.AlignLeft Layout.fillWidth: true - font: DccUtils.copyFont(D.DTK.fontManager.t4, { - "bold": true + font: DccUtils.copyFont(D.DTK.fontManager.t5, { + "weight": 500 }) + color: D.ColorSelector.textColor text: dccObj.displayName elide: Text.ElideMiddle } diff --git a/dcc-network/qml/SectionDNS.qml b/dcc-network/qml/SectionDNS.qml index 019f0cde..0acf673f 100644 --- a/dcc-network/qml/SectionDNS.qml +++ b/dcc-network/qml/SectionDNS.qml @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2024 - 2027 UnionTech Software Technology Co., Ltd. +// SPDX-FileCopyrightText: 2024 - 2026 UnionTech Software Technology Co., Ltd. // SPDX-License-Identifier: GPL-3.0-or-later import QtQuick 2.15 import QtQuick.Controls 2.15 @@ -128,6 +128,8 @@ DccObject { } Label { // visible: root.config.method === "manual" + bottomPadding: 0 + font.pixelSize: D.DTK.fontManager.t8.pixelSize text: isEdit ? qsTr("Done") : qsTr("Edit") color: palette.link MouseArea { diff --git a/dcc-network/qml/SectionIPv4.qml b/dcc-network/qml/SectionIPv4.qml index 6964b80b..3811be6f 100644 --- a/dcc-network/qml/SectionIPv4.qml +++ b/dcc-network/qml/SectionIPv4.qml @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2024 - 2027 UnionTech Software Technology Co., Ltd. +// SPDX-FileCopyrightText: 2024 - 2026 UnionTech Software Technology Co., Ltd. // SPDX-License-Identifier: GPL-3.0-or-later import QtQuick 2.15 import QtQuick.Controls 2.15 @@ -153,6 +153,8 @@ DccObject { } Label { visible: root.method === "manual" + bottomPadding: 0 + font.pixelSize: D.DTK.fontManager.t8.pixelSize text: isEdit ? qsTr("Done") : qsTr("Edit") color: palette.link MouseArea { diff --git a/dcc-network/qml/SectionIPv6.qml b/dcc-network/qml/SectionIPv6.qml index 10d696f9..0a97cddf 100644 --- a/dcc-network/qml/SectionIPv6.qml +++ b/dcc-network/qml/SectionIPv6.qml @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2024 - 2027 UnionTech Software Technology Co., Ltd. +// SPDX-FileCopyrightText: 2024 - 2026 UnionTech Software Technology Co., Ltd. // SPDX-License-Identifier: GPL-3.0-or-later import QtQuick 2.15 import QtQuick.Controls 2.15 @@ -179,6 +179,8 @@ DccObject { } Label { visible: root.method === "manual" + bottomPadding: 0 + font.pixelSize: D.DTK.fontManager.t8.pixelSize text: isEdit ? qsTr("Done") : qsTr("Edit") color: palette.link MouseArea {