Mercurial Repositories > eric / file diff

--- a/eric7/Network/IRC/IrcChannelWidget.py	Sat May 22 17:01:51 2021 +0200
+++ b/eric7/Network/IRC/IrcChannelWidget.py	Sat May 22 18:51:46 2021 +0200
@@ -20,8 +20,8 @@
     QWidget, QListWidgetItem, QMenu, QApplication, QInputDialog, QLineEdit
 )
 
-from E5Gui import E5MessageBox, E5FileDialog
-from E5Gui.E5Application import e5App
+from E5Gui import EricMessageBox, EricFileDialog
+from E5Gui.EricApplication import ericApp
 
 from .Ui_IrcChannelWidget import Ui_IrcChannelWidget
 
@@ -253,7 +253,7 @@
         super().__init__(parent)
         self.setupUi(self)
         
-        self.__ui = e5App().getObject("UserInterface")
+        self.__ui = ericApp().getObject("UserInterface")
         self.__ircWidget = parent
         
         self.editTopicButton.setIcon(
@@ -414,7 +414,7 @@
 
         if msg.startswith("/"):
             if self.__private:
-                E5MessageBox.information(
+                EricMessageBox.information(
                     self,
                     self.tr("Send Message"),
                     self.tr(
@@ -530,7 +530,7 @@
         """
         Public method to leave the channel.
         """
-        ok = E5MessageBox.yesNo(
+        ok = EricMessageBox.yesNo(
             self,
             self.tr("Leave IRC channel"),
             self.tr(
@@ -1364,7 +1364,7 @@
                 htmlExtension = "htm"
             else:
                 htmlExtension = "html"
-            fname, selectedFilter = E5FileDialog.getSaveFileNameAndFilter(
+            fname, selectedFilter = EricFileDialog.getSaveFileNameAndFilter(
                 self,
                 self.tr("Save Messages"),
                 "",
@@ -1372,7 +1372,7 @@
                     "HTML Files (*.{0});;Text Files (*.txt);;All Files (*)")
                 .format(htmlExtension),
                 None,
-                E5FileDialog.DontConfirmOverwrite)
+                EricFileDialog.DontConfirmOverwrite)
             if fname:
                 ext = QFileInfo(fname).suffix()
                 if not ext:
@@ -1381,12 +1381,12 @@
                         fname += ex
                     ext = QFileInfo(fname).suffix()
                 if QFileInfo(fname).exists():
-                    res = E5MessageBox.yesNo(
+                    res = EricMessageBox.yesNo(
                         self,
                         self.tr("Save Messages"),
                         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)
@@ -1400,7 +1400,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 Messages"),
                         self.tr(
@@ -1483,10 +1483,10 @@
         """
         Private slot to send a private message to a specific user.
         """
-        from E5Gui import E5TextInputDialog
+        from E5Gui import EricTextInputDialog
         
         user = self.usersList.selectedItems()[0].text()
-        ok, message = E5TextInputDialog.getText(
+        ok, message = EricTextInputDialog.getText(
             self, self.tr("Send Message"),
             self.tr("Enter the message to be sent:"),
             minimumWidth=400)
@@ -1497,10 +1497,10 @@
         """
         Private slot to send a query message to a specific user.
         """
-        from E5Gui import E5TextInputDialog
+        from E5Gui import EricTextInputDialog
         
         user = self.usersList.selectedItems()[0].text()
-        ok, message = E5TextInputDialog.getText(
+        ok, message = EricTextInputDialog.getText(
             self, self.tr("Send Query"),
             self.tr("Enter the message to be sent:"),
             minimumWidth=400)
@@ -1511,10 +1511,10 @@
         """
         Private slot to send a notice message to a specific user.
         """
-        from E5Gui import E5TextInputDialog
+        from E5Gui import EricTextInputDialog
         
         user = self.usersList.selectedItems()[0].text()
-        ok, message = E5TextInputDialog.getText(
+        ok, message = EricTextInputDialog.getText(
             self, self.tr("Send Notice"),
             self.tr("Enter the message to be sent:"),
             minimumWidth=400)