Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.py
Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.py
- changeset 3366
- 6084bb3c3911
- parent 3337
- 49faa820151a
- child 3484
- 645c12de6b0c
equal
deleted
inserted
replaced
| 3364:5dafcc891579 | 3366:6084bb3c3911 |
|---|---|
| 37 if bookmarksList is not None: | 37 if bookmarksList is not None: |
| 38 self.bookmarkCombo.addItems(sorted(bookmarksList)) | 38 self.bookmarkCombo.addItems(sorted(bookmarksList)) |
| 39 else: | 39 else: |
| 40 self.bookmarkButton.setHidden(True) | 40 self.bookmarkButton.setHidden(True) |
| 41 self.bookmarkCombo.setHidden(True) | 41 self.bookmarkCombo.setHidden(True) |
| 42 | |
| 43 msh = self.minimumSizeHint() | |
| 44 self.resize(max(self.width(), msh.width()), msh.height()) | |
| 42 | 45 |
| 43 def __updateOK(self): | 46 def __updateOK(self): |
| 44 """ | 47 """ |
| 45 Private slot to update the OK button. | 48 Private slot to update the OK button. |
| 46 """ | 49 """ |
