Mercurial Repositories > eric / file diff

--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/GpgExtension/gpg.py	Fri Oct 25 09:47:48 2024 +0200
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/GpgExtension/gpg.py	Fri Oct 25 17:58:59 2024 +0200
@@ -19,14 +19,16 @@
     Class implementing the gpg extension interface.
     """
 
-    def __init__(self, vcs):
+    def __init__(self, vcs, ui=None):
         """
         Constructor
 
         @param vcs reference to the Mercurial vcs object
         @type Hg
+        @param ui reference to a UI widget (defaults to None)
+        @type QWidget
         """
-        super().__init__(vcs)
+        super().__init__(vcs, ui=ui)
 
         self.gpgSignaturesDialog = None
 
@@ -60,6 +62,7 @@
                 self.vcs.hgGetBranchesList(),
                 bookmarksList=self.vcs.hgGetBookmarksList(),
                 revset=False,
+                parent=self.ui,
             )
             if dlg.exec() == QDialog.DialogCode.Accepted:
                 rev = dlg.getRevision()
@@ -70,7 +73,7 @@
             args = self.vcs.initCommand("sigcheck")
             args.append(rev)
 
-            dia = HgDialog(self.tr("Verify Signatures"), self.vcs)
+            dia = HgDialog(self.tr("Verify Signatures"), hg=self.vcs, parent=self.ui)
             res = dia.startProcess(args)
             if res:
                 dia.exec()
@@ -89,6 +92,7 @@
                 self.vcs.hgGetTagsList(),
                 self.vcs.hgGetBranchesList(),
                 self.vcs.hgGetBookmarksList(),
+                parent=self.ui,
             )
             if dlg.exec() == QDialog.DialogCode.Accepted:
                 revision, noCommit, message, keyId, local, force = dlg.getData()
@@ -121,7 +125,7 @@
         for rev in revisions:
             args.append(rev)
 
-        dia = HgDialog(self.tr("Sign Revision"), self.vcs)
+        dia = HgDialog(self.tr("Sign Revision"), hg=self.vcs, parent=self.ui)
         res = dia.startProcess(args)
         if res:
             dia.exec()