Skip to content

fix(network): show WiFi connection progress #2684

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bbedward merged 1 commit into from
Jun 23, 2026
+59 −13
Merged

fix(network): show WiFi connection progress #2684

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 21 additions & 6 deletions quickshell/Modules/ControlCenter/Details/NetworkDetail.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -565,6 +565,7 @@ Rectangle {
required property int index

readonly property bool isConnected: modelData.ssid === NetworkService.currentWifiSSID
readonly property bool isConnecting: NetworkService.isWifiConnecting && NetworkService.connectingSSID === modelData.ssid
readonly property bool isPinned: root.getPinnedNetworks().includes(modelData.ssid)
readonly property string networkName: modelData.ssid || I18n.tr("Unknown Network")
readonly property int signalStrength: modelData.signal || 0
Expand All @@ -583,7 +584,17 @@ Rectangle {
anchors.leftMargin: Theme.spacingM
spacing: Theme.spacingS

DankSpinner {
size: Theme.iconSize - 4
strokeWidth: 2
color: Theme.warning
running: wifiDelegate.isConnecting
visible: wifiDelegate.isConnecting
anchors.verticalCenter: parent.verticalCenter
}

DankIcon {
visible: !wifiDelegate.isConnecting
name: {
if (wifiDelegate.signalStrength >= 50)
return "wifi";
Expand All @@ -603,7 +614,7 @@ Rectangle {
StyledText {
text: wifiDelegate.networkName
font.pixelSize: Theme.fontSizeMedium
color: Theme.surfaceText
color: wifiDelegate.isConnected ? Theme.primary : Theme.surfaceText
font.weight: wifiDelegate.isConnected ? Font.Medium : Font.Normal
elide: Text.ElideRight
width: parent.width
Expand All @@ -613,9 +624,9 @@ Rectangle {
spacing: Theme.spacingXS

StyledText {
text: wifiDelegate.isConnected ? I18n.tr("Connected") + " \u2022" : (modelData.secured ? I18n.tr("Secured") + " \u2022" : I18n.tr("Open") + " \u2022")
text: wifiDelegate.isConnecting ? I18n.tr("Connecting...") + " \u2022" : (wifiDelegate.isConnected ? I18n.tr("Connected") + " \u2022" : (modelData.secured ? I18n.tr("Secured") + " \u2022" : I18n.tr("Open") + " \u2022"))
font.pixelSize: Theme.fontSizeSmall
color: Theme.surfaceVariantText
color: wifiDelegate.isConnecting ? Theme.warning : Theme.surfaceVariantText
}

StyledText {
Expand Down Expand Up @@ -651,6 +662,7 @@ Rectangle {
networkContextMenu.currentSecured = modelData.secured;
networkContextMenu.currentEnterprise = modelData.enterprise;
networkContextMenu.currentConnected = wifiDelegate.isConnected;
networkContextMenu.currentConnecting = wifiDelegate.isConnecting;
networkContextMenu.currentSaved = modelData.saved;
networkContextMenu.currentSignal = modelData.signal;
networkContextMenu.currentAutoconnect = modelData.autoconnect || false;
Expand Down Expand Up @@ -743,7 +755,8 @@ Rectangle {
anchors.fill: parent
anchors.rightMargin: optionsButton.width + pinWifiRow.width + (qrCodeButton.visible ? qrCodeButton.width : 0) + Theme.spacingS * 5 + Theme.spacingM
hoverEnabled: true
cursorShape: Qt.PointingHandCursor
enabled: !NetworkService.isWifiConnecting || wifiDelegate.isConnected
cursorShape: enabled ? Qt.PointingHandCursor : Qt.BusyCursor
onPressed: mouse => wifiRipple.trigger(mouse.x, mouse.y)
onClicked: function (event) {
if (wifiDelegate.isConnected) {
Expand All @@ -768,6 +781,7 @@ Rectangle {
property bool currentSecured: false
property bool currentEnterprise: false
property bool currentConnected: false
property bool currentConnecting: false
property bool currentSaved: false
property int currentSignal: 0
property bool currentAutoconnect: false
Expand All @@ -786,13 +800,14 @@ Rectangle {
}

MenuItem {
text: networkContextMenu.currentConnected ? I18n.tr("Disconnect") : I18n.tr("Connect")
text: networkContextMenu.currentConnecting ? I18n.tr("Connecting...") : (networkContextMenu.currentConnected ? I18n.tr("Disconnect") : I18n.tr("Connect"))
height: 32
enabled: !networkContextMenu.currentConnecting

contentItem: StyledText {
text: parent.text
font.pixelSize: Theme.fontSizeSmall
color: Theme.surfaceText
color: parent.enabled ? Theme.surfaceText : Theme.surfaceVariantText
leftPadding: Theme.spacingS
verticalAlignment: Text.AlignVCenter
}
Expand Down
41 changes: 34 additions & 7 deletions quickshell/Modules/Settings/NetworkWifiTab.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,6 +465,7 @@ Item {
required property int index

readonly property bool isConnected: modelData.ssid === NetworkService.currentWifiSSID
readonly property bool isConnecting: NetworkService.isWifiConnecting && NetworkService.connectingSSID === modelData.ssid
readonly property bool isPinned: root.getPinnedWifiNetworks().includes(modelData.ssid)
readonly property bool isExpanded: root.expandedWifiSsid === modelData.ssid

Expand Down Expand Up @@ -499,7 +500,17 @@ Item {
anchors.rightMargin: Theme.spacingS
spacing: Theme.spacingS

DankSpinner {
size: 20
strokeWidth: 2
color: Theme.warning
running: isConnecting
visible: isConnecting
anchors.verticalCenter: parent.verticalCenter
}

DankIcon {
visible: !isConnecting
name: {
const s = modelData.signal || 0;
if (s >= 50)
Expand Down Expand Up @@ -552,9 +563,9 @@ Item {
spacing: Theme.spacingXS

StyledText {
text: isConnected ? I18n.tr("Connected") : (modelData.secured ? I18n.tr("Secured") : I18n.tr("Open"))
text: isConnecting ? I18n.tr("Connecting...") : (isConnected ? I18n.tr("Connected") : (modelData.secured ? I18n.tr("Secured") : I18n.tr("Open")))
font.pixelSize: Theme.fontSizeSmall
color: isConnected ? Theme.primary : Theme.surfaceVariantText
color: isConnecting ? Theme.warning : (isConnected ? Theme.primary : Theme.surfaceVariantText)
}

StyledText {
Expand Down Expand Up @@ -672,7 +683,8 @@ Item {
anchors.fill: parent
anchors.rightMargin: wifiNetworkActions.width + Theme.spacingM
hoverEnabled: true
cursorShape: Qt.PointingHandCursor
enabled: !NetworkService.isWifiConnecting || isConnected
cursorShape: enabled ? Qt.PointingHandCursor : Qt.BusyCursor
onClicked: {
WifiConnectionActions.connectToNetwork(modelData, {
connected: isConnected,
Expand Down Expand Up @@ -859,6 +871,7 @@ Item {
required property int index

readonly property bool isConnected: modelData.ssid === NetworkService.currentWifiSSID
readonly property bool isConnecting: NetworkService.isWifiConnecting && NetworkService.connectingSSID === modelData.ssid
readonly property bool isPinned: root.getPinnedWifiNetworks().includes(modelData.ssid)
readonly property bool isOutOfRange: modelData.outOfRange || false
readonly property bool isExpanded: !isOutOfRange && root.expandedSavedWifiSsid === modelData.ssid
Expand Down Expand Up @@ -894,7 +907,17 @@ Item {
anchors.rightMargin: Theme.spacingS
spacing: Theme.spacingS

DankSpinner {
size: 20
strokeWidth: 2
color: Theme.warning
running: isConnecting
visible: isConnecting
anchors.verticalCenter: parent.verticalCenter
}

DankIcon {
visible: !isConnecting
name: {
if (isOutOfRange)
return "wifi_off";
Expand Down Expand Up @@ -941,14 +964,16 @@ Item {

StyledText {
text: {
if (isConnecting)
return I18n.tr("Connecting...");
const parts = [isConnected ? I18n.tr("Connected") : (modelData.secured ? I18n.tr("Secured") : I18n.tr("Open"))];
parts.push(isOutOfRange ? I18n.tr("Unavailable") : (modelData.signal || 0) + "%");
if (modelData.hidden || false)
parts.push(I18n.tr("Hidden"));
return parts.join(" • ");
}
font.pixelSize: Theme.fontSizeSmall
color: isConnected ? Theme.primary : Theme.surfaceVariantText
color: isConnecting ? Theme.warning : (isConnected ? Theme.primary : Theme.surfaceVariantText)
width: parent.width
elide: Text.ElideRight
}
Expand Down Expand Up @@ -1028,7 +1053,8 @@ Item {
anchors.fill: parent
anchors.rightMargin: savedWifiActions.width + Theme.spacingM
hoverEnabled: true
cursorShape: isOutOfRange ? Qt.ArrowCursor : Qt.PointingHandCursor
enabled: !NetworkService.isWifiConnecting || isConnected
cursorShape: isOutOfRange ? Qt.ArrowCursor : (enabled ? Qt.PointingHandCursor : Qt.BusyCursor)
onClicked: {
if (isOutOfRange)
return;
Expand Down Expand Up @@ -1162,14 +1188,15 @@ Item {
}

MenuItem {
text: isConnected ? I18n.tr("Disconnect") : I18n.tr("Connect")
text: isConnecting ? I18n.tr("Connecting...") : (isConnected ? I18n.tr("Disconnect") : I18n.tr("Connect"))
height: isOutOfRange ? 0 : 32
visible: !isOutOfRange
enabled: !isConnecting

contentItem: StyledText {
text: parent.text
font.pixelSize: Theme.fontSizeSmall
color: Theme.surfaceText
color: parent.enabled ? Theme.surfaceText : Theme.surfaceVariantText
leftPadding: Theme.spacingS
verticalAlignment: Text.AlignVCenter
}
Expand Down
4 changes: 4 additions & 0 deletions quickshell/Services/DMSNetworkService.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,6 +467,8 @@ Singleton {
return;
pendingConnectionSSID = ssid;
pendingConnectionStartTime = Date.now();
isConnecting = true;
connectingSSID = ssid;
connectionError = "";
connectionStatus = "connecting";
credentialsRequested = false;
Expand Down Expand Up @@ -510,6 +512,8 @@ Singleton {
connectionError = response.error;
lastConnectionError = response.error;
pendingConnectionSSID = "";
isConnecting = false;
connectingSSID = "";
connectionStatus = "failed";
ToastService.showError(I18n.tr("Failed to start connection to %1").arg(ssid));
}
Expand Down
Loading