nosignal/nosignal-shell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

refactor: EthernetList correction on selected style

Browse source
This commit is contained in:
ATMDA 2025-11-20 08:18:29 -05:00
parent a15554ffde
commit ea9ab75db1
1 changed files with 38 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
modules/controlcenter/network/EthernetList.qml
View file

@ -56,14 +56,20 @@ DeviceList {
delegate: Component { delegate: Component {
StyledRect { StyledRect {
id: ethernetItem
required property var modelData required property var modelData
readonly property bool isActive: root.activeItem && modelData && root.activeItem.interface === modelData.interface
width: ListView.view ? ListView.view.width : undefined width: ListView.view ? ListView.view.width : undefined
implicitHeight: rowLayout.implicitHeight + Appearance.padding.normal * 2
color: Qt.alpha(Colours.tPalette.m3surfaceContainer, root.activeItem === modelData ? Colours.tPalette.m3surfaceContainer.a : 0) color: Qt.alpha(Colours.tPalette.m3surfaceContainer, ethernetItem.isActive ? Colours.tPalette.m3surfaceContainer.a : 0)
radius: Appearance.rounding.normal radius: Appearance.rounding.normal
StateLayer { StateLayer {
id: stateLayer
function onClicked(): void { function onClicked(): void {
root.session.ethernet.active = modelData; root.session.ethernet.active = modelData;
} }
@ -72,9 +78,7 @@ DeviceList {
RowLayout { RowLayout {
id: rowLayout id: rowLayout
anchors.left: parent.left anchors.fill: parent
anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter
anchors.margins: Appearance.padding.normal anchors.margins: Appearance.padding.normal
spacing: Appearance.spacing.normal spacing: Appearance.spacing.normal
@ -86,6 +90,12 @@ DeviceList {
radius: Appearance.rounding.normal radius: Appearance.rounding.normal
color: modelData.connected ? Colours.palette.m3primaryContainer : Colours.tPalette.m3surfaceContainerHigh color: modelData.connected ? Colours.palette.m3primaryContainer : Colours.tPalette.m3surfaceContainerHigh
StyledRect {
anchors.fill: parent
radius: parent.radius
color: Qt.alpha(modelData.connected ? Colours.palette.m3onPrimaryContainer : Colours.palette.m3onSurface, stateLayer.pressed ? 0.1 : stateLayer.containsMouse ? 0.08 : 0)
}
MaterialIcon { MaterialIcon {
id: icon id: icon
@ -94,25 +104,36 @@ DeviceList {
font.pointSize: Appearance.font.size.large font.pointSize: Appearance.font.size.large
fill: modelData.connected ? 1 : 0 fill: modelData.connected ? 1 : 0
color: modelData.connected ? Colours.palette.m3onPrimaryContainer : Colours.palette.m3onSurface color: modelData.connected ? Colours.palette.m3onPrimaryContainer : Colours.palette.m3onSurface
Behavior on fill {
Anim {}
} }
} }
}
ColumnLayout {
Layout.fillWidth: true
spacing: 0
StyledText {
Layout.fillWidth: true
text: modelData.interface || qsTr("Unknown")
elide: Text.ElideRight
}
StyledText { StyledText {
Layout.fillWidth: true Layout.fillWidth: true
elide: Text.ElideRight
maximumLineCount: 1
text: modelData.interface || qsTr("Unknown")
}
StyledText {
text: modelData.connected ? qsTr("Connected") : qsTr("Disconnected") text: modelData.connected ? qsTr("Connected") : qsTr("Disconnected")
color: modelData.connected ? Colours.palette.m3primary : Colours.palette.m3outline color: Colours.palette.m3outline
font.pointSize: Appearance.font.size.small font.pointSize: Appearance.font.size.small
font.weight: modelData.connected ? 500 : 400 elide: Text.ElideRight
}
} }
StyledRect { StyledRect {
id: connectBtn
implicitWidth: implicitHeight implicitWidth: implicitHeight
implicitHeight: connectIcon.implicitHeight + Appearance.padding.smaller * 2 implicitHeight: connectIcon.implicitHeight + Appearance.padding.smaller * 2
@ -120,6 +141,8 @@ DeviceList {
color: Qt.alpha(Colours.palette.m3primaryContainer, modelData.connected ? 1 : 0) color: Qt.alpha(Colours.palette.m3primaryContainer, modelData.connected ? 1 : 0)
StateLayer { StateLayer {
color: modelData.connected ? Colours.palette.m3onPrimaryContainer : Colours.palette.m3onSurface
function onClicked(): void { function onClicked(): void {
if (modelData.connected && modelData.connection) { if (modelData.connected && modelData.connection) {
Nmcli.disconnectEthernet(modelData.connection, () => {}); Nmcli.disconnectEthernet(modelData.connection, () => {});
@ -133,13 +156,12 @@ DeviceList {
id: connectIcon id: connectIcon
anchors.centerIn: parent anchors.centerIn: parent
animate: true
text: modelData.connected ? "link_off" : "link" text: modelData.connected ? "link_off" : "link"
color: modelData.connected ? Colours.palette.m3onPrimaryContainer : Colours.palette.m3onSurface color: modelData.connected ? Colours.palette.m3onPrimaryContainer : Colours.palette.m3onSurface
} }
} }
} }
implicitHeight: rowLayout.implicitHeight + Appearance.padding.normal * 2
} }
} }