Mercurial Repositories > eric / file comparison
comparison: eric6/Plugins/VcsPlugins/vcsSubversion/SvnMergeDialog.py
eric6/Plugins/VcsPlugins/vcsSubversion/SvnMergeDialog.py
- branch
- maintenance
- changeset 8176
- 31965986ecd1
- parent 8143
- 2c730d5fd177
- child 8218
- 7c09585bd960
equal
deleted
inserted
replaced
| 8153:e01ae92db699 | 8176:31965986ecd1 |
|---|---|
| 44 self.tag2Combo.clear() | 44 self.tag2Combo.clear() |
| 45 self.tag2Combo.addItems(mergelist2) | 45 self.tag2Combo.addItems(mergelist2) |
| 46 self.targetCombo.clear() | 46 self.targetCombo.clear() |
| 47 self.targetCombo.addItems(targetlist) | 47 self.targetCombo.addItems(targetlist) |
| 48 | 48 |
| 49 self.okButton = self.buttonBox.button(QDialogButtonBox.Ok) | 49 self.okButton = self.buttonBox.button( |
| 50 QDialogButtonBox.StandardButton.Ok) | |
| 50 self.okButton.setEnabled(False) | 51 self.okButton.setEnabled(False) |
| 51 | 52 |
| 52 msh = self.minimumSizeHint() | 53 msh = self.minimumSizeHint() |
| 53 self.resize(max(self.width(), msh.width()), msh.height()) | 54 self.resize(max(self.width(), msh.width()), msh.height()) |
| 54 | 55 |
