eric: comparison src/eric7/Project/Project.py

-:c8df46dd566d
+:27cd57e98461
 )
 else:
 fn1, _ext = os.path.splitext(os.path.basename(self.pfile))
 fn = os.path.join(self.getProjectManagementDir(), f"{fn1}{indicator}.esj")
-self.__sessionFile.writeFile(fn)
+self.__sessionFile.writeFile(fn, withServer=False)
 def __deleteSession(self):
 """
 Private method to delete the session file.
 """
 Private slot to display the debugger properties dialog.
 """
 from .DebuggerPropertiesDialog import DebuggerPropertiesDialog
 dlg = DebuggerPropertiesDialog(
-self, isRemote=FileSystemUtilities.isRemoteFileName(self.ppath)
+self,
+isRemote=FileSystemUtilities.isRemoteFileName(self.ppath),
+parent=self.ui,
 )
 if dlg.exec() == QDialog.DialogCode.Accepted:
 dlg.storeData()
 def getDebugProperty(self, key):
 self.tr("Add Language"),
 self.tr("You have to specify a translation pattern first."),
 )
 return
-dlg = AddLanguageDialog(self.parent())
+dlg = AddLanguageDialog(parent=self.parent())
 if dlg.exec() == QDialog.DialogCode.Accepted:
 lang = dlg.getSelectedLanguage()
 if self.__pdata["PROJECTTYPE"] in [
 "PyQt5",
 "PyQt5C",
 from .AddFileDialog import AddFileDialog
 if not startdir:
 startdir = self.ppath
-dlg = AddFileDialog(self, self.parent(), fileTypeFilter, startdir=startdir)
+dlg = AddFileDialog(
+self, parent=self.parent(), fileTypeFilter=fileTypeFilter, startdir=startdir
+)
 if dlg.exec() == QDialog.DialogCode.Accepted:
 fnames, target, isSource = dlg.getData()
 if target != "":
 isRemote = FileSystemUtilities.isRemoteFileName(target)
 for fn in fnames:
 from .AddDirectoryDialog import AddDirectoryDialog
 if not startdir:
 startdir = self.ppath
-dlg = AddDirectoryDialog(self, fileTypeFilter, self.parent(), startdir=startdir)
+dlg = AddDirectoryDialog(
+self, fileTypeFilter, parent=self.parent(), startdir=startdir
+)
 if dlg.exec() == QDialog.DialogCode.Accepted:
 filetype, source, target, recursive = dlg.getData()
 if target == "":
 EricMessageBox.critical(
 self.ui,
 if not self.checkDirty():
 return
 isRemote = self.__remoteServer.isServerConnected()
-dlg = PropertiesDialog(self, new=True, isRemote=isRemote)
+dlg = PropertiesDialog(self, new=True, isRemote=isRemote, parent=self.ui)
 if dlg.exec() == QDialog.DialogCode.Accepted:
 self.closeProject()
 # reset the auto save flag
 autoSaveProject = Preferences.getProject("AutoSaveProject")
 ),
 )
 else:
 vcores = False
 if vcores:
-codlg = VcsCommandOptionsDialog(self.vcs)
+codlg = VcsCommandOptionsDialog(
+self.vcs, parent=self.ui
+)
 if codlg.exec() == QDialog.DialogCode.Accepted:
 self.vcs.vcsSetOptions(codlg.getOptions())
 # add project file to repository
 if res == 0:
 apres = EricMessageBox.yesNo(
 self.__pdata["VCS"] = "None"
 else:
 self.__pdata["VCS"] = "None"
 self.vcs = self.initVCS()
 if self.vcs is not None:
-vcsdlg = self.vcs.vcsOptionsDialog(self, self.name)
+vcsdlg = self.vcs.vcsOptionsDialog(self, self.name, parent=self.ui)
 if vcsdlg.exec() == QDialog.DialogCode.Accepted:
 vcsDataDict = vcsdlg.getData()
 else:
 self.__pdata["VCS"] = "None"
 self.vcs = self.initVCS()
 ),
 )
 else:
 vcores = False
 if vcores:
-codlg = VcsCommandOptionsDialog(self.vcs)
+codlg = VcsCommandOptionsDialog(self.vcs, parent=self.ui)
 if codlg.exec() == QDialog.DialogCode.Accepted:
 self.vcs.vcsSetOptions(codlg.getOptions())
 # create the project in the VCS
 self.vcs.vcsSetDataFromDict(vcsDataDict)
 Private slot to display the properties dialog.
 """
 from .PropertiesDialog import PropertiesDialog
 isRemote = FileSystemUtilities.isRemoteFileName(self.ppath)
