Mercurial Repositories > eric / file comparison
comparison: Preferences/ConfigurationPages/NetworkPage.py
Preferences/ConfigurationPages/NetworkPage.py
- changeset 4350
- 686c79ffbcff
- parent 4349
- a99dcf04f6f5
- child 4577
- e79a139aacc4
- child 4632
- ca310db386ed
equal
deleted
inserted
replaced
| 4349:a99dcf04f6f5 | 4350:686c79ffbcff |
|---|---|
| 106 Preferences.getUI("UseHttpProxyForAll")) | 106 Preferences.getUI("UseHttpProxyForAll")) |
| 107 if not Preferences.getUI("UseProxy"): | 107 if not Preferences.getUI("UseProxy"): |
| 108 self.noProxyButton.setChecked(True) | 108 self.noProxyButton.setChecked(True) |
| 109 elif Preferences.getUI("UseSystemProxy"): | 109 elif Preferences.getUI("UseSystemProxy"): |
| 110 self.systemProxyButton.setChecked(True) | 110 self.systemProxyButton.setChecked(True) |
| 111 elif Preferences.getUI("UseProxyAutoConfiguration"): | |
| 112 self.pacButton.setChecked(True) | |
| 113 else: | 111 else: |
| 114 self.manualProxyButton.setChecked(True) | 112 self.manualProxyButton.setChecked(True) |
| 115 | 113 |
| 116 self.pacUrlEdit.setText(Preferences.getUI("ProxyPacUrl")) | |
| 117 self.exceptionsEdit.setText( | 114 self.exceptionsEdit.setText( |
| 118 ", ".join(Preferences.getUI("ProxyExceptions").split(","))) | 115 ", ".join(Preferences.getUI("ProxyExceptions").split(","))) |
| 119 | 116 |
| 120 def save(self): | 117 def save(self): |
| 121 """ | 118 """ |
| 141 not self.noProxyButton.isChecked()) | 138 not self.noProxyButton.isChecked()) |
| 142 Preferences.setUI( | 139 Preferences.setUI( |
| 143 "UseSystemProxy", | 140 "UseSystemProxy", |
| 144 self.systemProxyButton.isChecked()) | 141 self.systemProxyButton.isChecked()) |
| 145 Preferences.setUI( | 142 Preferences.setUI( |
| 146 "UseProxyAutoConfiguration", | |
| 147 self.systemProxyButton.isChecked()) | |
| 148 Preferences.setUI( | |
| 149 "UseHttpProxyForAll", | 143 "UseHttpProxyForAll", |
| 150 self.httpProxyForAllCheckBox.isChecked()) | 144 self.httpProxyForAllCheckBox.isChecked()) |
| 151 | 145 |
| 152 Preferences.setUI( | |
| 153 "ProxyPacUrl", | |
| 154 self.pacUrlEdit.text()) | |
| 155 Preferences.setUI( | 146 Preferences.setUI( |
| 156 "ProxyExceptions", | 147 "ProxyExceptions", |
| 157 ",".join( | 148 ",".join( |
| 158 [h.strip() for h in self.exceptionsEdit.text().split(",")])) | 149 [h.strip() for h in self.exceptionsEdit.text().split(",")])) |
| 159 | 150 |
| 237 E5FtpProxyType.NonAuthorizing]) | 228 E5FtpProxyType.NonAuthorizing]) |
| 238 self.ftpProxyAccountEdit.setEnabled( | 229 self.ftpProxyAccountEdit.setEnabled( |
| 239 proxyType not in [E5FtpProxyType.NoProxy, | 230 proxyType not in [E5FtpProxyType.NoProxy, |
| 240 E5FtpProxyType.NonAuthorizing]) | 231 E5FtpProxyType.NonAuthorizing]) |
| 241 | 232 |
| 242 @pyqtSlot() | |
| 243 def on_pacReloadButton_clicked(self): | |
| 244 """ | |
| 245 Private slot to reload the proxy auto-configuration file. | |
| 246 """ | |
| 247 from E5Network.E5NetworkProxyFactory import E5NetworkProxyFactory | |
| 248 # TODO: switch lines once PacManager is implemented | |
| 249 E5NetworkProxyFactory.pacManager() | |
| 250 # E5NetworkProxyFactory.pacManager().downloadPacFile() | |
| 251 | |
| 252 | 233 |
| 253 def create(dlg): | 234 def create(dlg): |
| 254 """ | 235 """ |
| 255 Module function to create the configuration page. | 236 Module function to create the configuration page. |
| 256 | 237 |
