Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsPySvn/SvnMergeDialog.py
Plugins/VcsPlugins/vcsPySvn/SvnMergeDialog.py
- branch
- Py2 comp.
- changeset 3484
- 645c12de6b0c
- parent 3178
- f25fc1364c88
- parent 3366
- 6084bb3c3911
- child 3656
- 441956d8fce5
equal
deleted
inserted
replaced
| 3456:96232974dcdb | 3484:645c12de6b0c |
|---|---|
| 48 self.tag2Combo.clear() | 48 self.tag2Combo.clear() |
| 49 self.tag2Combo.addItems(mergelist2) | 49 self.tag2Combo.addItems(mergelist2) |
| 50 self.targetCombo.clear() | 50 self.targetCombo.clear() |
| 51 self.targetCombo.addItems(targetlist) | 51 self.targetCombo.addItems(targetlist) |
| 52 | 52 |
| 53 msh = self.minimumSizeHint() | |
| 54 self.resize(max(self.width(), msh.width()), msh.height()) | |
| 55 | |
| 53 def __enableOkButton(self): | 56 def __enableOkButton(self): |
| 54 """ | 57 """ |
| 55 Private method used to enable/disable the OK-button. | 58 Private method used to enable/disable the OK-button. |
| 56 """ | 59 """ |
| 57 self.okButton.setDisabled( | 60 self.okButton.setDisabled( |
