Rearrange for tidier structure (#2212)

2025-10-16 07:19:55 +08:00
parent 13065d7e5a
commit 8b493e091d
529 changed files with 165 additions and 138 deletions
@@ -0,0 +1,75 @@
+import qs
+import qs.services
+import qs.services.network
+import qs.modules.common
+import qs.modules.common.widgets
+import QtQuick
+import QtQuick.Layouts
+import Quickshell
+
+WindowDialog {
+    id: root
+
+    WindowDialogTitle {
+        text: Translation.tr("Connect to Wi-Fi")
+    }
+    WindowDialogSeparator {
+        visible: !Network.wifiScanning
+    }
+    StyledIndeterminateProgressBar {
+        visible: Network.wifiScanning
+        Layout.fillWidth: true
+        Layout.topMargin: -8
+        Layout.bottomMargin: -8
+        Layout.leftMargin: -Appearance.rounding.large
+        Layout.rightMargin: -Appearance.rounding.large
+    }
+    ListView {
+        Layout.fillHeight: true
+        Layout.fillWidth: true
+        Layout.topMargin: -15
+        Layout.bottomMargin: -16
+        Layout.leftMargin: -Appearance.rounding.large
+        Layout.rightMargin: -Appearance.rounding.large
+
+        clip: true
+        spacing: 0
+
+        model: ScriptModel {
+            values: [...Network.wifiNetworks].sort((a, b) => {
+                if (a.active && !b.active)
+                    return -1;
+                if (!a.active && b.active)
+                    return 1;
+                return b.strength - a.strength;
+            })
+        }
+        delegate: WifiNetworkItem {
+            required property WifiAccessPoint modelData
+            wifiNetwork: modelData
+            anchors {
+                left: parent?.left
+                right: parent?.right
+            }
+        }
+    }
+    WindowDialogSeparator {}
+    WindowDialogButtonRow {
+        DialogButton {
+            buttonText: Translation.tr("Details")
+            onClicked: {
+                Quickshell.execDetached(["bash", "-c", `${Network.ethernet ? Config.options.apps.networkEthernet : Config.options.apps.network}`]);
+                GlobalStates.sidebarRightOpen = false;
+            }
+        }
+
+        Item {
+            Layout.fillWidth: true
+        }
+
+        DialogButton {
+            buttonText: Translation.tr("Done")
+            onClicked: root.dismiss()
+        }
+    }
+}
@@ -0,0 +1,118 @@
+import qs
+import qs.modules.common
+import qs.modules.common.widgets
+import qs.services
+import qs.services.network
+import QtQuick
+import QtQuick.Layouts
+
+DialogListItem {
+    id: root
+    required property WifiAccessPoint wifiNetwork
+    enabled: !(Network.wifiConnectTarget === root.wifiNetwork && !wifiNetwork?.active)
+
+    active: (wifiNetwork?.askingPassword || wifiNetwork?.active) ?? false
+    onClicked: {
+        Network.connectToWifiNetwork(wifiNetwork);
+    }
+
+    contentItem: ColumnLayout {
+        anchors {
+            fill: parent
+            topMargin: root.verticalPadding
+            bottomMargin: root.verticalPadding
+            leftMargin: root.horizontalPadding
+            rightMargin: root.horizontalPadding
+        }
+        spacing: 0
+
+        RowLayout {
+            // Name
+            spacing: 10
+            MaterialSymbol {
+                iconSize: Appearance.font.pixelSize.larger
+                property int strength: root.wifiNetwork?.strength ?? 0
+                text: strength > 80 ? "signal_wifi_4_bar" : strength > 60 ? "network_wifi_3_bar" : strength > 40 ? "network_wifi_2_bar" : strength > 20 ? "network_wifi_1_bar" : "signal_wifi_0_bar"
+                color: Appearance.colors.colOnSurfaceVariant
+            }
+            StyledText {
+                Layout.fillWidth: true
+                color: Appearance.colors.colOnSurfaceVariant
+                elide: Text.ElideRight
+                text: root.wifiNetwork?.ssid ?? Translation.tr("Unknown")
+            }
+            MaterialSymbol {
+                visible: (root.wifiNetwork?.isSecure || root.wifiNetwork?.active) ?? false
+                text: root.wifiNetwork?.active ? "check" : Network.wifiConnectTarget === root.wifiNetwork ? "settings_ethernet" : "lock"
+                iconSize: Appearance.font.pixelSize.larger
+                color: Appearance.colors.colOnSurfaceVariant
+            }
+        }
+
+        ColumnLayout { // Password
+            id: passwordPrompt
+            Layout.topMargin: 8
+            visible: root.wifiNetwork?.askingPassword ?? false
+
+            MaterialTextField {
+                id: passwordField
+                Layout.fillWidth: true
+                placeholderText: Translation.tr("Password")
+
+                // Password
+                echoMode: TextInput.Password
+                inputMethodHints: Qt.ImhSensitiveData
+
+                onAccepted: {
+                    Network.changePassword(root.wifiNetwork, passwordField.text);
+                }
+            }
+
+            RowLayout {
+                Layout.fillWidth: true
+
+                Item {
+                    Layout.fillWidth: true
+                }
+
+                DialogButton {
+                    buttonText: Translation.tr("Cancel")
+                    onClicked: {
+                        root.wifiNetwork.askingPassword = false;
+                    }
+                }
+
+                DialogButton {
+                    buttonText: Translation.tr("Connect")
+                    onClicked: {
+                        Network.changePassword(root.wifiNetwork, passwordField.text);
+                    }
+                }
+            }
+        }
+
+        ColumnLayout { // Public wifi login page
+            id: publicWifiPortal
+            Layout.topMargin: 8
+            visible: (root.wifiNetwork?.active && (root.wifiNetwork?.security ?? "").trim().length === 0) ?? false
+
+            RowLayout {
+                DialogButton {
+                    Layout.fillWidth: true
+                    buttonText: Translation.tr("Open network portal")
+                    colBackground: Appearance.colors.colLayer4
+                    colBackgroundHover: Appearance.colors.colLayer4Hover
+                    colRipple: Appearance.colors.colLayer4Active
+                    onClicked: {
+                        Network.openPublicWifiPortal()
+                        GlobalStates.sidebarRightOpen = false
+                    }
+                }
+            }
+        }
+
+        Item {
+            Layout.fillHeight: true
+        }
+    }
+}