diff -r 5fe9bfafbc7c -r 8be7dd9460c5 src/eric7/MicroPython/BluetoothDialogs/BluetoothScanWindow.py
--- a/src/eric7/MicroPython/BluetoothDialogs/BluetoothScanWindow.py Thu Jun 15 17:11:14 2023 +0200
+++ b/src/eric7/MicroPython/BluetoothDialogs/BluetoothScanWindow.py Thu Jun 15 19:13:51 2023 +0200
@@ -86,19 +86,30 @@
itm.setTextAlignment(1, Qt.AlignmentFlag.AlignHCenter)
itm.setTextAlignment(2, Qt.AlignmentFlag.AlignHCenter)
- for service, isComplete in res.services:
- if len(service) == 6:
+ for serviceID, serviceName, isComplete in res.services:
+ if len(serviceID) == 6:
bits = 16
- elif len(service) == 10:
+ elif len(serviceID) == 10:
bits = 32
else:
bits = 128
template = (
- self.tr("Complete {0}-bit Service UUID: {1}")
+ self.tr("Complete {0}-bit Service UUID: {1}{2}")
if isComplete
- else self.tr("Incomplete {0}-bit Service UUID: {1}")
+ else self.tr("Incomplete {0}-bit Service UUID: {1}{2}")
)
- citm = QTreeWidgetItem(itm, [template.format(bits, service)])
+ citm = QTreeWidgetItem(
+ itm,
+ [
+ template.format(
+ bits,
+ serviceID,
+ self.tr(" - {0}").format(serviceName)
+ if serviceName
+ else "",
+ )
+ ],
+ )
citm.setFirstColumnSpanned(True)
seenMIds = []
@@ -107,7 +118,7 @@
citm = QTreeWidgetItem(
itm,
[
- self.tr("Manufacturer ID: 0x{0:x} ({1})").format(
+ self.tr("Manufacturer ID: 0x{0:x} - {1}").format(
mid, mname
)
if bool(mname)
