Mercurial Repositories > eric / file diff

diff -r a99dcf04f6f5 -r 686c79ffbcff Preferences/ConfigurationPages/NetworkPage.py
--- a/Preferences/ConfigurationPages/NetworkPage.py	Sun Aug 02 19:48:22 2015 +0200
+++ b/Preferences/ConfigurationPages/NetworkPage.py	Mon Aug 03 19:24:55 2015 +0200
@@ -108,12 +108,9 @@
             self.noProxyButton.setChecked(True)
         elif Preferences.getUI("UseSystemProxy"):
             self.systemProxyButton.setChecked(True)
-        elif Preferences.getUI("UseProxyAutoConfiguration"):
-            self.pacButton.setChecked(True)
         else:
             self.manualProxyButton.setChecked(True)
         
-        self.pacUrlEdit.setText(Preferences.getUI("ProxyPacUrl"))
         self.exceptionsEdit.setText(
             ", ".join(Preferences.getUI("ProxyExceptions").split(",")))
     
@@ -143,16 +140,10 @@
             "UseSystemProxy",
             self.systemProxyButton.isChecked())
         Preferences.setUI(
-            "UseProxyAutoConfiguration",
-            self.systemProxyButton.isChecked())
-        Preferences.setUI(
             "UseHttpProxyForAll",
             self.httpProxyForAllCheckBox.isChecked())
         
         Preferences.setUI(
-            "ProxyPacUrl",
-            self.pacUrlEdit.text())
-        Preferences.setUI(
             "ProxyExceptions",
             ",".join(
                 [h.strip() for h in self.exceptionsEdit.text().split(",")]))
@@ -239,16 +230,6 @@
             proxyType not in [E5FtpProxyType.NoProxy,
                               E5FtpProxyType.NonAuthorizing])
     
-    @pyqtSlot()
-    def on_pacReloadButton_clicked(self):
-        """
-        Private slot to reload the proxy auto-configuration file.
-        """
-        from E5Network.E5NetworkProxyFactory import E5NetworkProxyFactory
-        # TODO: switch lines once PacManager is implemented
-        E5NetworkProxyFactory.pacManager()
-#        E5NetworkProxyFactory.pacManager().downloadPacFile()
-    
 
 def create(dlg):
     """