summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/bar/popouts/WirelessPasswordPopout.qml85
-rw-r--r--modules/controlcenter/network/NetworkingPane.qml681
-rw-r--r--modules/controlcenter/network/WirelessPasswordDialog.qml115
3 files changed, 488 insertions, 393 deletions
diff --git a/modules/bar/popouts/WirelessPasswordPopout.qml b/modules/bar/popouts/WirelessPasswordPopout.qml
index aa7f40f..59a15b9 100644
--- a/modules/bar/popouts/WirelessPasswordPopout.qml
+++ b/modules/bar/popouts/WirelessPasswordPopout.qml
@@ -32,14 +32,22 @@ ColumnLayout {
}
}
// Force focus to password container when popout becomes active
- Qt.callLater(() => {
- passwordContainer.forceActiveFocus();
- }, 100);
- }, 100);
+ // Use Timer for actual delay to ensure dialog is fully rendered
+ focusTimer.start();
+ });
}
}
}
+ Timer {
+ id: focusTimer
+ interval: 150
+ onTriggered: {
+ root.forceActiveFocus();
+ passwordContainer.forceActiveFocus();
+ }
+ }
+
spacing: Appearance.spacing.normal
implicitWidth: 400
@@ -51,19 +59,15 @@ ColumnLayout {
Component.onCompleted: {
if (shouldBeVisible) {
- Qt.callLater(() => {
- root.forceActiveFocus();
- passwordContainer.forceActiveFocus();
- }, 150);
+ // Use Timer for actual delay to ensure dialog is fully rendered
+ focusTimer.start();
}
}
onShouldBeVisibleChanged: {
if (shouldBeVisible) {
- Qt.callLater(() => {
- root.forceActiveFocus();
- passwordContainer.forceActiveFocus();
- }, 150);
+ // Use Timer for actual delay to ensure dialog is fully rendered
+ focusTimer.start();
}
}
@@ -243,20 +247,26 @@ ColumnLayout {
target: root
function onShouldBeVisibleChanged(): void {
if (root.shouldBeVisible) {
- Qt.callLater(() => {
- passwordContainer.forceActiveFocus();
- }, 50);
+ // Use Timer for actual delay to ensure focus works correctly
+ passwordFocusTimer.start();
passwordContainer.passwordBuffer = "";
connectButton.hasError = false;
}
}
}
+ Timer {
+ id: passwordFocusTimer
+ interval: 50
+ onTriggered: {
+ passwordContainer.forceActiveFocus();
+ }
+ }
+
Component.onCompleted: {
if (root.shouldBeVisible) {
- Qt.callLater(() => {
- passwordContainer.forceActiveFocus();
- }, 100);
+ // Use Timer for actual delay to ensure focus works correctly
+ passwordFocusTimer.start();
}
}
@@ -489,22 +499,8 @@ ColumnLayout {
if (isConnected) {
// Successfully connected - give it a moment for network list to update
- Qt.callLater(() => {
- // Double-check connection is still active
- if (root.shouldBeVisible && Nmcli.active && Nmcli.active.ssid) {
- const stillConnected = Nmcli.active.ssid.toLowerCase().trim() === root.network.ssid.toLowerCase().trim();
- if (stillConnected) {
- connectionMonitor.stop();
- connectButton.connecting = false;
- connectButton.text = qsTr("Connect");
- // Return to network popout on successful connection
- if (root.wrapper.currentName === "wirelesspassword") {
- root.wrapper.currentName = "network";
- }
- closeDialog();
- }
- }
- }, 500);
+ // Use Timer for actual delay
+ connectionSuccessTimer.start();
return;
}
@@ -545,6 +541,27 @@ ColumnLayout {
}
}
+ Timer {
+ id: connectionSuccessTimer
+ interval: 500
+ onTriggered: {
+ // Double-check connection is still active
+ if (root.shouldBeVisible && Nmcli.active && Nmcli.active.ssid) {
+ const stillConnected = Nmcli.active.ssid.toLowerCase().trim() === root.network.ssid.toLowerCase().trim();
+ if (stillConnected) {
+ connectionMonitor.stop();
+ connectButton.connecting = false;
+ connectButton.text = qsTr("Connect");
+ // Return to network popout on successful connection
+ if (root.wrapper.currentName === "wirelesspassword") {
+ root.wrapper.currentName = "network";
+ }
+ closeDialog();
+ }
+ }
+ }
+ }
+
Connections {
target: Nmcli
function onActiveChanged() {
diff --git a/modules/controlcenter/network/NetworkingPane.qml b/modules/controlcenter/network/NetworkingPane.qml
index 56ab7f1..74e0034 100644
--- a/modules/controlcenter/network/NetworkingPane.qml
+++ b/modules/controlcenter/network/NetworkingPane.qml
@@ -15,500 +15,507 @@ import Quickshell.Widgets
import QtQuick
import QtQuick.Layouts
-RowLayout {
+Item {
id: root
required property Session session
anchors.fill: parent
- spacing: 0
+ RowLayout {
+ id: contentLayout
- Item {
- Layout.preferredWidth: Math.floor(parent.width * 0.4)
- Layout.minimumWidth: 420
- Layout.fillHeight: true
+ anchors.fill: parent
+ spacing: 0
- // Left pane - networking list with collapsible sections
- StyledFlickable {
- id: leftFlickable
+ Item {
+ Layout.preferredWidth: Math.floor(parent.width * 0.4)
+ Layout.minimumWidth: 420
+ Layout.fillHeight: true
- anchors.fill: parent
- anchors.margins: Appearance.padding.large + Appearance.padding.normal
- anchors.leftMargin: Appearance.padding.large
- anchors.rightMargin: Appearance.padding.large + Appearance.padding.normal / 2
- flickableDirection: Flickable.VerticalFlick
- contentHeight: leftContent.height
- clip: true
-
- StyledScrollBar.vertical: StyledScrollBar {
- flickable: leftFlickable
- }
+ // Left pane - networking list with collapsible sections
+ StyledFlickable {
+ id: leftFlickable
- ColumnLayout {
- id: leftContent
+ anchors.fill: parent
+ anchors.margins: Appearance.padding.large + Appearance.padding.normal
+ anchors.leftMargin: Appearance.padding.large
+ anchors.rightMargin: Appearance.padding.large + Appearance.padding.normal / 2
+ flickableDirection: Flickable.VerticalFlick
+ contentHeight: leftContent.height
+ clip: true
- anchors.left: parent.left
- anchors.right: parent.right
- spacing: Appearance.spacing.normal
+ StyledScrollBar.vertical: StyledScrollBar {
+ flickable: leftFlickable
+ }
- // Settings header above the collapsible sections
- RowLayout {
- Layout.fillWidth: true
- spacing: Appearance.spacing.smaller
+ ColumnLayout {
+ id: leftContent
- StyledText {
- text: qsTr("Settings")
- font.pointSize: Appearance.font.size.large
- font.weight: 500
- }
+ anchors.left: parent.left
+ anchors.right: parent.right
+ spacing: Appearance.spacing.normal
- Item {
+ // Settings header above the collapsible sections
+ RowLayout {
Layout.fillWidth: true
- }
+ spacing: Appearance.spacing.smaller
+
+ StyledText {
+ text: qsTr("Settings")
+ font.pointSize: Appearance.font.size.large
+ font.weight: 500
+ }
- ToggleButton {
- toggled: Nmcli.wifiEnabled
- icon: "wifi"
- accent: "Tertiary"
+ Item {
+ Layout.fillWidth: true
+ }
- onClicked: {
- Nmcli.toggleWifi(null);
+ ToggleButton {
+ toggled: Nmcli.wifiEnabled
+ icon: "wifi"
+ accent: "Tertiary"
+
+ onClicked: {
+ Nmcli.toggleWifi(null);
+ }
}
- }
- ToggleButton {
- toggled: Nmcli.scanning
- icon: "wifi_find"
- accent: "Secondary"
+ ToggleButton {
+ toggled: Nmcli.scanning
+ icon: "wifi_find"
+ accent: "Secondary"
- onClicked: {
- Nmcli.rescanWifi();
+ onClicked: {
+ Nmcli.rescanWifi();
+ }
}
- }
- ToggleButton {
- toggled: !root.session.ethernet.active && !root.session.network.active
- icon: "settings"
- accent: "Primary"
+ ToggleButton {
+ toggled: !root.session.ethernet.active && !root.session.network.active
+ icon: "settings"
+ accent: "Primary"
- onClicked: {
- if (root.session.ethernet.active || root.session.network.active) {
- root.session.ethernet.active = null;
- root.session.network.active = null;
- } else {
- // Toggle to show settings - prefer ethernet if available, otherwise wireless
- if (Nmcli.ethernetDevices.length > 0) {
- root.session.ethernet.active = Nmcli.ethernetDevices[0];
- } else if (Nmcli.networks.length > 0) {
- root.session.network.active = Nmcli.networks[0];
+ onClicked: {
+ if (root.session.ethernet.active || root.session.network.active) {
+ root.session.ethernet.active = null;
+ root.session.network.active = null;
+ } else {
+ // Toggle to show settings - prefer ethernet if available, otherwise wireless
+ if (Nmcli.ethernetDevices.length > 0) {
+ root.session.ethernet.active = Nmcli.ethernetDevices[0];
+ } else if (Nmcli.networks.length > 0) {
+ root.session.network.active = Nmcli.networks[0];
+ }
}
}
}
}
- }
-
- CollapsibleSection {
- id: ethernetListSection
- Layout.fillWidth: true
- title: qsTr("Ethernet")
- expanded: true
+ CollapsibleSection {
+ id: ethernetListSection
- ColumnLayout {
Layout.fillWidth: true
- spacing: Appearance.spacing.small
+ title: qsTr("Ethernet")
+ expanded: true
- RowLayout {
+ ColumnLayout {
Layout.fillWidth: true
spacing: Appearance.spacing.small
- StyledText {
- text: qsTr("Devices (%1)").arg(Nmcli.ethernetDevices.length)
- font.pointSize: Appearance.font.size.normal
- font.weight: 500
+ RowLayout {
+ Layout.fillWidth: true
+ spacing: Appearance.spacing.small
+
+ StyledText {
+ text: qsTr("Devices (%1)").arg(Nmcli.ethernetDevices.length)
+ font.pointSize: Appearance.font.size.normal
+ font.weight: 500
+ }
}
- }
- StyledText {
- Layout.fillWidth: true
- text: qsTr("All available ethernet devices")
- color: Colours.palette.m3outline
- }
+ StyledText {
+ Layout.fillWidth: true
+ text: qsTr("All available ethernet devices")
+ color: Colours.palette.m3outline
+ }
- Repeater {
- id: ethernetRepeater
+ Repeater {
+ id: ethernetRepeater
- Layout.fillWidth: true
- model: Nmcli.ethernetDevices
+ Layout.fillWidth: true
+ model: Nmcli.ethernetDevices
- delegate: StyledRect {
- required property var modelData
+ delegate: StyledRect {
+ required property var modelData
- Layout.fillWidth: true
+ Layout.fillWidth: true
- color: Qt.alpha(Colours.tPalette.m3surfaceContainer, root.session.ethernet.active === modelData ? Colours.tPalette.m3surfaceContainer.a : 0)
- radius: Appearance.rounding.normal
+ color: Qt.alpha(Colours.tPalette.m3surfaceContainer, root.session.ethernet.active === modelData ? Colours.tPalette.m3surfaceContainer.a : 0)
+ radius: Appearance.rounding.normal
- StateLayer {
- function onClicked(): void {
- root.session.network.active = null;
- root.session.ethernet.active = modelData;
+ StateLayer {
+ function onClicked(): void {
+ root.session.network.active = null;
+ root.session.ethernet.active = modelData;
+ }
}
- }
- RowLayout {
- id: rowLayout
+ RowLayout {
+ id: rowLayout
- anchors.left: parent.left
- anchors.right: parent.right
- anchors.verticalCenter: parent.verticalCenter
- anchors.margins: Appearance.padding.normal
+ anchors.left: parent.left
+ anchors.right: parent.right
+ anchors.verticalCenter: parent.verticalCenter
+ anchors.margins: Appearance.padding.normal
- spacing: Appearance.spacing.normal
+ spacing: Appearance.spacing.normal
- StyledRect {
- implicitWidth: implicitHeight
- implicitHeight: icon.implicitHeight + Appearance.padding.normal * 2
+ StyledRect {
+ implicitWidth: implicitHeight
+ implicitHeight: icon.implicitHeight + Appearance.padding.normal * 2
- radius: Appearance.rounding.normal
- color: modelData.connected ? Colours.palette.m3primaryContainer : Colours.tPalette.m3surfaceContainerHigh
+ radius: Appearance.rounding.normal
+ color: modelData.connected ? Colours.palette.m3primaryContainer : Colours.tPalette.m3surfaceContainerHigh
- MaterialIcon {
- id: icon
+ MaterialIcon {
+ id: icon
- anchors.centerIn: parent
- text: "cable"
- font.pointSize: Appearance.font.size.large
- fill: modelData.connected ? 1 : 0
- color: modelData.connected ? Colours.palette.m3onPrimaryContainer : Colours.palette.m3onSurface
+ anchors.centerIn: parent
+ text: "cable"
+ font.pointSize: Appearance.font.size.large
+ fill: modelData.connected ? 1 : 0
+ color: modelData.connected ? Colours.palette.m3onPrimaryContainer : Colours.palette.m3onSurface
+ }
}
- }
- StyledText {
- Layout.fillWidth: true
- elide: Text.ElideRight
- maximumLineCount: 1
+ StyledText {
+ Layout.fillWidth: true
+ elide: Text.ElideRight
+ maximumLineCount: 1
- text: modelData.interface || qsTr("Unknown")
- }
+ text: modelData.interface || qsTr("Unknown")
+ }
- StyledText {
- text: modelData.connected ? qsTr("Connected") : qsTr("Disconnected")
- color: modelData.connected ? Colours.palette.m3primary : Colours.palette.m3outline
- font.pointSize: Appearance.font.size.small
- font.weight: modelData.connected ? 500 : 400
- }
+ StyledText {
+ text: modelData.connected ? qsTr("Connected") : qsTr("Disconnected")
+ color: modelData.connected ? Colours.palette.m3primary : Colours.palette.m3outline
+ font.pointSize: Appearance.font.size.small
+ font.weight: modelData.connected ? 500 : 400
+ }
- StyledRect {
- implicitWidth: implicitHeight
- implicitHeight: connectIcon.implicitHeight + Appearance.padding.smaller * 2
+ StyledRect {
+ implicitWidth: implicitHeight
+ implicitHeight: connectIcon.implicitHeight + Appearance.padding.smaller * 2
- radius: Appearance.rounding.full
- color: Qt.alpha(Colours.palette.m3primaryContainer, modelData.connected ? 1 : 0)
+ radius: Appearance.rounding.full
+ color: Qt.alpha(Colours.palette.m3primaryContainer, modelData.connected ? 1 : 0)
- StateLayer {
- function onClicked(): void {
- if (modelData.connected && modelData.connection) {
- Nmcli.disconnectEthernet(modelData.connection, () => {});
- } else {
- Nmcli.connectEthernet(modelData.connection || "", modelData.interface || "", () => {});
+ StateLayer {
+ function onClicked(): void {
+ if (modelData.connected && modelData.connection) {
+ Nmcli.disconnectEthernet(modelData.connection, () => {});
+ } else {
+ Nmcli.connectEthernet(modelData.connection || "", modelData.interface || "", () => {});
+ }
}
}
- }
- MaterialIcon {
- id: connectIcon
+ MaterialIcon {
+ id: connectIcon
- anchors.centerIn: parent
- text: modelData.connected ? "link_off" : "link"
- color: modelData.connected ? Colours.palette.m3onPrimaryContainer : Colours.palette.m3onSurface
+ anchors.centerIn: parent
+ text: modelData.connected ? "link_off" : "link"
+ color: modelData.connected ? Colours.palette.m3onPrimaryContainer : Colours.palette.m3onSurface
+ }
}
}
- }
- implicitHeight: rowLayout.implicitHeight + Appearance.padding.normal * 2
+ implicitHeight: rowLayout.implicitHeight + Appearance.padding.normal * 2
+ }
}
}
}
- }
- CollapsibleSection {
- id: wirelessListSection
+ CollapsibleSection {
+ id: wirelessListSection
- Layout.fillWidth: true
- title: qsTr("Wireless")
- expanded: true
-
- ColumnLayout {
Layout.fillWidth: true
- spacing: Appearance.spacing.small
+ title: qsTr("Wireless")
+ expanded: true
- RowLayout {
+ ColumnLayout {
Layout.fillWidth: true
spacing: Appearance.spacing.small
- StyledText {
- text: qsTr("Networks (%1)").arg(Nmcli.networks.length)
- font.pointSize: Appearance.font.size.normal
- font.weight: 500
+ RowLayout {
+ Layout.fillWidth: true
+ spacing: Appearance.spacing.small
+
+ StyledText {
+ text: qsTr("Networks (%1)").arg(Nmcli.networks.length)
+ font.pointSize: Appearance.font.size.normal
+ font.weight: 500
+ }
+
+ StyledText {
+ visible: Nmcli.scanning
+ text: qsTr("Scanning...")
+ color: Colours.palette.m3primary
+ font.pointSize: Appearance.font.size.small
+ }
}
StyledText {
- visible: Nmcli.scanning
- text: qsTr("Scanning...")
- color: Colours.palette.m3primary
- font.pointSize: Appearance.font.size.small
+ Layout.fillWidth: true
+ text: qsTr("All available WiFi networks")
+ color: Colours.palette.m3outline
}
- }
-
- StyledText {
- Layout.fillWidth: true
- text: qsTr("All available WiFi networks")
- color: Colours.palette.m3outline
- }
- Repeater {
- id: wirelessRepeater
+ Repeater {
+ id: wirelessRepeater
- Layout.fillWidth: true
- model: ScriptModel {
- values: [...Nmcli.networks].sort((a, b) => {
- // Put active/connected network first
- if (a.active !== b.active)
- return b.active - a.active;
- // Then sort by signal strength
- return b.strength - a.strength;
- })
- }
+ Layout.fillWidth: true
+ model: ScriptModel {
+ values: [...Nmcli.networks].sort((a, b) => {
+ // Put active/connected network first
+ if (a.active !== b.active)
+ return b.active - a.active;
+ // Then sort by signal strength
+ return b.strength - a.strength;
+ })
+ }
- delegate: StyledRect {
- required property var modelData
+ delegate: StyledRect {
+ required property var modelData
- Layout.fillWidth: true
+ Layout.fillWidth: true
- color: Qt.alpha(Colours.tPalette.m3surfaceContainer, root.session.network.active === modelData ? Colours.tPalette.m3surfaceContainer.a : 0)
- radius: Appearance.rounding.normal
+ color: Qt.alpha(Colours.tPalette.m3surfaceContainer, (modelData && root.session.network.active === modelData) ? Colours.tPalette.m3surfaceContainer.a : 0)
+ radius: Appearance.rounding.normal
StateLayer {
function onClicked(): void {
+ if (!modelData) {
+ return;
+ }
root.session.ethernet.active = null;
root.session.network.active = modelData;
// Check if we need to refresh saved connections when selecting a network
- if (modelData && modelData.ssid) {
+ if (modelData.ssid) {
checkSavedProfileForNetwork(modelData.ssid);
}
}
}
- RowLayout {
- id: wirelessRowLayout
+ RowLayout {
+ id: wirelessRowLayout
- anchors.left: parent.left
- anchors.right: parent.right
- anchors.verticalCenter: parent.verticalCenter
- anchors.margins: Appearance.padding.normal
+ anchors.left: parent.left
+ anchors.right: parent.right
+ anchors.verticalCenter: parent.verticalCenter
+ anchors.margins: Appearance.padding.normal
- spacing: Appearance.spacing.normal
+ spacing: Appearance.spacing.normal
- StyledRect {
- implicitWidth: implicitHeight
- implicitHeight: wirelessIcon.implicitHeight + Appearance.padding.normal * 2
+ StyledRect {
+ implicitWidth: implicitHeight
+ implicitHeight: wirelessIcon.implicitHeight + Appearance.padding.normal * 2
- radius: Appearance.rounding.normal
- color: modelData.active ? Colours.palette.m3primaryContainer : Colours.tPalette.m3surfaceContainerHigh
+ radius: Appearance.rounding.normal
+ color: (modelData && modelData.active) ? Colours.palette.m3primaryContainer : Colours.tPalette.m3surfaceContainerHigh
- MaterialIcon {
- id: wirelessIcon
+ MaterialIcon {
+ id: wirelessIcon
- anchors.centerIn: parent
- text: Icons.getNetworkIcon(modelData.strength)
- font.pointSize: Appearance.font.size.large
- fill: modelData.active ? 1 : 0
- color: modelData.active ? Colours.palette.m3onPrimaryContainer : Colours.palette.m3onSurface
+ anchors.centerIn: parent
+ text: Icons.getNetworkIcon(modelData && modelData.strength !== undefined ? modelData.strength : 0)
+ font.pointSize: Appearance.font.size.large
+ fill: (modelData && modelData.active) ? 1 : 0
+ color: (modelData && modelData.active) ? Colours.palette.m3onPrimaryContainer : Colours.palette.m3onSurface
+ }
}
- }
- StyledText {
- Layout.fillWidth: true
- elide: Text.ElideRight
- maximumLineCount: 1
+ StyledText {
+ Layout.fillWidth: true
+ elide: Text.ElideRight
+ maximumLineCount: 1
- text: modelData.ssid || qsTr("Unknown")
- }
+ text: (modelData && modelData.ssid) ? modelData.ssid : qsTr("Unknown")
+ }
- StyledText {
- text: modelData.active ? qsTr("Connected") : (modelData.isSecure ? qsTr("Secured") : qsTr("Open"))
- color: modelData.active ? Colours.palette.m3primary : Colours.palette.m3outline
- font.pointSize: Appearance.font.size.small
- font.weight: modelData.active ? 500 : 400
- }
+ StyledText {
+ text: (modelData && modelData.active) ? qsTr("Connected") : ((modelData && modelData.isSecure) ? qsTr("Secured") : qsTr("Open"))
+ color: (modelData && modelData.active) ? Colours.palette.m3primary : Colours.palette.m3outline
+ font.pointSize: Appearance.font.size.small
+ font.weight: (modelData && modelData.active) ? 500 : 400
+ }
- StyledRect {
- implicitWidth: implicitHeight
- implicitHeight: wirelessConnectIcon.implicitHeight + Appearance.padding.smaller * 2
+ StyledRect {
+ implicitWidth: implicitHeight
+ implicitHeight: wirelessConnectIcon.implicitHeight + Appearance.padding.smaller * 2
- radius: Appearance.rounding.full
- color: Qt.alpha(Colours.palette.m3primaryContainer, modelData.active ? 1 : 0)
+ radius: Appearance.rounding.full
+ color: Qt.alpha(Colours.palette.m3primaryContainer, (modelData && modelData.active) ? 1 : 0)
- StateLayer {
- function onClicked(): void {
- if (modelData.active) {
- Nmcli.disconnectFromNetwork();
- } else {
- handleWirelessConnect(modelData);
+ StateLayer {
+ function onClicked(): void {
+ if (modelData && modelData.active) {
+ Nmcli.disconnectFromNetwork();
+ } else if (modelData) {
+ handleWirelessConnect(modelData);
+ }
}
}
- }
- MaterialIcon {
- id: wirelessConnectIcon
+ MaterialIcon {
+ id: wirelessConnectIcon
- anchors.centerIn: parent
- text: modelData.active ? "link_off" : "link"
- color: modelData.active ? Colours.palette.m3onPrimaryContainer : Colours.palette.m3onSurface
+ anchors.centerIn: parent
+ text: (modelData && modelData.active) ? "link_off" : "link"
+ color: (modelData && modelData.active) ? Colours.palette.m3onPrimaryContainer : Colours.palette.m3onSurface
+ }
}
}
- }
- implicitHeight: wirelessRowLayout.implicitHeight + Appearance.padding.normal * 2
+ implicitHeight: wirelessRowLayout.implicitHeight + Appearance.padding.normal * 2
+ }
}
}
}
}
}
- }
- InnerBorder {
- leftThickness: 0
- rightThickness: Appearance.padding.normal / 2
+ InnerBorder {
+ leftThickness: 0
+ rightThickness: Appearance.padding.normal / 2
+ }
}
- }
- Item {
- Layout.fillWidth: true
- Layout.fillHeight: true
+ Item {
+ Layout.fillWidth: true
+ Layout.fillHeight: true
- ClippingRectangle {
- anchors.fill: parent
- anchors.margins: Appearance.padding.normal
- anchors.leftMargin: 0
- anchors.rightMargin: Appearance.padding.normal / 2
+ ClippingRectangle {
+ anchors.fill: parent
+ anchors.margins: Appearance.padding.normal
+ anchors.leftMargin: 0
+ anchors.rightMargin: Appearance.padding.normal / 2
- radius: rightBorder.innerRadius
- color: "transparent"
- clip: true
+ radius: rightBorder.innerRadius
+ color: "transparent"
+ clip: true
- // Right pane - networking details/settings
- Loader {
- id: loader
+ // Right pane - networking details/settings
+ Loader {
+ id: loader
- property var ethernetPane: root.session.ethernet.active
- property var wirelessPane: root.session.network.active
- property var pane: ethernetPane || wirelessPane
- property string paneId: ethernetPane ? (ethernetPane.interface || "") : (wirelessPane ? (wirelessPane.ssid || wirelessPane.bssid || "") : "")
+ property var ethernetPane: root.session.ethernet.active
+ property var wirelessPane: root.session.network.active
+ property var pane: ethernetPane || wirelessPane
+ property string paneId: ethernetPane ? (ethernetPane.interface || "") : (wirelessPane ? (wirelessPane.ssid || wirelessPane.bssid || "") : "")
- anchors.fill: parent
- anchors.margins: Appearance.padding.large * 2
+ anchors.fill: parent
+ anchors.margins: Appearance.padding.large * 2
- opacity: 1
- scale: 1
- transformOrigin: Item.Center
+ opacity: 1
+ scale: 1
+ transformOrigin: Item.Center
- clip: true
- asynchronous: true
- sourceComponent: pane ? (ethernetPane ? ethernetDetails : wirelessDetails) : settings
+ clip: true
+ asynchronous: true
+ sourceComponent: pane ? (ethernetPane ? ethernetDetails : wirelessDetails) : settings
- Behavior on paneId {
- SequentialAnimation {
- ParallelAnimation {
- Anim {
- target: loader
- property: "opacity"
- to: 0
- easing.bezierCurve: Appearance.anim.curves.standardAccel
- }
- Anim {
- target: loader
- property: "scale"
- to: 0.8
- easing.bezierCurve: Appearance.anim.curves.standardAccel
- }
- }
- PropertyAction {}
- ParallelAnimation {
- Anim {
- target: loader
- property: "opacity"
- to: 1
- easing.bezierCurve: Appearance.anim.curves.standardDecel
+ Behavior on paneId {
+ SequentialAnimation {
+ ParallelAnimation {
+ Anim {
+ target: loader
+ property: "opacity"
+ to: 0
+ easing.bezierCurve: Appearance.anim.curves.standardAccel
+ }
+ Anim {
+ target: loader
+ property: "scale"
+ to: 0.8
+ easing.bezierCurve: Appearance.anim.curves.standardAccel
+ }
}
- Anim {
- target: loader
- property: "scale"
- to: 1
- easing.bezierCurve: Appearance.anim.curves.standardDecel
+ PropertyAction {}
+ ParallelAnimation {
+ Anim {
+ target: loader
+ property: "opacity"
+ to: 1
+ easing.bezierCurve: Appearance.anim.curves.standardDecel
+ }
+ Anim {
+ target: loader
+ property: "scale"
+ to: 1
+ easing.bezierCurve: Appearance.anim.curves.standardDecel
+ }
}
}
}
- }
- onPaneChanged: {
- paneId = ethernetPane ? (ethernetPane.interface || "") : (wirelessPane ? (wirelessPane.ssid || wirelessPane.bssid || "") : "");
+ onPaneChanged: {
+ paneId = ethernetPane ? (ethernetPane.interface || "") : (wirelessPane ? (wirelessPane.ssid || wirelessPane.bssid || "") : "");
+ }
}
}
- }
- InnerBorder {
- id: rightBorder
+ InnerBorder {
+ id: rightBorder
- leftThickness: Appearance.padding.normal / 2
- }
+ leftThickness: Appearance.padding.normal / 2
+ }
- Component {
- id: settings
+ Component {
+ id: settings
- StyledFlickable {
- id: settingsFlickable
+ StyledFlickable {
+ id: settingsFlickable
- flickableDirection: Flickable.VerticalFlick
- contentHeight: settingsInner.height
- clip: true
+ flickableDirection: Flickable.VerticalFlick
+ contentHeight: settingsInner.height
+ clip: true
- StyledScrollBar.vertical: StyledScrollBar {
- flickable: settingsFlickable
- }
+ StyledScrollBar.vertical: StyledScrollBar {
+ flickable: settingsFlickable
+ }
- NetworkSettings {
- id: settingsInner
+ NetworkSettings {
+ id: settingsInner
- anchors.left: parent.left
- anchors.right: parent.right
- session: root.session
+ anchors.left: parent.left
+ anchors.right: parent.right
+ session: root.session
+ }
}
}
- }
- Component {
- id: ethernetDetails
+ Component {
+ id: ethernetDetails
- EthernetDetails {
- session: root.session
+ EthernetDetails {
+ session: root.session
+ }
}
- }
- Component {
- id: wirelessDetails
+ Component {
+ id: wirelessDetails
- WirelessDetails {
- session: root.session
+ WirelessDetails {
+ session: root.session
+ }
}
}
}
WirelessPasswordDialog {
- Layout.fillWidth: true
- Layout.fillHeight: true
+ anchors.fill: parent
session: root.session
z: 1000
}
diff --git a/modules/controlcenter/network/WirelessPasswordDialog.qml b/modules/controlcenter/network/WirelessPasswordDialog.qml
index f3381b7..4b350be 100644
--- a/modules/controlcenter/network/WirelessPasswordDialog.qml
+++ b/modules/controlcenter/network/WirelessPasswordDialog.qml
@@ -131,14 +131,17 @@ Item {
Layout.alignment: Qt.AlignHCenter
Layout.topMargin: Appearance.spacing.small
- visible: connectButton.connecting
+ visible: connectButton.connecting || connectButton.hasError
text: {
+ if (connectButton.hasError) {
+ return qsTr("Connection failed. Please check your password and try again.");
+ }
if (connectButton.connecting) {
return qsTr("Connecting...");
}
return "";
}
- color: Colours.palette.m3onSurfaceVariant
+ color: connectButton.hasError ? Colours.palette.m3error : Colours.palette.m3onSurfaceVariant
font.pointSize: Appearance.font.size.small
font.weight: 400
wrapMode: Text.WordWrap
@@ -153,18 +156,31 @@ Item {
focus: true
Keys.onPressed: event => {
+ // Ensure we have focus when receiving keyboard input
+ if (!activeFocus) {
+ forceActiveFocus();
+ }
+
+ // Clear error when user starts typing
+ if (connectButton.hasError && event.text && event.text.length > 0) {
+ connectButton.hasError = false;
+ }
+
if (event.key === Qt.Key_Enter || event.key === Qt.Key_Return) {
if (connectButton.enabled) {
connectButton.clicked();
}
+ event.accepted = true;
} else if (event.key === Qt.Key_Backspace) {
if (event.modifiers & Qt.ControlModifier) {
passwordBuffer = "";
} else {
passwordBuffer = passwordBuffer.slice(0, -1);
}
+ event.accepted = true;
} else if (event.text && event.text.length > 0) {
passwordBuffer += event.text;
+ event.accepted = true;
}
}
@@ -178,6 +194,7 @@ Item {
Qt.callLater(() => {
passwordContainer.forceActiveFocus();
passwordContainer.passwordBuffer = "";
+ connectButton.hasError = false;
});
}
}
@@ -198,13 +215,29 @@ Item {
StyledRect {
anchors.fill: parent
radius: Appearance.rounding.normal
- color: Colours.tPalette.m3surfaceContainer
- border.width: passwordContainer.activeFocus ? 2 : 1
- border.color: passwordContainer.activeFocus ? Colours.palette.m3primary : Colours.palette.m3outline
+ color: passwordContainer.activeFocus ? Qt.lighter(Colours.tPalette.m3surfaceContainer, 1.05) : Colours.tPalette.m3surfaceContainer
+ border.width: passwordContainer.activeFocus || connectButton.hasError ? 4 : (root.visible ? 1 : 0)
+ border.color: {
+ if (connectButton.hasError) {
+ return Colours.palette.m3error;
+ }
+ if (passwordContainer.activeFocus) {
+ return Colours.palette.m3primary;
+ }
+ return root.visible ? Colours.palette.m3outline : "transparent";
+ }
Behavior on border.color {
CAnim {}
}
+
+ Behavior on border.width {
+ CAnim {}
+ }
+
+ Behavior on color {
+ CAnim {}
+ }
}
StateLayer {
@@ -329,6 +362,9 @@ Item {
TextButton {
id: connectButton
+ property bool connecting: false
+ property bool hasError: false
+
Layout.fillWidth: true
Layout.minimumHeight: Appearance.font.size.normal + Appearance.padding.normal * 2
inactiveColour: Colours.palette.m3primary
@@ -336,8 +372,6 @@ Item {
text: qsTr("Connect")
enabled: passwordContainer.passwordBuffer.length > 0 && !connecting
- property bool connecting: false
-
onClicked: {
if (!root.network || connecting) {
return;
@@ -348,6 +382,9 @@ Item {
return;
}
+ // Clear any previous error
+ hasError = false;
+
// Set connecting state
connecting = true;
enabled = false;
@@ -361,11 +398,27 @@ Item {
// Shouldn't happen since we provided password
connectionMonitor.stop();
connecting = false;
+ hasError = true;
enabled = true;
text = qsTr("Connect");
- } else
- // Connection failed, monitor will handle timeout
- {}
+ passwordContainer.passwordBuffer = "";
+ // Delete the failed connection
+ if (root.network && root.network.ssid) {
+ Nmcli.forgetNetwork(root.network.ssid);
+ }
+ } else {
+ // Connection failed immediately - show error
+ connectionMonitor.stop();
+ connecting = false;
+ hasError = true;
+ enabled = true;
+ text = qsTr("Connect");
+ passwordContainer.passwordBuffer = "";
+ // Delete the failed connection
+ if (root.network && root.network.ssid) {
+ Nmcli.forgetNetwork(root.network.ssid);
+ }
+ }
});
// Start monitoring connection
@@ -386,18 +439,8 @@ Item {
if (isConnected) {
// Successfully connected - give it a moment for network list to update
- Qt.callLater(() => {
- // Double-check connection is still active
- if (root.visible && Nmcli.active && Nmcli.active.ssid) {
- const stillConnected = Nmcli.active.ssid.toLowerCase().trim() === root.network.ssid.toLowerCase().trim();
- if (stillConnected) {
- connectionMonitor.stop();
- connectButton.connecting = false;
- connectButton.text = qsTr("Connect");
- closeDialog();
- }
- }
- }, 500);
+ // Use Timer for actual delay
+ connectionSuccessTimer.start();
return;
}
@@ -407,8 +450,14 @@ Item {
if (connectionMonitor.repeatCount > 10) {
connectionMonitor.stop();
connectButton.connecting = false;
+ connectButton.hasError = true;
connectButton.enabled = true;
connectButton.text = qsTr("Connect");
+ passwordContainer.passwordBuffer = "";
+ // Delete the failed connection
+ if (root.network && root.network.ssid) {
+ Nmcli.forgetNetwork(root.network.ssid);
+ }
}
}
}
@@ -432,6 +481,23 @@ Item {
}
}
+ Timer {
+ id: connectionSuccessTimer
+ interval: 500
+ onTriggered: {
+ // Double-check connection is still active
+ if (root.visible && Nmcli.active && Nmcli.active.ssid) {
+ const stillConnected = Nmcli.active.ssid.toLowerCase().trim() === root.network.ssid.toLowerCase().trim();
+ if (stillConnected) {
+ connectionMonitor.stop();
+ connectButton.connecting = false;
+ connectButton.text = qsTr("Connect");
+ closeDialog();
+ }
+ }
+ }
+ }
+
Connections {
target: Nmcli
function onActiveChanged() {
@@ -443,8 +509,12 @@ Item {
if (root.visible && root.network && root.network.ssid === ssid && connectButton.connecting) {
connectionMonitor.stop();
connectButton.connecting = false;
+ connectButton.hasError = true;
connectButton.enabled = true;
connectButton.text = qsTr("Connect");
+ passwordContainer.passwordBuffer = "";
+ // Delete the failed connection
+ Nmcli.forgetNetwork(ssid);
}
}
}
@@ -457,6 +527,7 @@ Item {
isClosing = true;
passwordContainer.passwordBuffer = "";
connectButton.connecting = false;
+ connectButton.hasError = false;
connectButton.text = qsTr("Connect");
connectionMonitor.stop();
}
generated by cgit v1.2.3-freya (git 2.51.1) at 2026-01-20 18:56:41 +0000