Mercurial Repositories > eric / file comparison
comparison: eric6/Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.py
eric6/Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.py
- changeset 8143
- 2c730d5fd177
- parent 7923
- 91e843545d9a
- child 8218
- 7c09585bd960
equal
deleted
inserted
replaced
| 8141:27f636beebad | 8143:2c730d5fd177 |
|---|---|
| 28 @param parent parent widget (QWidget) | 28 @param parent parent widget (QWidget) |
| 29 """ | 29 """ |
| 30 super(HgMergeDialog, self).__init__(parent) | 30 super(HgMergeDialog, self).__init__(parent) |
| 31 self.setupUi(self) | 31 self.setupUi(self) |
| 32 | 32 |
| 33 self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False) | 33 self.buttonBox.button( |
| 34 QDialogButtonBox.StandardButton.Ok).setEnabled(False) | |
| 34 | 35 |
| 35 self.tagCombo.addItems(sorted(tagsList)) | 36 self.tagCombo.addItems(sorted(tagsList)) |
| 36 self.branchCombo.addItems(["default"] + sorted(branchesList)) | 37 self.branchCombo.addItems(["default"] + sorted(branchesList)) |
| 37 if bookmarksList is not None: | 38 if bookmarksList is not None: |
| 38 self.bookmarkCombo.addItems(sorted(bookmarksList)) | 39 self.bookmarkCombo.addItems(sorted(bookmarksList)) |
| 55 elif self.branchButton.isChecked(): | 56 elif self.branchButton.isChecked(): |
| 56 enabled = self.branchCombo.currentText() != "" | 57 enabled = self.branchCombo.currentText() != "" |
| 57 elif self.bookmarkButton.isChecked(): | 58 elif self.bookmarkButton.isChecked(): |
| 58 enabled = self.bookmarkCombo.currentText() != "" | 59 enabled = self.bookmarkCombo.currentText() != "" |
| 59 | 60 |
| 60 self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(enabled) | 61 self.buttonBox.button( |
| 62 QDialogButtonBox.StandardButton.Ok).setEnabled(enabled) | |
| 61 | 63 |
| 62 @pyqtSlot(bool) | 64 @pyqtSlot(bool) |
| 63 def on_idButton_toggled(self, checked): | 65 def on_idButton_toggled(self, checked): |
| 64 """ | 66 """ |
| 65 Private slot to handle changes of the ID select button. | 67 Private slot to handle changes of the ID select button. |
