--- a/eric7/MultiProject/MultiProject.py Sat May 22 17:01:51 2021 +0200
+++ b/eric7/MultiProject/MultiProject.py Sat May 22 18:51:46 2021 +0200
@@ -18,10 +18,10 @@
from Globals import recentNameMultiProject
-from E5Gui.E5Action import E5Action, createActionGroup
-from E5Gui import E5FileDialog, E5MessageBox, E5PathPickerDialog
-from E5Gui.E5PathPickerDialog import E5PathPickerModes
-from E5Gui.E5OverrideCursor import E5OverrideCursor
+from E5Gui.EricAction import EricAction, createActionGroup
+from E5Gui import EricFileDialog, EricMessageBox, EricPathPickerDialog
+from E5Gui.EricPathPickerDialog import EricPathPickerModes
+from E5Gui.EricOverrideCursor import EricOverrideCursor
import UI.PixmapCache
@@ -229,20 +229,20 @@
"""
if os.path.splitext(fn)[1] == ".emj":
# new JSON based format
- with E5OverrideCursor():
+ with EricOverrideCursor():
res = self.__multiProjectFile.readFile(fn)
else:
# old XML based format
f = QFile(fn)
if f.open(QIODevice.OpenModeFlag.ReadOnly):
- with E5OverrideCursor():
+ with EricOverrideCursor():
from EricXML.MultiProjectReader import MultiProjectReader
reader = MultiProjectReader(f, self)
reader.readXML()
f.close()
res = not reader.hasError()
else:
- E5MessageBox.critical(
+ EricMessageBox.critical(
self.ui,
self.tr("Read Multi Project File"),
self.tr(
@@ -365,12 +365,12 @@
startdir = Preferences.getMultiProject("Workspace")
srcProject = self.__projects[uid]
srcProjectDirectory = os.path.dirname(srcProject["file"])
- dstProjectDirectory, ok = E5PathPickerDialog.getPath(
+ dstProjectDirectory, ok = EricPathPickerDialog.getPath(
self.parent(),
self.tr("Copy Project"),
self.tr("Enter directory for the new project (must not exist"
" already):"),
- mode=E5PathPickerModes.DIRECTORY_MODE,
+ mode=EricPathPickerModes.DIRECTORY_MODE,
path=srcProjectDirectory,
defaultDirectory=startdir,
)
@@ -382,7 +382,7 @@
try:
shutil.copytree(srcProjectDirectory, dstProjectDirectory)
except shutil.Error:
- E5MessageBox.critical(
+ EricMessageBox.critical(
self.parent(),
self.tr("Copy Project"),
self.tr("<p>The source project <b>{0}</b> could not"
@@ -536,7 +536,7 @@
return
if fn is None:
- fn = E5FileDialog.getOpenFileName(
+ fn = EricFileDialog.getOpenFileName(
self.parent(),
self.tr("Open Multi Project"),
Preferences.getMultiProject("Workspace") or
@@ -601,13 +601,13 @@
(Preferences.getMultiProject("Workspace") or
Utilities.getHomeDir())
)
- fn, selectedFilter = E5FileDialog.getSaveFileNameAndFilter(
+ fn, selectedFilter = EricFileDialog.getSaveFileNameAndFilter(
self.parent(),
self.tr("Save Multiproject"),
defaultPath,
self.tr("Multi Project Files (*.emj)"),
defaultFilter,
- E5FileDialog.DontConfirmOverwrite)
+ EricFileDialog.DontConfirmOverwrite)
if fn:
ext = QFileInfo(fn).suffix()
@@ -616,12 +616,12 @@
if ex:
fn += ex
if QFileInfo(fn).exists():
- res = E5MessageBox.yesNo(
+ res = EricMessageBox.yesNo(
self.parent(),
self.tr("Save File"),
self.tr("<p>The file <b>{0}</b> already exists."
" Overwrite it?</p>").format(fn),
- icon=E5MessageBox.Warning)
+ icon=EricMessageBox.Warning)
if not res:
return False
@@ -641,7 +641,7 @@
@return flag indicating whether this operation was successful (boolean)
"""
if self.isDirty():
- res = E5MessageBox.okToClearData(
+ res = EricMessageBox.okToClearData(
self.parent(),
self.tr("Close Multiproject"),
self.tr("The current multiproject has unsaved changes."),
@@ -695,7 +695,7 @@
self.actGrp1 = createActionGroup(self)
- act = E5Action(
+ act = EricAction(
self.tr('New multiproject'),
UI.PixmapCache.getIcon("multiProjectNew"),
self.tr('&New...'), 0, 0,
@@ -709,7 +709,7 @@
act.triggered.connect(self.__newMultiProject)
self.actions.append(act)
- act = E5Action(
+ act = EricAction(
self.tr('Open multiproject'),
UI.PixmapCache.getIcon("multiProjectOpen"),
self.tr('&Open...'), 0, 0,
@@ -722,7 +722,7 @@
act.triggered.connect(self.openMultiProject)
self.actions.append(act)
- self.closeAct = E5Action(
+ self.closeAct = EricAction(
self.tr('Close multiproject'),
UI.PixmapCache.getIcon("multiProjectClose"),
self.tr('&Close'), 0, 0, self, 'multi_project_close')
@@ -735,7 +735,7 @@
self.closeAct.triggered.connect(self.closeMultiProject)
self.actions.append(self.closeAct)
- self.saveAct = E5Action(
+ self.saveAct = EricAction(
self.tr('Save multiproject'),
UI.PixmapCache.getIcon("multiProjectSave"),
self.tr('&Save'), 0, 0, self, 'multi_project_save')
@@ -747,7 +747,7 @@
self.saveAct.triggered.connect(self.saveMultiProject)
self.actions.append(self.saveAct)
- self.saveasAct = E5Action(
+ self.saveasAct = EricAction(
self.tr('Save multiproject as'),
UI.PixmapCache.getIcon("multiProjectSaveAs"),
self.tr('Save &as...'), 0, 0, self,
@@ -761,7 +761,7 @@
self.saveasAct.triggered.connect(self.saveMultiProjectAs)
self.actions.append(self.saveasAct)
- self.addProjectAct = E5Action(
+ self.addProjectAct = EricAction(
self.tr('Add project to multiproject'),
UI.PixmapCache.getIcon("fileProject"),
self.tr('Add &project...'), 0, 0,
@@ -776,7 +776,7 @@
self.addProjectAct.triggered.connect(self.addNewProject)
self.actions.append(self.addProjectAct)
- self.propsAct = E5Action(
+ self.propsAct = EricAction(
self.tr('Multiproject properties'),
UI.PixmapCache.getIcon("multiProjectProps"),
self.tr('&Properties...'), 0, 0, self,
@@ -839,7 +839,7 @@
Public slot to initialize the multi project toolbar.
@param toolbarManager reference to a toolbar manager object
- (E5ToolBarManager)
+ (EricToolBarManager)
@return the toolbar generated (QToolBar)
"""
tb = QToolBar(self.tr("Multiproject"), self.ui)
@@ -923,23 +923,23 @@
"""
Public method to get a list of all actions.
- @return list of all actions (list of E5Action)
+ @return list of all actions (list of EricAction)
"""
return self.actions[:]
- def addE5Actions(self, actions):
+ def addEricActions(self, actions):
"""
Public method to add actions to the list of actions.
- @param actions list of actions (list of E5Action)
+ @param actions list of actions (list of EricAction)
"""
self.actions.extend(actions)
- def removeE5Actions(self, actions):
+ def removeEricActions(self, actions):
"""
Public method to remove actions from the list of actions.
- @param actions list of actions (list of E5Action)
+ @param actions list of actions (list of EricAction)
"""
for act in actions:
with contextlib.suppress(ValueError):
