Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.py
Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.py
- branch
- Py2 comp.
- changeset 3484
- 645c12de6b0c
- parent 3178
- f25fc1364c88
- parent 3366
- 6084bb3c3911
- child 3591
- 2f2a4a76dd22
equal
deleted
inserted
replaced
| 3456:96232974dcdb | 3484:645c12de6b0c |
|---|---|
| 42 else: | 42 else: |
| 43 self.bookmark1Button.setHidden(True) | 43 self.bookmark1Button.setHidden(True) |
| 44 self.bookmark1Combo.setHidden(True) | 44 self.bookmark1Combo.setHidden(True) |
| 45 self.bookmark2Button.setHidden(True) | 45 self.bookmark2Button.setHidden(True) |
| 46 self.bookmark2Combo.setHidden(True) | 46 self.bookmark2Combo.setHidden(True) |
| 47 | |
| 48 msh = self.minimumSizeHint() | |
| 49 self.resize(max(self.width(), msh.width()), msh.height()) | |
| 47 | 50 |
| 48 def __updateOK(self): | 51 def __updateOK(self): |
| 49 """ | 52 """ |
| 50 Private slot to update the OK button. | 53 Private slot to update the OK button. |
| 51 """ | 54 """ |
| 246 bookmarkButton = self.bookmark2Button | 249 bookmarkButton = self.bookmark2Button |
| 247 bookmarkCombo = self.bookmark2Combo | 250 bookmarkCombo = self.bookmark2Combo |
| 248 tipButton = self.tip2Button | 251 tipButton = self.tip2Button |
| 249 | 252 |
| 250 if numberButton.isChecked(): | 253 if numberButton.isChecked(): |
| 251 return str(numberSpinBox.value()) | 254 return "rev({0})".format(numberSpinBox.value()) |
| 252 elif idButton.isChecked(): | 255 elif idButton.isChecked(): |
| 253 return idEdit.text() | 256 return "id({0})".format(idEdit.text()) |
| 254 elif tagButton.isChecked(): | 257 elif tagButton.isChecked(): |
| 255 return tagCombo.currentText() | 258 return tagCombo.currentText() |
| 256 elif branchButton.isChecked(): | 259 elif branchButton.isChecked(): |
| 257 return branchCombo.currentText() | 260 return branchCombo.currentText() |
| 258 elif bookmarkButton.isChecked(): | 261 elif bookmarkButton.isChecked(): |
