Mercurial Repositories > eric / file diff

--- a/eric7/Preferences/ConfigurationPages/NetworkPage.py	Sat May 22 12:54:57 2021 +0200
+++ b/eric7/Preferences/ConfigurationPages/NetworkPage.py	Sat May 22 16:52:45 2021 +0200
@@ -11,7 +11,7 @@
 
 from E5Gui.E5PathPicker import E5PathPickerModes
 
-from E5Network.E5Ftp import E5FtpProxyType
+from EricNetwork.EricFtp import EricFtpProxyType
 
 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_NetworkPage import Ui_NetworkPage
@@ -41,25 +41,25 @@
         self.downloadDirPicker.setMode(E5PathPickerModes.DIRECTORY_MODE)
         
         self.ftpProxyTypeCombo.addItem(
-            self.tr("No FTP Proxy"), E5FtpProxyType.NO_PROXY.value)
+            self.tr("No FTP Proxy"), EricFtpProxyType.NO_PROXY.value)
         self.ftpProxyTypeCombo.addItem(
             self.tr("No Proxy Authentication required"),
-            E5FtpProxyType.NON_AUTHORIZING.value)
+            EricFtpProxyType.NON_AUTHORIZING.value)
         self.ftpProxyTypeCombo.addItem(
-            self.tr("User@Server"), E5FtpProxyType.USER_SERVER.value)
+            self.tr("User@Server"), EricFtpProxyType.USER_SERVER.value)
         self.ftpProxyTypeCombo.addItem(
-            self.tr("SITE"), E5FtpProxyType.SITE.value)
+            self.tr("SITE"), EricFtpProxyType.SITE.value)
         self.ftpProxyTypeCombo.addItem(
-            self.tr("OPEN"), E5FtpProxyType.OPEN.value)
+            self.tr("OPEN"), EricFtpProxyType.OPEN.value)
         self.ftpProxyTypeCombo.addItem(
             self.tr("User@Proxyuser@Server"),
-            E5FtpProxyType.USER_PROXYUSER_SERVER.value)
+            EricFtpProxyType.USER_PROXYUSER_SERVER.value)
         self.ftpProxyTypeCombo.addItem(
-            self.tr("Proxyuser@Server"), E5FtpProxyType.PROXYUSER_SERVER.value)
+            self.tr("Proxyuser@Server"), EricFtpProxyType.PROXYUSER_SERVER.value)
         self.ftpProxyTypeCombo.addItem(
-            self.tr("AUTH and RESP"), E5FtpProxyType.AUTH_RESP.value)
+            self.tr("AUTH and RESP"), EricFtpProxyType.AUTH_RESP.value)
         self.ftpProxyTypeCombo.addItem(
-            self.tr("Bluecoat Proxy"), E5FtpProxyType.BLUECOAT.value)
+            self.tr("Bluecoat Proxy"), EricFtpProxyType.BLUECOAT.value)
         
         # set initial values
         self.downloadDirPicker.setText(Preferences.getUI("DownloadPath"))
@@ -204,7 +204,7 @@
             self.ftpProxyPortSpin.value())
         Preferences.setUI(
             "ProxyType/Ftp",
-            E5FtpProxyType(self.ftpProxyTypeCombo.currentData()))
+            EricFtpProxyType(self.ftpProxyTypeCombo.currentData()))
         Preferences.setUI(
             "ProxyUser/Ftp",
             self.ftpProxyUserEdit.text())
@@ -230,18 +230,18 @@
         
         @param index index of the selected item (integer)
         """
-        proxyType = E5FtpProxyType(self.ftpProxyTypeCombo.itemData(index))
-        self.ftpProxyHostEdit.setEnabled(proxyType != E5FtpProxyType.NO_PROXY)
-        self.ftpProxyPortSpin.setEnabled(proxyType != E5FtpProxyType.NO_PROXY)
+        proxyType = EricFtpProxyType(self.ftpProxyTypeCombo.itemData(index))
+        self.ftpProxyHostEdit.setEnabled(proxyType != EricFtpProxyType.NO_PROXY)
+        self.ftpProxyPortSpin.setEnabled(proxyType != EricFtpProxyType.NO_PROXY)
         self.ftpProxyUserEdit.setEnabled(
-            proxyType not in [E5FtpProxyType.NO_PROXY,
-                              E5FtpProxyType.NON_AUTHORIZING])
+            proxyType not in [EricFtpProxyType.NO_PROXY,
+                              EricFtpProxyType.NON_AUTHORIZING])
         self.ftpProxyPasswordEdit.setEnabled(
-            proxyType not in [E5FtpProxyType.NO_PROXY,
-                              E5FtpProxyType.NON_AUTHORIZING])
+            proxyType not in [EricFtpProxyType.NO_PROXY,
+                              EricFtpProxyType.NON_AUTHORIZING])
         self.ftpProxyAccountEdit.setEnabled(
-            proxyType not in [E5FtpProxyType.NO_PROXY,
-                              E5FtpProxyType.NON_AUTHORIZING])
+            proxyType not in [EricFtpProxyType.NO_PROXY,
+                              EricFtpProxyType.NON_AUTHORIZING])
     
 
 def create(dlg):