Mercurial Repositories > eric / file comparison
comparison: src/eric7/MicroPython/BluetoothDialogs/BluetoothScanWindow.py
src/eric7/MicroPython/BluetoothDialogs/BluetoothScanWindow.py
- branch
- mpy_network
- changeset 9859
- 829c1edbf253
- parent 9857
- 0122ae72618d
- child 10090
- 8be7dd9460c5
equal
deleted
inserted
replaced
| 9858:6518c336fcd3 | 9859:829c1edbf253 |
|---|---|
| 71 """<p>Reason: {0}</p>""" | 71 """<p>Reason: {0}</p>""" |
| 72 ).format(error), | 72 ).format(error), |
| 73 ) | 73 ) |
| 74 | 74 |
| 75 else: | 75 else: |
| 76 self.statusLabel.setText( | |
| 77 self.tr("<p>Detected <b>%n</b> device(s).</p>", "", len(scanResults)) | |
| 78 ) | |
| 76 for res in scanResults.values(): | 79 for res in scanResults.values(): |
| 77 name = res.name | 80 name = res.name |
| 78 if not name: | 81 if not name: |
| 79 name = self.tr("N/A") | 82 name = self.tr("N/A") |
| 80 itm = QTreeWidgetItem( | 83 itm = QTreeWidgetItem( |
| 93 template = ( | 96 template = ( |
| 94 self.tr("Complete {0}-bit Service UUID: {1}") | 97 self.tr("Complete {0}-bit Service UUID: {1}") |
| 95 if isComplete | 98 if isComplete |
| 96 else self.tr("Incomplete {0}-bit Service UUID: {1}") | 99 else self.tr("Incomplete {0}-bit Service UUID: {1}") |
| 97 ) | 100 ) |
| 98 sitm = QTreeWidgetItem(itm, [template.format(bits, service)]) | 101 citm = QTreeWidgetItem(itm, [template.format(bits, service)]) |
| 99 sitm.setFirstColumnSpanned(True) | 102 citm.setFirstColumnSpanned(True) |
| 100 | 103 |
| 104 seenMIds = [] | |
| 101 for mid, _, mname in res.manufacturer(withName=True): | 105 for mid, _, mname in res.manufacturer(withName=True): |
| 102 mitm = QTreeWidgetItem( | 106 if mid not in seenMIds: |
| 103 itm, | 107 citm = QTreeWidgetItem( |
| 104 [ | 108 itm, |
| 105 self.tr("Manufacturer ID: 0x{0:x} ({1})").format(mid, mname) | 109 [ |
| 106 if bool(mname) | 110 self.tr("Manufacturer ID: 0x{0:x} ({1})").format( |
| 107 else self.tr("Manufacturer ID: 0x{0:x}").format(mid) | 111 mid, mname |
| 108 ], | 112 ) |
| 113 if bool(mname) | |
| 114 else self.tr("Manufacturer ID: 0x{0:x}").format(mid) | |
| 115 ], | |
| 116 ) | |
| 117 citm.setFirstColumnSpanned(True) | |
| 118 seenMIds.append(mid) | |
| 119 | |
| 120 txPower = res.txPower | |
| 121 if txPower: | |
| 122 citm = QTreeWidgetItem( | |
| 123 itm, [self.tr("Tx Power Level [dBm]: {0}").format(txPower)] | |
| 109 ) | 124 ) |
| 110 mitm.setFirstColumnSpanned(True) | 125 citm.setFirstColumnSpanned(True) |
| 111 | 126 |
| 112 self.__resizeColumns() | 127 self.__resizeColumns() |
| 113 self.__resort() | 128 self.__resort() |
| 114 | 129 |
| 115 def __resort(self): | 130 def __resort(self): |
