diff --git a/config/Dimensions.qml b/config/Dimensions.qml index 6b3deaf..afaa224 100644 --- a/config/Dimensions.qml +++ b/config/Dimensions.qml @@ -13,7 +13,6 @@ Singleton { property Clock clock: Clock {} property Pipewire pipewire: Pipewire {} property Network network: Network {} - property Bluetooth bluetooth: Bluetooth {} property Storage storage: Storage {} property Memory memory: Memory {} property Cpu cpu: Cpu {} @@ -63,13 +62,6 @@ Singleton { property int verticalPadding: 6 } - component Bluetooth: QtObject { - property int fontSize: 16 - property int height: 30 - property int horizontalPadding: 8 - property int verticalPadding: 6 - } - component Storage: QtObject { property int iconSize: 14 property int fontSize: 14 diff --git a/constants/Icons.qml b/constants/Icons.qml index 4126c27..f484252 100644 --- a/constants/Icons.qml +++ b/constants/Icons.qml @@ -5,8 +5,6 @@ import Quickshell Singleton { property string bell: "\u{E05d}" property string bellRing: "\u{E224}" - property string bluetooth: "\u{E060}" - property string bluetoothConnected: "\u{E1b8}" property string brickWall: "\u{E586}" property string coffee: "\u{E09a}" property string cpu: "\u{E0ad}" diff --git a/modules/bar/Bar.qml b/modules/bar/Bar.qml index 66eae2c..7bd20f8 100644 --- a/modules/bar/Bar.qml +++ b/modules/bar/Bar.qml @@ -1,11 +1,10 @@ -import qs.config import QtQuick import Quickshell import "components" -import "components/bluetooth" import "components/hyprland" import "components/mpris" import "components/tray" +import "../../config/" Scope { PanelWindow { @@ -109,10 +108,6 @@ Scope { anchors.verticalCenter: parent.verticalCenter } - Bluetooth { - anchors.verticalCenter: parent.verticalCenter - } - Storage { anchors.verticalCenter: parent.verticalCenter } diff --git a/modules/bar/components/bluetooth/Bluetooth.qml b/modules/bar/components/bluetooth/Bluetooth.qml deleted file mode 100644 index b39e7b8..0000000 --- a/modules/bar/components/bluetooth/Bluetooth.qml +++ /dev/null @@ -1,39 +0,0 @@ -import qs.config -import qs.constants -import qs.styled - -Clickable { - id: root - - implicitWidth: text.width - implicitHeight: Dimensions.bluetooth.height - - onClicked: { - popup.opened = !popup.opened; - } - - StyledText { - id: text - - font.family: Theme.lucide.font.family - font.pixelSize: Dimensions.bluetooth.fontSize - font.bold: true - text: Icons.bluetooth - - color: root.containsMouse ? Theme.palette.base300 : Theme.palette.basecontent - - anchors.verticalCenter: parent.verticalCenter - topPadding: Dimensions.bluetooth.verticalPadding - bottomPadding: Dimensions.bluetooth.verticalPadding - leftPadding: Dimensions.bluetooth.horizontalPadding - rightPadding: Dimensions.bluetooth.horizontalPadding - } - - BluetoothMenu { - id: popup - - anchor.item: root - anchor.rect.x: root.width / 2 - width / 2 - anchor.rect.y: root.height + 8 - } -} diff --git a/modules/bar/components/bluetooth/BluetoothMenu.qml b/modules/bar/components/bluetooth/BluetoothMenu.qml deleted file mode 100644 index ed896c3..0000000 --- a/modules/bar/components/bluetooth/BluetoothMenu.qml +++ /dev/null @@ -1,74 +0,0 @@ -pragma ComponentBehavior: Bound - -import qs.config -import qs.constants -import qs.services -import qs.styled -import QtQuick -import QtQuick.Controls -import QtQuick.Layouts -import Quickshell.Widgets - -StyledPopupWindow { - id: root - - backgroundColor: Theme.palette.base300 - margins: 16 - radius: 8 - - content: ColumnLayout { - spacing: 8 - WrapperRectangle { - margin: 16 - color: Theme.palette.base200 - radius: 8 - Layout.fillWidth: true - RowLayout { - StyledText { - text: "Bluetooth" - } - - Switch { - checked: Bluetooth.defaultAdapter.enabled - onClicked: Bluetooth.defaultAdapter.enabled = checked - } - } - } - - WrapperRectangle { - margin: 16 - color: Theme.palette.base200 - radius: 8 - ColumnLayout { - spacing: 8 - - StyledText { - font.bold: true - text: "Connected Devices" - } - - DeviceList { - devices: Bluetooth.connectedDevices - } - - StyledText { - font.bold: true - text: "Paired Devices" - } - - DeviceList { - devices: Bluetooth.pairedDevices - } - - StyledText { - font.bold: true - text: "Available Devices" - } - - DeviceList { - devices: Bluetooth.availableDevices - } - } - } - } -} diff --git a/modules/bar/components/bluetooth/DeviceList.qml b/modules/bar/components/bluetooth/DeviceList.qml deleted file mode 100644 index fa21d27..0000000 --- a/modules/bar/components/bluetooth/DeviceList.qml +++ /dev/null @@ -1,46 +0,0 @@ -import qs.config -import qs.constants -import qs.services -import qs.styled -import QtQuick -import QtQuick.Layouts - -ColumnLayout { - id: root - required property var devices - - Repeater { - model: devices - delegate: Clickable { - id: device - required property var modelData - - implicitWidth: row.width - implicitHeight: row.height - Layout.fillWidth: true - - RowLayout { - id: row - - StyledText { - topPadding: 8 - bottomPadding: 8 - leftPadding: 8 - text: device.modelData.deviceName - } - StyledText { - font.family: Theme.lucide.font.family - font.pixelSize: 10 - font.bold: true - text: device.modelData.connected ? Icons.bluetoothConnected : Icons.bluetooth - - topPadding: 8 - bottomPadding: 8 - rightPadding: 8 - - color: device.containsMouse ? Theme.palette.base300 : Theme.palette.basecontent - } - } - } - } -} diff --git a/services/Bluetooth.qml b/services/Bluetooth.qml deleted file mode 100644 index 0904672..0000000 --- a/services/Bluetooth.qml +++ /dev/null @@ -1,21 +0,0 @@ -pragma Singleton - -import Quickshell -import Quickshell.Bluetooth - -Singleton { - id: root - - property BluetoothAdapter defaultAdapter: Bluetooth.defaultAdapter - property list connectedDevices: defaultAdapter.devices.values.filter(device => device.connected) - property list pairedDevices: defaultAdapter.devices.values.filter(device => device.paired) - property list availableDevices: defaultAdapter.devices.values.filter(device => !device.paired) - - function isConnected(BluetoothDevice: device) { - return device.state == BluetoothDeviceState.Connected; - } - - function isConnecting(BluetoothDevice: device) { - return device.state == BluetoothDeviceState.Connecting; - } -}