Mercurial Repositories > eric / file comparison
comparison: src/eric7/Preferences/ConfigurationPages/NetworkProxyPage.py
src/eric7/Preferences/ConfigurationPages/NetworkProxyPage.py
- branch
- eric7
- changeset 10928
- 46651e194fbe
- parent 10518
- 1682f3203ae5
- child 11090
- f5f5f5803935
equal
deleted
inserted
replaced
| 10927:ce599998be7d | 10928:46651e194fbe |
|---|---|
| 7 Module implementing the Network configuration page. | 7 Module implementing the Network configuration page. |
| 8 """ | 8 """ |
| 9 | 9 |
| 10 from PyQt6.QtCore import pyqtSlot | 10 from PyQt6.QtCore import pyqtSlot |
| 11 | 11 |
| 12 from eric7 import Preferences | 12 from eric7.EricCore import EricPreferences |
| 13 from eric7.EricNetwork.EricFtp import EricFtpProxyType | 13 from eric7.EricNetwork.EricFtp import EricFtpProxyType |
| 14 | 14 |
| 15 from .ConfigurationPageBase import ConfigurationPageBase | 15 from .ConfigurationPageBase import ConfigurationPageBase |
| 16 from .Ui_NetworkProxyPage import Ui_NetworkProxyPage | 16 from .Ui_NetworkProxyPage import Ui_NetworkProxyPage |
| 17 | 17 |
| 61 ) | 61 ) |
| 62 | 62 |
| 63 # set initial values | 63 # set initial values |
| 64 | 64 |
| 65 # HTTP proxy | 65 # HTTP proxy |
| 66 self.httpProxyHostEdit.setText(Preferences.getUI("ProxyHost/Http")) | 66 self.httpProxyHostEdit.setText( |
| 67 self.httpProxyPortSpin.setValue(Preferences.getUI("ProxyPort/Http")) | 67 EricPreferences.getNetworkProxy("ProxyHost/Http") |
| 68 ) | |
| 69 self.httpProxyPortSpin.setValue( | |
| 70 EricPreferences.getNetworkProxy("ProxyPort/Http") | |
| 71 ) | |
| 68 | 72 |
| 69 # HTTPS proxy | 73 # HTTPS proxy |
| 70 self.httpsProxyHostEdit.setText(Preferences.getUI("ProxyHost/Https")) | 74 self.httpsProxyHostEdit.setText( |
| 71 self.httpsProxyPortSpin.setValue(Preferences.getUI("ProxyPort/Https")) | 75 EricPreferences.getNetworkProxy("ProxyHost/Https") |
| 76 ) | |
| 77 self.httpsProxyPortSpin.setValue( | |
| 78 EricPreferences.getNetworkProxy("ProxyPort/Https") | |
| 79 ) | |
| 72 | 80 |
| 73 # FTP proxy | 81 # FTP proxy |
| 74 self.ftpProxyHostEdit.setText(Preferences.getUI("ProxyHost/Ftp")) | 82 self.ftpProxyHostEdit.setText(EricPreferences.getNetworkProxy("ProxyHost/Ftp")) |
| 75 self.ftpProxyPortSpin.setValue(Preferences.getUI("ProxyPort/Ftp")) | 83 self.ftpProxyPortSpin.setValue(EricPreferences.getNetworkProxy("ProxyPort/Ftp")) |
| 76 self.ftpProxyTypeCombo.setCurrentIndex( | 84 self.ftpProxyTypeCombo.setCurrentIndex( |
| 77 self.ftpProxyTypeCombo.findData(Preferences.getUI("ProxyType/Ftp").value) | 85 self.ftpProxyTypeCombo.findData( |
| 86 EricPreferences.getNetworkProxy("ProxyType/Ftp").value | |
| 87 ) | |
| 78 ) | 88 ) |
| 79 self.ftpProxyUserEdit.setText(Preferences.getUI("ProxyUser/Ftp")) | 89 self.ftpProxyUserEdit.setText(EricPreferences.getNetworkProxy("ProxyUser/Ftp")) |
| 80 self.ftpProxyPasswordEdit.setText(Preferences.getUI("ProxyPassword/Ftp")) | 90 self.ftpProxyPasswordEdit.setText( |
| 81 self.ftpProxyAccountEdit.setText(Preferences.getUI("ProxyAccount/Ftp")) | 91 EricPreferences.getNetworkProxy("ProxyPassword/Ftp") |
| 92 ) | |
| 93 self.ftpProxyAccountEdit.setText( | |
| 94 EricPreferences.getNetworkProxy("ProxyAccount/Ftp") | |
| 95 ) | |
| 82 | 96 |
| 83 self.httpProxyForAllCheckBox.setChecked(Preferences.getUI("UseHttpProxyForAll")) | 97 self.httpProxyForAllCheckBox.setChecked( |
| 84 if not Preferences.getUI("UseProxy"): | 98 EricPreferences.getNetworkProxy("UseHttpProxyForAll") |
| 99 ) | |
| 100 if not EricPreferences.getNetworkProxy("UseProxy"): | |
| 85 self.noProxyButton.setChecked(True) | 101 self.noProxyButton.setChecked(True) |
| 86 elif Preferences.getUI("UseSystemProxy"): | 102 elif EricPreferences.getNetworkProxy("UseSystemProxy"): |
| 87 self.systemProxyButton.setChecked(True) | 103 self.systemProxyButton.setChecked(True) |
| 88 else: | 104 else: |
| 89 self.manualProxyButton.setChecked(True) | 105 self.manualProxyButton.setChecked(True) |
| 90 | 106 |
| 91 self.exceptionsEdit.setText( | 107 self.exceptionsEdit.setText( |
| 92 ", ".join(Preferences.getUI("ProxyExceptions").split(",")) | 108 ", ".join(EricPreferences.getNetworkProxy("ProxyExceptions").split(",")) |
| 93 ) | 109 ) |
| 94 | 110 |
| 95 def save(self): | 111 def save(self): |
| 96 """ | 112 """ |
| 97 Public slot to save the Networj configuration. | 113 Public slot to save the Networj configuration. |
| 98 """ | 114 """ |
| 99 Preferences.setUI("UseProxy", not self.noProxyButton.isChecked()) | 115 EricPreferences.setNetworkProxy("UseProxy", not self.noProxyButton.isChecked()) |
| 100 Preferences.setUI("UseSystemProxy", self.systemProxyButton.isChecked()) | 116 EricPreferences.setNetworkProxy( |
| 101 Preferences.setUI( | 117 "UseSystemProxy", self.systemProxyButton.isChecked() |
| 118 ) | |
| 119 EricPreferences.setNetworkProxy( | |
| 102 "UseHttpProxyForAll", self.httpProxyForAllCheckBox.isChecked() | 120 "UseHttpProxyForAll", self.httpProxyForAllCheckBox.isChecked() |
| 103 ) | 121 ) |
| 104 | 122 |
| 105 Preferences.setUI( | 123 EricPreferences.setNetworkProxy( |
| 106 "ProxyExceptions", | 124 "ProxyExceptions", |
| 107 ",".join([h.strip() for h in self.exceptionsEdit.text().split(",")]), | 125 ",".join([h.strip() for h in self.exceptionsEdit.text().split(",")]), |
| 108 ) | 126 ) |
| 109 | 127 |
| 110 # HTTP proxy | 128 # HTTP proxy |
| 111 Preferences.setUI("ProxyHost/Http", self.httpProxyHostEdit.text()) | 129 EricPreferences.setNetworkProxy("ProxyHost/Http", self.httpProxyHostEdit.text()) |
| 112 Preferences.setUI("ProxyPort/Http", self.httpProxyPortSpin.value()) | 130 EricPreferences.setNetworkProxy( |
| 131 "ProxyPort/Http", self.httpProxyPortSpin.value() | |
| 132 ) | |
| 113 | 133 |
| 114 # HTTPS proxy | 134 # HTTPS proxy |
| 115 Preferences.setUI("ProxyHost/Https", self.httpsProxyHostEdit.text()) | 135 EricPreferences.setNetworkProxy( |
| 116 Preferences.setUI("ProxyPort/Https", self.httpsProxyPortSpin.value()) | 136 "ProxyHost/Https", self.httpsProxyHostEdit.text() |
| 137 ) | |
| 138 EricPreferences.setNetworkProxy( | |
| 139 "ProxyPort/Https", self.httpsProxyPortSpin.value() | |
| 140 ) | |
| 117 | 141 |
| 118 # FTP proxy | 142 # FTP proxy |
| 119 Preferences.setUI("ProxyHost/Ftp", self.ftpProxyHostEdit.text()) | 143 EricPreferences.setNetworkProxy("ProxyHost/Ftp", self.ftpProxyHostEdit.text()) |
| 120 Preferences.setUI("ProxyPort/Ftp", self.ftpProxyPortSpin.value()) | 144 EricPreferences.setNetworkProxy("ProxyPort/Ftp", self.ftpProxyPortSpin.value()) |
| 121 Preferences.setUI( | 145 EricPreferences.setNetworkProxy( |
| 122 "ProxyType/Ftp", EricFtpProxyType(self.ftpProxyTypeCombo.currentData()) | 146 "ProxyType/Ftp", EricFtpProxyType(self.ftpProxyTypeCombo.currentData()) |
| 123 ) | 147 ) |
| 124 Preferences.setUI("ProxyUser/Ftp", self.ftpProxyUserEdit.text()) | 148 EricPreferences.setNetworkProxy("ProxyUser/Ftp", self.ftpProxyUserEdit.text()) |
| 125 Preferences.setUI("ProxyPassword/Ftp", self.ftpProxyPasswordEdit.text()) | 149 EricPreferences.setNetworkProxy( |
| 126 Preferences.setUI("ProxyAccount/Ftp", self.ftpProxyAccountEdit.text()) | 150 "ProxyPassword/Ftp", self.ftpProxyPasswordEdit.text() |
| 151 ) | |
| 152 EricPreferences.setNetworkProxy( | |
| 153 "ProxyAccount/Ftp", self.ftpProxyAccountEdit.text() | |
| 154 ) | |
| 127 | 155 |
| 128 @pyqtSlot() | 156 @pyqtSlot() |
| 129 def on_clearProxyPasswordsButton_clicked(self): | 157 def on_clearProxyPasswordsButton_clicked(self): |
| 130 """ | 158 """ |
| 131 Private slot to clear the saved HTTP(S) proxy passwords. | 159 Private slot to clear the saved HTTP(S) proxy passwords. |
| 132 """ | 160 """ |
| 133 Preferences.setUI("ProxyPassword/Http", "") | 161 EricPreferences.setNetworkProxy("ProxyPassword/Http", "") |
| 134 Preferences.setUI("ProxyPassword/Https", "") | 162 EricPreferences.setNetworkProxy("ProxyPassword/Https", "") |
| 135 | 163 |
| 136 @pyqtSlot(int) | 164 @pyqtSlot(int) |
| 137 def on_ftpProxyTypeCombo_currentIndexChanged(self, index): | 165 def on_ftpProxyTypeCombo_currentIndexChanged(self, index): |
| 138 """ | 166 """ |
| 139 Private slot handling the selection of a proxy type. | 167 Private slot handling the selection of a proxy type. |
