From 9d7f0c48cebec02aaf2ca780b89a763ce91f8624 Mon Sep 17 00:00:00 2001 From: 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com> Date: Wed, 28 Jan 2026 19:21:44 +1100 Subject: internal: format --- modules/controlcenter/network/EthernetDetails.qml | 2 +- modules/controlcenter/network/EthernetList.qml | 2 +- modules/controlcenter/network/EthernetPane.qml | 2 +- modules/controlcenter/network/EthernetSettings.qml | 2 +- modules/controlcenter/network/NetworkSettings.qml | 13 ++++---- modules/controlcenter/network/NetworkingPane.qml | 35 ++++++++++++++-------- modules/controlcenter/network/VpnSettings.qml | 6 ++-- modules/controlcenter/network/WirelessDetails.qml | 5 ++-- modules/controlcenter/network/WirelessList.qml | 10 ++++--- modules/controlcenter/network/WirelessPane.qml | 2 +- .../network/WirelessPasswordDialog.qml | 3 +- modules/controlcenter/network/WirelessSettings.qml | 2 +- 12 files changed, 46 insertions(+), 38 deletions(-) (limited to 'modules/controlcenter/network') diff --git a/modules/controlcenter/network/EthernetDetails.qml b/modules/controlcenter/network/EthernetDetails.qml index 1cd6c0a..4e60b3d 100644 --- a/modules/controlcenter/network/EthernetDetails.qml +++ b/modules/controlcenter/network/EthernetDetails.qml @@ -16,7 +16,7 @@ DeviceDetails { required property Session session readonly property var ethernetDevice: root.session.ethernet.active - + device: ethernetDevice Component.onCompleted: { diff --git a/modules/controlcenter/network/EthernetList.qml b/modules/controlcenter/network/EthernetList.qml index 4f4dc8a..d1eb957 100644 --- a/modules/controlcenter/network/EthernetList.qml +++ b/modules/controlcenter/network/EthernetList.qml @@ -171,7 +171,7 @@ DeviceList { } } - onItemSelected: function(item) { + onItemSelected: function (item) { session.ethernet.active = item; } } diff --git a/modules/controlcenter/network/EthernetPane.qml b/modules/controlcenter/network/EthernetPane.qml index 126535a..59d82bb 100644 --- a/modules/controlcenter/network/EthernetPane.qml +++ b/modules/controlcenter/network/EthernetPane.qml @@ -16,7 +16,7 @@ SplitPaneWithDetails { anchors.fill: parent activeItem: session.ethernet.active - paneIdGenerator: function(item) { + paneIdGenerator: function (item) { return item ? (item.interface || "") : ""; } diff --git a/modules/controlcenter/network/EthernetSettings.qml b/modules/controlcenter/network/EthernetSettings.qml index f0f66b4..90bfcf4 100644 --- a/modules/controlcenter/network/EthernetSettings.qml +++ b/modules/controlcenter/network/EthernetSettings.qml @@ -73,4 +73,4 @@ ColumnLayout { } } } -} \ No newline at end of file +} diff --git a/modules/controlcenter/network/NetworkSettings.qml b/modules/controlcenter/network/NetworkSettings.qml index 04746af..bda7cb1 100644 --- a/modules/controlcenter/network/NetworkSettings.qml +++ b/modules/controlcenter/network/NetworkSettings.qml @@ -138,30 +138,30 @@ ColumnLayout { Popup { id: vpnSettingsDialog - + parent: Overlay.overlay anchors.centerIn: parent width: Math.min(600, parent.width - Appearance.padding.large * 2) height: Math.min(700, parent.height - Appearance.padding.large * 2) - + modal: true closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutside - + background: StyledRect { color: Colours.palette.m3surface radius: Appearance.rounding.large } - + StyledFlickable { anchors.fill: parent anchors.margins: Appearance.padding.large * 1.5 flickableDirection: Flickable.VerticalFlick contentHeight: vpnSettingsContent.height clip: true - + VpnSettings { id: vpnSettingsContent - + anchors.left: parent.left anchors.right: parent.right session: root.session @@ -169,4 +169,3 @@ ColumnLayout { } } } - diff --git a/modules/controlcenter/network/NetworkingPane.qml b/modules/controlcenter/network/NetworkingPane.qml index 23e795e..26cdbfa 100644 --- a/modules/controlcenter/network/NetworkingPane.qml +++ b/modules/controlcenter/network/NetworkingPane.qml @@ -171,7 +171,7 @@ Item { rightContent: Component { Item { id: rightPaneItem - + property var vpnPane: root.session && root.session.vpn ? root.session.vpn.active : null property var ethernetPane: root.session && root.session.ethernet ? root.session.ethernet.active : null property var wirelessPane: root.session && root.session.network ? root.session.network.active : null @@ -181,9 +181,12 @@ Item { property Component nextComponent: settingsComponent function getComponentForPane() { - if (vpnPane) return vpnDetailsComponent; - if (ethernetPane) return ethernetDetailsComponent; - if (wirelessPane) return wirelessDetailsComponent; + if (vpnPane) + return vpnDetailsComponent; + if (ethernetPane) + return ethernetDetailsComponent; + if (wirelessPane) + return wirelessDetailsComponent; return settingsComponent; } @@ -195,12 +198,14 @@ Item { Connections { target: root.session && root.session.vpn ? root.session.vpn : null enabled: target !== null - + function onActiveChanged() { // Clear others when VPN is selected if (root.session && root.session.vpn && root.session.vpn.active) { - if (root.session.ethernet && root.session.ethernet.active) root.session.ethernet.active = null; - if (root.session.network && root.session.network.active) root.session.network.active = null; + if (root.session.ethernet && root.session.ethernet.active) + root.session.ethernet.active = null; + if (root.session.network && root.session.network.active) + root.session.network.active = null; } rightPaneItem.nextComponent = rightPaneItem.getComponentForPane(); } @@ -209,12 +214,14 @@ Item { Connections { target: root.session && root.session.ethernet ? root.session.ethernet : null enabled: target !== null - + function onActiveChanged() { // Clear others when ethernet is selected if (root.session && root.session.ethernet && root.session.ethernet.active) { - if (root.session.vpn && root.session.vpn.active) root.session.vpn.active = null; - if (root.session.network && root.session.network.active) root.session.network.active = null; + if (root.session.vpn && root.session.vpn.active) + root.session.vpn.active = null; + if (root.session.network && root.session.network.active) + root.session.network.active = null; } rightPaneItem.nextComponent = rightPaneItem.getComponentForPane(); } @@ -223,12 +230,14 @@ Item { Connections { target: root.session && root.session.network ? root.session.network : null enabled: target !== null - + function onActiveChanged() { // Clear others when wireless is selected if (root.session && root.session.network && root.session.network.active) { - if (root.session.vpn && root.session.vpn.active) root.session.vpn.active = null; - if (root.session.ethernet && root.session.ethernet.active) root.session.ethernet.active = null; + if (root.session.vpn && root.session.vpn.active) + root.session.vpn.active = null; + if (root.session.ethernet && root.session.ethernet.active) + root.session.ethernet.active = null; } rightPaneItem.nextComponent = rightPaneItem.getComponentForPane(); } diff --git a/modules/controlcenter/network/VpnSettings.qml b/modules/controlcenter/network/VpnSettings.qml index 7387ddc..49d801d 100644 --- a/modules/controlcenter/network/VpnSettings.qml +++ b/modules/controlcenter/network/VpnSettings.qml @@ -54,17 +54,17 @@ ColumnLayout { ListView { Layout.fillWidth: true Layout.preferredHeight: contentHeight - + interactive: false spacing: Appearance.spacing.smaller - + model: ScriptModel { values: Config.utilities.vpn.provider.map((provider, index) => { const isObject = typeof provider === "object"; const name = isObject ? (provider.name || "custom") : String(provider); const displayName = isObject ? (provider.displayName || name) : name; const iface = isObject ? (provider.interface || "") : ""; - + return { index: index, name: name, diff --git a/modules/controlcenter/network/WirelessDetails.qml b/modules/controlcenter/network/WirelessDetails.qml index 47d42c2..e8777cd 100644 --- a/modules/controlcenter/network/WirelessDetails.qml +++ b/modules/controlcenter/network/WirelessDetails.qml @@ -18,7 +18,7 @@ DeviceDetails { required property Session session readonly property var network: root.session.network.active - + device: network Component.onCompleted: { @@ -66,8 +66,7 @@ DeviceDetails { const isActive = network.active || (Nmcli.active && Nmcli.active.ssid === network.ssid); if (isActive) { if (!Nmcli.wirelessDeviceDetails || Nmcli.wirelessDeviceDetails === null) { - Nmcli.getWirelessDeviceDetails("", () => { - }); + Nmcli.getWirelessDeviceDetails("", () => {}); } else { connectionUpdateTimer.stop(); } diff --git a/modules/controlcenter/network/WirelessList.qml b/modules/controlcenter/network/WirelessList.qml index 8159291..57a155f 100644 --- a/modules/controlcenter/network/WirelessList.qml +++ b/modules/controlcenter/network/WirelessList.qml @@ -22,7 +22,7 @@ DeviceList { title: qsTr("Networks (%1)").arg(Nmcli.networks.length) description: qsTr("All available WiFi networks") activeItem: session.network.active - + titleSuffix: Component { StyledText { visible: Nmcli.scanning @@ -165,11 +165,13 @@ DeviceList { StyledText { Layout.fillWidth: true text: { - if (modelData.active) return qsTr("Connected"); + if (modelData.active) + return qsTr("Connected"); if (modelData.isSecure && modelData.security && modelData.security.length > 0) { return modelData.security; } - if (modelData.isSecure) return qsTr("Secured"); + if (modelData.isSecure) + return qsTr("Secured"); return qsTr("Open"); } color: modelData.active ? Colours.palette.m3primary : Colours.palette.m3outline @@ -211,7 +213,7 @@ DeviceList { } } - onItemSelected: function(item) { + onItemSelected: function (item) { session.network.active = item; if (item && item.ssid) { checkSavedProfileForNetwork(item.ssid); diff --git a/modules/controlcenter/network/WirelessPane.qml b/modules/controlcenter/network/WirelessPane.qml index 109d416..8150af9 100644 --- a/modules/controlcenter/network/WirelessPane.qml +++ b/modules/controlcenter/network/WirelessPane.qml @@ -16,7 +16,7 @@ SplitPaneWithDetails { anchors.fill: parent activeItem: session.network.active - paneIdGenerator: function(item) { + paneIdGenerator: function (item) { return item ? (item.ssid || item.bssid || "") : ""; } diff --git a/modules/controlcenter/network/WirelessPasswordDialog.qml b/modules/controlcenter/network/WirelessPasswordDialog.qml index 7c046af..7ad5204 100644 --- a/modules/controlcenter/network/WirelessPasswordDialog.qml +++ b/modules/controlcenter/network/WirelessPasswordDialog.qml @@ -384,8 +384,7 @@ Item { text = qsTr("Connecting..."); NetworkConnection.connectWithPassword(root.network, password, result => { - if (result && result.success) { - } else if (result && result.needsPassword) { + if (result && result.success) {} else if (result && result.needsPassword) { connectionMonitor.stop(); connecting = false; hasError = true; diff --git a/modules/controlcenter/network/WirelessSettings.qml b/modules/controlcenter/network/WirelessSettings.qml index f87fe39..b4eb391 100644 --- a/modules/controlcenter/network/WirelessSettings.qml +++ b/modules/controlcenter/network/WirelessSettings.qml @@ -70,4 +70,4 @@ ColumnLayout { value: Nmcli.active ? qsTr("%1 MHz").arg(Nmcli.active.frequency) : qsTr("N/A") } } -} \ No newline at end of file +} -- cgit v1.2.3-freya