Mercurial Repositories > eric / changeset

Binary file Documentation/Help/source.qch has changed

--- a/E5Network/E5NetworkProxyFactory.py	Sun Aug 02 19:48:22 2015 +0200
+++ b/E5Network/E5NetworkProxyFactory.py	Mon Aug 03 19:24:55 2015 +0200
@@ -74,8 +74,6 @@
     """
     Class implementing a network proxy factory.
     """
-    _pacManager = None
-    
     def __init__(self):
         """
         Constructor
@@ -168,18 +166,3 @@
                     return [proxy, QNetworkProxy(QNetworkProxy.DefaultProxy)]
         else:
             return [QNetworkProxy(QNetworkProxy.NoProxy)]
-    
-    @classmethod
-    def pacManager(cls):
-        """
-        Class method to get a reference to the proxy auto-config manager.
-        
-        @return reference to the proxy auto-config manager (PacManager)
-        """
-        print("pacManager()")
-        # TODO: enable this once PacManager is implemented
-##        if cls._pacManager is None:
-##            from .Pac.PacManager import PacManager
-##            cls._pacManager = PacManager()
-##        
-##        return cls._pacManager

--- 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):
     """

--- a/Preferences/ConfigurationPages/NetworkPage.ui	Sun Aug 02 19:48:22 2015 +0200
+++ b/Preferences/ConfigurationPages/NetworkPage.ui	Mon Aug 03 19:24:55 2015 +0200
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>591</width>
-    <height>1013</height>
+    <height>789</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_5">
@@ -153,62 +153,6 @@
        </widget>
       </item>
       <item>
-       <widget class="QRadioButton" name="pacButton">
-        <property name="toolTip">
-         <string>Select to use a proxy auto configuration script</string>
-        </property>
-        <property name="text">
-         <string>Use script for automatic proxy configuration:</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <layout class="QHBoxLayout" name="horizontalLayout_4">
-        <item>
-         <spacer name="horizontalSpacer">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeType">
-           <enum>QSizePolicy::Fixed</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>20</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item>
-         <widget class="QLineEdit" name="pacUrlEdit">
-          <property name="enabled">
-           <bool>false</bool>
-          </property>
-          <property name="toolTip">
-           <string>Enter the URL of the Proxy Auto-Config (.pac) file</string>
-          </property>
-          <property name="placeholderText">
-           <string>Proxy Auto-Config (.pac) file</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QPushButton" name="pacReloadButton">
-          <property name="enabled">
-           <bool>false</bool>
-          </property>
-          <property name="toolTip">
-           <string>Press to reload the Proxy Auto-Config (.pac) file</string>
-          </property>
-          <property name="text">
-           <string>Reload</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-      <item>
        <widget class="QRadioButton" name="manualProxyButton">
         <property name="toolTip">
          <string>Select to use an application specific proxy configuration</string>
@@ -507,9 +451,6 @@
   <tabstop>cleanupSuccessfulButton</tabstop>
   <tabstop>noProxyButton</tabstop>
   <tabstop>systemProxyButton</tabstop>
-  <tabstop>pacButton</tabstop>
-  <tabstop>pacUrlEdit</tabstop>
-  <tabstop>pacReloadButton</tabstop>
   <tabstop>manualProxyButton</tabstop>
   <tabstop>httpProxyHostEdit</tabstop>
   <tabstop>httpProxyPortSpin</tabstop>
@@ -575,37 +516,5 @@
     </hint>
    </hints>
   </connection>
-  <connection>
-   <sender>pacButton</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>pacUrlEdit</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>141</x>
-     <y>339</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>138</x>
-     <y>366</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>pacButton</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>pacReloadButton</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>550</x>
-     <y>340</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>549</x>
-     <y>365</y>
-    </hint>
-   </hints>
-  </connection>
  </connections>
 </ui>

--- a/Preferences/__init__.py	Sun Aug 02 19:48:22 2015 +0200
+++ b/Preferences/__init__.py	Mon Aug 03 19:24:55 2015 +0200
@@ -187,7 +187,6 @@
         # 4 = monthly
         "UseProxy": False,
         "UseSystemProxy": True,
-        "UseProxyAutoConfiguration": False,
         "UseHttpProxyForAll": False,
         "ProxyHost/Http": "",
         "ProxyHost/Https": "",
@@ -204,7 +203,6 @@
         "ProxyType/Ftp": E5FtpProxyType.NoProxy,
         "ProxyAccount/Ftp": "",
         "ProxyExceptions": "localhost,127.0.0.,::1",
-        "ProxyPacUrl": "",
         
         "PluginRepositoryUrl6":
         "http://eric-ide.python-projects.org/plugins6/repository.xml",
@@ -1587,7 +1585,6 @@
                "CaptionShowsFilename", "ShowSplash",
                "SingleCloseButton", "SplitOrientationVertical",
                "UseProxy", "UseSystemProxy", "UseHttpProxyForAll",
-               "UseProxyAutoConfiguration",
                "TopLeftByLeft", "BottomLeftByLeft",
                "TopRightByRight", "BottomRightByRight",
                "RequestDownloadFilename",