Mercurial Repositories > eric / file diff

--- a/Preferences/ConfigurationPages/NetworkPage.py	Tue Oct 15 22:03:54 2013 +0200
+++ b/Preferences/ConfigurationPages/NetworkPage.py	Fri Oct 18 23:00:41 2013 +0200
@@ -38,24 +38,26 @@
         
         self.downloadDirCompleter = E5DirCompleter(self.downloadDirEdit)
         
-        self.ftpProxyTypeCombo.addItem(self.trUtf8("No FTP Proxy"),
-                                       E5FtpProxyType.NoProxy)
-        self.ftpProxyTypeCombo.addItem(self.trUtf8("No Proxy Authentication required"),
-                                       E5FtpProxyType.NonAuthorizing)
-        self.ftpProxyTypeCombo.addItem(self.trUtf8("User@Server"),
-                                       E5FtpProxyType.UserAtServer)
-        self.ftpProxyTypeCombo.addItem(self.trUtf8("SITE"),
-                                       E5FtpProxyType.Site)
-        self.ftpProxyTypeCombo.addItem(self.trUtf8("OPEN"),
-                                       E5FtpProxyType.Open)
-        self.ftpProxyTypeCombo.addItem(self.trUtf8("User@Proxyuser@Server"),
-                                       E5FtpProxyType.UserAtProxyuserAtServer)
-        self.ftpProxyTypeCombo.addItem(self.trUtf8("Proxyuser@Server"),
-                                       E5FtpProxyType.ProxyuserAtServer)
-        self.ftpProxyTypeCombo.addItem(self.trUtf8("AUTH and RESP"),
-                                       E5FtpProxyType.AuthResp)
-        self.ftpProxyTypeCombo.addItem(self.trUtf8("Bluecoat Proxy"),
-                                       E5FtpProxyType.Bluecoat)
+        self.ftpProxyTypeCombo.addItem(
+            self.trUtf8("No FTP Proxy"), E5FtpProxyType.NoProxy)
+        self.ftpProxyTypeCombo.addItem(
+            self.trUtf8("No Proxy Authentication required"),
+            E5FtpProxyType.NonAuthorizing)
+        self.ftpProxyTypeCombo.addItem(
+            self.trUtf8("User@Server"), E5FtpProxyType.UserAtServer)
+        self.ftpProxyTypeCombo.addItem(
+            self.trUtf8("SITE"), E5FtpProxyType.Site)
+        self.ftpProxyTypeCombo.addItem(
+            self.trUtf8("OPEN"), E5FtpProxyType.Open)
+        self.ftpProxyTypeCombo.addItem(
+            self.trUtf8("User@Proxyuser@Server"),
+            E5FtpProxyType.UserAtProxyuserAtServer)
+        self.ftpProxyTypeCombo.addItem(
+            self.trUtf8("Proxyuser@Server"), E5FtpProxyType.ProxyuserAtServer)
+        self.ftpProxyTypeCombo.addItem(
+            self.trUtf8("AUTH and RESP"), E5FtpProxyType.AuthResp)
+        self.ftpProxyTypeCombo.addItem(
+            self.trUtf8("Bluecoat Proxy"), E5FtpProxyType.Bluecoat)
         
         # set initial values
         self.downloadDirEdit.setText(Preferences.getUI("DownloadPath"))
@@ -193,11 +195,14 @@
         self.ftpProxyHostEdit.setEnabled(proxyType != E5FtpProxyType.NoProxy)
         self.ftpProxyPortSpin.setEnabled(proxyType != E5FtpProxyType.NoProxy)
         self.ftpProxyUserEdit.setEnabled(
-            proxyType not in [E5FtpProxyType.NoProxy, E5FtpProxyType.NonAuthorizing])
+            proxyType not in [E5FtpProxyType.NoProxy,
+                              E5FtpProxyType.NonAuthorizing])
         self.ftpProxyPasswordEdit.setEnabled(
-            proxyType not in [E5FtpProxyType.NoProxy, E5FtpProxyType.NonAuthorizing])
+            proxyType not in [E5FtpProxyType.NoProxy,
+                              E5FtpProxyType.NonAuthorizing])
         self.ftpProxyAccountEdit.setEnabled(
-            proxyType not in [E5FtpProxyType.NoProxy, E5FtpProxyType.NonAuthorizing])
+            proxyType not in [E5FtpProxyType.NoProxy,
+                              E5FtpProxyType.NonAuthorizing])
     
 
 def create(dlg):
@@ -205,6 +210,7 @@
     Module function to create the configuration page.
     
     @param dlg reference to the configuration dialog
+    @return reference to the instantiated page (ConfigurationPageBase)
     """
     page = NetworkPage()
     return page