summaryrefslogtreecommitdiff
path: root/modules/controlcenter/network/NetworkingPane.qml
diff options
context:
space:
mode:
authorFreya Murphy <freya@freyacat.org>2026-01-22 09:02:54 -0500
committerFreya Murphy <freya@freyacat.org>2026-03-16 09:45:27 -0400
commit6d9f0c1526c51ed1bc8102c135aae56a0bc0e1ef (patch)
tree9c77312e5a873647d3540331413dbe691e6768f2 /modules/controlcenter/network/NetworkingPane.qml
parentremove lockscreen (diff)
downloadcaelestia-shell-6d9f0c1526c51ed1bc8102c135aae56a0bc0e1ef.tar.gz
caelestia-shell-6d9f0c1526c51ed1bc8102c135aae56a0bc0e1ef.tar.bz2
caelestia-shell-6d9f0c1526c51ed1bc8102c135aae56a0bc0e1ef.zip
fix rebase
Diffstat (limited to 'modules/controlcenter/network/NetworkingPane.qml')
-rw-r--r--modules/controlcenter/network/NetworkingPane.qml68
1 files changed, 2 insertions, 66 deletions
diff --git a/modules/controlcenter/network/NetworkingPane.qml b/modules/controlcenter/network/NetworkingPane.qml
index 26cdbfa..c32fbb7 100644
--- a/modules/controlcenter/network/NetworkingPane.qml
+++ b/modules/controlcenter/network/NetworkingPane.qml
@@ -112,24 +112,6 @@ Item {
}
CollapsibleSection {
- id: vpnListSection
-
- Layout.fillWidth: true
- title: qsTr("VPN")
- expanded: true
-
- Loader {
- Layout.fillWidth: true
- sourceComponent: Component {
- VpnList {
- session: root.session
- showHeader: false
- }
- }
- }
- }
-
- CollapsibleSection {
id: ethernetListSection
Layout.fillWidth: true
@@ -172,17 +154,14 @@ Item {
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
- property var pane: vpnPane || ethernetPane || wirelessPane
- property string paneId: vpnPane ? ("vpn:" + (vpnPane.name || "")) : (ethernetPane ? ("eth:" + (ethernetPane.interface || "")) : (wirelessPane ? ("wifi:" + (wirelessPane.ssid || wirelessPane.bssid || "")) : "settings"))
+ property var pane: ethernetPane || wirelessPane
+ property string paneId: ethernetPane ? ("eth:" + (ethernetPane.interface || "")) : (wirelessPane ? ("wifi:" + (wirelessPane.ssid || wirelessPane.bssid || "")) : "settings")
property Component targetComponent: settingsComponent
property Component nextComponent: settingsComponent
function getComponentForPane() {
- if (vpnPane)
- return vpnDetailsComponent;
if (ethernetPane)
return ethernetDetailsComponent;
if (wirelessPane)
@@ -196,30 +175,12 @@ 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;
- }
- rightPaneItem.nextComponent = rightPaneItem.getComponentForPane();
- }
- }
-
- 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;
}
@@ -234,8 +195,6 @@ Item {
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;
}
@@ -342,29 +301,6 @@ Item {
}
}
- Component {
- id: vpnDetailsComponent
-
- StyledFlickable {
- id: vpnFlickable
- flickableDirection: Flickable.VerticalFlick
- contentHeight: vpnDetailsInner.height
-
- StyledScrollBar.vertical: StyledScrollBar {
- flickable: vpnFlickable
- }
-
- VpnDetails {
- id: vpnDetailsInner
-
- anchors.left: parent.left
- anchors.right: parent.right
- anchors.top: parent.top
- session: root.session
- }
- }
- }
-
WirelessPasswordDialog {
anchors.fill: parent
session: root.session