diff -r b918c6c2736b -r a671918232f3 src/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py Fri Oct 25 09:47:48 2024 +0200
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py Fri Oct 25 17:58:59 2024 +0200
@@ -46,14 +46,16 @@
Class implementing the queues 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.qdiffDialog = None
self.qheaderDialog = None
@@ -196,7 +198,7 @@
HgQueuesNewPatchDialogMode,
)
- dlg = HgQueuesNewPatchDialog(HgQueuesNewPatchDialogMode.NEW)
+ dlg = HgQueuesNewPatchDialog(HgQueuesNewPatchDialogMode.NEW, parent=self.ui)
if dlg.exec() == QDialog.DialogCode.Accepted:
(
name,
@@ -223,7 +225,7 @@
args.append(dateStr)
args.append(name)
- dia = HgDialog(self.tr("New Patch"), self.vcs)
+ dia = HgDialog(self.tr("New Patch"), hg=self.vcs, parent=self.ui)
res = dia.startProcess(args)
if res:
dia.exec()
@@ -247,7 +249,7 @@
if editMessage:
currentMessage = self.__getCommitMessage()
dlg = HgQueuesNewPatchDialog(
- HgQueuesNewPatchDialogMode.REFRESH, currentMessage
+ HgQueuesNewPatchDialogMode.REFRESH, currentMessage, parent=self.ui
)
if dlg.exec() == QDialog.DialogCode.Accepted:
(
@@ -274,7 +276,7 @@
else:
return
- dia = HgDialog(self.tr("Update Current Patch"), self.vcs)
+ dia = HgDialog(self.tr("Update Current Patch"), hg=self.vcs, parent=self.ui)
res = dia.startProcess(args)
if res:
dia.exec()
@@ -371,7 +373,7 @@
)
return False
- dia = HgDialog(title, self.vcs)
+ dia = HgDialog(title, hg=self.vcs, parent=self.ui)
res = dia.startProcess(args)
if res:
dia.exec()
@@ -396,7 +398,7 @@
args = self.vcs.initCommand("qfinish")
args.append("--applied")
- dia = HgDialog(self.tr("Finish Applied Patches"), self.vcs)
+ dia = HgDialog(self.tr("Finish Applied Patches"), hg=self.vcs, parent=self.ui)
res = dia.startProcess(args)
if res:
dia.exec()
@@ -413,14 +415,16 @@
if patchnames:
currentPatch = self.__getCurrentPatch()
if currentPatch:
- dlg = HgQueuesRenamePatchDialog(currentPatch, patchnames)
+ dlg = HgQueuesRenamePatchDialog(
+ currentPatch, patchnames, parent=self.ui
+ )
if dlg.exec() == QDialog.DialogCode.Accepted:
newName, selectedPatch = dlg.getData()
if selectedPatch:
args.append(selectedPatch)
args.append(newName)
- dia = HgDialog(self.tr("Rename Patch"), self.vcs)
+ dia = HgDialog(self.tr("Rename Patch"), hg=self.vcs, parent=self.ui)
res = dia.startProcess(args)
if res:
dia.exec()
@@ -443,7 +447,7 @@
if ok and patch:
args.append(patch)
- dia = HgDialog(self.tr("Delete Patch"), self.vcs)
+ dia = HgDialog(self.tr("Delete Patch"), hg=self.vcs, parent=self.ui)
res = dia.startProcess(args)
if res:
dia.exec()
@@ -463,7 +467,7 @@
self.__getPatchesList(QueuePatchesListType.UNAPPLIED, withSummary=True)
)
if patchnames:
- dlg = HgQueuesFoldDialog(patchnames)
+ dlg = HgQueuesFoldDialog(patchnames, parent=self.ui)
if dlg.exec() == QDialog.DialogCode.Accepted:
message, patchesList = dlg.getData()
if message:
@@ -472,7 +476,7 @@
if patchesList:
args.extend(patchesList)
- dia = HgDialog(self.tr("Fold Patches"), self.vcs)
+ dia = HgDialog(self.tr("Fold Patches"), hg=self.vcs, parent=self.ui)
res = dia.startProcess(args)
if res:
dia.exec()
@@ -579,7 +583,10 @@
if guardsList:
activeGuardsList = self.getGuardsList(allGuards=False)
dlg = HgQueuesGuardsSelectionDialog(
- guardsList, activeGuards=activeGuardsList, listOnly=False
+ guardsList,
+ activeGuards=activeGuardsList,
+ listOnly=False,
+ parent=self.ui,
)
if dlg.exec() == QDialog.DialogCode.Accepted:
guards = dlg.getData()
@@ -587,7 +594,9 @@
args = self.vcs.initCommand("qselect")
args.extend(guards)
- dia = HgDialog(self.tr("Set Active Guards"), self.vcs)
+ dia = HgDialog(
+ self.tr("Set Active Guards"), hg=self.vcs, parent=self.ui
+ )
res = dia.startProcess(args)
if res:
dia.exec()
@@ -606,7 +615,7 @@
args = self.vcs.initCommand("qselect")
args.append("--none")
- dia = HgDialog(self.tr("Deactivate Guards"), self.vcs)
+ dia = HgDialog(self.tr("Deactivate Guards"), hg=self.vcs, parent=self.ui)
res = dia.startProcess(args)
if res:
dia.exec()
@@ -619,7 +628,9 @@
guardsList = self.getGuardsList(allGuards=False)
if guardsList:
- dlg = HgQueuesGuardsSelectionDialog(guardsList, listOnly=True)
+ dlg = HgQueuesGuardsSelectionDialog(
+ guardsList, listOnly=True, parent=self.ui
+ )
dlg.exec()
def hgQueueCreateRenameQueue(self, isCreate):
@@ -638,7 +649,11 @@
self.tr("Create New Queue") if isCreate else self.tr("Rename Active Queue")
)
dlg = HgQueuesQueueManagementDialog(
- HgQueuesQueueManagementDialogMode.NAME_INPUT, title, False, self.vcs
+ HgQueuesQueueManagementDialogMode.NAME_INPUT,
+ title,
+ False,
+ self.vcs,
+ parent=self.ui,
)
if dlg.exec() == QDialog.DialogCode.Accepted:
queueName = dlg.getData()
@@ -697,7 +712,11 @@
title = self.tr("Activate Queue")
dlg = HgQueuesQueueManagementDialog(
- HgQueuesQueueManagementDialogMode.QUEUE_INPUT, title, True, self.vcs
+ HgQueuesQueueManagementDialogMode.QUEUE_INPUT,
+ title,
+ True,
+ self.vcs,
+ parent=self.ui,
)
if dlg.exec() == QDialog.DialogCode.Accepted:
queueName = dlg.getData()
@@ -754,7 +773,11 @@
args.append("--mq")
args.append(self.vcs.getClient().getRepository())
# init is not possible with the command server
- dia = HgDialog(self.tr("Initializing new queue repository"), self.vcs)
+ dia = HgDialog(
+ self.tr("Initializing new queue repository"),
+ hg=self.vcs,
+ parent=self.ui,
+ )
res = dia.startProcess(args)
if res:
dia.exec()
