💥 fix(control-center/bluetooth): also show trusted devices on devices list
changed Paired Devices key to Devices
This commit is contained in:
@@ -80,12 +80,12 @@ export const BluetoothPage: (() => Page) = () => new Page({
|
|||||||
visible: bind(AstalBluetooth.get_default(), "devices").as((devs) =>
|
visible: bind(AstalBluetooth.get_default(), "devices").as((devs) =>
|
||||||
devs.filter(dev => dev.paired || dev.connected).length > 0),
|
devs.filter(dev => dev.paired || dev.connected).length > 0),
|
||||||
children: bind(AstalBluetooth.get_default(), "devices").as((devs) => {
|
children: bind(AstalBluetooth.get_default(), "devices").as((devs) => {
|
||||||
const connectedDevices = devs.filter((dev) => dev.connected || dev.paired)
|
const connectedDevices = devs.filter((dev) => (dev.connected || dev.paired) && dev.trusted)
|
||||||
|
|
||||||
return [
|
return [
|
||||||
new Widget.Label({
|
new Widget.Label({
|
||||||
className: "sub-header",
|
className: "sub-header",
|
||||||
label: tr("control_center.pages.bluetooth.paired_devices"),
|
label: tr("devices"),
|
||||||
xalign: 0,
|
xalign: 0,
|
||||||
} as Widget.LabelProps),
|
} as Widget.LabelProps),
|
||||||
...connectedDevices.map((dev) => DeviceWidget(dev))
|
...connectedDevices.map((dev) => DeviceWidget(dev))
|
||||||
@@ -99,7 +99,7 @@ export const BluetoothPage: (() => Page) = () => new Page({
|
|||||||
visible: bind(AstalBluetooth.get_default(), "devices").as((devs) =>
|
visible: bind(AstalBluetooth.get_default(), "devices").as((devs) =>
|
||||||
devs.filter((dev) => !dev.connected && !dev.paired).length > 0),
|
devs.filter((dev) => !dev.connected && !dev.paired).length > 0),
|
||||||
children: bind(AstalBluetooth.get_default(), "devices").as((devices) => {
|
children: bind(AstalBluetooth.get_default(), "devices").as((devices) => {
|
||||||
const discoveredDevices = devices.filter((dev) => !dev.connected && !dev.paired);
|
const discoveredDevices = devices.filter((dev) => !dev.connected && !dev.paired && !dev.trusted);
|
||||||
|
|
||||||
return [
|
return [
|
||||||
new Widget.Label({
|
new Widget.Label({
|
||||||
@@ -172,7 +172,7 @@ function DeviceWidget(dev: AstalBluetooth.Device): Gtk.Widget {
|
|||||||
body: `Couldn't connect to ${dev.alias ?? dev.name}, an error occurred: ${err.message || err.stack}`,
|
body: `Couldn't connect to ${dev.alias ?? dev.name}, an error occurred: ${err.message || err.stack}`,
|
||||||
urgency: AstalNotifd.Urgency.NORMAL
|
urgency: AstalNotifd.Urgency.NORMAL
|
||||||
})
|
})
|
||||||
});
|
}).then(() => dev.set_trusted(true));
|
||||||
|
|
||||||
if(!skipConnection)
|
if(!skipConnection)
|
||||||
(async () => dev.connect_device(null))().catch((err: Gio.IOErrorEnum) =>
|
(async () => dev.connect_device(null))().catch((err: Gio.IOErrorEnum) =>
|
||||||
|
|||||||
Reference in New Issue
Block a user