--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgBookmarkDialog.py Wed Jul 13 11:16:20 2022 +0200 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgBookmarkDialog.py Wed Jul 13 14:55:47 2022 +0200 @@ -17,14 +17,14 @@ """ Class mplementing the bookmark dialog. """ + DEFINE_MODE = 0 MOVE_MODE = 1 - - def __init__(self, mode, tagsList, branchesList, bookmarksList, - parent=None): + + def __init__(self, mode, tagsList, branchesList, bookmarksList, parent=None): """ Constructor - + @param mode of the dialog @type int @param tagsList list of tags @@ -38,10 +38,9 @@ """ super().__init__(parent) self.setupUi(self) - - self.buttonBox.button( - QDialogButtonBox.StandardButton.Ok).setEnabled(False) - + + self.buttonBox.button(QDialogButtonBox.StandardButton.Ok).setEnabled(False) + self.__mode = mode if mode == self.MOVE_MODE: self.nameEdit.hide() @@ -50,34 +49,34 @@ else: self.nameCombo.hide() self.setWindowTitle(self.tr("Define Bookmark")) - + self.__bookmarksList = bookmarksList[:] - + self.tagCombo.addItems(sorted(tagsList)) self.branchCombo.addItems(["default"] + sorted(branchesList)) self.bookmarkCombo.addItems(sorted(bookmarksList)) - + # connect various radio buttons and input fields self.idButton.toggled.connect(self.__updateOK) self.tagButton.toggled.connect(self.__updateOK) self.branchButton.toggled.connect(self.__updateOK) self.bookmarkButton.toggled.connect(self.__updateOK) self.expressionButton.toggled.connect(self.__updateOK) - + self.nameCombo.activated.connect(self.__updateOK) self.nameCombo.activated.connect(self.__updateBookmarksCombo) - + self.nameEdit.textChanged.connect(self.__updateOK) self.idEdit.textChanged.connect(self.__updateOK) self.expressionEdit.textChanged.connect(self.__updateOK) - + self.tagCombo.editTextChanged.connect(self.__updateOK) self.branchCombo.editTextChanged.connect(self.__updateOK) self.bookmarkCombo.editTextChanged.connect(self.__updateOK) - + msh = self.minimumSizeHint() self.resize(max(self.width(), msh.width()), msh.height()) - + @pyqtSlot() def __updateOK(self): """ @@ -85,10 +84,10 @@ """ enabled = ( bool(self.nameCombo.currentText()) - if self.__mode == self.MOVE_MODE else - bool(self.nameEdit.text()) + if self.__mode == self.MOVE_MODE + else bool(self.nameEdit.text()) ) - + if self.idButton.isChecked(): enabled = bool(self.idEdit.text()) elif self.tagButton.isChecked(): @@ -99,10 +98,9 @@ enabled = bool(self.bookmarkCombo.currentText()) elif self.expressionButton.isChecked(): enabled = enabled and bool(self.expressionEdit.text()) - - self.buttonBox.button( - QDialogButtonBox.StandardButton.Ok).setEnabled(enabled) - + + self.buttonBox.button(QDialogButtonBox.StandardButton.Ok).setEnabled(enabled) + def __updateBookmarksCombo(self): """ Private slot to update the bookmarks combo. @@ -120,11 +118,11 @@ index = self.bookmarkCombo.findText(selectedBookmark) if index > -1: self.bookmarkCombo.setCurrentIndex(index) - + def getData(self): """ Public method to retrieve the entered data. - + @return tuple naming the revision and the bookmark name @rtype tuple of (str, str) """ @@ -142,11 +140,11 @@ rev = self.expressionEdit.text() else: rev = "" - + name = ( self.nameCombo.currentText().replace(" ", "_") - if self.__mode == self.MOVE_MODE else - self.nameEdit.text().replace(" ", "_") + if self.__mode == self.MOVE_MODE + else self.nameEdit.text().replace(" ", "_") ) - + return rev, name