diff --git a/modules/user/modules/quickshell/default.nix b/modules/user/modules/quickshell/default.nix
index 9dff89b..0f5598c 100644
--- a/modules/user/modules/quickshell/default.nix
+++ b/modules/user/modules/quickshell/default.nix
@@ -10,12 +10,12 @@ in {
qt6.qtdeclarative # qtdecl types in path
(quickshell.packages.${system}.default.override (prevqs: {
debug = true;
- /*qt6 = prevqs.qt6.overrideScope (_: prevqt: {
+ qt6 = prevqs.qt6.overrideScope (_: prevqt: {
qtdeclarative = prevqt.qtdeclarative.overrideAttrs (prev: {
cmakeBuildType = "Debug";
dontStrip = true;
});
- });*/
+ });
}))
grim imagemagick # screenshot
];
diff --git a/modules/user/modules/quickshell/shell/bar/ActivityButton.qml b/modules/user/modules/quickshell/shell/bar/ActivityButton.qml
deleted file mode 100644
index 99c2338..0000000
--- a/modules/user/modules/quickshell/shell/bar/ActivityButton.qml
+++ /dev/null
@@ -1,19 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-ClickableIcon {
- id: root
- property bool showAction: false
- showPressed: mouseArea.pressed || showAction
-
- BusyIndicator {
- parent: root
- anchors.centerIn: parent
- opacity: root.showAction ? 1 : 0
- Behavior on opacity { SmoothedAnimation { velocity: 8 }}
- visible: opacity != 0
- width: root.width - 3 + opacity * 11
- height: width
- padding: 0
- }
-}
diff --git a/modules/user/modules/quickshell/shell/bar/Bar.qml b/modules/user/modules/quickshell/shell/bar/Bar.qml
index 08dab26..955993c 100644
--- a/modules/user/modules/quickshell/shell/bar/Bar.qml
+++ b/modules/user/modules/quickshell/shell/bar/Bar.qml
@@ -1,12 +1,11 @@
pragma ComponentBehavior: Bound
-
import QtQuick
import QtQuick.Layouts
+import QtQuick.Controls
import Quickshell
import qs.bar.systray as SysTray
import qs.bar.audio as Audio
import qs.bar.mpris as Mpris
-import qs.bar.connections as Connections
import qs.bar.power as Power
import qs.notifications as Notifs
@@ -15,6 +14,7 @@ BarContainment {
property bool isSoleBar: Quickshell.screens.length == 1;
ColumnLayout {
+
anchors {
left: parent.left
right: parent.right
@@ -75,11 +75,6 @@ BarContainment {
Layout.fillWidth: true
}
- Connections.Connections {
- bar: root
- Layout.fillWidth: true
- }
-
Power.Power {
bar: root
Layout.fillWidth: true
@@ -89,5 +84,6 @@ BarContainment {
bar: root
Layout.fillWidth: true
}
+
}
}
diff --git a/modules/user/modules/quickshell/shell/bar/connections/Bluetooth.qml b/modules/user/modules/quickshell/shell/bar/connections/Bluetooth.qml
deleted file mode 100644
index 459938a..0000000
--- a/modules/user/modules/quickshell/shell/bar/connections/Bluetooth.qml
+++ /dev/null
@@ -1,129 +0,0 @@
-import QtQuick
-import QtQuick.Layouts
-import QtQuick.Controls
-import Quickshell
-import Quickshell.Widgets
-import Quickshell.Bluetooth
-import qs
-import qs.bar
-
-ClickableIcon {
- id: root
- required property var bar;
- readonly property BluetoothAdapter adapter: Bluetooth.defaultAdapter
- readonly property bool connected: adapter.devices.values.some(device => device.connected)
-
- property bool showMenu: false
-
- onPressed: event => {
- event.accepted = true;
- if (event.button === Qt.RightButton) {
- showMenu = !showMenu;
- }
- }
-
- onClicked: event => {
- if (event.button === Qt.LeftButton) {
- adapter.enabled = !adapter.enabled;
- }
- }
-
- showPressed: showMenu || (pressedButtons & ~Qt.RightButton)
-
- implicitHeight: width
- fillWindowWidth: true
- acceptedButtons: Qt.LeftButton | Qt.RightButton
- image: adapter.enabled
- ? (connected ? "root:/icons/bluetooth-connected.svg" : "root:/icons/bluetooth.svg")
- : "root:/icons/bluetooth-slash.svg"
-
- property var tooltip: TooltipItem {
- tooltip: bar.tooltip
- owner: root
- show: root.containsMouse
-
- Label { text: "Bluetooth" }
- }
-
- property var rightclickMenu: TooltipItem {
- id: rightclickMenu
- tooltip: bar.tooltip
- owner: root
-
- isMenu: true
- show: root.showMenu
- onClose: root.showMenu = false
-
- Loader {
- width: 400
- active: root.showMenu || rightclickMenu.visible
-
- sourceComponent: Column {
- spacing: 5
-
- move: Transition {
- SmoothedAnimation { property: "y"; velocity: 350 }
- }
-
- RowLayout {
- width: parent.width
-
- ClickableIcon {
- image: root.image
- implicitHeight: 40
- implicitWidth: height
- onClicked: root.adapter.enabled = !root.adapter.enabled
- }
-
- Label {
- text: `Bluetooth (${root.adapter.adapterId})`
- }
-
- Item { Layout.fillWidth: true }
-
- ClickableIcon {
- image: root.adapter.enabled ? "root:/icons/bluetooth-slash.svg" : "root:/icons/bluetooth.svg"
- implicitHeight: 24
- implicitWidth: height
- onClicked: root.adapter.enabled = !root.adapter.enabled
- }
-
- ActivityButton {
- image: "root:/icons/binoculars.svg"
- implicitHeight: 24
- implicitWidth: height
- onClicked: root.adapter.discovering = !root.adapter.discovering
- showAction: root.adapter.discovering
- Layout.rightMargin: 4
- }
- }
-
- Rectangle {
- width: parent.width
- implicitHeight: 1
- visible: linkTracker.linkGroups.length > 0
-
- color: ShellGlobals.colors.separator
- }
-
- Repeater {
- model: ScriptModel {
- values: [...root.adapter.devices.values].sort((a, b) => {
- if (a.connected && !b.connected) return -1;
- if (b.connected && !a.connected) return 1;
- if (a.bonded && !b.bonded) return -1;
- if (b.bonded && !a.bonded) return 1;
- return b.name - a.name;
- })
- }
-
- delegate: BluetoothDeviceDelegate {
- required property BluetoothDevice modelData
- device: modelData
- width: parent.width
- }
- }
- }
- }
- }
-}
diff --git a/modules/user/modules/quickshell/shell/bar/connections/BluetoothDeviceDelegate.qml b/modules/user/modules/quickshell/shell/bar/connections/BluetoothDeviceDelegate.qml
deleted file mode 100644
index 6118690..0000000
--- a/modules/user/modules/quickshell/shell/bar/connections/BluetoothDeviceDelegate.qml
+++ /dev/null
@@ -1,88 +0,0 @@
-import QtQuick
-import QtQuick.Layouts
-import QtQuick.Controls
-import Quickshell
-import Quickshell.Widgets
-import Quickshell.Bluetooth
-import qs
-import qs.bar
-
-WrapperMouseArea {
- id: root
- required property BluetoothDevice device
- property bool menuOpen: false
- readonly property bool showBg: false//pairingContext.attentionRequested //device.connected//menuOpen //|| containsMouse
- hoverEnabled: true
-
- onClicked: menuOpen = !menuOpen
-
- WrapperRectangle {
- color: root.showBg ? ShellGlobals.colors.widget : "transparent"
- border.width: 1
- border.color: root.showBg ? ShellGlobals.colors.widgetOutline : "transparent"
- radius: 4
- rightMargin: 2
-
- ColumnLayout {
- RowLayout {
- ClickableIcon {
- image: Quickshell.iconPath(root.device.icon)
- implicitHeight: 40
- implicitWidth: height
- }
-
- Label {
- text: root.device.name
- }
-
- Item { Layout.fillWidth: true }
-
- ActivityButton {
- image: root.device.connected ? "root:/icons/plugs-connected.svg" : "root:/icons/plugs.svg"
- implicitHeight: 24
- implicitWidth: height
- showAction: root.device.pairing || root.device.state === BluetoothDeviceState.Connecting || root.device.state === BluetoothDeviceState.Disconnecting
- onClicked: {
- if (showAction) return;
- else if (root.device.connected) root.device.disconnect();
- else if (root.device.paired) root.device.connect();
- else root.device.pair();
- }
- }
-
- ClickableIcon {
- image: "root:/icons/trash.svg"
- implicitHeight: 24
- implicitWidth: height
- visible: root.device.bonded
- onClicked: root.device.forget()
- }
- }
-
- /*RowLayout {
- Layout.margins: 3
- Layout.topMargin: 0
- visible: root.showBg
-
- BluetoothPairingContext {
- id: pairingContext
- device: root.device
- }
-
- Label {
- text: `Pairing Code: ${pairingContext.pairingCode}`
- }
-
- Button {
- text: "Accept"
- onClicked: pairingContext.confirmCode(true)
- }
-
- Button {
- text: "Reject"
- onClicked: pairingContext.confirmCode(false)
- }
- }*/
- }
- }
-}
diff --git a/modules/user/modules/quickshell/shell/bar/connections/ConnectionDelegate.qml b/modules/user/modules/quickshell/shell/bar/connections/ConnectionDelegate.qml
deleted file mode 100644
index 83f9bc3..0000000
--- a/modules/user/modules/quickshell/shell/bar/connections/ConnectionDelegate.qml
+++ /dev/null
@@ -1 +0,0 @@
-import Quickshell
diff --git a/modules/user/modules/quickshell/shell/bar/connections/Connections.qml b/modules/user/modules/quickshell/shell/bar/connections/Connections.qml
deleted file mode 100644
index c3c9a98..0000000
--- a/modules/user/modules/quickshell/shell/bar/connections/Connections.qml
+++ /dev/null
@@ -1,23 +0,0 @@
-import QtQuick
-import QtQuick.Layouts
-import qs.bar
-
-BarWidgetInner {
- id: root
- required property var bar;
- implicitHeight: column.implicitHeight + 10
-
- ColumnLayout {
- id: column
-
- anchors {
- fill: parent
- margins: 5
- }
-
- Bluetooth {
- Layout.fillWidth: true
- bar: root.bar
- }
- }
-}
diff --git a/modules/user/modules/quickshell/shell/bar/mpris/BackgroundArt.qml b/modules/user/modules/quickshell/shell/bar/mpris/BackgroundArt.qml
index b7c0204..4c7b81c 100644
--- a/modules/user/modules/quickshell/shell/bar/mpris/BackgroundArt.qml
+++ b/modules/user/modules/quickshell/shell/bar/mpris/BackgroundArt.qml
@@ -1,6 +1,3 @@
-//@ pragma Internal
-pragma ComponentBehavior: Bound
-
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
diff --git a/modules/user/modules/quickshell/shell/bar/mpris/MediaSlider.qml b/modules/user/modules/quickshell/shell/bar/mpris/MediaSlider.qml
index af3ae41..5670051 100644
--- a/modules/user/modules/quickshell/shell/bar/mpris/MediaSlider.qml
+++ b/modules/user/modules/quickshell/shell/bar/mpris/MediaSlider.qml
@@ -1,4 +1,3 @@
-//@ pragma Internal
import QtQuick
import QtQuick.Templates as T
diff --git a/modules/user/modules/quickshell/shell/bar/systray/MenuCheckBox.qml b/modules/user/modules/quickshell/shell/bar/systray/MenuCheckBox.qml
index eb42eb3..257229d 100644
--- a/modules/user/modules/quickshell/shell/bar/systray/MenuCheckBox.qml
+++ b/modules/user/modules/quickshell/shell/bar/systray/MenuCheckBox.qml
@@ -1,4 +1,3 @@
-//@ pragma Internal
import QtQuick
import QtQuick.Shapes
import qs
diff --git a/modules/user/modules/quickshell/shell/bar/systray/MenuChildrenRevealer.qml b/modules/user/modules/quickshell/shell/bar/systray/MenuChildrenRevealer.qml
index 55f9c8e..ad7c0f8 100644
--- a/modules/user/modules/quickshell/shell/bar/systray/MenuChildrenRevealer.qml
+++ b/modules/user/modules/quickshell/shell/bar/systray/MenuChildrenRevealer.qml
@@ -1,4 +1,3 @@
-//@ pragma Internal
import QtQuick
import QtQuick.Shapes
import Quickshell
diff --git a/modules/user/modules/quickshell/shell/bar/systray/MenuItem.qml b/modules/user/modules/quickshell/shell/bar/systray/MenuItem.qml
index 2ed52d6..7271841 100644
--- a/modules/user/modules/quickshell/shell/bar/systray/MenuItem.qml
+++ b/modules/user/modules/quickshell/shell/bar/systray/MenuItem.qml
@@ -1,4 +1,3 @@
-//@ pragma Internal
import QtQuick
import QtQuick.Layouts
import Quickshell
@@ -25,7 +24,7 @@ MouseArea {
if (entry.hasChildren) childrenRevealer.expanded = !childrenRevealer.expanded
else {
entry.triggered();
- close();
+ if (entry.toggleType == ToggleButtonType.None) close();
}
}
diff --git a/modules/user/modules/quickshell/shell/bar/systray/MenuRadioButton.qml b/modules/user/modules/quickshell/shell/bar/systray/MenuRadioButton.qml
index fd5c288..adabdf5 100644
--- a/modules/user/modules/quickshell/shell/bar/systray/MenuRadioButton.qml
+++ b/modules/user/modules/quickshell/shell/bar/systray/MenuRadioButton.qml
@@ -1,4 +1,3 @@
-//@ pragma Internal
import QtQuick
import qs
diff --git a/modules/user/modules/quickshell/shell/bar/systray/MenuView.qml b/modules/user/modules/quickshell/shell/bar/systray/MenuView.qml
index b90514f..fc80aea 100644
--- a/modules/user/modules/quickshell/shell/bar/systray/MenuView.qml
+++ b/modules/user/modules/quickshell/shell/bar/systray/MenuView.qml
@@ -1,7 +1,7 @@
-//@ pragma Internal
import QtQuick
import QtQuick.Layouts
import Quickshell
+import Quickshell.DBusMenu
import qs
ColumnLayout {
diff --git a/modules/user/modules/quickshell/shell/icons/binoculars.svg b/modules/user/modules/quickshell/shell/icons/binoculars.svg
deleted file mode 100644
index 06592fc..0000000
--- a/modules/user/modules/quickshell/shell/icons/binoculars.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/modules/user/modules/quickshell/shell/icons/bluetooth-connected.svg b/modules/user/modules/quickshell/shell/icons/bluetooth-connected.svg
deleted file mode 100644
index 8a1cc58..0000000
--- a/modules/user/modules/quickshell/shell/icons/bluetooth-connected.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/modules/user/modules/quickshell/shell/icons/bluetooth-slash.svg b/modules/user/modules/quickshell/shell/icons/bluetooth-slash.svg
deleted file mode 100644
index 0991c7e..0000000
--- a/modules/user/modules/quickshell/shell/icons/bluetooth-slash.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/modules/user/modules/quickshell/shell/icons/bluetooth-x.svg b/modules/user/modules/quickshell/shell/icons/bluetooth-x.svg
deleted file mode 100644
index 8603667..0000000
--- a/modules/user/modules/quickshell/shell/icons/bluetooth-x.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/modules/user/modules/quickshell/shell/icons/bluetooth.svg b/modules/user/modules/quickshell/shell/icons/bluetooth.svg
deleted file mode 100644
index e57998a..0000000
--- a/modules/user/modules/quickshell/shell/icons/bluetooth.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/modules/user/modules/quickshell/shell/icons/plugs-connected.svg b/modules/user/modules/quickshell/shell/icons/plugs-connected.svg
deleted file mode 100644
index 3659335..0000000
--- a/modules/user/modules/quickshell/shell/icons/plugs-connected.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/modules/user/modules/quickshell/shell/icons/plugs.svg b/modules/user/modules/quickshell/shell/icons/plugs.svg
deleted file mode 100644
index 9d704ec..0000000
--- a/modules/user/modules/quickshell/shell/icons/plugs.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/modules/user/modules/quickshell/shell/icons/trash.svg b/modules/user/modules/quickshell/shell/icons/trash.svg
deleted file mode 100644
index d73b018..0000000
--- a/modules/user/modules/quickshell/shell/icons/trash.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/modules/user/modules/quickshell/shell/icons/wifi-slash.svg b/modules/user/modules/quickshell/shell/icons/wifi-slash.svg
deleted file mode 100644
index 1adff03..0000000
--- a/modules/user/modules/quickshell/shell/icons/wifi-slash.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/modules/user/modules/quickshell/shell/icons/wifi.svg b/modules/user/modules/quickshell/shell/icons/wifi.svg
deleted file mode 100644
index c4840c7..0000000
--- a/modules/user/modules/quickshell/shell/icons/wifi.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file