Mercurial Repositories > eric / file diff

--- a/src/eric7/Preferences/__init__.py	Thu Sep 26 09:48:49 2024 +0200
+++ b/src/eric7/Preferences/__init__.py	Thu Sep 26 15:49:36 2024 +0200
@@ -48,16 +48,16 @@
     QWebEngineSettings = None
 
 from eric7 import EricUtilities, Globals
-from eric7.EricNetwork.EricFtp import EricFtpProxyType
+from eric7.EricCore import EricPreferences
 from eric7.EricUtilities import toBool, toByteArray, toDict, toList  # noqa
+from eric7.EricUtilities.crypto import pwConvert
+from eric7.EricUtilities.crypto.py3PBKDF2 import hashPassword
 from eric7.EricWidgets import EricFileDialog
 from eric7.EricWidgets.EricApplication import ericApp
 from eric7.EricWidgets.EricIconBar import EricIconBar
 from eric7.QScintilla.QsciScintillaCompat import QsciScintillaPrintColorMode
 from eric7.QScintilla.Shell import ShellHistoryStyle
 from eric7.SystemUtilities import OSUtilities, PythonUtilities, QtUtilities
-from eric7.Utilities.crypto import pwConvert
-from eric7.Utilities.crypto.py3PBKDF2 import hashPassword
 
 
 class Prefs:
@@ -206,24 +206,6 @@
         # 3 = weekly
         # 4 = monthly
         "DynamicOnlineCheck": True,
-        "UseProxy": False,
-        "UseSystemProxy": True,
-        "UseHttpProxyForAll": False,
-        "ProxyHost/Http": "",
-        "ProxyHost/Https": "",
-        "ProxyHost/Ftp": "",
-        "ProxyPort/Http": 80,
-        "ProxyPort/Https": 443,
-        "ProxyPort/Ftp": 21,
-        "ProxyUser/Http": "",
-        "ProxyUser/Https": "",
-        "ProxyUser/Ftp": "",
-        "ProxyPassword/Http": "",
-        "ProxyPassword/Https": "",
-        "ProxyPassword/Ftp": "",
-        "ProxyType/Ftp": EricFtpProxyType.NO_PROXY,
-        "ProxyAccount/Ftp": "",
-        "ProxyExceptions": "localhost,127.0.0.,::1",
         "PluginRepositoryUrl7": (
             "https://eric-ide.python-projects.org/plugins7/repository.xml"
         ),
@@ -1907,6 +1889,7 @@
     as well.
     """
     Prefs.settings.sync()
+    EricPreferences.syncPreferences()
 
 
 def exportPreferences():
@@ -2243,9 +2226,6 @@
         "ShowSplash",
         "SplitOrientationVertical",
         "DynamicOnlineCheck",
-        "UseProxy",
-        "UseSystemProxy",
-        "UseHttpProxyForAll",
         "RequestDownloadFilename",
         "CheckErrorLog",
         "OpenCrashSessionOnStartup",
@@ -2274,9 +2254,6 @@
     elif key in [
         "TabViewManagerFilenameLength",
         "CaptionFilenameLength",
-        "ProxyPort/Http",
-        "ProxyPort/Https",
-        "ProxyPort/Ftp",
         "OpenOnStartup",
         "PerformVersionCheck",
         "RecentNumber",
@@ -2287,20 +2264,6 @@
         "MinimumMessageTypeSeverity",
     ]:
         return int(Prefs.settings.value("UI/" + key, Prefs.uiDefaults[key]))
-    elif key in [
-        "ProxyType/Ftp",
-    ]:
-        return EricFtpProxyType(
-            int(Prefs.settings.value("UI/" + key, Prefs.uiDefaults[key].value))
-        )
-    elif key in [
-        "ProxyPassword/Http",
-        "ProxyPassword/Https",
-        "ProxyPassword/Ftp",
-    ]:
-        return pwConvert(
-            Prefs.settings.value("UI/" + key, Prefs.uiDefaults[key]), encode=False
-        )
     elif key in ("LogStdErrColour", "IconBarColor"):
         col = Prefs.settings.value("UI/" + key)
         if col is not None:
@@ -2374,17 +2337,6 @@
         Prefs.settings.setValue("UI/" + key, json.dumps(profiles))
     elif key in ("LogStdErrColour", "IconBarColor"):
         Prefs.settings.setValue("UI/" + key, value.name())
-    elif key in [
-        "ProxyPassword/Http",
-        "ProxyPassword/Https",
-        "ProxyPassword/Ftp",
-    ]:
-        Prefs.settings.setValue("UI/" + key, pwConvert(value, encode=True))
-    elif key in [
-        "ProxyType/Ftp",
-    ]:
-        # value is an enum.Enum derived item
-        Prefs.settings.setValue("UI/" + key, value.value)
     else:
         Prefs.settings.setValue("UI/" + key, value)
 
@@ -4370,21 +4322,8 @@
     @param newPassword new password
     @type str
     """
-    from eric7.Utilities.crypto import pwRecode
-
-    for key in [
-        "ProxyPassword/Http",
-        "ProxyPassword/Https",
-        "ProxyPassword/Ftp",
-    ]:
-        Prefs.settings.setValue(
-            "UI/" + key,
-            pwRecode(
-                Prefs.settings.value("UI/" + key, Prefs.uiDefaults[key]),
-                oldPassword,
-                newPassword,
-            ),
-        )
+    from eric7.EricUtilities.crypto import pwRecode
+
     for key in ["MailServerPassword"]:
         Prefs.settings.setValue(
             "User/" + key,
@@ -4406,9 +4345,12 @@
             ),
         )
 
+    EricPreferences.convertPasswords(oldPassword, newPassword)
+
 
 initPreferences(withMigration=True)
 initRecentSettings()
+EricPreferences.initPreferences()
 
 #
 # eflag: noqa = M201, M613