Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsPySvn/SvnMergeDialog.py
Plugins/VcsPlugins/vcsPySvn/SvnMergeDialog.py
- changeset 3366
- 6084bb3c3911
- parent 3160
- 209a07d7e401
- child 3484
- 645c12de6b0c
equal
deleted
inserted
replaced
| 3364:5dafcc891579 | 3366:6084bb3c3911 |
|---|---|
| 46 self.tag2Combo.clear() | 46 self.tag2Combo.clear() |
| 47 self.tag2Combo.addItems(mergelist2) | 47 self.tag2Combo.addItems(mergelist2) |
| 48 self.targetCombo.clear() | 48 self.targetCombo.clear() |
| 49 self.targetCombo.addItems(targetlist) | 49 self.targetCombo.addItems(targetlist) |
| 50 | 50 |
| 51 msh = self.minimumSizeHint() | |
| 52 self.resize(max(self.width(), msh.width()), msh.height()) | |
| 53 | |
| 51 def __enableOkButton(self): | 54 def __enableOkButton(self): |
| 52 """ | 55 """ |
| 53 Private method used to enable/disable the OK-button. | 56 Private method used to enable/disable the OK-button. |
| 54 """ | 57 """ |
| 55 self.okButton.setDisabled( | 58 self.okButton.setDisabled( |
