Mercurial Repositories > eric / file comparison
comparison: eric6/Plugins/VcsPlugins/vcsGit/GitMergeDialog.py
eric6/Plugins/VcsPlugins/vcsGit/GitMergeDialog.py
- changeset 8143
- 2c730d5fd177
- parent 7923
- 91e843545d9a
- child 8218
- 7c09585bd960
equal
deleted
inserted
replaced
| 8141:27f636beebad | 8143:2c730d5fd177 |
|---|---|
| 29 @param parent reference to the parent widget (QWidget) | 29 @param parent reference to the parent widget (QWidget) |
| 30 """ | 30 """ |
| 31 super(GitMergeDialog, self).__init__(parent) | 31 super(GitMergeDialog, self).__init__(parent) |
| 32 self.setupUi(self) | 32 self.setupUi(self) |
| 33 | 33 |
| 34 self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False) | 34 self.buttonBox.button( |
| 35 QDialogButtonBox.StandardButton.Ok).setEnabled(False) | |
| 35 | 36 |
| 36 self.__currentBranch = currentBranch | 37 self.__currentBranch = currentBranch |
| 37 | 38 |
| 38 self.tagCombo.addItems(sorted(tagsList)) | 39 self.tagCombo.addItems(sorted(tagsList)) |
| 39 if currentBranch in branchesList: | 40 if currentBranch in branchesList: |
| 59 enabled = self.remoteBranchCombo.currentText() != "" | 60 enabled = self.remoteBranchCombo.currentText() != "" |
| 60 | 61 |
| 61 enabled &= (self.commitGroupBox.isChecked() and | 62 enabled &= (self.commitGroupBox.isChecked() and |
| 62 self.commitMessageEdit.toPlainText() != "") | 63 self.commitMessageEdit.toPlainText() != "") |
| 63 | 64 |
| 64 self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(enabled) | 65 self.buttonBox.button( |
| 66 QDialogButtonBox.StandardButton.Ok).setEnabled(enabled) | |
| 65 | 67 |
| 66 def __generateDefaultCommitMessage(self): | 68 def __generateDefaultCommitMessage(self): |
| 67 """ | 69 """ |
| 68 Private slot to generate a default commit message based on the | 70 Private slot to generate a default commit message based on the |
| 69 data entered. | 71 data entered. |
