Mercurial Repositories > eric / file comparison
comparison: src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnMergeDialog.py
src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnMergeDialog.py
- branch
- eric7
- changeset 10438
- 4cd7e5a8b3cf
- parent 10069
- 435cc5875135
- child 10439
- 21c28b0f9e41
equal
deleted
inserted
replaced
| 10437:2f70ca07f0af | 10438:4cd7e5a8b3cf |
|---|---|
| 23 def __init__(self, mergelist1, mergelist2, targetlist, force=False, parent=None): | 23 def __init__(self, mergelist1, mergelist2, targetlist, force=False, parent=None): |
| 24 """ | 24 """ |
| 25 Constructor | 25 Constructor |
| 26 | 26 |
| 27 @param mergelist1 list of previously entered URLs/revisions | 27 @param mergelist1 list of previously entered URLs/revisions |
| 28 (list of strings) | 28 @type list of str |
| 29 @param mergelist2 list of previously entered URLs/revisions | 29 @param mergelist2 list of previously entered URLs/revisions |
| 30 (list of strings) | 30 @type list of str |
| 31 @param targetlist list of previously entered targets (list of strings) | 31 @param targetlist list of previously entered targets |
| 32 @param force flag indicating a forced merge (boolean) | 32 @type list of str |
| 33 @param parent parent widget (QWidget) | 33 @param force flag indicating a forced merge |
| 34 @type bool | |
| 35 @param parent parent widget | |
| 36 @type QWidget | |
| 34 """ | 37 """ |
| 35 super().__init__(parent) | 38 super().__init__(parent) |
| 36 self.setupUi(self) | 39 self.setupUi(self) |
| 37 | 40 |
| 38 self.forceCheckBox.setChecked(force) | 41 self.forceCheckBox.setChecked(force) |
| 75 @pyqtSlot(str) | 78 @pyqtSlot(str) |
| 76 def on_tag1Combo_editTextChanged(self, text): | 79 def on_tag1Combo_editTextChanged(self, text): |
| 77 """ | 80 """ |
| 78 Private slot to handle the tag1Combo editTextChanged signal. | 81 Private slot to handle the tag1Combo editTextChanged signal. |
| 79 | 82 |
| 80 @param text text of the combo (string) | 83 @param text text of the combo |
| 84 @type str | |
| 81 """ | 85 """ |
| 82 self.__enableOkButton() | 86 self.__enableOkButton() |
| 83 | 87 |
| 84 @pyqtSlot(str) | 88 @pyqtSlot(str) |
| 85 def on_tag2Combo_editTextChanged(self, text): | 89 def on_tag2Combo_editTextChanged(self, text): |
| 86 """ | 90 """ |
| 87 Private slot to handle the tag2Combo editTextChanged signal. | 91 Private slot to handle the tag2Combo editTextChanged signal. |
| 88 | 92 |
| 89 @param text text of the combo (string) | 93 @param text text of the combo |
| 94 @type str | |
| 90 """ | 95 """ |
| 91 self.__enableOkButton() | 96 self.__enableOkButton() |
| 92 | 97 |
| 93 def getParameters(self): | 98 def getParameters(self): |
| 94 """ | 99 """ |
| 95 Public method to retrieve the merge data. | 100 Public method to retrieve the merge data. |
| 96 | 101 |
| 97 @return tuple naming two tag names or two revisions, a target and | 102 @return tuple naming two tag names or two revisions, a target and |
| 98 a flag indicating a forced merge (string, string, string, boolean) | 103 a flag indicating a forced merge |
| 104 @rtype tuple of (str, str, str, bool) | |
| 99 """ | 105 """ |
| 100 return ( | 106 return ( |
| 101 self.tag1Combo.currentText(), | 107 self.tag1Combo.currentText(), |
| 102 self.tag2Combo.currentText(), | 108 self.tag2Combo.currentText(), |
| 103 self.targetCombo.currentText(), | 109 self.targetCombo.currentText(), |
