Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsPySvn/SvnMergeDialog.py
Plugins/VcsPlugins/vcsPySvn/SvnMergeDialog.py
- changeset 2963
- 745d38097b7f
- parent 2302
- f29e9405c851
- child 3009
- bf5ae5d7477d
equal
deleted
inserted
replaced
| 2962:d6c9d1ca2da4 | 2963:745d38097b7f |
|---|---|
| 46 self.targetCombo.addItems(targetlist) | 46 self.targetCombo.addItems(targetlist) |
| 47 | 47 |
| 48 def __enableOkButton(self): | 48 def __enableOkButton(self): |
| 49 """ | 49 """ |
| 50 Private method used to enable/disable the OK-button. | 50 Private method used to enable/disable the OK-button. |
| 51 | |
| 52 @param text ignored | |
| 53 """ | 51 """ |
| 54 self.okButton.setDisabled( | 52 self.okButton.setDisabled( |
| 55 self.tag1Combo.currentText() == "" or \ | 53 self.tag1Combo.currentText() == "" or \ |
| 56 self.tag2Combo.currentText() == "" or \ | 54 self.tag2Combo.currentText() == "" or \ |
| 57 not ((self.rx_url.exactMatch(self.tag1Combo.currentText()) and \ | 55 not ((self.rx_url.exactMatch(self.tag1Combo.currentText()) and \ |
| 62 ) | 60 ) |
| 63 | 61 |
| 64 def on_tag1Combo_editTextChanged(self, text): | 62 def on_tag1Combo_editTextChanged(self, text): |
| 65 """ | 63 """ |
| 66 Private slot to handle the tag1Combo editTextChanged signal. | 64 Private slot to handle the tag1Combo editTextChanged signal. |
| 65 | |
| 66 @param text text of the combo (string) | |
| 67 """ | 67 """ |
| 68 self.__enableOkButton() | 68 self.__enableOkButton() |
| 69 | 69 |
| 70 def on_tag2Combo_editTextChanged(self, text): | 70 def on_tag2Combo_editTextChanged(self, text): |
| 71 """ | 71 """ |
| 72 Private slot to handle the tag2Combo editTextChanged signal. | 72 Private slot to handle the tag2Combo editTextChanged signal. |
| 73 | |
| 74 @param text text of the combo (string) | |
| 73 """ | 75 """ |
| 74 self.__enableOkButton() | 76 self.__enableOkButton() |
| 75 | 77 |
| 76 def getParameters(self): | 78 def getParameters(self): |
| 77 """ | 79 """ |
