Mercurial Repositories > eric / file comparison
comparison: src/eric7/Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.py
src/eric7/Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.py
- branch
- eric7
- changeset 9221
- bf71ee032bb4
- parent 9209
- b99e7fd55fd3
- child 9653
- e67609152c5e
equal
deleted
inserted
replaced
| 9220:e9e7eca7efee | 9221:bf71ee032bb4 |
|---|---|
| 15 | 15 |
| 16 class HgRevisionsSelectionDialog(QDialog, Ui_HgRevisionsSelectionDialog): | 16 class HgRevisionsSelectionDialog(QDialog, Ui_HgRevisionsSelectionDialog): |
| 17 """ | 17 """ |
| 18 Class implementing a dialog to enter the revisions for the hg diff command. | 18 Class implementing a dialog to enter the revisions for the hg diff command. |
| 19 """ | 19 """ |
| 20 def __init__(self, tagsList, branchesList, bookmarksList=None, | 20 |
| 21 parent=None): | 21 def __init__(self, tagsList, branchesList, bookmarksList=None, parent=None): |
| 22 """ | 22 """ |
| 23 Constructor | 23 Constructor |
| 24 | 24 |
| 25 @param tagsList list of tags | 25 @param tagsList list of tags |
| 26 @type list of str | 26 @type list of str |
| 27 @param branchesList list of branches | 27 @param branchesList list of branches |
| 28 @type list of str | 28 @type list of str |
| 29 @param bookmarksList list of bookmarks | 29 @param bookmarksList list of bookmarks |
| 31 @param parent parent widget of the dialog | 31 @param parent parent widget of the dialog |
| 32 @type QWidget | 32 @type QWidget |
| 33 """ | 33 """ |
| 34 super().__init__(parent) | 34 super().__init__(parent) |
| 35 self.setupUi(self) | 35 self.setupUi(self) |
| 36 | 36 |
| 37 self.buttonBox.button( | 37 self.buttonBox.button(QDialogButtonBox.StandardButton.Ok).setEnabled(False) |
| 38 QDialogButtonBox.StandardButton.Ok).setEnabled(False) | 38 |
| 39 | |
| 40 self.tag1Combo.addItems(sorted(tagsList)) | 39 self.tag1Combo.addItems(sorted(tagsList)) |
| 41 self.tag2Combo.addItems(sorted(tagsList)) | 40 self.tag2Combo.addItems(sorted(tagsList)) |
| 42 self.branch1Combo.addItems(["default"] + sorted(branchesList)) | 41 self.branch1Combo.addItems(["default"] + sorted(branchesList)) |
| 43 self.branch2Combo.addItems(["default"] + sorted(branchesList)) | 42 self.branch2Combo.addItems(["default"] + sorted(branchesList)) |
| 44 if bookmarksList is not None: | 43 if bookmarksList is not None: |
| 47 else: | 46 else: |
| 48 self.bookmark1Button.setHidden(True) | 47 self.bookmark1Button.setHidden(True) |
| 49 self.bookmark1Combo.setHidden(True) | 48 self.bookmark1Combo.setHidden(True) |
| 50 self.bookmark2Button.setHidden(True) | 49 self.bookmark2Button.setHidden(True) |
| 51 self.bookmark2Combo.setHidden(True) | 50 self.bookmark2Combo.setHidden(True) |
| 52 | 51 |
| 53 # connect various radio buttons and input fields | 52 # connect various radio buttons and input fields |
| 54 self.id1Button.toggled.connect(self.__updateOK) | 53 self.id1Button.toggled.connect(self.__updateOK) |
| 55 self.id2Button.toggled.connect(self.__updateOK) | 54 self.id2Button.toggled.connect(self.__updateOK) |
| 56 self.tag1Button.toggled.connect(self.__updateOK) | 55 self.tag1Button.toggled.connect(self.__updateOK) |
| 57 self.tag2Button.toggled.connect(self.__updateOK) | 56 self.tag2Button.toggled.connect(self.__updateOK) |
| 59 self.branch2Button.toggled.connect(self.__updateOK) | 58 self.branch2Button.toggled.connect(self.__updateOK) |
| 60 self.bookmark1Button.toggled.connect(self.__updateOK) | 59 self.bookmark1Button.toggled.connect(self.__updateOK) |
| 61 self.bookmark2Button.toggled.connect(self.__updateOK) | 60 self.bookmark2Button.toggled.connect(self.__updateOK) |
| 62 self.expression1Button.toggled.connect(self.__updateOK) | 61 self.expression1Button.toggled.connect(self.__updateOK) |
| 63 self.expression2Button.toggled.connect(self.__updateOK) | 62 self.expression2Button.toggled.connect(self.__updateOK) |
| 64 | 63 |
| 65 self.id1Edit.textChanged.connect(self.__updateOK) | 64 self.id1Edit.textChanged.connect(self.__updateOK) |
| 66 self.id2Edit.textChanged.connect(self.__updateOK) | 65 self.id2Edit.textChanged.connect(self.__updateOK) |
| 67 self.expression1Edit.textChanged.connect(self.__updateOK) | 66 self.expression1Edit.textChanged.connect(self.__updateOK) |
| 68 self.expression2Edit.textChanged.connect(self.__updateOK) | 67 self.expression2Edit.textChanged.connect(self.__updateOK) |
| 69 | 68 |
| 70 self.tag1Combo.editTextChanged.connect(self.__updateOK) | 69 self.tag1Combo.editTextChanged.connect(self.__updateOK) |
| 71 self.tag2Combo.editTextChanged.connect(self.__updateOK) | 70 self.tag2Combo.editTextChanged.connect(self.__updateOK) |
| 72 self.branch1Combo.editTextChanged.connect(self.__updateOK) | 71 self.branch1Combo.editTextChanged.connect(self.__updateOK) |
| 73 self.branch2Combo.editTextChanged.connect(self.__updateOK) | 72 self.branch2Combo.editTextChanged.connect(self.__updateOK) |
| 74 self.bookmark1Combo.editTextChanged.connect(self.__updateOK) | 73 self.bookmark1Combo.editTextChanged.connect(self.__updateOK) |
| 75 self.bookmark2Combo.editTextChanged.connect(self.__updateOK) | 74 self.bookmark2Combo.editTextChanged.connect(self.__updateOK) |
| 76 | 75 |
| 77 msh = self.minimumSizeHint() | 76 msh = self.minimumSizeHint() |
| 78 self.resize(max(self.width(), msh.width()), msh.height()) | 77 self.resize(max(self.width(), msh.width()), msh.height()) |
| 79 | 78 |
| 80 @pyqtSlot() | 79 @pyqtSlot() |
| 81 def __updateOK(self): | 80 def __updateOK(self): |
| 82 """ | 81 """ |
| 83 Private slot to update the OK button. | 82 Private slot to update the OK button. |
| 84 """ | 83 """ |
| 91 enabled = enabled and bool(self.branch1Combo.currentText()) | 90 enabled = enabled and bool(self.branch1Combo.currentText()) |
| 92 elif self.bookmark1Button.isChecked(): | 91 elif self.bookmark1Button.isChecked(): |
| 93 enabled = enabled and bool(self.bookmark1Combo.currentText()) | 92 enabled = enabled and bool(self.bookmark1Combo.currentText()) |
| 94 elif self.expression1Button.isChecked(): | 93 elif self.expression1Button.isChecked(): |
| 95 enabled = enabled and bool(self.expression1Edit.text()) | 94 enabled = enabled and bool(self.expression1Edit.text()) |
| 96 | 95 |
| 97 if self.id2Button.isChecked(): | 96 if self.id2Button.isChecked(): |
| 98 enabled = enabled and bool(self.id2Edit.text()) | 97 enabled = enabled and bool(self.id2Edit.text()) |
| 99 elif self.tag2Button.isChecked(): | 98 elif self.tag2Button.isChecked(): |
| 100 enabled = enabled and bool(self.tag2Combo.currentText()) | 99 enabled = enabled and bool(self.tag2Combo.currentText()) |
| 101 elif self.branch2Button.isChecked(): | 100 elif self.branch2Button.isChecked(): |
| 102 enabled = enabled and bool(self.branch2Combo.currentText()) | 101 enabled = enabled and bool(self.branch2Combo.currentText()) |
| 103 elif self.bookmark2Button.isChecked(): | 102 elif self.bookmark2Button.isChecked(): |
| 104 enabled = enabled and bool(self.bookmark2Combo.currentText()) | 103 enabled = enabled and bool(self.bookmark2Combo.currentText()) |
| 105 elif self.expression2Button.isChecked(): | 104 elif self.expression2Button.isChecked(): |
| 106 enabled = enabled and bool(self.expression2Edit.text()) | 105 enabled = enabled and bool(self.expression2Edit.text()) |
| 107 | 106 |
| 108 self.buttonBox.button( | 107 self.buttonBox.button(QDialogButtonBox.StandardButton.Ok).setEnabled(enabled) |
| 109 QDialogButtonBox.StandardButton.Ok).setEnabled(enabled) | 108 |
| 110 | |
| 111 def __getRevision(self, no): | 109 def __getRevision(self, no): |
| 112 """ | 110 """ |
| 113 Private method to generate the revision. | 111 Private method to generate the revision. |
| 114 | 112 |
| 115 @param no revision number to generate (1 or 2) | 113 @param no revision number to generate (1 or 2) |
| 116 @type int | 114 @type int |
| 117 @return revision | 115 @return revision |
| 118 @rtype str | 116 @rtype str |
| 119 """ | 117 """ |
| 147 expressionButton = self.expression2Button | 145 expressionButton = self.expression2Button |
| 148 expressionEdit = self.expression2Edit | 146 expressionEdit = self.expression2Edit |
| 149 tipButton = self.tip2Button | 147 tipButton = self.tip2Button |
| 150 prevButton = self.prev2Button | 148 prevButton = self.prev2Button |
| 151 noneButton = self.none2Button | 149 noneButton = self.none2Button |
| 152 | 150 |
| 153 if numberButton.isChecked(): | 151 if numberButton.isChecked(): |
| 154 return "rev({0})".format(numberSpinBox.value()) | 152 return "rev({0})".format(numberSpinBox.value()) |
| 155 elif idButton.isChecked(): | 153 elif idButton.isChecked(): |
| 156 return "id({0})".format(idEdit.text()) | 154 return "id({0})".format(idEdit.text()) |
| 157 elif tagButton.isChecked(): | 155 elif tagButton.isChecked(): |
| 166 return "tip" | 164 return "tip" |
| 167 elif prevButton.isChecked(): | 165 elif prevButton.isChecked(): |
| 168 return "." | 166 return "." |
| 169 elif noneButton.isChecked(): | 167 elif noneButton.isChecked(): |
| 170 return "" | 168 return "" |
| 171 | 169 |
| 172 return "" | 170 return "" |
| 173 | 171 |
| 174 def getRevisions(self): | 172 def getRevisions(self): |
| 175 """ | 173 """ |
| 176 Public method to get the revisions. | 174 Public method to get the revisions. |
| 177 | 175 |
| 178 @return list of two revisions | 176 @return list of two revisions |
| 179 @rtype list of [str, str] | 177 @rtype list of [str, str] |
| 180 """ | 178 """ |
| 181 rev1 = self.__getRevision(1) | 179 rev1 = self.__getRevision(1) |
| 182 rev2 = self.__getRevision(2) | 180 rev2 = self.__getRevision(2) |
| 183 | 181 |
| 184 return [rev1, rev2] | 182 return [rev1, rev2] |
