Mercurial Repositories > eric / file comparison
comparison: eric7/Plugins/VcsPlugins/vcsGit/GitMergeDialog.py
eric7/Plugins/VcsPlugins/vcsGit/GitMergeDialog.py
- branch
- eric7
- changeset 8629
- 1b58dc890b87
- parent 8318
- 962bce857696
- child 8881
- 54e42bc2437a
equal
deleted
inserted
replaced
| 8628:dcdf0074ad39 | 8629:1b58dc890b87 |
|---|---|
| 7 Module implementing a dialog to enter the merge data. | 7 Module implementing a dialog to enter the merge data. |
| 8 """ | 8 """ |
| 9 | 9 |
| 10 from PyQt6.QtCore import pyqtSlot | 10 from PyQt6.QtCore import pyqtSlot |
| 11 from PyQt6.QtWidgets import QDialog, QDialogButtonBox | 11 from PyQt6.QtWidgets import QDialog, QDialogButtonBox |
| 12 | |
| 13 from EricWidgets.EricApplication import ericApp | |
| 12 | 14 |
| 13 from .Ui_GitMergeDialog import Ui_GitMergeDialog | 15 from .Ui_GitMergeDialog import Ui_GitMergeDialog |
| 14 | 16 |
| 15 | 17 |
| 16 class GitMergeDialog(QDialog, Ui_GitMergeDialog): | 18 class GitMergeDialog(QDialog, Ui_GitMergeDialog): |
| 31 super().__init__(parent) | 33 super().__init__(parent) |
| 32 self.setupUi(self) | 34 self.setupUi(self) |
| 33 | 35 |
| 34 self.buttonBox.button( | 36 self.buttonBox.button( |
| 35 QDialogButtonBox.StandardButton.Ok).setEnabled(False) | 37 QDialogButtonBox.StandardButton.Ok).setEnabled(False) |
| 38 | |
| 39 project = ericApp().getObject("Project") | |
| 40 pwl, pel = project.getProjectDictionaries() | |
| 41 language = project.getProjectSpellLanguage() | |
| 42 self.commitMessageEdit.setLanguageWithPWL( | |
| 43 language, pwl or None, pel or None) | |
| 36 | 44 |
| 37 self.__currentBranch = currentBranch | 45 self.__currentBranch = currentBranch |
| 38 | 46 |
| 39 self.tagCombo.addItems(sorted(tagsList)) | 47 self.tagCombo.addItems(sorted(tagsList)) |
| 40 if currentBranch in branchesList: | 48 if currentBranch in branchesList: |
