Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsPySvn/SvnMergeDialog.py
Plugins/VcsPlugins/vcsPySvn/SvnMergeDialog.py
- branch
- Py2 comp.
- changeset 3060
- 5883ce99ee12
- parent 3057
- 10516539f238
- parent 3037
- a417a0670a36
- child 3145
- a9de05d4a22f
equal
deleted
inserted
replaced
| 3058:0a02c433f52d | 3060:5883ce99ee12 |
|---|---|
| 53 def __enableOkButton(self): | 53 def __enableOkButton(self): |
| 54 """ | 54 """ |
| 55 Private method used to enable/disable the OK-button. | 55 Private method used to enable/disable the OK-button. |
| 56 """ | 56 """ |
| 57 self.okButton.setDisabled( | 57 self.okButton.setDisabled( |
| 58 self.tag1Combo.currentText() == "" or \ | 58 self.tag1Combo.currentText() == "" or |
| 59 self.tag2Combo.currentText() == "" or \ | 59 self.tag2Combo.currentText() == "" or |
| 60 not ((self.rx_url.exactMatch(self.tag1Combo.currentText()) and \ | 60 not ((self.rx_url.exactMatch(self.tag1Combo.currentText()) and |
| 61 self.rx_url.exactMatch(self.tag2Combo.currentText())) or \ | 61 self.rx_url.exactMatch(self.tag2Combo.currentText())) or |
| 62 (self.rx_rev.exactMatch(self.tag1Combo.currentText()) and \ | 62 (self.rx_rev.exactMatch(self.tag1Combo.currentText()) and |
| 63 self.rx_rev.exactMatch(self.tag2Combo.currentText())) | 63 self.rx_rev.exactMatch(self.tag2Combo.currentText())) |
| 64 ) | 64 ) |
| 65 ) | 65 ) |
| 66 | 66 |
| 67 def on_tag1Combo_editTextChanged(self, text): | 67 def on_tag1Combo_editTextChanged(self, text): |
| 68 """ | 68 """ |
| 69 Private slot to handle the tag1Combo editTextChanged signal. | 69 Private slot to handle the tag1Combo editTextChanged signal. |
| 70 | 70 |
