Mercurial Repositories > eric / file comparison
comparison: eric6/MicroPython/MicroPythonWidget.py
eric6/MicroPython/MicroPythonWidget.py
- changeset 8139
- 418c2d9a767d
- parent 8137
- 97d37389fbfd
- child 8143
- 2c730d5fd177
equal
deleted
inserted
replaced
| 8138:169e65a6787c | 8139:418c2d9a767d |
|---|---|
| 313 self.deviceTypeComboBox.addItem("", "") | 313 self.deviceTypeComboBox.addItem("", "") |
| 314 devices, unknownDevices, unknownPorts = ( | 314 devices, unknownDevices, unknownPorts = ( |
| 315 MicroPythonDevices.getFoundDevices() | 315 MicroPythonDevices.getFoundDevices() |
| 316 ) | 316 ) |
| 317 if devices: | 317 if devices: |
| 318 self.deviceInfoLabel.setText( | 318 supportedMessage = self.tr( |
| 319 self.tr("%n supported device(s) detected.", "", len(devices))) | 319 "%n supported device(s) detected.", "", len(devices)) |
| 320 | 320 |
| 321 for index, (boardType, boardName, description, portName, | 321 for index, (boardType, boardName, description, portName, |
| 322 vid, pid) in enumerate(sorted(devices), 1): | 322 vid, pid) in enumerate(sorted(devices), 1): |
| 323 self.deviceTypeComboBox.addItem( | 323 self.deviceTypeComboBox.addItem( |
| 324 self.tr("{0} - {1} ({2})", | 324 self.tr("{0} - {1} ({2})", |
| 335 index, vid, self.DeviceVidRole) | 335 index, vid, self.DeviceVidRole) |
| 336 self.deviceTypeComboBox.setItemData( | 336 self.deviceTypeComboBox.setItemData( |
| 337 index, pid, self.DevicePidRole) | 337 index, pid, self.DevicePidRole) |
| 338 | 338 |
| 339 else: | 339 else: |
| 340 self.deviceInfoLabel.setText( | 340 supportedMessage = self.tr("No supported devices detected.") |
| 341 self.tr("No supported devices detected.")) | |
| 342 | 341 |
| 343 self.__unknownPorts = unknownPorts | 342 self.__unknownPorts = unknownPorts |
| 344 if self.__unknownPorts: | 343 if self.__unknownPorts: |
| 344 unknownMessage = self.tr( | |
| 345 "\n%n unknown device(s) for manual selection.", "", | |
| 346 len(self.__unknownPorts)) | |
| 345 if self.deviceTypeComboBox.count(): | 347 if self.deviceTypeComboBox.count(): |
| 346 self.deviceTypeComboBox.insertSeparator( | 348 self.deviceTypeComboBox.insertSeparator( |
| 347 self.deviceTypeComboBox.count()) | 349 self.deviceTypeComboBox.count()) |
| 348 self.deviceTypeComboBox.addItem(self.tr("Manual Selection")) | 350 self.deviceTypeComboBox.addItem(self.tr("Manual Selection")) |
| 349 self.deviceTypeComboBox.setItemData( | 351 self.deviceTypeComboBox.setItemData( |
| 350 self.deviceTypeComboBox.count() - 1, | 352 self.deviceTypeComboBox.count() - 1, |
| 351 self.ManualMarker, self.DeviceTypeRole) | 353 self.ManualMarker, self.DeviceTypeRole) |
| 354 else: | |
| 355 unknownMessage = "" | |
| 356 | |
| 357 self.deviceInfoLabel.setText(supportedMessage + unknownMessage) | |
| 352 | 358 |
| 353 index = self.deviceTypeComboBox.findText(currentDevice, | 359 index = self.deviceTypeComboBox.findText(currentDevice, |
| 354 Qt.MatchExactly) | 360 Qt.MatchExactly) |
| 355 if index == -1: | 361 if index == -1: |
| 356 # entry is no longer present | 362 # entry is no longer present |
