eric: comparison src/eric7/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py

-:e9e7eca7efee
+:bf71ee032bb4
 """
 import re
 from PyQt6.QtCore import pyqtSlot, Qt, QCoreApplication
-from PyQt6.QtWidgets import (
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QHeaderView, QTreeWidgetItem
-QDialog, QDialogButtonBox, QHeaderView, QTreeWidgetItem
-)
 from .Ui_HgGpgSignaturesDialog import Ui_HgGpgSignaturesDialog
 class HgGpgSignaturesDialog(QDialog, Ui_HgGpgSignaturesDialog):
 """
 Class implementing a dialog showing signed changesets.
 """
 def __init__(self, vcs, parent=None):
 """
 Constructor
 @param vcs reference to the vcs object
 @param parent reference to the parent widget (QWidget)
 """
 super().__init__(parent)
 self.setupUi(self)
 self.setWindowFlags(Qt.WindowType.Window)
-self.buttonBox.button(
+self.buttonBox.button(QDialogButtonBox.StandardButton.Close).setEnabled(False)
-QDialogButtonBox.StandardButton.Close).setEnabled(False)
+self.buttonBox.button(QDialogButtonBox.StandardButton.Cancel).setDefault(True)
-self.buttonBox.button(
-QDialogButtonBox.StandardButton.Cancel).setDefault(True)
 self.vcs = vcs
 self.__hgClient = vcs.getClient()
 self.show()
 QCoreApplication.processEvents()
 def closeEvent(self, e):
 """
 Protected slot implementing a close event handler.
 @param e close event (QCloseEvent)
 """
 if self.__hgClient.isExecuting():
 self.__hgClient.cancel()
 e.accept()
 def start(self):
 """
 Public slot to start the list command.
 """
 self.errorGroup.hide()
 self.intercept = False
 self.activateWindow()
 args = self.vcs.initCommand("sigs")
 out, err = self.__hgClient.runcommand(args)
 if err:
 self.__showError(err)
 if out:
 for line in out.splitlines():
 self.__processOutputLine(line)
 if self.__hgClient.wasCanceled():
 break
 self.__finish()
 def __finish(self):
 """
 Private slot called when the process finished or the user pressed
 the button.
 """
-self.buttonBox.button(
+self.buttonBox.button(QDialogButtonBox.StandardButton.Close).setEnabled(True)
-QDialogButtonBox.StandardButton.Close).setEnabled(True)
+self.buttonBox.button(QDialogButtonBox.StandardButton.Cancel).setEnabled(False)
-self.buttonBox.button(
+self.buttonBox.button(QDialogButtonBox.StandardButton.Close).setDefault(True)
-QDialogButtonBox.StandardButton.Cancel).setEnabled(False)
+self.buttonBox.button(QDialogButtonBox.StandardButton.Close).setFocus(
-self.buttonBox.button(
+Qt.FocusReason.OtherFocusReason
-QDialogButtonBox.StandardButton.Close).setDefault(True)
+)
-self.buttonBox.button(
-QDialogButtonBox.StandardButton.Close).setFocus(
-Qt.FocusReason.OtherFocusReason)
 if self.signaturesList.topLevelItemCount() == 0:
 # no patches present
 self.__generateItem("", "", self.tr("no signatures found"))
 self.__resizeColumns()
 self.__resort()
 def on_buttonBox_clicked(self, button):
 """
 Private slot called by a button of the button box clicked.
 @param button button that was clicked (QAbstractButton)
 """
-if button == self.buttonBox.button(
+if button == self.buttonBox.button(QDialogButtonBox.StandardButton.Close):
-QDialogButtonBox.StandardButton.Close
-):
 self.close()
-elif button == self.buttonBox.button(
+elif button == self.buttonBox.button(QDialogButtonBox.StandardButton.Cancel):
-QDialogButtonBox.StandardButton.Cancel
-):
 self.__hgClient.cancel()
 def __resort(self):
 """
 Private method to resort the tree.
 """
 self.signaturesList.sortItems(
 self.signaturesList.sortColumn(),
-self.signaturesList.header().sortIndicatorOrder())
+self.signaturesList.header().sortIndicatorOrder(),
+)
 def __resizeColumns(self):
 """
 Private method to resize the list columns.
 """
 self.signaturesList.header().resizeSections(
-QHeaderView.ResizeMode.ResizeToContents)
+QHeaderView.ResizeMode.ResizeToContents
+)
 self.signaturesList.header().setStretchLastSection(True)
 def __generateItem(self, revision, changeset, signature):
 """
 Private method to generate a patch item in the list of patches.
 @param revision revision number (string)
 @param changeset changeset of the bookmark (string)
 @param signature signature of the changeset (string)
 """
 if revision == "" and changeset == "":
 QTreeWidgetItem(self.signaturesList, [signature])
 else:
 revString = "{0:>7}:{1}".format(revision, changeset)
 topItems = self.signaturesList.findItems(
-revString, Qt.MatchFlag.MatchExactly)
+revString, Qt.MatchFlag.MatchExactly
+)
 if len(topItems) == 0:
 # first signature for this changeset
-topItm = QTreeWidgetItem(self.signaturesList, [
+topItm = QTreeWidgetItem(
-"{0:>7}:{1}".format(revision, changeset)])
+self.signaturesList, ["{0:>7}:{1}".format(revision, changeset)]
+)
 topItm.setExpanded(True)
 font = topItm.font(0)
 font.setBold(True)
 topItm.setFont(0, font)
 else:
 topItm = topItems[0]
 QTreeWidgetItem(topItm, [signature])
 def __processOutputLine(self, line):
 """
 Private method to process the lines of output.
 @param line output line to be processed (string)
 """
 li = line.split()
 if li[-1][0] in "1234567890":
 # last element is a rev:changeset
 rev, changeset = li[-1].split(":", 1)
 del li[-1]
 signature = " ".join(li)
 self.__generateItem(rev, changeset, signature)
 def __showError(self, out):
 """
 Private slot to show some error.
 @param out error to be shown (string)
 """
 self.errorGroup.show()
 self.errors.insertPlainText(out)
 self.errors.ensureCursorVisible()
 @pyqtSlot()
 def on_signaturesList_itemSelectionChanged(self):
 """
 Private slot handling changes of the selection.
 """
 selectedItems = self.signaturesList.selectedItems()
 if (
-len(selectedItems) == 1 and
+len(selectedItems) == 1
-self.signaturesList.indexOfTopLevelItem(selectedItems[0]) != -1
+and self.signaturesList.indexOfTopLevelItem(selectedItems[0]) != -1
 ):
 self.verifyButton.setEnabled(True)
 else:
 self.verifyButton.setEnabled(False)
 @pyqtSlot()
 def on_verifyButton_clicked(self):
 """
 Private slot to verify the signatures of the selected revision.
 """
-rev = (
+rev = self.signaturesList.selectedItems()[0].text(0).split(":")[0].strip()
-self.signaturesList.selectedItems()[0].text(0)
-.split(":")[0].strip()
-)
 self.vcs.getExtensionObject("gpg").hgGpgVerifySignatures(rev)
 @pyqtSlot(int)
 def on_categoryCombo_activated(self, index):
 """
 Private slot called, when a new filter category is selected.
 @param index index of the selected entry
 @type int
 """
 self.__filterSignatures()
 @pyqtSlot(str)
 def on_rxEdit_textChanged(self, txt):
 """
 Private slot called, when a filter expression is entered.
 @param txt filter expression (string)
 """
 self.__filterSignatures()
 def __filterSignatures(self):
 """
 Private method to filter the log entries.
 """
 searchRxText = self.rxEdit.text()
 filterTop = self.categoryCombo.currentText() == self.tr("Revision")
 searchRx = (
-re.compile(
+re.compile(r"^\s*{0}".format(searchRxText[1:]), re.IGNORECASE)
-r"^\s*{0}".format(searchRxText[1:]), re.IGNORECASE)
+if filterTop and searchRxText.startswith("^")
-if filterTop and searchRxText.startswith("^") else
+else re.compile(searchRxText, re.IGNORECASE)
-re.compile(searchRxText, re.IGNORECASE)
 )
 for topIndex in range(self.signaturesList.topLevelItemCount()):
 topLevelItem = self.signaturesList.topLevelItem(topIndex)
 if filterTop:
-topLevelItem.setHidden(
+topLevelItem.setHidden(searchRx.search(topLevelItem.text(0)) is None)
-searchRx.search(topLevelItem.text(0)) is None)
 else:
 visibleChildren = topLevelItem.childCount()
 for childIndex in range(topLevelItem.childCount()):
 childItem = topLevelItem.child(childIndex)
 if searchRx.search(childItem.text(0)) is None:

Mercurial Repositories > eric / file comparison

comparison: src/eric7/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py

src/eric7/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py