--- a/eric7/VCS/ProjectHelper.py Sat May 22 17:01:51 2021 +0200
+++ b/eric7/VCS/ProjectHelper.py Sat May 22 18:51:46 2021 +0200
@@ -14,9 +14,9 @@
from PyQt6.QtCore import pyqtSlot, QDir, QFileInfo, QObject, QCoreApplication
from PyQt6.QtWidgets import QDialog, QInputDialog, QToolBar
-from E5Gui.E5Action import E5Action
-from E5Gui import E5MessageBox
-from E5Gui.E5Application import e5App
+from E5Gui.EricAction import EricAction
+from E5Gui import EricMessageBox
+from E5Gui.EricApplication import ericApp
import Preferences
import UI.PixmapCache
@@ -63,7 +63,7 @@
"""
Public method to generate the action objects.
"""
- self.vcsNewAct = E5Action(
+ self.vcsNewAct = EricAction(
QCoreApplication.translate(
"VcsProjectHelper", 'New from repository'),
UI.PixmapCache.getIcon("vcsCheckout"),
@@ -83,7 +83,7 @@
self.vcsNewAct.triggered.connect(self._vcsCheckout)
self.actions.append(self.vcsNewAct)
- self.vcsExportAct = E5Action(
+ self.vcsExportAct = EricAction(
QCoreApplication.translate(
"VcsProjectHelper", 'Export from repository'),
UI.PixmapCache.getIcon("vcsExport"),
@@ -102,7 +102,7 @@
self.vcsExportAct.triggered.connect(self._vcsExport)
self.actions.append(self.vcsExportAct)
- self.vcsAddAct = E5Action(
+ self.vcsAddAct = EricAction(
QCoreApplication.translate(
"VcsProjectHelper", 'Add to repository'),
UI.PixmapCache.getIcon("vcsCommit"),
@@ -142,7 +142,7 @@
@param ui reference to the main window (UserInterface)
@param toolbarManager reference to a toolbar manager object
- (E5ToolBarManager)
+ (EricToolBarManager)
@return the toolbar generated (QToolBar)
"""
return None # __IGNORE_WARNING_M831__
@@ -153,7 +153,7 @@
@param ui reference to the main window (UserInterface)
@param toolbarManager reference to a toolbar manager object
- (E5ToolBarManager)
+ (EricToolBarManager)
@return the toolbar generated (QToolBar)
"""
tb = QToolBar(QCoreApplication.translate("VcsProjectHelper", "VCS"),
@@ -189,7 +189,7 @@
if not self.project or not self.project.checkDirty():
return
- vcsSystemsDict = e5App().getObject(
+ vcsSystemsDict = ericApp().getObject(
"PluginManager").getPluginDisplayStrings("version_control")
if not vcsSystemsDict:
# no version control system found
@@ -226,7 +226,7 @@
projectdir, vcsDataDict = vcsdlg.getData()
# edit VCS command options
if vcs.vcsSupportCommandOptions():
- vcores = E5MessageBox.yesNo(
+ vcores = EricMessageBox.yesNo(
self.parent(),
QCoreApplication.translate(
"VcsProjectHelper", "New Project"),
@@ -247,7 +247,7 @@
try:
os.makedirs(projectdir)
except OSError:
- E5MessageBox.critical(
+ EricMessageBox.critical(
self.parent(),
QCoreApplication.translate(
"VcsProjectHelper",
@@ -300,7 +300,7 @@
self.project.setDirty(True)
self.project.saveProject()
else:
- res = E5MessageBox.yesNo(
+ res = EricMessageBox.yesNo(
self.parent(),
QCoreApplication.translate(
"VcsProjectHelper",
@@ -337,7 +337,7 @@
self.project.saveProject()
self.project.openProject(self.project.pfile)
if not export:
- res = E5MessageBox.yesNo(
+ res = EricMessageBox.yesNo(
self.parent(),
QCoreApplication.translate(
"VcsProjectHelper",
@@ -351,7 +351,7 @@
self.project.vcs.vcsAdd(
self.project.pfile)
else:
- E5MessageBox.critical(
+ EricMessageBox.critical(
self.parent(),
QCoreApplication.translate(
"VcsProjectHelper", "New project from repository"),
@@ -395,7 +395,7 @@
pdata_vcsother = copy.deepcopy(self.project.pdata["VCSOTHERDATA"])
vcs = self.project.vcs
vcsHelper = self.project.vcsProjectHelper
- vcsSystemsDict = e5App().getObject(
+ vcsSystemsDict = ericApp().getObject(
"PluginManager").getPluginDisplayStrings("version_control")
if not vcsSystemsDict:
# no version control system found
@@ -432,7 +432,7 @@
vcsDataDict = vcsdlg.getData()
# edit VCS command options
if self.project.vcs.vcsSupportCommandOptions():
- vcores = E5MessageBox.yesNo(
+ vcores = EricMessageBox.yesNo(
self.parent(),
QCoreApplication.translate(
"VcsProjectHelper", "Import Project"),
@@ -475,7 +475,7 @@
shouldReopen = self.vcs.vcsUpdate(self.project.ppath)
if shouldReopen:
- res = E5MessageBox.yesNo(
+ res = EricMessageBox.yesNo(
self.parent(),
QCoreApplication.translate("VcsProjectHelper", "Update"),
QCoreApplication.translate(
@@ -511,7 +511,7 @@
# just in case
return
- res = E5MessageBox.yesNo(
+ res = EricMessageBox.yesNo(
self.parent(),
QCoreApplication.translate(
"VcsProjectHelper",
@@ -613,7 +613,7 @@
shouldReopen = self.vcs.vcsSwitch(self.project.ppath)
if shouldReopen:
- res = E5MessageBox.yesNo(
+ res = EricMessageBox.yesNo(
self.parent(),
QCoreApplication.translate("VcsProjectHelper", "Switch"),
QCoreApplication.translate(
