diff -r ce599998be7d -r 46651e194fbe src/eric7/Preferences/ConfigurationPages/NetworkProxyPage.py
--- a/src/eric7/Preferences/ConfigurationPages/NetworkProxyPage.py Thu Sep 26 09:48:49 2024 +0200
+++ b/src/eric7/Preferences/ConfigurationPages/NetworkProxyPage.py Thu Sep 26 15:49:36 2024 +0200
@@ -9,7 +9,7 @@
from PyQt6.QtCore import pyqtSlot
-from eric7 import Preferences
+from eric7.EricCore import EricPreferences
from eric7.EricNetwork.EricFtp import EricFtpProxyType
from .ConfigurationPageBase import ConfigurationPageBase
@@ -63,75 +63,103 @@
# set initial values
# HTTP proxy
- self.httpProxyHostEdit.setText(Preferences.getUI("ProxyHost/Http"))
- self.httpProxyPortSpin.setValue(Preferences.getUI("ProxyPort/Http"))
+ self.httpProxyHostEdit.setText(
+ EricPreferences.getNetworkProxy("ProxyHost/Http")
+ )
+ self.httpProxyPortSpin.setValue(
+ EricPreferences.getNetworkProxy("ProxyPort/Http")
+ )
# HTTPS proxy
- self.httpsProxyHostEdit.setText(Preferences.getUI("ProxyHost/Https"))
- self.httpsProxyPortSpin.setValue(Preferences.getUI("ProxyPort/Https"))
+ self.httpsProxyHostEdit.setText(
+ EricPreferences.getNetworkProxy("ProxyHost/Https")
+ )
+ self.httpsProxyPortSpin.setValue(
+ EricPreferences.getNetworkProxy("ProxyPort/Https")
+ )
# FTP proxy
- self.ftpProxyHostEdit.setText(Preferences.getUI("ProxyHost/Ftp"))
- self.ftpProxyPortSpin.setValue(Preferences.getUI("ProxyPort/Ftp"))
+ self.ftpProxyHostEdit.setText(EricPreferences.getNetworkProxy("ProxyHost/Ftp"))
+ self.ftpProxyPortSpin.setValue(EricPreferences.getNetworkProxy("ProxyPort/Ftp"))
self.ftpProxyTypeCombo.setCurrentIndex(
- self.ftpProxyTypeCombo.findData(Preferences.getUI("ProxyType/Ftp").value)
+ self.ftpProxyTypeCombo.findData(
+ EricPreferences.getNetworkProxy("ProxyType/Ftp").value
+ )
+ )
+ self.ftpProxyUserEdit.setText(EricPreferences.getNetworkProxy("ProxyUser/Ftp"))
+ self.ftpProxyPasswordEdit.setText(
+ EricPreferences.getNetworkProxy("ProxyPassword/Ftp")
)
- self.ftpProxyUserEdit.setText(Preferences.getUI("ProxyUser/Ftp"))
- self.ftpProxyPasswordEdit.setText(Preferences.getUI("ProxyPassword/Ftp"))
- self.ftpProxyAccountEdit.setText(Preferences.getUI("ProxyAccount/Ftp"))
+ self.ftpProxyAccountEdit.setText(
+ EricPreferences.getNetworkProxy("ProxyAccount/Ftp")
+ )
- self.httpProxyForAllCheckBox.setChecked(Preferences.getUI("UseHttpProxyForAll"))
- if not Preferences.getUI("UseProxy"):
+ self.httpProxyForAllCheckBox.setChecked(
+ EricPreferences.getNetworkProxy("UseHttpProxyForAll")
+ )
+ if not EricPreferences.getNetworkProxy("UseProxy"):
self.noProxyButton.setChecked(True)
- elif Preferences.getUI("UseSystemProxy"):
+ elif EricPreferences.getNetworkProxy("UseSystemProxy"):
self.systemProxyButton.setChecked(True)
else:
self.manualProxyButton.setChecked(True)
self.exceptionsEdit.setText(
- ", ".join(Preferences.getUI("ProxyExceptions").split(","))
+ ", ".join(EricPreferences.getNetworkProxy("ProxyExceptions").split(","))
)
def save(self):
"""
Public slot to save the Networj configuration.
"""
- Preferences.setUI("UseProxy", not self.noProxyButton.isChecked())
- Preferences.setUI("UseSystemProxy", self.systemProxyButton.isChecked())
- Preferences.setUI(
+ EricPreferences.setNetworkProxy("UseProxy", not self.noProxyButton.isChecked())
+ EricPreferences.setNetworkProxy(
+ "UseSystemProxy", self.systemProxyButton.isChecked()
+ )
+ EricPreferences.setNetworkProxy(
"UseHttpProxyForAll", self.httpProxyForAllCheckBox.isChecked()
)
- Preferences.setUI(
+ EricPreferences.setNetworkProxy(
"ProxyExceptions",
",".join([h.strip() for h in self.exceptionsEdit.text().split(",")]),
)
# HTTP proxy
- Preferences.setUI("ProxyHost/Http", self.httpProxyHostEdit.text())
- Preferences.setUI("ProxyPort/Http", self.httpProxyPortSpin.value())
+ EricPreferences.setNetworkProxy("ProxyHost/Http", self.httpProxyHostEdit.text())
+ EricPreferences.setNetworkProxy(
+ "ProxyPort/Http", self.httpProxyPortSpin.value()
+ )
# HTTPS proxy
- Preferences.setUI("ProxyHost/Https", self.httpsProxyHostEdit.text())
- Preferences.setUI("ProxyPort/Https", self.httpsProxyPortSpin.value())
+ EricPreferences.setNetworkProxy(
+ "ProxyHost/Https", self.httpsProxyHostEdit.text()
+ )
+ EricPreferences.setNetworkProxy(
+ "ProxyPort/Https", self.httpsProxyPortSpin.value()
+ )
# FTP proxy
- Preferences.setUI("ProxyHost/Ftp", self.ftpProxyHostEdit.text())
- Preferences.setUI("ProxyPort/Ftp", self.ftpProxyPortSpin.value())
- Preferences.setUI(
+ EricPreferences.setNetworkProxy("ProxyHost/Ftp", self.ftpProxyHostEdit.text())
+ EricPreferences.setNetworkProxy("ProxyPort/Ftp", self.ftpProxyPortSpin.value())
+ EricPreferences.setNetworkProxy(
"ProxyType/Ftp", EricFtpProxyType(self.ftpProxyTypeCombo.currentData())
)
- Preferences.setUI("ProxyUser/Ftp", self.ftpProxyUserEdit.text())
- Preferences.setUI("ProxyPassword/Ftp", self.ftpProxyPasswordEdit.text())
- Preferences.setUI("ProxyAccount/Ftp", self.ftpProxyAccountEdit.text())
+ EricPreferences.setNetworkProxy("ProxyUser/Ftp", self.ftpProxyUserEdit.text())
+ EricPreferences.setNetworkProxy(
+ "ProxyPassword/Ftp", self.ftpProxyPasswordEdit.text()
+ )
+ EricPreferences.setNetworkProxy(
+ "ProxyAccount/Ftp", self.ftpProxyAccountEdit.text()
+ )
@pyqtSlot()
def on_clearProxyPasswordsButton_clicked(self):
"""
Private slot to clear the saved HTTP(S) proxy passwords.
"""
- Preferences.setUI("ProxyPassword/Http", "")
- Preferences.setUI("ProxyPassword/Https", "")
+ EricPreferences.setNetworkProxy("ProxyPassword/Http", "")
+ EricPreferences.setNetworkProxy("ProxyPassword/Https", "")
@pyqtSlot(int)
def on_ftpProxyTypeCombo_currentIndexChanged(self, index):
