Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsPySvn/SvnMergeDialog.py
Plugins/VcsPlugins/vcsPySvn/SvnMergeDialog.py
- changeset 3034
- 7ce719013078
- parent 3009
- bf5ae5d7477d
- child 3037
- a417a0670a36
equal
deleted
inserted
replaced
| 3033:58fe260e7469 | 3034:7ce719013078 |
|---|---|
| 51 def __enableOkButton(self): | 51 def __enableOkButton(self): |
| 52 """ | 52 """ |
| 53 Private method used to enable/disable the OK-button. | 53 Private method used to enable/disable the OK-button. |
| 54 """ | 54 """ |
| 55 self.okButton.setDisabled( | 55 self.okButton.setDisabled( |
| 56 self.tag1Combo.currentText() == "" or \ | 56 self.tag1Combo.currentText() == "" or |
| 57 self.tag2Combo.currentText() == "" or \ | 57 self.tag2Combo.currentText() == "" or |
| 58 not ((self.rx_url.exactMatch(self.tag1Combo.currentText()) and \ | 58 not ((self.rx_url.exactMatch(self.tag1Combo.currentText()) and |
| 59 self.rx_url.exactMatch(self.tag2Combo.currentText())) or \ | 59 self.rx_url.exactMatch(self.tag2Combo.currentText())) or |
| 60 (self.rx_rev.exactMatch(self.tag1Combo.currentText()) and \ | 60 (self.rx_rev.exactMatch(self.tag1Combo.currentText()) and |
| 61 self.rx_rev.exactMatch(self.tag2Combo.currentText())) | 61 self.rx_rev.exactMatch(self.tag2Combo.currentText())) |
| 62 ) | 62 ) |
| 63 ) | 63 ) |
| 64 | 64 |
| 65 def on_tag1Combo_editTextChanged(self, text): | 65 def on_tag1Combo_editTextChanged(self, text): |
