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

some fixes - deleted un-needed if block

Browse Source 
Someone for some reason may have one or more ethernet interfaces. but they only see one icon for all | but status badges works YAY!
This commit is contained in:
Turann_
2026-03-15 06:51:19 +03:00
parent bd61583482
commit 9b69980267
1 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/Panels/Network/NetworkPanel.qml
+12 -19
View File
@@ -129,7 +129,7 @@ SmartPanel {
panelViewMode = "wifi";
}
}
onEntered: TooltipService.show(parent, panelViewMode === "wifi" ? I18n.tr("common.ethernet") : I18n.tr("common.wifi"))
onEntered: TooltipService.show(parent, panelViewMode === "wifi" ? I18n.tr("common.wifi") : I18n.tr("common.ethernet"))
onExited: TooltipService.hide()
}
}
@@ -475,7 +475,7 @@ SmartPanel {
// anchored to this row (defined right after this RowLayout).
NIcon {
icon: "ethernet"
icon: NetworkService.getIcon()
pointSize: Style.fontSizeXXL
color: modelData.connected ? Color.mPrimary : Color.mOnSurface
}
@@ -499,47 +499,40 @@ SmartPanel {
NText {
text: {
if (modelData.connected) {
switch (NetworkService.networkConnectivity) {
switch (modelData.connectivity) {
case "full":
return I18n.tr("common.connected");
case "limited":
case "unknown":
return I18n.tr("wifi.panel.internet-limited");
case "portal":
return I18n.tr("wifi.panel.action-required");
default:
return NetworkService.networkConnectivity;
return modelData.connectivity || "unknown";
}
}
return I18n.tr("common.disconnected");
}
pointSize: Style.fontSizeXXS
color: {
if (!modelData.connected) {
return Color.mError;
}
if (NetworkService.networkConnectivity === "limited" || NetworkService.networkConnectivity === "portal") {
return Color.mError;
}
return Color.mPrimary;
}
color: (!modelData.connected || modelData.connectivity === "limited" || modelData.connectivity === "portal" || modelData.connectivity === "unknown") ? Color.mError : Color.mPrimary
}
// Network speed indicators (visible when connected and speed > 0)
RowLayout {
visible: modelData.connected && (SystemStatService.rxSpeed > 0 || SystemStatService.txSpeed > 0)
visible: modelData.connectivity === "full" && (SystemStatService.rxSpeed > 0 || SystemStatService.txSpeed > 0)
spacing: 2
Layout.leftMargin: Style.marginXS
Layout.fillWidth: false
NIcon {
visible: SystemStatService.rxSpeed > 0
visible: modelData.connectivity === "full" && SystemStatService.rxSpeed > 0
icon: "arrow-down"
pointSize: Style.fontSizeXXS
color: Color.mOnSurfaceVariant
}
NText {
visible: SystemStatService.rxSpeed > 0
visible: modelData.connectivity === "full" && SystemStatService.rxSpeed > 0
text: SystemStatService.formatSpeed(SystemStatService.rxSpeed)
pointSize: Style.fontSizeXXS
color: Color.mOnSurfaceVariant
@@ -547,20 +540,20 @@ SmartPanel {
}
Item {
visible: SystemStatService.rxSpeed > 0 && SystemStatService.txSpeed > 0
visible: modelData.connectivity === "full" && && SystemStatService.rxSpeed > 0 && SystemStatService.txSpeed > 0
width: Style.marginXS
height: 1
}
NIcon {
visible: SystemStatService.txSpeed > 0
visible: modelData.connectivity === "full" && SystemStatService.txSpeed > 0
icon: "arrow-up"
pointSize: Style.fontSizeXXS
color: Color.mOnSurfaceVariant
}
NText {
visible: SystemStatService.txSpeed > 0
visible: modelData.connectivity === "full" && SystemStatService.txSpeed > 0
text: SystemStatService.formatSpeed(SystemStatService.txSpeed)
pointSize: Style.fontSizeXXS
color: Color.mOnSurfaceVariant