Mercurial Repositories > eric / file diff

--- a/eric7/Preferences/ConfigurationPages/NetworkPage.py	Thu May 20 19:20:50 2021 +0200
+++ b/eric7/Preferences/ConfigurationPages/NetworkPage.py	Thu May 20 19:21:36 2021 +0200
@@ -41,25 +41,25 @@
         self.downloadDirPicker.setMode(E5PathPickerModes.DIRECTORY_MODE)
         
         self.ftpProxyTypeCombo.addItem(
-            self.tr("No FTP Proxy"), E5FtpProxyType.NO_PROXY)
+            self.tr("No FTP Proxy"), E5FtpProxyType.NO_PROXY.value)
         self.ftpProxyTypeCombo.addItem(
             self.tr("No Proxy Authentication required"),
-            E5FtpProxyType.NON_AUTHORIZING)
+            E5FtpProxyType.NON_AUTHORIZING.value)
         self.ftpProxyTypeCombo.addItem(
-            self.tr("User@Server"), E5FtpProxyType.USER_SERVER)
+            self.tr("User@Server"), E5FtpProxyType.USER_SERVER.value)
         self.ftpProxyTypeCombo.addItem(
-            self.tr("SITE"), E5FtpProxyType.SITE)
+            self.tr("SITE"), E5FtpProxyType.SITE.value)
         self.ftpProxyTypeCombo.addItem(
-            self.tr("OPEN"), E5FtpProxyType.OPEN)
+            self.tr("OPEN"), E5FtpProxyType.OPEN.value)
         self.ftpProxyTypeCombo.addItem(
             self.tr("User@Proxyuser@Server"),
-            E5FtpProxyType.USER_PROXYUSER_SERVER)
+            E5FtpProxyType.USER_PROXYUSER_SERVER.value)
         self.ftpProxyTypeCombo.addItem(
-            self.tr("Proxyuser@Server"), E5FtpProxyType.PROXYUSER_SERVER)
+            self.tr("Proxyuser@Server"), E5FtpProxyType.PROXYUSER_SERVER.value)
         self.ftpProxyTypeCombo.addItem(
-            self.tr("AUTH and RESP"), E5FtpProxyType.AUTH_RESP)
+            self.tr("AUTH and RESP"), E5FtpProxyType.AUTH_RESP.value)
         self.ftpProxyTypeCombo.addItem(
-            self.tr("Bluecoat Proxy"), E5FtpProxyType.BLUECOAT)
+            self.tr("Bluecoat Proxy"), E5FtpProxyType.BLUECOAT.value)
         
         # set initial values
         self.downloadDirPicker.setText(Preferences.getUI("DownloadPath"))
@@ -85,7 +85,7 @@
             Preferences.getUI("ProxyPort/Ftp"))
         self.ftpProxyTypeCombo.setCurrentIndex(
             self.ftpProxyTypeCombo.findData(
-                Preferences.getUI("ProxyType/Ftp")))
+                Preferences.getUI("ProxyType/Ftp").value))
         self.ftpProxyUserEdit.setText(
             Preferences.getUI("ProxyUser/Ftp"))
         self.ftpProxyPasswordEdit.setText(
@@ -204,7 +204,7 @@
             self.ftpProxyPortSpin.value())
         Preferences.setUI(
             "ProxyType/Ftp",
-            self.ftpProxyTypeCombo.currentData())
+            E5FtpProxyType(self.ftpProxyTypeCombo.currentData()))
         Preferences.setUI(
             "ProxyUser/Ftp",
             self.ftpProxyUserEdit.text())
@@ -230,7 +230,7 @@
         
         @param index index of the selected item (integer)
         """
-        proxyType = self.ftpProxyTypeCombo.itemData(index)
+        proxyType = E5FtpProxyType(self.ftpProxyTypeCombo.itemData(index))
         self.ftpProxyHostEdit.setEnabled(proxyType != E5FtpProxyType.NO_PROXY)
         self.ftpProxyPortSpin.setEnabled(proxyType != E5FtpProxyType.NO_PROXY)
         self.ftpProxyUserEdit.setEnabled(