--- a/eric7/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py Sat May 22 17:01:51 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py Sat May 22 18:51:46 2021 +0200
@@ -17,8 +17,8 @@
QTreeWidgetItem
)
-from E5Gui.E5Application import e5App
-from E5Gui import E5MessageBox
+from E5Gui.EricApplication import ericApp
+from E5Gui import EricMessageBox
from .Ui_SvnStatusDialog import Ui_SvnStatusDialog
@@ -410,7 +410,7 @@
if not procStarted:
self.inputGroup.setEnabled(False)
self.inputGroup.hide()
- E5MessageBox.critical(
+ EricMessageBox.critical(
self,
self.tr('Process Generation Error'),
self.tr(
@@ -741,7 +741,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"""
@@ -749,7 +749,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, '')
@@ -781,7 +781,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"""
@@ -791,7 +791,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()
@@ -803,7 +803,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"""
@@ -815,7 +815,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()
@@ -827,7 +827,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"""
@@ -845,7 +845,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"""
@@ -866,14 +866,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"""
@@ -889,7 +889,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"""
@@ -906,7 +906,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"""
@@ -924,7 +924,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"""
@@ -942,7 +942,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"""
@@ -959,7 +959,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(
@@ -978,7 +978,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(
