From 4a673fe1b5674ceabf778e16b427ffbefe39ca81 Mon Sep 17 00:00:00 2001 From: bbedward Date: Fri, 19 Sep 2025 17:00:53 -0400 Subject: [PATCH] check disabled option on DankButtonGroup + always show bluetooth placeholder --- Modals/Settings/PowerSettings.qml | 1 + Modules/ControlCenter/ControlCenterPopout.qml | 7 +++++-- Modules/ControlCenter/Widgets/BluetoothPill.qml | 4 ++-- Widgets/DankButtonGroup.qml | 3 ++- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/Modals/Settings/PowerSettings.qml b/Modals/Settings/PowerSettings.qml index b7d21410..f608da47 100644 --- a/Modals/Settings/PowerSettings.qml +++ b/Modals/Settings/PowerSettings.qml @@ -70,6 +70,7 @@ Item { model: ["AC Power", "Battery"] currentIndex: 0 selectionMode: "single" + checkEnabled: false } } diff --git a/Modules/ControlCenter/ControlCenterPopout.qml b/Modules/ControlCenter/ControlCenterPopout.qml index 17e42900..0e82700f 100644 --- a/Modules/ControlCenter/ControlCenterPopout.qml +++ b/Modules/ControlCenter/ControlCenterPopout.qml @@ -607,11 +607,14 @@ DankPopout { width: (parent.width - Theme.spacingM) / 2 expanded: root.expandedSection === "bluetooth" onClicked: { + if (!BluetoothService.available) return if (BluetoothService.adapter) BluetoothService.adapter.enabled = !BluetoothService.adapter.enabled } - onExpandClicked: root.toggleSection("bluetooth") - visible: BluetoothService.available + onExpandClicked: { + if (!BluetoothService.available) return + root.toggleSection("bluetooth") + } } } diff --git a/Modules/ControlCenter/Widgets/BluetoothPill.qml b/Modules/ControlCenter/Widgets/BluetoothPill.qml index dccd2950..ddbeae10 100644 --- a/Modules/ControlCenter/Widgets/BluetoothPill.qml +++ b/Modules/ControlCenter/Widgets/BluetoothPill.qml @@ -40,7 +40,7 @@ BasePill { primaryText: { if (!BluetoothService.available) { - return "Bluetooth unavailable" + return "Bluetooth" } if (!BluetoothService.adapter) { return "No adapter" @@ -53,7 +53,7 @@ BasePill { secondaryText: { if (!BluetoothService.available) { - return "Hardware not found" + return "Not available" } if (!BluetoothService.adapter || !BluetoothService.adapter.enabled) { return "Off" diff --git a/Widgets/DankButtonGroup.qml b/Widgets/DankButtonGroup.qml index 7a12cf37..a72ef05c 100644 --- a/Widgets/DankButtonGroup.qml +++ b/Widgets/DankButtonGroup.qml @@ -9,6 +9,7 @@ Row { property int currentIndex: -1 property string selectionMode: "single" property bool multiSelect: selectionMode === "multi" + property bool checkEnabled: true signal selectionChanged(int index, bool selected) @@ -143,7 +144,7 @@ Row { name: "check" size: Theme.iconSizeSmall color: segment.selected ? Theme.surfaceText : Theme.primaryText - visible: segment.selected + visible: root.checkEnabled && segment.selected opacity: segment.selected ? 1 : 0 scale: segment.selected ? 1 : 0.6