never/noctalia-shell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Post refactoring fixes 3/?

Browse source
This commit is contained in:
quadbyte 2025-08-15 22:19:18 -04:00
parent 258bb37533
commit c371ea68a3
4 changed files with 21 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Modules/Bar/ActiveWindow.qml
View file

@ -5,7 +5,6 @@ import qs.Commons
import qs.Services import qs.Services
import qs.Widgets import qs.Widgets
Row { Row {
id: layout id: layout
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter

2
Modules/Bar/WiFi.qml
View file

@ -19,7 +19,7 @@ NIconButton {
for (const net in NetworkService.networks) { for (const net in NetworkService.networks) {
if (NetworkService.networks[net].connected) { if (NetworkService.networks[net].connected) {
connected = true connected = true
signalStrength = network.networks[net].signal signalStrength = NetworkService.networks[net].signal
break break
} }
} }

13
Modules/Bar/WiFiMenu.qml
View file

@ -62,7 +62,7 @@ NLoader {
onTriggered: { onTriggered: {
wifiPanel.visible = false wifiPanel.visible = false
wifiPanel.dismissed() wifiPanel.dismissed()
NetworkService.onMenuClosed() // NetworkService.onMenuClosed()
} }
} }
@ -163,7 +163,7 @@ NLoader {
icon: "refresh" icon: "refresh"
tooltipText: "Refresh Networks" tooltipText: "Refresh Networks"
sizeMultiplier: 0.8 sizeMultiplier: 0.8
enabled: Settings.data.network.wifiEnabled && !network.isLoading enabled: Settings.data.network.wifiEnabled && !NetworkService.isLoading
onClicked: { onClicked: {
NetworkService.refreshNetworks() NetworkService.refreshNetworks()
} }
@ -239,8 +239,8 @@ NLoader {
ListView { ListView {
id: networkList id: networkList
anchors.fill: parent anchors.fill: parent
visible: Settings.data.network.wifiEnabled && !network.isLoading visible: Settings.data.network.wifiEnabled && !NetworkService.isLoading
model: Object.values(network.networks) model: Object.values(NetworkService.networks)
spacing: Style.marginMedium * scaling spacing: Style.marginMedium * scaling
clip: true clip: true
@ -295,7 +295,7 @@ NLoader {
NText { NText {
visible: NetworkService.connectStatusSsid === modelData.ssid visible: NetworkService.connectStatusSsid === modelData.ssid
&& NetworkService.connectStatus === "error" && network.connectError.length > 0 && NetworkService.connectStatus === "error" && NetworkService.connectError.length > 0
text: NetworkService.connectError text: NetworkService.connectError
color: Colors.mError color: Colors.mError
font.pointSize: Style.fontSizeSmall * scaling font.pointSize: Style.fontSizeSmall * scaling
@ -308,7 +308,8 @@ NLoader {
Layout.preferredWidth: Style.baseWidgetSize * 0.7 * scaling Layout.preferredWidth: Style.baseWidgetSize * 0.7 * scaling
Layout.preferredHeight: Style.baseWidgetSize * 0.7 * scaling Layout.preferredHeight: Style.baseWidgetSize * 0.7 * scaling
visible: NetworkService.connectStatusSsid === modelData.ssid visible: NetworkService.connectStatusSsid === modelData.ssid
&& (network.connectStatus !== "" || NetworkService.connectingSsid === modelData.ssid) && (NetworkService.connectStatus !== ""
|| NetworkService.connectingSsid === modelData.ssid)
NBusyIndicator { NBusyIndicator {
visible: NetworkService.connectingSsid === modelData.ssid visible: NetworkService.connectingSsid === modelData.ssid

22
Services/NetworkService.qml
View file

@ -1,6 +1,9 @@
pragma Singleton
import QtQuick import QtQuick
import Quickshell import Quickshell
import Quickshell.Io import Quickshell.Io
import qs.Commons
Singleton { Singleton {
id: root id: root
@ -14,6 +17,14 @@ Singleton {
property string lastConnectedNetwork: "" property string lastConnectedNetwork: ""
property bool isLoading: false property bool isLoading: false
Component.onCompleted: {
console.log("[Network] Service started")
// Only refresh networks if WiFi is enabled
if (Settings.data.network.wifiEnabled) {
refreshNetworks()
}
}
function signalIcon(signal) { function signalIcon(signal) {
if (signal >= 80) if (signal >= 80)
return "network_wifi" return "network_wifi"
@ -252,7 +263,7 @@ Singleton {
for (var i = 0; i < lines.length; ++i) { for (var i = 0; i < lines.length; ++i) {
const line = lines[i].trim() const line = lines[i].trim()
if (!line) if (!line)
continue continue
const parts = line.split(":") const parts = line.split(":")
if (parts.length < 2) { if (parts.length < 2) {
@ -291,7 +302,7 @@ Singleton {
for (var i = 0; i < lines.length; ++i) { for (var i = 0; i < lines.length; ++i) {
const line = lines[i].trim() const line = lines[i].trim()
if (!line) if (!line)
continue continue
const parts = line.split(":") const parts = line.split(":")
if (parts.length < 4) { if (parts.length < 4) {
@ -456,11 +467,4 @@ Singleton {
} }
} }
} }
Component.onCompleted: {
// Only refresh networks if WiFi is enabled
if (Settings.data.network.wifiEnabled) {
refreshNetworks()
}
}
} }