diff -r 8a7677a63c8d -r 68ec9c3d4de5 eric7/Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py
--- a/eric7/Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py Sat May 22 17:01:51 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py Sat May 22 18:51:46 2021 +0200
@@ -14,8 +14,8 @@
from PyQt6.QtGui import QTextCursor
from PyQt6.QtWidgets import QWidget, QLineEdit, QDialogButtonBox
-from E5Gui.E5Application import e5App
-from E5Gui import E5MessageBox, E5FileDialog
+from E5Gui.EricApplication import ericApp
+from E5Gui import EricMessageBox, EricFileDialog
from .Ui_SvnDiffDialog import Ui_SvnDiffDialog
from .SvnDiffHighlighter import SvnDiffHighlighter
@@ -162,7 +162,7 @@
else:
dname, fname = self.vcs.splitPath(fn)
fnames = [fname]
- project = e5App().getObject('Project')
+ project = ericApp().getObject('Project')
if dname == project.getProjectPath():
path = ""
else:
@@ -186,7 +186,7 @@
if not procStarted:
self.inputGroup.setEnabled(False)
self.inputGroup.hide()
- E5MessageBox.critical(
+ EricMessageBox.critical(
self,
self.tr('Process Generation Error'),
self.tr(
@@ -374,13 +374,13 @@
else:
fname = self.vcs.splitPath(self.filename)[0]
- fname, selectedFilter = E5FileDialog.getSaveFileNameAndFilter(
+ fname, selectedFilter = EricFileDialog.getSaveFileNameAndFilter(
self,
self.tr("Save Diff"),
fname,
self.tr("Patch Files (*.diff)"),
None,
- E5FileDialog.DontConfirmOverwrite)
+ EricFileDialog.DontConfirmOverwrite)
if not fname:
return # user aborted
@@ -391,22 +391,22 @@
if ex:
fname += ex
if QFileInfo(fname).exists():
- res = E5MessageBox.yesNo(
+ res = EricMessageBox.yesNo(
self,
self.tr("Save Diff"),
self.tr("<p>The patch file <b>{0}</b> already exists."
" Overwrite it?</p>").format(fname),
- icon=E5MessageBox.Warning)
+ icon=EricMessageBox.Warning)
if not res:
return
fname = Utilities.toNativeSeparators(fname)
- eol = e5App().getObject("Project").getEolString()
+ eol = ericApp().getObject("Project").getEolString()
try:
with open(fname, "w", encoding="utf-8", newline="") as f:
f.write(eol.join(self.contents.toPlainText().splitlines()))
except OSError as why:
- E5MessageBox.critical(
+ EricMessageBox.critical(
self, self.tr('Save Diff'),
self.tr(
'<p>The patch file <b>{0}</b> could not be saved.'
