--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py Wed Jul 13 11:16:20 2022 +0200
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py Wed Jul 13 14:55:47 2022 +0200
@@ -10,9 +10,7 @@
import re
from PyQt6.QtCore import pyqtSlot, Qt, QCoreApplication
-from PyQt6.QtWidgets import (
- QDialog, QDialogButtonBox, QHeaderView, QTreeWidgetItem
-)
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QHeaderView, QTreeWidgetItem
from .Ui_HgGpgSignaturesDialog import Ui_HgGpgSignaturesDialog
@@ -21,50 +19,49 @@
"""
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(
- QDialogButtonBox.StandardButton.Close).setEnabled(False)
- self.buttonBox.button(
- QDialogButtonBox.StandardButton.Cancel).setDefault(True)
-
+
+ self.buttonBox.button(QDialogButtonBox.StandardButton.Close).setEnabled(False)
+ 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)
@@ -74,63 +71,58 @@
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(
- QDialogButtonBox.StandardButton.Close).setEnabled(True)
- self.buttonBox.button(
- QDialogButtonBox.StandardButton.Cancel).setEnabled(False)
- self.buttonBox.button(
- QDialogButtonBox.StandardButton.Close).setDefault(True)
- self.buttonBox.button(
- QDialogButtonBox.StandardButton.Close).setFocus(
- Qt.FocusReason.OtherFocusReason)
-
+ self.buttonBox.button(QDialogButtonBox.StandardButton.Close).setEnabled(True)
+ self.buttonBox.button(QDialogButtonBox.StandardButton.Cancel).setEnabled(False)
+ self.buttonBox.button(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(
- QDialogButtonBox.StandardButton.Close
- ):
+ if button == self.buttonBox.button(QDialogButtonBox.StandardButton.Close):
self.close()
- elif button == self.buttonBox.button(
- QDialogButtonBox.StandardButton.Cancel
- ):
+ elif button == self.buttonBox.button(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)
@@ -140,11 +132,13 @@
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, [
- "{0:>7}:{1}".format(revision, changeset)])
+ topItm = QTreeWidgetItem(
+ self.signaturesList, ["{0:>7}:{1}".format(revision, changeset)]
+ )
topItm.setExpanded(True)
font = topItm.font(0)
font.setBold(True)
@@ -152,11 +146,11 @@
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()
@@ -166,17 +160,17 @@
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):
"""
@@ -184,43 +178,40 @@
"""
selectedItems = self.signaturesList.selectedItems()
if (
- len(selectedItems) == 1 and
- self.signaturesList.indexOfTopLevelItem(selectedItems[0]) != -1
+ len(selectedItems) == 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 = (
- self.signaturesList.selectedItems()[0].text(0)
- .split(":")[0].strip()
- )
+ rev = 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.
@@ -228,16 +219,14 @@
searchRxText = self.rxEdit.text()
filterTop = self.categoryCombo.currentText() == self.tr("Revision")
searchRx = (
- re.compile(
- r"^\s*{0}".format(searchRxText[1:]), re.IGNORECASE)
- if filterTop and searchRxText.startswith("^") else
- re.compile(searchRxText, re.IGNORECASE)
+ re.compile(r"^\s*{0}".format(searchRxText[1:]), re.IGNORECASE)
+ if filterTop and searchRxText.startswith("^")
+ else re.compile(searchRxText, re.IGNORECASE)
)
for topIndex in range(self.signaturesList.topLevelItemCount()):
topLevelItem = self.signaturesList.topLevelItem(topIndex)
if filterTop:
- topLevelItem.setHidden(
- searchRx.search(topLevelItem.text(0)) is None)
+ topLevelItem.setHidden(searchRx.search(topLevelItem.text(0)) is None)
else:
visibleChildren = topLevelItem.childCount()
for childIndex in range(topLevelItem.childCount()):
