Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.py
Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.py
- changeset 1131
- 7781e396c903
- parent 1017
- 919147f2b518
- child 1509
- c0b5e693b0eb
equal
deleted
inserted
replaced
| 1130:3e9f0330f833 | 1131:7781e396c903 |
|---|---|
| 25 @param tagsList list of tags (list of strings) | 25 @param tagsList list of tags (list of strings) |
| 26 @param branchesList list of branches (list of strings) | 26 @param branchesList list of branches (list of strings) |
| 27 @param bookmarksList list of bookmarks (list of strings) | 27 @param bookmarksList list of bookmarks (list of strings) |
| 28 @param parent parent widget (QWidget) | 28 @param parent parent widget (QWidget) |
| 29 """ | 29 """ |
| 30 QDialog.__init__(self, parent) | 30 super().__init__(parent) |
| 31 self.setupUi(self) | 31 self.setupUi(self) |
| 32 | 32 |
| 33 self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False) | 33 self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False) |
| 34 | 34 |
| 35 self.forceCheckBox.setChecked(force) | 35 self.forceCheckBox.setChecked(force) |
