diff -r c3686b43f76b -r 773ad1f1ed22 src/eric7/MultiProject/MultiProject.py
--- a/src/eric7/MultiProject/MultiProject.py Tue Apr 04 17:26:54 2023 +0200
+++ b/src/eric7/MultiProject/MultiProject.py Wed Apr 05 11:58:22 2023 +0200
@@ -99,8 +99,7 @@
# dict of project info keyed by 'uid'; each info entry is a dictionary
# 'name' : name of the project
# 'file' : project file name
- # 'master' : flag indicating the master
- # project
+ # 'master' : flag indicating the main project
# 'description' : description of the project
# 'category' : name of the group
# 'uid' : unique identifier
@@ -315,15 +314,15 @@
self.ui, startdir=startdir, categories=self.categories, category=category
)
if dlg.exec() == QDialog.DialogCode.Accepted:
- name, filename, isMaster, description, category, uid = dlg.getData()
+ name, filename, isMain, description, category, uid = dlg.getData()
# step 1: check, if project was already added
for project in self.__projects.values():
if project["file"] == filename:
return
- # step 2: check, if master should be changed
- if isMaster:
+ # step 2: check, if main should be changed
+ if isMain:
for project in self.__projects.values():
if project["master"]:
project["master"] = False
@@ -335,7 +334,7 @@
project = {
"name": name,
"file": filename,
- "master": isMaster,
+ "master": isMain,
"description": description,
"category": category,
"uid": uid,
@@ -405,7 +404,7 @@
@param pro dictionary with the project data (string)
"""
- # step 1: check, if master should be changed
+ # step 1: check, if main should be changed
if pro["master"]:
for project in self.__projects.values():
if project["master"]:
@@ -517,14 +516,14 @@
@pyqtSlot()
@pyqtSlot(str)
- def openMultiProject(self, fn=None, openMaster=True):
+ def openMultiProject(self, fn=None, openMain=True):
"""
Public slot to open a multi project.
@param fn optional filename of the multi project file to be
read
@type str
- @param openMaster flag indicating, that the master project
+ @param openMain flag indicating, that the main project
should be opened depending on the configuration
@type bool
"""
@@ -558,10 +557,10 @@
self.multiProjectOpened.emit()
- if openMaster and Preferences.getMultiProject(
+ if openMain and Preferences.getMultiProject(
"OpenMasterAutomatically"
):
- self.__openMasterProject(False)
+ self.__openMainProject(False)
def saveMultiProject(self):
"""
@@ -1000,11 +999,11 @@
self.projectObject.openProject(filename)
self.projectOpened.emit(filename)
- def __openMasterProject(self, reopen=True):
+ def __openMainProject(self, reopen=True):
"""
- Private slot to open the master project.
+ Private slot to open the main project.
- @param reopen flag indicating, that the master project should be
+ @param reopen flag indicating, that the main project should be
reopened, if it has been opened already (boolean)
"""
for project in self.__projects.values():
@@ -1016,11 +1015,12 @@
self.openProject(project["file"])
return
- def getMasterProjectFile(self):
+ def getMainProjectFile(self):
"""
- Public method to get the filename of the master project.
+ Public method to get the filename of the main project.
- @return name of the master project file (string)
+ @return name of the main project file
+ @rtype str
"""
for project in self.__projects:
if project["master"]:
