--- a/eric7/Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py Sat May 22 17:01:51 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py Sat May 22 18:51:46 2021 +0200
@@ -18,9 +18,9 @@
QTreeWidgetItem
)
-from E5Gui.E5Application import e5App
-from E5Gui import E5MessageBox
-from E5Gui.E5OverrideCursor import E5OverrideCursor
+from E5Gui.EricApplication import ericApp
+from E5Gui import EricMessageBox
+from E5Gui.EricOverrideCursor import EricOverrideCursor
from EricUtilities.EricMutexLocker import EricMutexLocker
@@ -319,7 +319,7 @@
hideHistoryColumn = True
hideSwitchedColumn = True
- with E5OverrideCursor():
+ with EricOverrideCursor():
cwd = os.getcwd()
os.chdir(self.dname)
try:
@@ -645,7 +645,7 @@
names = [os.path.join(self.dname, itm.text(self.__pathColumn))
for itm in self.__getCommitableItems()]
if not names:
- E5MessageBox.information(
+ EricMessageBox.information(
self,
self.tr("Commit"),
self.tr("""There are no entries selected to be"""
@@ -653,7 +653,7 @@
return
if Preferences.getVCS("AutoSaveFiles"):
- vm = e5App().getObject("ViewManager")
+ vm = ericApp().getObject("ViewManager")
for name in names:
vm.saveEditor(name)
self.vcs.vcsCommit(names, '')
@@ -685,7 +685,7 @@
names = [os.path.join(self.dname, itm.text(self.__pathColumn))
for itm in self.__getUnversionedItems()]
if not names:
- E5MessageBox.information(
+ EricMessageBox.information(
self,
self.tr("Add"),
self.tr("""There are no unversioned entries"""
@@ -695,7 +695,7 @@
self.vcs.vcsAdd(names)
self.on_refreshButton_clicked()
- project = e5App().getObject("Project")
+ project = ericApp().getObject("Project")
for name in names:
project.getModel().updateVCSStatus(name)
self.vcs.checkVCSStatus()
@@ -707,7 +707,7 @@
names = [os.path.join(self.dname, itm.text(self.__pathColumn))
for itm in self.__getModifiedItems()]
if not names:
- E5MessageBox.information(
+ EricMessageBox.information(
self,
self.tr("Revert"),
self.tr("""There are no uncommitted changes"""
@@ -719,7 +719,7 @@
self.activateWindow()
self.on_refreshButton_clicked()
- project = e5App().getObject("Project")
+ project = ericApp().getObject("Project")
for name in names:
project.getModel().updateVCSStatus(name)
self.vcs.checkVCSStatus()
@@ -731,7 +731,7 @@
names = [os.path.join(self.dname, itm.text(self.__pathColumn))
for itm in self.__getMissingItems()]
if not names:
- E5MessageBox.information(
+ EricMessageBox.information(
self,
self.tr("Revert"),
self.tr("""There are no missing entries"""
@@ -749,7 +749,7 @@
names = [os.path.join(self.dname, itm.text(self.__pathColumn))
for itm in self.__getModifiedItems()]
if not names:
- E5MessageBox.information(
+ EricMessageBox.information(
self,
self.tr("Differences"),
self.tr("""There are no uncommitted changes"""
@@ -770,14 +770,14 @@
names = [os.path.join(self.dname, itm.text(self.__pathColumn))
for itm in self.__getModifiedItems()]
if not names:
- E5MessageBox.information(
+ EricMessageBox.information(
self,
self.tr("Side-by-Side Diff"),
self.tr("""There are no uncommitted changes"""
""" available/selected."""))
return
elif len(names) > 1:
- E5MessageBox.information(
+ EricMessageBox.information(
self,
self.tr("Side-by-Side Diff"),
self.tr("""Only one file with uncommitted changes"""
@@ -793,7 +793,7 @@
names = [os.path.join(self.dname, itm.text(self.__pathColumn))
for itm in self.__getLockActionItems(self.unlockedIndicators)]
if not names:
- E5MessageBox.information(
+ EricMessageBox.information(
self,
self.tr("Lock"),
self.tr("""There are no unlocked files"""
@@ -810,7 +810,7 @@
names = [os.path.join(self.dname, itm.text(self.__pathColumn))
for itm in self.__getLockActionItems(self.lockedIndicators)]
if not names:
- E5MessageBox.information(
+ EricMessageBox.information(
self,
self.tr("Unlock"),
self.tr("""There are no locked files"""
@@ -828,7 +828,7 @@
for itm in self.__getLockActionItems(
self.stealBreakLockIndicators)]
if not names:
- E5MessageBox.information(
+ EricMessageBox.information(
self,
self.tr("Break Lock"),
self.tr("""There are no locked files"""
@@ -846,7 +846,7 @@
for itm in self.__getLockActionItems(
self.stealBreakLockIndicators)]
if not names:
- E5MessageBox.information(
+ EricMessageBox.information(
self,
self.tr("Steal Lock"),
self.tr("""There are no locked files"""
@@ -863,7 +863,7 @@
names = [os.path.join(self.dname, itm.text(self.__pathColumn))
for itm in self.__getNonChangelistItems()]
if not names:
- E5MessageBox.information(
+ EricMessageBox.information(
self,
self.tr("Remove from Changelist"),
self.tr(
@@ -882,7 +882,7 @@
names = [os.path.join(self.dname, itm.text(self.__pathColumn))
for itm in self.__getChangelistItems()]
if not names:
- E5MessageBox.information(
+ EricMessageBox.information(
self,
self.tr("Remove from Changelist"),
self.tr(
