Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.py
Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.py
- branch
- Py2 comp.
- changeset 3484
- 645c12de6b0c
- parent 3178
- f25fc1364c88
- parent 3407
- 07966c6b5565
- child 3656
- 441956d8fce5
equal
deleted
inserted
replaced
| 3456:96232974dcdb | 3484:645c12de6b0c |
|---|---|
| 44 else: | 44 else: |
| 45 self.bookmark1Button.setHidden(True) | 45 self.bookmark1Button.setHidden(True) |
| 46 self.bookmark1Combo.setHidden(True) | 46 self.bookmark1Combo.setHidden(True) |
| 47 self.bookmark2Button.setHidden(True) | 47 self.bookmark2Button.setHidden(True) |
| 48 self.bookmark2Combo.setHidden(True) | 48 self.bookmark2Combo.setHidden(True) |
| 49 | |
| 50 msh = self.minimumSizeHint() | |
| 51 self.resize(max(self.width(), msh.width()), msh.height()) | |
| 49 | 52 |
| 50 def __updateOK(self): | 53 def __updateOK(self): |
| 51 """ | 54 """ |
| 52 Private slot to update the OK button. | 55 Private slot to update the OK button. |
| 53 """ | 56 """ |
| 234 branchCombo = self.branch1Combo | 237 branchCombo = self.branch1Combo |
| 235 bookmarkButton = self.bookmark1Button | 238 bookmarkButton = self.bookmark1Button |
| 236 bookmarkCombo = self.bookmark1Combo | 239 bookmarkCombo = self.bookmark1Combo |
| 237 tipButton = self.tip1Button | 240 tipButton = self.tip1Button |
| 238 prevButton = self.prev1Button | 241 prevButton = self.prev1Button |
| 242 noneButton = self.none1Button | |
| 239 else: | 243 else: |
| 240 numberButton = self.number2Button | 244 numberButton = self.number2Button |
| 241 numberSpinBox = self.number2SpinBox | 245 numberSpinBox = self.number2SpinBox |
| 242 idButton = self.id2Button | 246 idButton = self.id2Button |
| 243 idEdit = self.id2Edit | 247 idEdit = self.id2Edit |
| 247 branchCombo = self.branch2Combo | 251 branchCombo = self.branch2Combo |
| 248 bookmarkButton = self.bookmark2Button | 252 bookmarkButton = self.bookmark2Button |
| 249 bookmarkCombo = self.bookmark2Combo | 253 bookmarkCombo = self.bookmark2Combo |
| 250 tipButton = self.tip2Button | 254 tipButton = self.tip2Button |
| 251 prevButton = self.prev2Button | 255 prevButton = self.prev2Button |
| 256 noneButton = self.none2Button | |
| 252 | 257 |
| 253 if numberButton.isChecked(): | 258 if numberButton.isChecked(): |
| 254 return str(numberSpinBox.value()) | 259 return "rev({0})".format(numberSpinBox.value()) |
| 255 elif idButton.isChecked(): | 260 elif idButton.isChecked(): |
| 256 return idEdit.text() | 261 return "id({0})".format(idEdit.text()) |
| 257 elif tagButton.isChecked(): | 262 elif tagButton.isChecked(): |
| 258 return tagCombo.currentText() | 263 return tagCombo.currentText() |
| 259 elif branchButton.isChecked(): | 264 elif branchButton.isChecked(): |
| 260 return branchCombo.currentText() | 265 return branchCombo.currentText() |
| 261 elif bookmarkButton.isChecked(): | 266 elif bookmarkButton.isChecked(): |
| 262 return bookmarkCombo.currentText() | 267 return bookmarkCombo.currentText() |
| 263 elif tipButton.isChecked(): | 268 elif tipButton.isChecked(): |
| 264 return "tip" | 269 return "tip" |
| 265 elif prevButton.isChecked(): | 270 elif prevButton.isChecked(): |
| 266 return "." | 271 return "." |
| 272 elif noneButton.isChecked(): | |
| 273 return "" | |
| 267 | 274 |
| 268 def getRevisions(self): | 275 def getRevisions(self): |
| 269 """ | 276 """ |
| 270 Public method to get the revisions. | 277 Public method to get the revisions. |
| 271 | 278 |
