Mercurial Repositories > eric / file diff

--- a/eric7/Cooperation/ChatWidget.py	Sat May 22 17:01:51 2021 +0200
+++ b/eric7/Cooperation/ChatWidget.py	Sat May 22 18:51:46 2021 +0200
@@ -11,8 +11,8 @@
 from PyQt6.QtGui import QColor
 from PyQt6.QtWidgets import QWidget, QListWidgetItem, QMenu, QApplication
 
-from E5Gui.E5Application import e5App
-from E5Gui import E5MessageBox, E5FileDialog
+from E5Gui.EricApplication import ericApp
+from E5Gui import EricMessageBox, EricFileDialog
 
 from Globals import recentNameHosts
 
@@ -348,7 +348,7 @@
         self.sharingGroup.setEnabled(connected)
         
         if connected:
-            vm = e5App().getObject("ViewManager")
+            vm = ericApp().getObject("ViewManager")
             aw = vm.activeWindow()
             if aw:
                 self.checkEditorActions(aw)
@@ -404,7 +404,7 @@
         from QScintilla.Editor import Editor
         if (message.startswith(Editor.StartEditToken + Editor.Separator) or
                 message.startswith(Editor.EndEditToken + Editor.Separator)):
-            vm = e5App().getObject("ViewManager")
+            vm = ericApp().getObject("ViewManager")
             aw = vm.activeWindow()
             if aw:
                 self.checkEditorActions(aw)
@@ -550,13 +550,13 @@
         """
         txt = self.chatEdit.toPlainText()
         if txt:
-            fname, selectedFilter = E5FileDialog.getSaveFileNameAndFilter(
+            fname, selectedFilter = EricFileDialog.getSaveFileNameAndFilter(
                 self,
                 self.tr("Save Chat"),
                 "",
                 self.tr("Text Files (*.txt);;All Files (*)"),
                 None,
-                E5FileDialog.DontConfirmOverwrite)
+                EricFileDialog.DontConfirmOverwrite)
             if fname:
                 ext = QFileInfo(fname).suffix()
                 if not ext:
@@ -564,12 +564,12 @@
                     if ex:
                         fname += ex
                 if QFileInfo(fname).exists():
-                    res = E5MessageBox.yesNo(
+                    res = EricMessageBox.yesNo(
                         self,
                         self.tr("Save Chat"),
                         self.tr("<p>The 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)
@@ -578,7 +578,7 @@
                     with open(fname, "w", encoding="utf-8") as f:
                         f.write(txt)
                 except OSError as err:
-                    E5MessageBox.critical(
+                    EricMessageBox.critical(
                         self,
                         self.tr("Error saving Chat"),
                         self.tr("""<p>The chat contents could not be"""