diff -r 136eb25e4314 -r 5cb87968aad5 Preferences/__init__.py
--- a/Preferences/__init__.py Sat Sep 29 12:45:07 2012 +0200
+++ b/Preferences/__init__.py Sat Sep 29 18:37:03 2012 +0200
@@ -28,6 +28,7 @@
from PyQt4.Qsci import QsciScintilla
from E5Gui import E5FileDialog
+from E5Network.E5Ftp import E5FtpProxyType
import QScintilla.Lexers
@@ -186,6 +187,8 @@
"ProxyPassword/Http": "",
"ProxyPassword/Https": "",
"ProxyPassword/Ftp": "",
+ "ProxyType/Ftp": E5FtpProxyType.NoProxy,
+ "ProxyAccount/Ftp": "",
"PluginRepositoryUrl5": \
"http://eric-ide.python-projects.org/plugins5/repository.xml",
@@ -1307,7 +1310,7 @@
prefClass.uiDefaults[key]))
elif key in ["TabViewManagerFilenameLength", "CaptionFilenameLength",
"ProxyPort/Http", "ProxyPort/Https", "ProxyPort/Ftp",
- "OpenOnStartup",
+ "ProxyType/Ftp", "OpenOnStartup",
"PerformVersionCheck", "RecentNumber", ]:
return int(prefClass.settings.value("UI/" + key,
prefClass.uiDefaults[key]))
