diff -r 8a7677a63c8d -r 68ec9c3d4de5 eric7/Plugins/VcsPlugins/vcsGit/GitStatusDialog.py
--- a/eric7/Plugins/VcsPlugins/vcsGit/GitStatusDialog.py Sat May 22 17:01:51 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsGit/GitStatusDialog.py Sat May 22 18:51:46 2021 +0200
@@ -19,8 +19,8 @@
QInputDialog
)
-from E5Gui.E5Application import e5App
-from E5Gui import E5MessageBox
+from E5Gui.EricApplication import ericApp
+from E5Gui import EricMessageBox
from Globals import strToQByteArray
@@ -412,7 +412,7 @@
if not procStarted:
self.inputGroup.setEnabled(False)
self.inputGroup.hide()
- E5MessageBox.critical(
+ EricMessageBox.critical(
self,
self.tr('Process Generation Error'),
self.tr(
@@ -665,7 +665,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"""
@@ -673,7 +673,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, commitAll=False, amend=amend)
@@ -706,7 +706,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"""
@@ -716,7 +716,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()
@@ -728,7 +728,7 @@
names = [os.path.join(self.dname, itm.text(self.__pathColumn))
for itm in self.__getStageableItems()]
if not names:
- E5MessageBox.information(
+ EricMessageBox.information(
self,
self.tr("Stage"),
self.tr("""There are no stageable entries"""
@@ -738,7 +738,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()
@@ -750,7 +750,7 @@
names = [os.path.join(self.dname, itm.text(self.__pathColumn))
for itm in self.__getUnstageableItems()]
if not names:
- E5MessageBox.information(
+ EricMessageBox.information(
self,
self.tr("Unstage"),
self.tr("""There are no unstageable entries"""
@@ -760,7 +760,7 @@
self.vcs.gitUnstage(names)
self.on_refreshButton_clicked()
- project = e5App().getObject("Project")
+ project = ericApp().getObject("Project")
for name in names:
project.getModel().updateVCSStatus(name)
self.vcs.checkVCSStatus()
@@ -772,7 +772,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("Forget Missing"),
self.tr("""There are no missing entries"""
@@ -789,7 +789,7 @@
names = [os.path.join(self.dname, itm.text(self.__pathColumn))
for itm in self.__getStageableItems()]
if not names:
- E5MessageBox.information(
+ EricMessageBox.information(
self,
self.tr("Revert"),
self.tr("""There are no uncommitted, unstaged changes"""
@@ -801,7 +801,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()
@@ -813,7 +813,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("Restore Missing"),
self.tr("""There are no missing entries"""
@@ -831,7 +831,7 @@
itm = self.__getConflictingItems()[0]
filename = os.path.join(self.__repodir, itm.text(self.__pathColumn))
if Utilities.MimeTypes.isTextFile(filename):
- e5App().getObject("ViewManager").getEditor(filename)
+ ericApp().getObject("ViewManager").getEditor(filename)
def __diff(self):
"""
@@ -842,7 +842,7 @@
namesS = [os.path.join(self.dname, itm.text(self.__pathColumn))
for itm in self.__getUnstageableItems()]
if not namesW and not namesS:
- E5MessageBox.information(
+ EricMessageBox.information(
self,
self.tr("Differences"),
self.tr("""There are no uncommitted changes"""
@@ -1215,7 +1215,7 @@
if cursor.hasSelection() else
self.tr("Revert hunk")
)
- res = E5MessageBox.yesNo(
+ res = EricMessageBox.yesNo(
self,
title,
self.tr("""Are you sure you want to revert the selected"""
