Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.py
Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.py
- branch
- Py2 comp.
- changeset 3484
- 645c12de6b0c
- parent 3178
- f25fc1364c88
- parent 3408
- b6e6a7062d12
equal
deleted
inserted
replaced
| 3456:96232974dcdb | 3484:645c12de6b0c |
|---|---|
| 40 | 40 |
| 41 self.__mode = mode | 41 self.__mode = mode |
| 42 if mode == self.MOVE_MODE: | 42 if mode == self.MOVE_MODE: |
| 43 self.nameEdit.hide() | 43 self.nameEdit.hide() |
| 44 self.nameCombo.addItems([""] + sorted(bookmarksList)) | 44 self.nameCombo.addItems([""] + sorted(bookmarksList)) |
| 45 self.setWindowTitle(self.trUtf8("Move Bookmark")) | 45 self.setWindowTitle(self.tr("Move Bookmark")) |
| 46 else: | 46 else: |
| 47 self.nameCombo.hide() | 47 self.nameCombo.hide() |
| 48 self.setWindowTitle(self.trUtf8("Define Bookmark")) | 48 self.setWindowTitle(self.tr("Define Bookmark")) |
| 49 | 49 |
| 50 self.__bookmarksList = bookmarksList[:] | 50 self.__bookmarksList = bookmarksList[:] |
| 51 | 51 |
| 52 self.tagCombo.addItems(sorted(tagsList)) | 52 self.tagCombo.addItems(sorted(tagsList)) |
| 53 self.branchCombo.addItems(["default"] + sorted(branchesList)) | 53 self.branchCombo.addItems(["default"] + sorted(branchesList)) |
| 54 self.bookmarkCombo.addItems(sorted(bookmarksList)) | 54 self.bookmarkCombo.addItems(sorted(bookmarksList)) |
| 55 | |
| 56 msh = self.minimumSizeHint() | |
| 57 self.resize(max(self.width(), msh.width()), msh.height()) | |
| 55 | 58 |
| 56 def __updateOK(self): | 59 def __updateOK(self): |
| 57 """ | 60 """ |
| 58 Private slot to update the OK button. | 61 Private slot to update the OK button. |
| 59 """ | 62 """ |
| 187 | 190 |
| 188 @return tuple naming the revision and the bookmark name | 191 @return tuple naming the revision and the bookmark name |
| 189 (string, string) | 192 (string, string) |
| 190 """ | 193 """ |
| 191 if self.numberButton.isChecked(): | 194 if self.numberButton.isChecked(): |
| 192 rev = str(self.numberSpinBox.value()) | 195 rev = "rev({0})".format(self.numberSpinBox.value()) |
| 193 elif self.idButton.isChecked(): | 196 elif self.idButton.isChecked(): |
| 194 rev = self.idEdit.text() | 197 rev = "id({0})".format(self.idEdit.text()) |
| 195 elif self.tagButton.isChecked(): | 198 elif self.tagButton.isChecked(): |
| 196 rev = self.tagCombo.currentText() | 199 rev = self.tagCombo.currentText() |
| 197 elif self.branchButton.isChecked(): | 200 elif self.branchButton.isChecked(): |
| 198 rev = self.branchCombo.currentText() | 201 rev = self.branchCombo.currentText() |
| 199 elif self.bookmarkButton.isChecked(): | 202 elif self.bookmarkButton.isChecked(): |
| 200 rev = self.bookmarkCombo.currentText() | 203 rev = self.bookmarkCombo.currentText() |
| 201 else: | 204 else: |
| 202 rev = "" | 205 rev = "" |
| 203 | 206 |
| 204 if self.__mode == self.MOVE_MODE: | 207 if self.__mode == self.MOVE_MODE: |
| 205 name = self.nameCombo.currentText() | 208 name = self.nameCombo.currentText().replace(" ", "_") |
| 206 else: | 209 else: |
| 207 name = self.nameEdit.text() | 210 name = self.nameEdit.text().replace(" ", "_") |
| 208 | 211 |
| 209 return rev, name | 212 return rev, name |
