change things

7 files changed, 3 insertions, 104 deletions

diff --git a/modules/bar/popouts/Audio.qml b/modules/bar/popouts/Audio.qml
index 58b29ba..2bfb1c7 100644
--- a/modules/bar/popouts/Audio.qml
+++ b/modules/bar/popouts/Audio.qml
@@ -9,7 +9,6 @@ import Quickshell.Services.Pipewire
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.Controls
-import "../../controlcenter/network"
 
 Item {
     id: root
@@ -104,17 +103,5 @@ Item {
                 }
             }
         }
-
-        IconTextButton {
-            Layout.fillWidth: true
-            Layout.topMargin: Appearance.spacing.normal
-            inactiveColour: Colours.palette.m3primaryContainer
-            inactiveOnColour: Colours.palette.m3onPrimaryContainer
-            verticalPadding: Appearance.padding.small
-            text: qsTr("Open settings")
-            icon: "settings"
-
-            onClicked: root.wrapper.detach("audio")
-        }
     }
 }
diff --git a/modules/bar/popouts/Background.qml b/modules/bar/popouts/Background.qml
index 075b698..983650c 100644
--- a/modules/bar/popouts/Background.qml
+++ b/modules/bar/popouts/Background.qml
@@ -9,7 +9,7 @@ ShapePath {
 
     required property Wrapper wrapper
     required property bool invertBottomRounding
-    readonly property real rounding: wrapper.isDetached ? Appearance.rounding.normal : Config.border.rounding
+    readonly property real rounding: Config.border.rounding
     readonly property bool flatten: wrapper.width < rounding * 2
     readonly property real roundingX: flatten ? wrapper.width / 2 : rounding
     property real ibr: invertBottomRounding ? -1 : 1
diff --git a/modules/bar/popouts/Bluetooth.qml b/modules/bar/popouts/Bluetooth.qml
index 676da82..151891f 100644
--- a/modules/bar/popouts/Bluetooth.qml
+++ b/modules/bar/popouts/Bluetooth.qml
@@ -9,7 +9,6 @@ import Quickshell
 import Quickshell.Bluetooth
 import QtQuick
 import QtQuick.Layouts
-import "../../controlcenter/network"
 
 ColumnLayout {
     id: root
@@ -164,18 +163,6 @@ ColumnLayout {
         }
     }
 
-    IconTextButton {
-        Layout.fillWidth: true
-        Layout.topMargin: Appearance.spacing.normal
-        inactiveColour: Colours.palette.m3primaryContainer
-        inactiveOnColour: Colours.palette.m3onPrimaryContainer
-        verticalPadding: Appearance.padding.small
-        text: qsTr("Open settings")
-        icon: "settings"
-
-        onClicked: root.wrapper.detach("bluetooth")
-    }
-
     component Toggle: RowLayout {
         required property string label
         property alias checked: toggle.checked
diff --git a/modules/bar/popouts/Content.qml b/modules/bar/popouts/Content.qml
index 779cc5f..6bcc9f7 100644
--- a/modules/bar/popouts/Content.qml
+++ b/modules/bar/popouts/Content.qml
@@ -114,11 +114,6 @@ Item {
             }
         }
 
-        Popout {
-            name: "lockstatus"
-            sourceComponent: LockStatus {}
-        }
-
         Repeater {
             model: ScriptModel {
                 values: SystemTray.items.values.filter(i => !Config.bar.tray.hiddenIcons.includes(i.id))
diff --git a/modules/bar/popouts/LockStatus.qml b/modules/bar/popouts/LockStatus.qml
deleted file mode 100644
index 7d74530..0000000
--- a/modules/bar/popouts/LockStatus.qml
+++ /dev/null
@@ -1,16 +0,0 @@
-import qs.components
-import qs.services
-import qs.config
-import QtQuick.Layouts
-
-ColumnLayout {
-    spacing: Appearance.spacing.small
-
-    StyledText {
-        text: qsTr("Capslock: %1").arg(Hypr.capsLock ? "Enabled" : "Disabled")
-    }
-
-    StyledText {
-        text: qsTr("Numlock: %1").arg(Hypr.numLock ? "Enabled" : "Disabled")
-    }
-}
diff --git a/modules/bar/popouts/Wrapper.qml b/modules/bar/popouts/Wrapper.qml
index 05a1d3c..73a7556 100644
--- a/modules/bar/popouts/Wrapper.qml
+++ b/modules/bar/popouts/Wrapper.qml
@@ -3,8 +3,6 @@ pragma ComponentBehavior: Bound
 import qs.components
 import qs.services
 import qs.config
-import qs.modules.windowinfo
-import qs.modules.controlcenter
 import Quickshell
 import Quickshell.Wayland
 import Quickshell.Hyprland
@@ -23,29 +21,15 @@ Item {
     property real currentCenter
     property bool hasCurrent
 
-    property string detachedMode
     property string queuedMode
-    readonly property bool isDetached: detachedMode.length > 0
 
     property int animLength: Appearance.anim.durations.normal
     property list<real> animCurve: Appearance.anim.curves.emphasized
 
-    function detach(mode: string): void {
-        animLength = Appearance.anim.durations.large;
-        if (mode === "winfo") {
-            detachedMode = mode;
-        } else {
-            queuedMode = mode;
-            detachedMode = "any";
-        }
-        focus = true;
-    }
-
     function close(): void {
         hasCurrent = false;
         animCurve = Appearance.anim.curves.emphasizedAccel;
         animLength = Appearance.anim.durations.normal;
-        detachedMode = "";
         animCurve = Appearance.anim.curves.emphasized;
     }
 
@@ -75,20 +59,6 @@ Item {
         }
     }
 
-    HyprlandFocusGrab {
-        active: root.isDetached
-        windows: [QsWindow.window]
-        onCleared: root.close()
-    }
-
-    Binding {
-        when: root.isDetached
-
-        target: QsWindow.window
-        property: "WlrLayershell.keyboardFocus"
-        value: WlrKeyboardFocus.OnDemand
-    }
-
     Binding {
         when: root.hasCurrent && root.currentName === "wirelesspassword"
 
@@ -100,7 +70,7 @@ Item {
     Comp {
         id: content
 
-        shouldBeActive: root.hasCurrent && !root.detachedMode
+        shouldBeActive: root.hasCurrent
         anchors.right: parent.right
         anchors.verticalCenter: parent.verticalCenter
 
@@ -109,30 +79,6 @@ Item {
         }
     }
 
-    Comp {
-        shouldBeActive: root.detachedMode === "winfo"
-        anchors.centerIn: parent
-
-        sourceComponent: WindowInfo {
-            screen: root.screen
-            client: Hypr.activeToplevel
-        }
-    }
-
-    Comp {
-        shouldBeActive: root.detachedMode === "any"
-        anchors.centerIn: parent
-
-        sourceComponent: ControlCenter {
-            screen: root.screen
-            active: root.queuedMode
-
-            function close(): void {
-                root.close();
-            }
-        }
-    }
-
     Behavior on x {
         Anim {
             duration: root.animLength
diff --git a/modules/bar/popouts/kblayout/KbLayoutModel.qml b/modules/bar/popouts/kblayout/KbLayoutModel.qml
index 4371095..d1845af 100644
--- a/modules/bar/popouts/kblayout/KbLayoutModel.qml
+++ b/modules/bar/popouts/kblayout/KbLayoutModel.qml
@@ -199,7 +199,7 @@ Item {
         arr = arr.filter(i => i.layoutIndex !== activeIndex);
         arr.forEach(i => _visibleModel.append(i));
 
-        if (!Config.utilities.toasts.kbLimit)
+        if (!Config.toasts.kbLimit)
             return;
 
         if (_layoutsModel.count > 4) {