-dlg = PropertiesDialog(self, new=False, isRemote=isRemote)
+dlg = PropertiesDialog(self, new=False, isRemote=isRemote, parent=self.ui)
 if dlg.exec() == QDialog.DialogCode.Accepted:
 fileTypesDict = copy.copy(self.__pdata["FILETYPES"])
 dlg.storeData()
 self.setDirty(True)
 if self.__pdata["MAINSCRIPT"]:
 from .UserPropertiesDialog import UserPropertiesDialog
 vcsSystem = self.__pdata["VCS"] or None
 vcsSystemOverride = self.pudata["VCSOVERRIDE"] or None
-dlg = UserPropertiesDialog(self)
+dlg = UserPropertiesDialog(self, parent=self.ui)
 if dlg.exec() == QDialog.DialogCode.Accepted:
 dlg.storeData()
 if (
 (self.__pdata["VCS"] and self.__pdata["VCS"] != vcsSystem)
 """
 Private slot to display the filetype association dialog.
 """
 from .FiletypeAssociationDialog import FiletypeAssociationDialog
-dlg = FiletypeAssociationDialog(self, self.getProjectData(dataKey="FILETYPES"))
+dlg = FiletypeAssociationDialog(
+self, self.getProjectData(dataKey="FILETYPES"), parent=self.ui
+)
 if dlg.exec() == QDialog.DialogCode.Accepted:
 fileTypes = dlg.getData()
 self.setProjectData(fileTypes, dataKey="FILETYPES")
 self.setDirty(True)
 self.__reorganizeFiles()
 """
 Private slot to display the lexer association dialog.
 """
 from .LexerAssociationDialog import LexerAssociationDialog
-dlg = LexerAssociationDialog(self)
+dlg = LexerAssociationDialog(self, parent=self.ui)
 if dlg.exec() == QDialog.DialogCode.Accepted:
 dlg.transferData()
 self.setDirty(True)
 self.lexerAssociationsChanged.emit()
 ericApp().getObject("TaskViewer").regenerateProjectTasks(quiet=True)
 if restoreSession:
 # open the main script
 if self.__pdata["MAINSCRIPT"]:
-if not os.path.isabs(self.__pdata["MAINSCRIPT"]):
+ms = self.getAbsolutePath(self.__pdata["MAINSCRIPT"])
-ms = os.path.join(self.ppath, self.__pdata["MAINSCRIPT"])
-else:
-ms = self.__pdata["MAINSCRIPT"]
 self.sourceFile.emit(ms)
 # open a project session file being quiet about errors
 if reopen:
 self.__readSession(quiet=True, indicator="_tmp")
 dlg = EricListSelectionDialog(
 sorted(pkglists),
 title=self.tr("Create Plugin Archive"),
 message=self.tr("Select package lists:"),
 checkBoxSelection=True,
+parent=self.ui,
 )
 if dlg.exec() == QDialog.DialogCode.Accepted:
 selectedLists = [
 os.path.join(self.ppath, s) for s in dlg.getSelection()
 ]
 """
 Private slot to create a SBOM file of the project dependencies.
 """
 from eric7 import CycloneDXInterface
-CycloneDXInterface.createCycloneDXFile("<project>")
+CycloneDXInterface.createCycloneDXFile("<project>", parent=self.ui)
 #########################################################################
 ## Below are methods implementing the 'Code Formatting' support
 #########################################################################
 BlackConfigurationDialog,
 )
 from eric7.CodeFormatting.BlackFormattingDialog import BlackFormattingDialog
 if ericApp().getObject("ViewManager").checkAllDirty():
