lainns-mirror/noctalia-shell
1
0
Fork 0
mirror of https://github.com/noctalia-dev/noctalia-shell.git synced 2026-05-11 17:08:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(wifi): simplified colors managements in the panel

Browse Source
This commit is contained in:
Lemmy
2026-03-15 16:03:03 -04:00
parent ce5fd29650
commit ccd5b792ed
1 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/Panels/Settings/Tabs/Connections/WifiSubTab.qml
+21 -15
View File
@@ -508,14 +508,20 @@ Item {
readonly property bool isBusy: NetworkService.connectingTo === modelData.ssid || NetworkService.disconnectingFrom === modelData.ssid || NetworkService.forgettingNetwork === modelData.ssid
readonly property bool isExpanded: root.infoSsid === modelData.ssid
function getContentColor(defaultColor = Color.mOnSurface) {
function getContentColors(defaultColors = [Color.mSurface, Color.mOnSurface]) {
if (root.passwordSsid === modelData.ssid || NetworkService.connectingTo === modelData.ssid) {
return Color.mPrimary;
return [Color.mPrimary, Color.mOnPrimary];
}
if (modelData.connected && NetworkService.internetConnectivity && NetworkService.disconnectingFrom !== modelData.ssid) {
return [Color.mPrimary, Color.mOnPrimary];
}
if (NetworkService.disconnectingFrom === modelData.ssid || NetworkService.forgettingNetwork === modelData.ssid) {
return Color.mError;
return [Color.mError, Color.mOnError];
}
return defaultColor;
if (modelData.connected && !NetworkService.internetConnectivity) {
return [Color.mError, Color.mOnError];
}
return defaultColors;
}
Layout.fillWidth: true
@@ -523,7 +529,7 @@ Item {
radius: Style.radiusM
clip: true
color: (modelData.connected && NetworkService.disconnectingFrom !== modelData.ssid) ? Qt.alpha(Color.mPrimary, Color.panelBackgroundOpacity) : Color.mSurface
color: networkItem.getContentColors()[0]
ColumnLayout {
id: deviceColumn
@@ -540,7 +546,7 @@ Item {
NIcon {
icon: NetworkService.signalIcon(modelData.signal, modelData.connected)
pointSize: Style.fontSizeXXL
color: modelData.connected ? (NetworkService.internetConnectivity ? Color.mPrimary : Color.mError) : networkItem.getContentColor(Color.mOnSurface)
color: networkItem.getContentColors()[1]
Layout.alignment: Qt.AlignVCenter
MouseArea {
@@ -560,7 +566,7 @@ Item {
pointSize: Style.fontSizeM
font.weight: modelData.connected ? Style.fontWeightBold : Style.fontWeightMedium
elide: Text.ElideRight
color: networkItem.getContentColor(Color.mOnSurface)
color: networkItem.getContentColors()[1]
Layout.fillWidth: true
}
@@ -570,7 +576,7 @@ Item {
NIcon {
icon: NetworkService.isSecured(modelData.security) ? "lock" : "lock-open"
pointSize: Style.fontSizeXXS
color: networkItem.getContentColor(Color.mOnSurfaceVariant)
color: Qt.alpha(networkItem.getContentColors()[1], Style.opacityHeavy)
visible: !modelData.connected && NetworkService.disconnectingFrom !== modelData.ssid && NetworkService.forgettingNetwork !== modelData.ssid
}
@@ -600,7 +606,7 @@ Item {
return NetworkService.isSecured(modelData.security) ? modelData.security : I18n.tr("wifi.panel.security-open");
}
pointSize: Style.fontSizeXXS
color: networkItem.getContentColor(Color.mOnSurfaceVariant)
color: Qt.alpha(networkItem.getContentColors()[1], Style.opacityHeavy)
}
// Network speed indicators (visible when connected and speed > 0)
@@ -613,14 +619,14 @@ Item {
visible: SystemStatService.rxSpeed > 0
icon: "arrow-down"
pointSize: Style.fontSizeXXS
color: networkItem.getContentColor(Color.mOnSurfaceVariant)
color: Qt.alpha(networkItem.getContentColors()[1], Style.opacityHeavy)
}
NText {
visible: SystemStatService.rxSpeed > 0
text: SystemStatService.formatSpeed(SystemStatService.rxSpeed)
pointSize: Style.fontSizeXXS
color: networkItem.getContentColor(Color.mOnSurfaceVariant)
color: Qt.alpha(networkItem.getContentColors()[1], Style.opacityHeavy)
}
Item {
@@ -633,14 +639,14 @@ Item {
visible: SystemStatService.txSpeed > 0
icon: "arrow-up"
pointSize: Style.fontSizeXXS
color: networkItem.getContentColor(Color.mOnSurfaceVariant)
color: Qt.alpha(networkItem.getContentColors()[1], Style.opacityHeavy)
}
NText {
visible: SystemStatService.txSpeed > 0
text: SystemStatService.formatSpeed(SystemStatService.txSpeed)
pointSize: Style.fontSizeXXS
color: networkItem.getContentColor(Color.mOnSurfaceVariant)
color: Qt.alpha(networkItem.getContentColors()[1], Style.opacityHeavy)
}
}
}
@@ -687,9 +693,9 @@ Item {
id: button
visible: !modelData.connected && NetworkService.connectingTo !== modelData.ssid && root.passwordSsid !== modelData.ssid
enabled: !NetworkService.connecting && !networkItem.isBusy
outlined: !button.hovered
fontSize: Style.fontSizeS
backgroundColor: Color.mPrimary
textColor: Color.mOnPrimary
text: I18n.tr("common.connect")
onClicked: {
if (modelData.existing || modelData.cached || !NetworkService.isSecured(modelData.security)) {
@@ -704,9 +710,9 @@ Item {
id: disconnectButton
visible: modelData.connected && NetworkService.disconnectingFrom !== modelData.ssid
text: I18n.tr("common.disconnect")
outlined: !disconnectButton.hovered
fontSize: Style.fontSizeS
backgroundColor: Color.mError
textColor: Color.mOnError
onClicked: NetworkService.disconnect(modelData.ssid)
}
}