Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsPySvn/SvnMergeDialog.py
Plugins/VcsPlugins/vcsPySvn/SvnMergeDialog.py
- branch
- Py2 comp.
- changeset 3057
- 10516539f238
- parent 2525
- 8b507a9a2d40
- parent 3009
- bf5ae5d7477d
- child 3060
- 5883ce99ee12
equal
deleted
inserted
replaced
| 3056:9986ec0e559a | 3057:10516539f238 |
|---|---|
| 17 | 17 |
| 18 class SvnMergeDialog(QDialog, Ui_SvnMergeDialog): | 18 class SvnMergeDialog(QDialog, Ui_SvnMergeDialog): |
| 19 """ | 19 """ |
| 20 Class implementing a dialog to enter the data for a merge operation. | 20 Class implementing a dialog to enter the data for a merge operation. |
| 21 """ | 21 """ |
| 22 def __init__(self, mergelist1, mergelist2, targetlist, force=False, parent=None): | 22 def __init__(self, mergelist1, mergelist2, targetlist, force=False, |
| 23 parent=None): | |
| 23 """ | 24 """ |
| 24 Constructor | 25 Constructor |
| 25 | 26 |
| 26 @param mergelist1 list of previously entered URLs/revisions (list of strings) | 27 @param mergelist1 list of previously entered URLs/revisions |
| 27 @param mergelist2 list of previously entered URLs/revisions (list of strings) | 28 (list of strings) |
| 29 @param mergelist2 list of previously entered URLs/revisions | |
| 30 (list of strings) | |
| 28 @param targetlist list of previously entered targets (list of strings) | 31 @param targetlist list of previously entered targets (list of strings) |
| 29 @param force flag indicating a forced merge (boolean) | 32 @param force flag indicating a forced merge (boolean) |
| 30 @param parent parent widget (QWidget) | 33 @param parent parent widget (QWidget) |
| 31 """ | 34 """ |
| 32 super(SvnMergeDialog, self).__init__(parent) | 35 super(SvnMergeDialog, self).__init__(parent) |
| 48 self.targetCombo.addItems(targetlist) | 51 self.targetCombo.addItems(targetlist) |
| 49 | 52 |
| 50 def __enableOkButton(self): | 53 def __enableOkButton(self): |
| 51 """ | 54 """ |
| 52 Private method used to enable/disable the OK-button. | 55 Private method used to enable/disable the OK-button. |
| 53 | |
| 54 @param text ignored | |
| 55 """ | 56 """ |
| 56 self.okButton.setDisabled( | 57 self.okButton.setDisabled( |
| 57 self.tag1Combo.currentText() == "" or \ | 58 self.tag1Combo.currentText() == "" or \ |
| 58 self.tag2Combo.currentText() == "" or \ | 59 self.tag2Combo.currentText() == "" or \ |
| 59 not ((self.rx_url.exactMatch(self.tag1Combo.currentText()) and \ | 60 not ((self.rx_url.exactMatch(self.tag1Combo.currentText()) and \ |
| 64 ) | 65 ) |
| 65 | 66 |
| 66 def on_tag1Combo_editTextChanged(self, text): | 67 def on_tag1Combo_editTextChanged(self, text): |
| 67 """ | 68 """ |
| 68 Private slot to handle the tag1Combo editTextChanged signal. | 69 Private slot to handle the tag1Combo editTextChanged signal. |
| 70 | |
| 71 @param text text of the combo (string) | |
| 69 """ | 72 """ |
| 70 self.__enableOkButton() | 73 self.__enableOkButton() |
| 71 | 74 |
| 72 def on_tag2Combo_editTextChanged(self, text): | 75 def on_tag2Combo_editTextChanged(self, text): |
| 73 """ | 76 """ |
| 74 Private slot to handle the tag2Combo editTextChanged signal. | 77 Private slot to handle the tag2Combo editTextChanged signal. |
| 78 | |
| 79 @param text text of the combo (string) | |
| 75 """ | 80 """ |
| 76 self.__enableOkButton() | 81 self.__enableOkButton() |
| 77 | 82 |
| 78 def getParameters(self): | 83 def getParameters(self): |
| 79 """ | 84 """ |
