--- a/src/eric7/VCS/ProjectHelper.py Sun Nov 06 11:22:39 2022 +0100 +++ b/src/eric7/VCS/ProjectHelper.py Mon Nov 07 17:19:58 2022 +0100 @@ -20,8 +20,11 @@ from eric7.EricGui.EricAction import EricAction from eric7.EricWidgets import EricMessageBox from eric7.EricWidgets.EricApplication import ericApp +from eric7.Project.PropertiesDialog import PropertiesDialog from eric7.UI import Config +from .CommandOptionsDialog import VcsCommandOptionsDialog + class VcsProjectHelper(QObject): """ @@ -260,8 +263,6 @@ else: vcores = False if vcores: - from .CommandOptionsDialog import VcsCommandOptionsDialog - codlg = VcsCommandOptionsDialog(vcs) if codlg.exec() == QDialog.DialogCode.Accepted: vcs.vcsSetOptions(codlg.getOptions()) @@ -341,8 +342,6 @@ self.project.ppath = projectdir self.project.opened = True - from eric7.Project.PropertiesDialog import PropertiesDialog - dlg = PropertiesDialog(self.project, False) if dlg.exec() == QDialog.DialogCode.Accepted: dlg.storeData() @@ -484,8 +483,6 @@ else: vcores = False if vcores: - from .CommandOptionsDialog import VcsCommandOptionsDialog - codlg = VcsCommandOptionsDialog(self.project.vcs) if codlg.exec() == QDialog.DialogCode.Accepted: self.project.vcs.vcsSetOptions(codlg.getOptions()) @@ -582,8 +579,6 @@ return if self.vcs.vcsSupportCommandOptions(): - from .CommandOptionsDialog import VcsCommandOptionsDialog - codlg = VcsCommandOptionsDialog(self.vcs) if codlg.exec() == QDialog.DialogCode.Accepted: self.vcs.vcsSetOptions(codlg.getOptions()) @@ -697,12 +692,12 @@ """ Protected slot called to show some vcs information. """ + from .RepositoryInfoDialog import VcsRepositoryInfoDialog + if self.vcs is None: # just in case return - from .RepositoryInfoDialog import VcsRepositoryInfoDialog - info = self.vcs.vcsRepositoryInfos(self.project.ppath) dlg = VcsRepositoryInfoDialog(None, info) dlg.exec()