Mercurial Repositories > eric / file diff

diff -r b918c6c2736b -r a671918232f3 src/eric7/VCS/ProjectHelper.py
--- a/src/eric7/VCS/ProjectHelper.py	Fri Oct 25 09:47:48 2024 +0200
+++ b/src/eric7/VCS/ProjectHelper.py	Fri Oct 25 17:58:59 2024 +0200
@@ -49,6 +49,7 @@
 
         self.vcs = vcsObject
         self.project = projectObject
+        self.ui = parent
 
         self.actions = []
 
@@ -255,7 +256,7 @@
 
         vcs = self.project.initVCS(selectedVcsSystem)
         if vcs is not None:
-            vcsdlg = vcs.vcsNewProjectOptionsDialog()
+            vcsdlg = vcs.vcsNewProjectOptionsDialog(parent=self.ui)
             if vcsdlg.exec() == QDialog.DialogCode.Accepted:
                 projectdir, vcsDataDict = vcsdlg.getData()
                 # edit VCS command options
@@ -272,7 +273,7 @@
                 else:
                     vcores = False
                 if vcores:
-                    codlg = VcsCommandOptionsDialog(vcs)
+                    codlg = VcsCommandOptionsDialog(vcs, parent=self.ui)
                     if codlg.exec() == QDialog.DialogCode.Accepted:
                         vcs.vcsSetOptions(codlg.getOptions())
 
@@ -347,7 +348,9 @@
                             self.project.ppath = projectdir
                             self.project.opened = True
 
-                            dlg = PropertiesDialog(self.project, new=False)
+                            dlg = PropertiesDialog(
+                                self.project, new=False, parent=self.ui
+                            )
                             if dlg.exec() == QDialog.DialogCode.Accepted:
                                 dlg.storeData()
                                 if not self.project.getProjectData(dataKey="FILETYPES"):
@@ -480,7 +483,7 @@
             self.project.vcs = self.project.initVCS(selectedVcsSystem)
             if self.project.vcs is not None:
                 vcsdlg = self.project.vcs.vcsOptionsDialog(
-                    self.project, self.project.name, 1
+                    self.project, self.project.name, 1, parent=self.ui
                 )
                 if vcsdlg.exec() == QDialog.DialogCode.Accepted:
                     vcsDataDict = vcsdlg.getData()
@@ -500,7 +503,9 @@
                     else:
                         vcores = False
                     if vcores:
-                        codlg = VcsCommandOptionsDialog(self.project.vcs)
+                        codlg = VcsCommandOptionsDialog(
+                            self.project.vcs, parent=self.ui
+                        )
                         if codlg.exec() == QDialog.DialogCode.Accepted:
                             self.project.vcs.vcsSetOptions(codlg.getOptions())
                     self.project.setDirty(True)
@@ -596,7 +601,7 @@
             return
 
         if self.vcs.vcsSupportCommandOptions():
-            codlg = VcsCommandOptionsDialog(self.vcs)
+            codlg = VcsCommandOptionsDialog(self.vcs, parent=self.ui)
             if codlg.exec() == QDialog.DialogCode.Accepted:
                 self.vcs.vcsSetOptions(codlg.getOptions())
                 self.project.setDirty(True)
@@ -716,5 +721,5 @@
             return
 
         info = self.vcs.vcsRepositoryInfos(self.project.ppath)
-        dlg = VcsRepositoryInfoDialog(None, info)
+        dlg = VcsRepositoryInfoDialog(parent=self.ui, info=info)
         dlg.exec()