Mercurial Repositories > eric / file diff

--- a/eric7/VirtualEnv/VirtualenvManager.py	Sat May 22 17:01:51 2021 +0200
+++ b/eric7/VirtualEnv/VirtualenvManager.py	Sat May 22 18:51:46 2021 +0200
@@ -16,8 +16,8 @@
 from PyQt6.QtCore import pyqtSlot, pyqtSignal, QObject
 from PyQt6.QtWidgets import QDialog
 
-from E5Gui import E5MessageBox
-from E5Gui.E5Application import e5App
+from E5Gui import EricMessageBox
+from E5Gui.EricApplication import ericApp
 
 import Preferences
 
@@ -186,7 +186,7 @@
             
             if resultDict["envType"] == "conda":
                 # create the conda environment
-                conda = e5App().getObject("Conda")
+                conda = ericApp().getObject("Conda")
                 ok, prefix, interpreter = conda.createCondaEnvironment(
                     resultDict["arguments"])
                 if ok and "--dry-run" not in resultDict["arguments"]:
@@ -225,13 +225,13 @@
         @type str
         """
         if venvName in self.__virtualEnvironments:
-            ok = E5MessageBox.yesNo(
+            ok = EricMessageBox.yesNo(
                 None,
                 self.tr("Add Virtual Environment"),
                 self.tr("""A virtual environment named <b>{0}</b> exists"""
                         """ already. Shall it be replaced?""")
                 .format(venvName),
-                icon=E5MessageBox.Warning)
+                icon=EricMessageBox.Warning)
             if not ok:
                 from .VirtualenvNameDialog import VirtualenvNameDialog
                 dlg = VirtualenvNameDialog(
@@ -289,13 +289,13 @@
         @type str
         """
         if venvName not in self.__virtualEnvironments:
-            E5MessageBox.yesNo(
+            EricMessageBox.yesNo(
                 None,
                 self.tr("Change Virtual Environment"),
                 self.tr("""A virtual environment named <b>{0}</b> does not"""
                         """ exist. Aborting!""")
                 .format(venvName),
-                icon=E5MessageBox.Warning)
+                icon=EricMessageBox.Warning)
             return
         
         self.__virtualEnvironments[venvName] = {
@@ -340,13 +340,13 @@
         @type str
         """
         if oldVenvName not in self.__virtualEnvironments:
-            E5MessageBox.yesNo(
+            EricMessageBox.yesNo(
                 None,
                 self.tr("Rename Virtual Environment"),
                 self.tr("""A virtual environment named <b>{0}</b> does not"""
                         """ exist. Aborting!""")
                 .format(oldVenvName),
-                icon=E5MessageBox.Warning)
+                icon=EricMessageBox.Warning)
             return
         
         del self.__virtualEnvironments[oldVenvName]
@@ -383,7 +383,7 @@
                 for venvName in venvNames:
                     if self.__isEnvironmentDeleteable(venvName):
                         if self.isCondaEnvironment(venvName):
-                            conda = e5App().getObject("Conda")
+                            conda = ericApp().getObject("Conda")
                             path = self.__virtualEnvironments[venvName]["path"]
                             res = conda.removeCondaEnvironment(prefix=path)
                             if res: