diff -r 197414ba11cc -r b3eefd7e58d1 eric6/Preferences/__init__.py
--- a/eric6/Preferences/__init__.py Sat May 01 14:27:38 2021 +0200
+++ b/eric6/Preferences/__init__.py Thu Jun 03 11:39:23 2021 +0200
@@ -201,7 +201,7 @@
"ProxyPassword/Http": "",
"ProxyPassword/Https": "",
"ProxyPassword/Ftp": "",
- "ProxyType/Ftp": E5FtpProxyType.NoProxy,
+ "ProxyType/Ftp": E5FtpProxyType.NO_PROXY,
"ProxyAccount/Ftp": "",
"ProxyExceptions": "localhost,127.0.0.,::1",
@@ -1933,12 +1933,15 @@
"UI/" + key, prefClass.uiDefaults[key]))
elif key in ["TabViewManagerFilenameLength", "CaptionFilenameLength",
"ProxyPort/Http", "ProxyPort/Https", "ProxyPort/Ftp",
- "ProxyType/Ftp", "OpenOnStartup",
- "PerformVersionCheck", "RecentNumber", "NotificationTimeout",
- "SidebarDelay", "KeyboardInputInterval",
- "BackgroundServiceProcesses", "MinimumMessageTypeSeverity"]:
+ "OpenOnStartup", "PerformVersionCheck", "RecentNumber",
+ "NotificationTimeout", "SidebarDelay",
+ "KeyboardInputInterval", "BackgroundServiceProcesses",
+ "MinimumMessageTypeSeverity"]:
return int(prefClass.settings.value(
"UI/" + key, prefClass.uiDefaults[key]))
+ elif key in ["ProxyType/Ftp", ]:
+ return E5FtpProxyType(int(prefClass.settings.value(
+ "UI/" + key, prefClass.uiDefaults[key].value)))
elif key in ["ProxyPassword/Http", "ProxyPassword/Https",
"ProxyPassword/Ftp", ]:
from Utilities.crypto import pwConvert
@@ -2015,6 +2018,9 @@
"ProxyPassword/Ftp", ]:
from Utilities.crypto import pwConvert
prefClass.settings.setValue("UI/" + key, pwConvert(value, encode=True))
+ elif key in ["ProxyType/Ftp", ]:
+ # value is an enum.Enum derived item
+ prefClass.settings.setValue("UI/" + key, value.value)
else:
prefClass.settings.setValue("UI/" + key, value)
