diff -r 8a7677a63c8d -r 68ec9c3d4de5 eric7/Plugins/VcsPlugins/vcsGit/GitDiffDialog.py
--- a/eric7/Plugins/VcsPlugins/vcsGit/GitDiffDialog.py Sat May 22 17:01:51 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsGit/GitDiffDialog.py Sat May 22 18:51:46 2021 +0200
@@ -14,8 +14,8 @@
from PyQt6.QtGui import QTextCursor
from PyQt6.QtWidgets import QWidget, QDialogButtonBox
-from E5Gui import E5MessageBox, E5FileDialog
-from E5Gui.E5Application import e5App
+from E5Gui import EricMessageBox, EricFileDialog
+from E5Gui.EricApplication import ericApp
from .Ui_GitDiffDialog import Ui_GitDiffDialog
@@ -53,14 +53,14 @@
try:
# insert the search widget if it is available
- from E5Gui.E5TextEditSearchWidget import E5TextEditSearchWidget
- self.searchWidget = E5TextEditSearchWidget(self.contentsGroup)
+ from E5Gui.EricTextEditSearchWidget import EricTextEditSearchWidget
+ self.searchWidget = EricTextEditSearchWidget(self.contentsGroup)
self.searchWidget.setFocusPolicy(Qt.FocusPolicy.WheelFocus)
self.searchWidget.setObjectName("searchWidget")
self.contentsGroup.layout().insertWidget(1, self.searchWidget)
self.searchWidget.attachTextEdit(self.contents)
- self.searchWidget2 = E5TextEditSearchWidget(self.contentsGroup)
+ self.searchWidget2 = EricTextEditSearchWidget(self.contentsGroup)
self.searchWidget2.setFocusPolicy(Qt.FocusPolicy.WheelFocus)
self.searchWidget2.setObjectName("searchWidget2")
self.contentsGroup.layout().addWidget(self.searchWidget2)
@@ -170,7 +170,7 @@
procStarted = self.__diffGenerator.start(
fn, versions=versions, diffMode=diffMode, stashName=stashName)
if not procStarted:
- E5MessageBox.critical(
+ EricMessageBox.critical(
self,
self.tr('Process Generation Error'),
self.tr(
@@ -318,13 +318,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
@@ -335,23 +335,23 @@
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.contents2.toPlainText().splitlines()))
f.write(eol)
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.'
