Mercurial Repositories > eric / file comparison
comparison: eric6/MicroPython/ConnectionSelectionDialog.py
eric6/MicroPython/ConnectionSelectionDialog.py
- changeset 8135
- 7cbb1ebf8d2d
- parent 8134
- a5c4ac339f2a
- child 8139
- 418c2d9a767d
equal
deleted
inserted
replaced
| 8134:a5c4ac339f2a | 8135:7cbb1ebf8d2d |
|---|---|
| 48 .format(description, portName)) | 48 .format(description, portName)) |
| 49 self.portNameComboBox.setItemData( | 49 self.portNameComboBox.setItemData( |
| 50 index, portName, self.PortNameRole) | 50 index, portName, self.PortNameRole) |
| 51 self.portNameComboBox.setItemData( | 51 self.portNameComboBox.setItemData( |
| 52 index, (vid, pid), self.VidPidRole) | 52 index, (vid, pid), self.VidPidRole) |
| 53 self.portNameComboBox.setCurrentText(currentPort) | |
| 54 | 53 |
| 55 self.deviceTypeComboBox.addItem("", "") | 54 self.deviceTypeComboBox.addItem("", "") |
| 56 for board, description in sorted( | 55 for board, description in sorted( |
| 57 MicroPythonDevices.getSupportedDevices(), | 56 MicroPythonDevices.getSupportedDevices(), |
| 58 key=lambda x: x[1] | 57 key=lambda x: x[1] |
| 59 ): | 58 ): |
| 60 self.deviceTypeComboBox.addItem(description, board) | 59 self.deviceTypeComboBox.addItem(description, board) |
| 61 index = self.deviceTypeComboBox.findData(currentType) | 60 |
| 62 self.deviceTypeComboBox.setCurrentIndex(index) | 61 if self.portNameComboBox.currentText(): |
| 62 # some ports were found; use the previously selected type as | |
| 63 # default | |
| 64 portIndex = self.portNameComboBox.findData( | |
| 65 currentPort, self.PortNameRole) | |
| 66 typeIndex = self.deviceTypeComboBox.findData(currentType) | |
| 67 else: | |
| 68 portIndex = 0 | |
| 69 typeIndex = 0 | |
| 70 self.portNameComboBox.setCurrentIndex(portIndex) | |
| 71 self.deviceTypeComboBox.setCurrentIndex(typeIndex) | |
| 63 | 72 |
| 64 self.__updateOK() | 73 self.__updateOK() |
| 65 | 74 |
| 66 msh = self.minimumSizeHint() | 75 msh = self.minimumSizeHint() |
| 67 self.resize(max(self.width(), msh.width()), msh.height()) | 76 self.resize(max(self.width(), msh.width()), msh.height()) |
