Mercurial Repositories > eric / file diff

--- a/eric7/CondaInterface/CondaPackagesWidget.py	Sat May 22 17:01:51 2021 +0200
+++ b/eric7/CondaInterface/CondaPackagesWidget.py	Sat May 22 18:51:46 2021 +0200
@@ -15,9 +15,9 @@
     QDialog
 )
 
-from E5Gui import E5FileDialog, E5MessageBox, E5TextInputDialog
-from E5Gui.E5Application import e5App
-from E5Gui.E5OverrideCursor import E5OverrideCursor
+from E5Gui import EricFileDialog, EricMessageBox, EricTextInputDialog
+from E5Gui.EricApplication import ericApp
+from E5Gui.EricOverrideCursor import EricOverrideCursor
 
 from .Ui_CondaPackagesWidget import Ui_CondaPackagesWidget
 
@@ -222,7 +222,7 @@
             self.statusLabel.show()
             self.statusLabel.setText(self.tr("Getting installed packages..."))
             
-            with E5OverrideCursor():
+            with EricOverrideCursor():
                 # 1. populate with installed packages
                 self.packagesList.setUpdatesEnabled(False)
                 installedPackages = self.__conda.getInstalledPackages(
@@ -287,7 +287,7 @@
         self.environmentsComboBox.clear()
         self.packagesList.clear()
         
-        with E5OverrideCursor():
+        with EricOverrideCursor():
             self.__populateEnvironments()
             
             index = self.environmentsComboBox.findText(
@@ -356,7 +356,7 @@
         self.searchResultList.clear()
         pattern = self.searchEdit.text()
         if pattern:
-            with E5OverrideCursor():
+            with EricOverrideCursor():
                 prefix = (
                     ""
                     if CondaInterface.condaVersion() >= (4, 4, 0) else
@@ -400,7 +400,7 @@
                     message = result["message"]
                 except KeyError:
                     message = result["error"]
-                E5MessageBox.warning(
+                EricMessageBox.warning(
                     self,
                     self.tr("Conda Search Package Error"),
                     message)
@@ -558,7 +558,7 @@
         prefix = self.environmentsComboBox.itemData(
             self.environmentsComboBox.currentIndex())
         if prefix:
-            ok, packageSpecs = E5TextInputDialog.getText(
+            ok, packageSpecs = EricTextInputDialog.getText(
                 self,
                 self.tr("Install Packages"),
                 self.tr("Package Specifications (separated by whitespace):"),
@@ -578,7 +578,7 @@
         prefix = self.environmentsComboBox.itemData(
             self.environmentsComboBox.currentIndex())
         if prefix:
-            requirements = E5FileDialog.getOpenFileNames(
+            requirements = EricFileDialog.getOpenFileNames(
                 self,
                 self.tr("Install Packages"),
                 "",
@@ -633,7 +633,7 @@
                 ok, prefix, interpreter = self.__conda.createCondaEnvironment(
                     args)
                 if ok:
-                    e5App().getObject("VirtualEnvManager").addVirtualEnv(
+                    ericApp().getObject("VirtualEnvManager").addVirtualEnv(
                         virtEnvName, prefix, interpreter, isConda=True)
     
     @pyqtSlot()
@@ -656,7 +656,7 @@
             ]
             ok, prefix, interpreter = self.__conda.createCondaEnvironment(args)
             if ok:
-                e5App().getObject("VirtualEnvManager").addVirtualEnv(
+                ericApp().getObject("VirtualEnvManager").addVirtualEnv(
                     virtEnvName, prefix, interpreter, isConda=True)
     
     @pyqtSlot()
@@ -665,7 +665,7 @@
         Private slot to delete a conda environment.
         """
         envName = self.environmentsComboBox.currentText()
-        ok = E5MessageBox.yesNo(
+        ok = EricMessageBox.yesNo(
             self,
             self.tr("Delete Environment"),
             self.tr("""<p>Shall the environment <b>{0}</b> really be"""
@@ -690,7 +690,7 @@
         
         # check, if the destination is writeable
         if not os.access(cfgFile, os.W_OK):
-            E5MessageBox.critical(
+            EricMessageBox.critical(
                 None,
                 self.tr("Edit Configuration"),
                 self.tr("""The configuration file "{0}" does not exist"""
@@ -705,7 +705,7 @@
         """
         Private slot to open the configuration page.
         """
-        e5App().getObject("UserInterface").showPreferences("condaPage")
+        ericApp().getObject("UserInterface").showPreferences("condaPage")
     
     @pyqtSlot()
     def on_recheckButton_clicked(self):