Mercurial Repositories > eric / file comparison
comparison: src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnMergeDialog.py
src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnMergeDialog.py
- branch
- eric7
- changeset 10069
- 435cc5875135
- parent 9653
- e67609152c5e
- child 10438
- 4cd7e5a8b3cf
equal
deleted
inserted
replaced
| 10068:7febcdccb2a1 | 10069:435cc5875135 |
|---|---|
| 7 Module implementing a dialog to enter the data for a merge operation. | 7 Module implementing a dialog to enter the data for a merge operation. |
| 8 """ | 8 """ |
| 9 | 9 |
| 10 import re | 10 import re |
| 11 | 11 |
| 12 from PyQt6.QtCore import pyqtSlot | |
| 12 from PyQt6.QtWidgets import QDialog, QDialogButtonBox | 13 from PyQt6.QtWidgets import QDialog, QDialogButtonBox |
| 13 | 14 |
| 14 from .Ui_SvnMergeDialog import Ui_SvnMergeDialog | 15 from .Ui_SvnMergeDialog import Ui_SvnMergeDialog |
| 15 | 16 |
| 16 | 17 |
| 69 and bool(self.rx_rev.fullmatch(self.tag2Combo.currentText())) | 70 and bool(self.rx_rev.fullmatch(self.tag2Combo.currentText())) |
| 70 ) | 71 ) |
| 71 ) | 72 ) |
| 72 ) | 73 ) |
| 73 | 74 |
| 75 @pyqtSlot(str) | |
| 74 def on_tag1Combo_editTextChanged(self, text): | 76 def on_tag1Combo_editTextChanged(self, text): |
| 75 """ | 77 """ |
| 76 Private slot to handle the tag1Combo editTextChanged signal. | 78 Private slot to handle the tag1Combo editTextChanged signal. |
| 77 | 79 |
| 78 @param text text of the combo (string) | 80 @param text text of the combo (string) |
| 79 """ | 81 """ |
| 80 self.__enableOkButton() | 82 self.__enableOkButton() |
| 81 | 83 |
| 84 @pyqtSlot(str) | |
| 82 def on_tag2Combo_editTextChanged(self, text): | 85 def on_tag2Combo_editTextChanged(self, text): |
| 83 """ | 86 """ |
| 84 Private slot to handle the tag2Combo editTextChanged signal. | 87 Private slot to handle the tag2Combo editTextChanged signal. |
| 85 | 88 |
| 86 @param text text of the combo (string) | 89 @param text text of the combo (string) |
