feat(ui): update button appearance by setting ColorSelector inactive state

add-uos · add-uos · commit e42cb0d168f8 · 2026-02-11T10:25:15.000+08:00
Set D.ColorSelector.inactived: false on buttons and input fields
across update module QML files to ensure consistent visual
appearance and prevent unintended inactive styling.

log: button appearance by setting ColorSelector inactive state
bug: PMS-298841
diff --git a/dcc-network/qml/NetButton.qml b/dcc-network/qml/NetButton.qml
@@ -3,6 +3,8 @@
 import QtQuick 2.15
 import QtQuick.Controls 2.15
 
+import org.deepin.dtk 1.0 as D
+
 Button {
     implicitHeight: implicitContentHeight + 6
     implicitWidth: implicitContentWidth + 10
@@ -11,4 +13,5 @@ Button {
     leftPadding: 0
     rightPadding: 0
     spacing: 0
+    D.ColorSelector.inactived: false
 }
diff --git a/dcc-network/qml/NetFileChooseEdit.qml b/dcc-network/qml/NetFileChooseEdit.qml
@@ -30,6 +30,7 @@ RowLayout {
     }
     D.LineEdit {
         id: edit
+        D.ColorSelector.inactived: false
         onTextChanged: {
             if (!initialized) {
                 return
diff --git a/dcc-network/qml/NetItemEditor.qml b/dcc-network/qml/NetItemEditor.qml
@@ -12,6 +12,7 @@ D.ItemDelegate {
     Layout.fillWidth: true
     backgroundVisible: false
     checkable: false
+    D.ColorSelector.inactived: false
     background: DccItemBackground {
         separatorVisible: true
     }
diff --git a/dcc-network/qml/NetPasswordEdit.qml b/dcc-network/qml/NetPasswordEdit.qml
@@ -12,6 +12,7 @@ D.PasswordEdit {
     property bool initialized: false
     signal textUpdated
 
+    D.ColorSelector.inactived: false
     placeholderText: qsTr("Required")
     echoButtonVisible: newInput
     showAlert: dataItem.errorKey === dccObj.name
diff --git a/dcc-network/qml/PageAppProxy.qml b/dcc-network/qml/PageAppProxy.qml
@@ -125,6 +125,7 @@ DccObject {
                 weight: 20
                 pageType: DccObject.Editor
                 page: D.LineEdit {
+                    D.ColorSelector.inactived: false
                     topInset: 4
                     bottomInset: 4
                     validator: RegularExpressionValidator {
@@ -155,6 +156,7 @@ DccObject {
                 weight: 30
                 pageType: DccObject.Editor
                 page: D.LineEdit {
+                    D.ColorSelector.inactived: false
                     topInset: 4
                     bottomInset: 4
                     validator: IntValidator {
@@ -186,6 +188,7 @@ DccObject {
                 weight: 40
                 pageType: DccObject.Editor
                 page: D.LineEdit {
+                    D.ColorSelector.inactived: false
                     topInset: 4
                     bottomInset: 4
                     text: root.config.user
@@ -257,6 +260,7 @@ DccObject {
                 leftPadding: 0
                 rightPadding: 0
                 spacing: 0
+                D.ColorSelector.inactived: false
                 text: qsTr("Cancel")
                 Layout.alignment: Qt.AlignRight
                 onClicked: {
@@ -279,6 +283,7 @@ DccObject {
                 leftPadding: 0
                 rightPadding: 0
                 spacing: 0
+                D.ColorSelector.inactived: false
                 text: qsTr("Save")
                 Layout.alignment: Qt.AlignRight
                 onClicked: {
diff --git a/dcc-network/qml/PageDSLSettings.qml b/dcc-network/qml/PageDSLSettings.qml
@@ -138,6 +138,7 @@ DccObject {
                         Button {
                             Layout.fillWidth: true
                             text: qsTr("Cancel")
+                            D.ColorSelector.inactived: false
                             onClicked: close()
                         }
                         Rectangle {
@@ -148,6 +149,7 @@ DccObject {
 
                         D.Button {
                             Layout.fillWidth: true
+                            D.ColorSelector.inactived: false
                             contentItem: D.IconLabel {
                                 text: qsTr("Delete")
                                 color: "red"
diff --git a/dcc-network/qml/PageHotspot.qml b/dcc-network/qml/PageHotspot.qml
@@ -236,6 +236,7 @@ DccObject {
                                     text: qsTr("Name (SSID)")
                                     corners: getCornersForBackground(0, colLayout.children.length)
                                     content: D.LineEdit {
+                                        D.ColorSelector.inactived: false
                                         showAlert: ssidAlert
                                         alertDuration: 2000
                                         placeholderText: qsTr("Required")
@@ -327,6 +328,7 @@ DccObject {
                             Button {
                                 Layout.fillWidth: true
                                 text: qsTr("Cancel")
+                                D.ColorSelector.inactived: false
                                 onClicked: close()
                             }
                             Rectangle {
@@ -337,6 +339,7 @@ DccObject {
 
                             D.Button {
                                 Layout.fillWidth: true
+                                D.ColorSelector.inactived: false
                                 // contentItem: D.IconLabel {
                                 text: qsTr("Save")
                                 //     color: "red"
diff --git a/dcc-network/qml/PageSettings.qml b/dcc-network/qml/PageSettings.qml
@@ -141,6 +141,7 @@ DccObject {
                         Button {
                             Layout.fillWidth: true
                             text: qsTr("Cancel")
+                            D.ColorSelector.inactived: false
                             onClicked: close()
                         }
                         Rectangle {
@@ -151,6 +152,7 @@ DccObject {
 
                         D.Button {
                             Layout.fillWidth: true
+                            D.ColorSelector.inactived: false
                             contentItem: D.IconLabel {
                                 text: qsTr("Delete")
                                 color: "red"
diff --git a/dcc-network/qml/PageSystemProxy.qml b/dcc-network/qml/PageSystemProxy.qml
@@ -136,6 +136,7 @@ DccObject {
                 pageType: DccObject.Editor
                 visible: method === NetType.Auto
                 page: D.LineEdit {
+                    D.ColorSelector.inactived: false
                     topInset: 4
                     bottomInset: 4
                     placeholderText: qsTr("Required")
@@ -236,6 +237,7 @@ DccObject {
                 pageType: DccObject.Item
                 page: TextArea {
                     wrapMode: TextEdit.WordWrap
+                    D.ColorSelector.inactived: false
                     text: dccObj.config
                     onTextChanged: {
                         if (dccObj.config !== text) {
@@ -286,6 +288,7 @@ DccObject {
                     leftPadding: 0
                     rightPadding: 0
                     spacing: 0
+                    D.ColorSelector.inactived: false
                     text: dccObj.displayName
                     Layout.alignment: Qt.AlignRight
                     onClicked: root.resetData()
@@ -306,6 +309,7 @@ DccObject {
                     leftPadding: 0
                     rightPadding: 0
                     spacing: 0
+                    D.ColorSelector.inactived: false
                     enabled: (method === NetType.Auto && (inputItem & 0xf0)) || (method === NetType.Manual && (inputItem & 0x0f))
                     text: dccObj.displayName
                     Layout.alignment: Qt.AlignRight
diff --git a/dcc-network/qml/PageVPN.qml b/dcc-network/qml/PageVPN.qml
@@ -231,6 +231,7 @@ DccObject {
                             Button {
                                 Layout.fillWidth: true
                                 Layout.margins: 10
+                                D.ColorSelector.inactived: false
                                 text: qsTr("OK")
                                 onClicked: close()
                             }
@@ -246,6 +247,7 @@ DccObject {
                 page: NetButton {
                     text: qsTr("Add VPN")
                     Layout.alignment: Qt.AlignRight
+                    D.ColorSelector.inactived: false
                     onClicked: {
                         dccData.exec(NetManager.ConnectInfo, netItem.id, {})
                     }
diff --git a/dcc-network/qml/PageVPNSettings.qml b/dcc-network/qml/PageVPNSettings.qml
@@ -195,6 +195,7 @@ DccObject {
                         Button {
                             Layout.fillWidth: true
                             text: qsTr("Cancel")
+                            D.ColorSelector.inactived: false
                             onClicked: close()
                         }
                         Rectangle {
@@ -205,6 +206,7 @@ DccObject {
 
                         D.Button {
                             Layout.fillWidth: true
+                            D.ColorSelector.inactived: false
                             contentItem: D.IconLabel {
                                 text: qsTr("Delete")
                                 color: "red"
diff --git a/dcc-network/qml/SectionDNS.qml b/dcc-network/qml/SectionDNS.qml
@@ -113,15 +113,10 @@ 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)
-            }
             font: DccUtils.copyFont(D.DTK.fontManager.t5, {
                                         "weight": 500
                                     })
             text: dccObj.displayName
-            color: D.ColorSelector.textColor
         }
         Item {
             Layout.fillWidth: true
@@ -165,6 +160,7 @@ DccObject {
             pageType: DccObject.Editor
             page: RowLayout {
                 D.LineEdit {
+                    D.ColorSelector.inactived: false
                     text: root.config[index]
                     // 移除正则验证器，改用手动验证以支持IPv6
                     // 显式允许所有字符输入，包括冒号
diff --git a/dcc-network/qml/SectionDevice.qml b/dcc-network/qml/SectionDevice.qml
@@ -137,6 +137,7 @@ DccTitleObject {
             pageType: DccObject.Editor
             page: D.LineEdit {
                 text: root.config.hasOwnProperty("cloned-mac-address") ? root.config["cloned-mac-address"] : ""
+                D.ColorSelector.inactived: false
                 validator: RegularExpressionValidator {
                     regularExpression: NetUtils.macRegExp
                 }
diff --git a/dcc-network/qml/SectionGeneric.qml b/dcc-network/qml/SectionGeneric.qml
@@ -55,6 +55,7 @@ DccTitleObject {
             enabled: root.config.type !== "802-11-wireless" || !root.config.hasOwnProperty("id") || root.config.id.length === 0
             pageType: DccObject.Editor
             page: D.LineEdit {
+                D.ColorSelector.inactived: false
                 text: settingsID
                 placeholderText: qsTr("Required")
                 onTextChanged: {
diff --git a/dcc-network/qml/SectionIPv4.qml b/dcc-network/qml/SectionIPv4.qml
@@ -138,15 +138,11 @@ 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)
-            }
             font: DccUtils.copyFont(D.DTK.fontManager.t5, {
                                         "weight": 500
                                     })
             text: dccObj.displayName
-            color: D.ColorSelector.textColor
+            D.ColorSelector.inactived: false
         }
         Item {
             Layout.fillWidth: true
@@ -331,6 +327,7 @@ DccObject {
                     canSearch: false
                     pageType: DccObject.Editor
                     page: D.LineEdit {
+                        D.ColorSelector.inactived: false
                         text: addressData.length > index ? addressData[index][0] : "0.0.0.0"
                         validator: RegularExpressionValidator {
                             regularExpression: NetUtils.ipRegExp
@@ -363,6 +360,7 @@ DccObject {
                     canSearch: false
                     pageType: DccObject.Editor
                     page: D.LineEdit {
+                        D.ColorSelector.inactived: false
                         text: addressData.length > index ? addressData[index][1] : "255.255.255.0"
                         validator: RegularExpressionValidator {
                             regularExpression: NetUtils.maskRegExp
@@ -395,6 +393,7 @@ DccObject {
                     pageType: DccObject.Editor
                     page: D.LineEdit {
                         enabled: index === 0
+                        D.ColorSelector.inactived: false
                         text: index === 0 && addressData.length > index ? addressData[index][2] : ""
                         validator: RegularExpressionValidator {
                             regularExpression: NetUtils.ipRegExp
diff --git a/dcc-network/qml/SectionIPv6.qml b/dcc-network/qml/SectionIPv6.qml
@@ -172,7 +172,7 @@ DccObject {
                                         "weight": 500
                                     })
             text: dccObj.displayName
-            color: D.ColorSelector.textColor
+            D.ColorSelector.inactived: falsegit
         }
         Item {
             Layout.fillWidth: true
@@ -336,6 +336,7 @@ DccObject {
                     canSearch: false
                     pageType: DccObject.Editor
                     page: D.LineEdit {
+                        D.ColorSelector.inactived: false
                         text: root.addressData.length > index ? root.addressData[index].address : ""
                         validator: RegularExpressionValidator {
                             regularExpression: NetUtils.ipv6RegExp
@@ -405,6 +406,7 @@ DccObject {
                     pageType: DccObject.Editor
                     page: D.LineEdit {
                         enabled: index === 0
+                        D.ColorSelector.inactived: false
                         text: index === 0 ? gateway[index] : ""
                         validator: RegularExpressionValidator {
                             regularExpression: NetUtils.ipv6RegExp
diff --git a/dcc-network/qml/SectionPPPOE.qml b/dcc-network/qml/SectionPPPOE.qml
@@ -51,6 +51,7 @@ DccTitleObject {
             weight: 10
             pageType: DccObject.Editor
             page: D.LineEdit {
+                D.ColorSelector.inactived: false
                 placeholderText: qsTr("Required")
                 text: root.config.hasOwnProperty("username") ? root.config.username : ""
                 showAlert: errorKey === dccObj.name
@@ -80,6 +81,7 @@ DccTitleObject {
             weight: 20
             pageType: DccObject.Editor
             page: D.LineEdit {
+                D.ColorSelector.inactived: false
                 text: root.config.hasOwnProperty("service") ? root.config.service : ""
                 onTextChanged: {
                     if (root.config.service !== text) {
diff --git a/dcc-network/qml/SectionSecret.qml b/dcc-network/qml/SectionSecret.qml
@@ -416,6 +416,7 @@ DccTitleObject {
             visible: root.keyMgmt === "wpa-eap"
             pageType: DccObject.Editor
             page: D.LineEdit {
+                D.ColorSelector.inactived: false
                 placeholderText: qsTr("Required")
                 text: root.config802_1x && root.config802_1x.hasOwnProperty("identity") ? root.config802_1x.identity : ""
                 onTextChanged: {
@@ -536,6 +537,7 @@ DccTitleObject {
             visible: root.keyMgmt === "wpa-eap" && (root.eapType === "fast" || root.eapType === "ttls" || root.eapType === "peap")
             pageType: DccObject.Editor
             page: D.LineEdit {
+                D.ColorSelector.inactived: false
                 text: root.config802_1x && root.config802_1x.hasOwnProperty("anonymous-identity") ? root.config802_1x["anonymous-identity"] : ""
                 onTextChanged: {
                     if (root.config802_1x["anonymous-identity"] !== text) {
diff --git a/dcc-network/qml/SectionVPN.qml b/dcc-network/qml/SectionVPN.qml
@@ -355,6 +355,7 @@ DccTitleObject {
         RowLayout {
             D.LineEdit {
                 id: fileEdit
+                D.ColorSelector.inactived: false
                 text: root.dataMap.hasOwnProperty(dccObj.name) ? NetUtils.removeTrailingNull(root.dataMap[dccObj.name]) : ""
                 onTextChanged: {
                     if (showAlert) {
@@ -389,6 +390,7 @@ DccTitleObject {
         RowLayout {
             D.LineEdit {
                 id: fileEdit
+                D.ColorSelector.inactived: false
                 placeholderText: qsTr("Required")
                 text: root.dataMap.hasOwnProperty(dccObj.name) ? NetUtils.removeTrailingNull(root.dataMap[dccObj.name]) : ""
                 onTextChanged: {
@@ -422,6 +424,7 @@ DccTitleObject {
     Component {
         id: gatewayLineEdit
         D.LineEdit {
+            D.ColorSelector.inactived: false
             placeholderText: qsTr("Required")
             text: root.dataMap.hasOwnProperty(dccObj.name) ? root.dataMap[dccObj.name] : ""
             onTextChanged: {
@@ -447,6 +450,7 @@ DccTitleObject {
     Component {
         id: requiredLineEdit
         D.LineEdit {
+            D.ColorSelector.inactived: false
             placeholderText: qsTr("Required")
             text: root.dataMap.hasOwnProperty(dccObj.name) ? root.dataMap[dccObj.name] : ""
             onTextChanged: {
@@ -471,6 +475,7 @@ DccTitleObject {
     Component {
         id: lineEdit
         D.LineEdit {
+            D.ColorSelector.inactived: false
             text: root.dataMap.hasOwnProperty(dccObj.name) ? root.dataMap[dccObj.name] : ""
             onTextChanged: {
                 if (showAlert) {
@@ -633,6 +638,7 @@ DccTitleObject {
             page: RowLayout {
                 D.LineEdit {
                     id: usercertEdit
+                    D.ColorSelector.inactived: false
                     placeholderText: root.vpnType === NetUtils.VpnTypeEnum["strongswan"] ? "" : qsTr("Required")
                     text: root.dataMap.hasOwnProperty(dccObj.name) ? NetUtils.removeTrailingNull(root.dataMap[dccObj.name]) : ""
                     onTextChanged: {
@@ -674,6 +680,7 @@ DccTitleObject {
             page: RowLayout {
                 D.LineEdit {
                     id: userkeyEdit
+                    D.ColorSelector.inactived: false
                     placeholderText: root.vpnType === NetUtils.VpnTypeEnum["strongswan"] ? "" : qsTr("Required")
                     text: root.dataMap.hasOwnProperty(dccObj.name) ? NetUtils.removeTrailingNull(root.dataMap[dccObj.name]) : ""
                     onTextChanged: {
diff --git a/dcc-network/qml/SystemProxyConfigItem.qml b/dcc-network/qml/SystemProxyConfigItem.qml

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@ RowLayout {`
`30`	`30`	`}`
`31`	`31`	`D.LineEdit {`
`32`	`32`	`id: edit`
	`33`	`+ D.ColorSelector.inactived: false`
`33`	`34`	`onTextChanged: {`
`34`	`35`	`if (!initialized) {`
`35`	`36`	`return`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ D.ItemDelegate {`
`12`	`12`	`Layout.fillWidth: true`
`13`	`13`	`backgroundVisible: false`
`14`	`14`	`checkable: false`
	`15`	`+ D.ColorSelector.inactived: false`
`15`	`16`	`background: DccItemBackground {`
`16`	`17`	`separatorVisible: true`
`17`	`18`	`}`