wactioncenter: bluetooth menu

dots/.config/quickshell/ii/modules/waffle/actionCenter/wifi/WWifiNetworkItem.qml

@@ -11,30 +11,16 @@ import qs.modules.common.widgets
 import qs.modules.waffle.looks
 import qs.modules.waffle.actionCenter
 
-WChoiceButton {
+ExpandableChoiceButton {
     id: root
     required property WifiAccessPoint wifiNetwork
 
-    property bool expanded: false
-    checked: expanded
-    clip: true
-
-    horizontalPadding: 12
-    verticalPadding: 6
-    animateChoiceHighlight: false
-
-    Behavior on implicitHeight {
-        animation: Looks.transition.resize.createObject(this)
-    }
-
-    onClicked: expanded = !expanded
-
     contentItem: RowLayout {
         id: contentItem
         spacing: 12
 
         FluentIcon { // Duotone hack
-        Layout.bottomMargin: 2
+            Layout.bottomMargin: 2
             Layout.alignment: Qt.AlignTop
             property int strength: root.wifiNetwork?.strength ?? 0
             icon: "wifi-1"

dots/.config/quickshell/ii/modules/waffle/actionCenter/wifi/WifiControl.qml

@@ -14,8 +14,6 @@ import qs.modules.waffle.actionCenter
 
 Item {
     id: root
-    implicitWidth: 360
-    implicitHeight: 352
 
     Component.onCompleted: {
         Network.rescanWifi();
@@ -37,29 +35,31 @@ Item {
                     implicitHeight: headerRow.implicitHeight
                     Layout.fillWidth: true
                     spacing: 0
-                    HeaderRow {
-                        id: headerRow
+                    RowLayout {
                         Layout.fillWidth: true
-                        title: qsTr("Wi-Fi")
+                        spacing: 0
+                        HeaderRow {
+                            id: headerRow
+                            Layout.fillWidth: true
+                            title: qsTr("Wi-Fi")
+                        }
+                        WSwitch {
+                            id: toggleSwitch
+                            Layout.rightMargin: 12
+                            checked: Network.wifiStatus !== "disabled"
+                            onCheckedChanged: {
+                                Network.enableWifi(checked);
+                                Network.rescanWifi();
+                            }
+                        }
                     }
                     FadeLoader {
                         Layout.leftMargin: -4
                         Layout.rightMargin: -4
                         Layout.fillWidth: true
                         shown: Network.wifiScanning
-                        sourceComponent: StyledIndeterminateProgressBar {
-                            id: progressBar
-                            implicitHeight: 3
-                            background: null
-                            layer.enabled: true
-                            layer.effect: OpacityMask {
-                                maskSource: Rectangle {
-                                    width: progressBar.width
-                                    height: progressBar.height
-                                    radius: progressBar.height / 2
-                                }
-                            }
-                        }
+                        visible: true
+                        sourceComponent: WIndeterminateProgressBar {}
                     }
                 }
 
@@ -89,30 +89,29 @@ Item {
         Separator {}
 
         FooterRectangle {
-            WButton {
-                id: moreSettingsButton
+            FooterMoreButton {
                 anchors {
                     verticalCenter: parent.verticalCenter
                     left: parent.left
                 }
-                implicitHeight: 40
-                implicitWidth: contentItem.implicitWidth + 30
-                color: "transparent"
-
+                text: qsTr("More Internet settings")
                 onClicked: {
                     Quickshell.execDetached(["qs", "-p", Quickshell.shellPath(""), "ipc", "call", "sidebarLeft", "toggle"]);
                     Quickshell.execDetached(["bash", "-c", Config.options.apps.network]);
                 }
+            }
+            WPanelFooterButton {
+                anchors.verticalCenter: parent.verticalCenter
+                anchors.right: parent.right
+                anchors.rightMargin: 12
+                enabled: !Network.wifiScanning
 
-                contentItem: Item {
-                    anchors.centerIn: parent
-                    implicitWidth: buttonText.implicitWidth
-                    WText {
-                        id: buttonText
-                        anchors.centerIn: parent
-                        text: qsTr("More Internet settings")
-                        color: moreSettingsButton.pressed ? Looks.colors.fg : Looks.colors.fg1
-                    }
+                onClicked: {
+                    Network.rescanWifi();
+                }
+
+                contentItem: FluentIcon {
+                    icon: "arrow-counterclockwise"
                 }
             }
         }