-dlg = BlackConfigurationDialog(withProject=True)
+dlg = BlackConfigurationDialog(withProject=True, parent=self.ui)
 if dlg.exec() == QDialog.DialogCode.Accepted:
 config = dlg.getConfiguration(saveToProject=True)
 formattingDialog = BlackFormattingDialog(
 config,
 self.getProjectFiles("SOURCES", normalized=True),
 project=self,
 action=action,
+parent=self.ui,
 )
 formattingDialog.exec()
 @pyqtSlot()
 def __configureBlack(self):
 """
 from eric7.CodeFormatting.BlackConfigurationDialog import (
 BlackConfigurationDialog,
 )
-dlg = BlackConfigurationDialog(withProject=True, onlyProject=True)
+dlg = BlackConfigurationDialog(
+withProject=True, onlyProject=True, parent=self.ui
+)
 if dlg.exec() == QDialog.DialogCode.Accepted:
 dlg.getConfiguration(saveToProject=True)
 # The data is saved to the project as a side effect.
 def __performImportSortingWithIsort(self, action):
 IsortConfigurationDialog,
 )
 from eric7.CodeFormatting.IsortFormattingDialog import IsortFormattingDialog
 if ericApp().getObject("ViewManager").checkAllDirty():
-dlg = IsortConfigurationDialog(withProject=True)
+dlg = IsortConfigurationDialog(withProject=True, parent=self.ui)
 if dlg.exec() == QDialog.DialogCode.Accepted:
 config = dlg.getConfiguration(saveToProject=True)
 isortDialog = IsortFormattingDialog(
 config,
 self.getProjectFiles("SOURCES", normalized=True),
 project=self,
 action=action,
+parent=self.ui,
 )
 isortDialog.exec()
 @pyqtSlot()
 def __configureIsort(self):
 """
 from eric7.CodeFormatting.IsortConfigurationDialog import (
 IsortConfigurationDialog,
 )
-dlg = IsortConfigurationDialog(withProject=True, onlyProject=True)
+dlg = IsortConfigurationDialog(
+withProject=True, onlyProject=True, parent=self.ui
+)
 if dlg.exec() == QDialog.DialogCode.Accepted:
 dlg.getConfiguration(saveToProject=True)
 # The data is saved to the project as a side effect.
 #########################################################################
 )
 environmentPath = self.__findEmbeddedEnvironment()
 if force or upgrade or not environmentPath:
 dlg = ProjectVenvCreationParametersDialog(
-withSystemSitePackages=self.__venvConfiguration["system_site_packages"]
+withSystemSitePackages=self.__venvConfiguration["system_site_packages"],
+parent=self.ui,
 )
 if dlg.exec() != QDialog.DialogCode.Accepted:
 # user canceled the environment creation
 self.__setEmbeddedEnvironmentProjectConfig(False)
 return
 if os.path.exists(os.path.join(self.getProjectPath(), ".venv")):
 args.append("--clear")
 if withSystemSitePackages:
 args.append("--system-site-packages")
 args.append(configuration["targetDirectory"])
-dia = VirtualenvExecDialog(configuration, None)
+dia = VirtualenvExecDialog(configuration, None, parent=self.ui)
 dia.show()
 dia.start(args)
 dia.exec()
 self.__venvConfiguration["system_site_packages"] = withSystemSitePackages
 dlg = ProjectVenvConfigurationDialog(
 self.__venvConfiguration["name"],
 environmentPath,
 self.__venvConfiguration["interpreter"],
 self.__venvConfiguration["exec_path"],
+parent=self.ui,
 )
 if dlg.exec() == QDialog.DialogCode.Accepted:
 (
 self.__venvConfiguration["interpreter"],
 self.__venvConfiguration["exec_path"],
 )
 if not connected and FileSystemUtilities.isRemoteFileName(self.ppath):
 self.closeProject(noSave=True)
 @pyqtSlot()
+def remoteConnectionAboutToDisconnect(self):
+"""
+Public slot to handle the imminent disconnect from an 'eric-ide' server.
+"""
+if FileSystemUtilities.isRemoteFileName(self.ppath):
+self.closeProject()
+@pyqtSlot()
 def __openRemoteProject(self):
 """
 Private slot to open a project of an 'eric-ide' server.
 """
 fn = EricServerFileDialog.getOpenFileName(

Mercurial Repositories > eric / file comparison

comparison: src/eric7/Project/Project.py

src/eric7/Project/Project.py