Replaced the direct access to 'Preferences.Prefs.settings' with 'Preferences.getSettings()'. eric7

Sat, 25 Sep 2021 18:12:48 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Sat, 25 Sep 2021 18:12:48 +0200
branch
eric7
changeset 8637
394377638256
parent 8636
c0a3a6e40815
child 8638
218bc66da8c0

Replaced the direct access to 'Preferences.Prefs.settings' with 'Preferences.getSettings()'.

eric7/Debugger/CallTraceViewer.py file | annotate | diff | comparison | revisions
eric7/Debugger/DebugServer.py file | annotate | diff | comparison | revisions
eric7/Debugger/DebugUI.py file | annotate | diff | comparison | revisions
eric7/EricNetwork/EricSslCertificatesDialog.py file | annotate | diff | comparison | revisions
eric7/EricNetwork/EricSslErrorHandler.py file | annotate | diff | comparison | revisions
eric7/Network/IRC/IrcNetworkManager.py file | annotate | diff | comparison | revisions
eric7/PluginManager/PluginManager.py file | annotate | diff | comparison | revisions
eric7/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py file | annotate | diff | comparison | revisions
eric7/Plugins/PluginTranslator.py file | annotate | diff | comparison | revisions
eric7/Plugins/PluginVcsGit.py file | annotate | diff | comparison | revisions
eric7/Plugins/PluginVcsMercurial.py file | annotate | diff | comparison | revisions
eric7/Plugins/PluginVcsPySvn.py file | annotate | diff | comparison | revisions
eric7/Plugins/PluginVcsSubversion.py file | annotate | diff | comparison | revisions
eric7/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.py file | annotate | diff | comparison | revisions
eric7/Plugins/WizardPlugins/EricPluginWizard/Templates.py file | annotate | diff | comparison | revisions
eric7/Preferences/PreferencesLexer.py file | annotate | diff | comparison | revisions
eric7/Preferences/__init__.py file | annotate | diff | comparison | revisions
eric7/QScintilla/Editor.py file | annotate | diff | comparison | revisions
eric7/QScintilla/Lexers/SubstyledLexer.py file | annotate | diff | comparison | revisions
eric7/QScintilla/MiniEditor.py file | annotate | diff | comparison | revisions
eric7/QScintilla/Shell.py file | annotate | diff | comparison | revisions
eric7/QScintilla/ShellWindow.py file | annotate | diff | comparison | revisions
eric7/Snapshot/SnapWidget.py file | annotate | diff | comparison | revisions
eric7/Tools/UIPreviewer.py file | annotate | diff | comparison | revisions
eric7/UI/BrowserModel.py file | annotate | diff | comparison | revisions
eric7/UI/FindFileWidget.py file | annotate | diff | comparison | revisions
eric7/UI/SymbolsWidget.py file | annotate | diff | comparison | revisions
eric7/UI/UserInterface.py file | annotate | diff | comparison | revisions
eric7/ViewManager/ViewManager.py file | annotate | diff | comparison | revisions
eric7/VirtualEnv/VirtualenvManager.py file | annotate | diff | comparison | revisions
eric7/WebBrowser/FeaturePermissions/FeaturePermissionManager.py file | annotate | diff | comparison | revisions
eric7/WebBrowser/Network/NetworkManager.py file | annotate | diff | comparison | revisions
eric7/WebBrowser/WebBrowserLanguagesDialog.py file | annotate | diff | comparison | revisions
eric7/WebBrowser/WebBrowserPage.py file | annotate | diff | comparison | revisions
eric7/WebBrowser/WebBrowserView.py file | annotate | diff | comparison | revisions
eric7/WebBrowser/WebBrowserWebSearchWidget.py file | annotate | diff | comparison | revisions
--- a/eric7/Debugger/CallTraceViewer.py	Sat Sep 25 18:08:10 2021 +0200
+++ b/eric7/Debugger/CallTraceViewer.py	Sat Sep 25 18:12:48 2021 +0200
@@ -71,11 +71,11 @@
         self.__tracedDebuggerId = ""
         
         stopOnExit = Preferences.toBool(
-            Preferences.Prefs.settings.value("CallTrace/StopOnExit", True))
+            Preferences.getSettings().value("CallTrace/StopOnExit", True))
         self.stopCheckBox.setChecked(stopOnExit)
         
         self.__callTraceEnabled = (Preferences.toBool(
-            Preferences.Prefs.settings.value("CallTrace/Enabled", False)) and
+            Preferences.getSettings().value("CallTrace/Enabled", False)) and
             not stopOnExit)
         
         if self.__callTraceEnabled:
@@ -101,7 +101,7 @@
         self.stopTraceButton.setEnabled(enabled)
         self.startTraceButton.setEnabled(not enabled)
         self.__callTraceEnabled = enabled
-        Preferences.Prefs.settings.setValue("CallTrace/Enabled", enabled)
+        Preferences.getSettings().setValue("CallTrace/Enabled", enabled)
         
         if not enabled:
             for column in range(self.callTrace.columnCount()):
@@ -115,7 +115,7 @@
         @param checked state of the check box
         @type bool
         """
-        Preferences.Prefs.settings.setValue("CallTrace/StopOnExit", checked)
+        Preferences.getSettings().setValue("CallTrace/StopOnExit", checked)
     
     @pyqtSlot()
     def on_startTraceButton_clicked(self):
--- a/eric7/Debugger/DebugServer.py	Sat Sep 25 18:08:10 2021 +0200
+++ b/eric7/Debugger/DebugServer.py	Sat Sep 25 18:12:48 2021 +0200
@@ -242,7 +242,7 @@
         self.running = False
         self.clientProcess = None
         self.clientInterpreter = ""
-        self.clientType = Preferences.Prefs.settings.value('DebugClient/Type')
+        self.clientType = Preferences.getSettings().value('DebugClient/Type')
         if self.clientType is None:
             self.clientType = 'Python3'
         
@@ -479,7 +479,7 @@
         """
         if clType is not None and clType in self.getSupportedLanguages():
             self.clientType = clType
-            Preferences.Prefs.settings.setValue(
+            Preferences.getSettings().setValue(
                 'DebugClient/Type', self.clientType)
     
     def startClient(self, unplanned=True, clType=None, forProject=False,
--- a/eric7/Debugger/DebugUI.py	Sat Sep 25 18:08:10 2021 +0200
+++ b/eric7/Debugger/DebugUI.py	Sat Sep 25 18:12:48 2021 +0200
@@ -86,40 +86,40 @@
         self.editorOpen = False
         
         # read the saved debug info values
-        self.lastUsedVenvName = Preferences.Prefs.settings.value(
+        self.lastUsedVenvName = Preferences.getSettings().value(
             'DebugInfo/VirtualEnvironment', '')
         self.scriptsHistory = Preferences.toList(
-            Preferences.Prefs.settings.value('DebugInfo/ScriptsHistory'))
+            Preferences.getSettings().value('DebugInfo/ScriptsHistory'))
         self.argvHistory = Preferences.toList(
-            Preferences.Prefs.settings.value('DebugInfo/ArgumentsHistory'))
+            Preferences.getSettings().value('DebugInfo/ArgumentsHistory'))
         self.wdHistory = Preferences.toList(
-            Preferences.Prefs.settings.value(
+            Preferences.getSettings().value(
                 'DebugInfo/WorkingDirectoryHistory'))
         self.envHistory = Preferences.toList(
-            Preferences.Prefs.settings.value('DebugInfo/EnvironmentHistory'))
+            Preferences.getSettings().value('DebugInfo/EnvironmentHistory'))
         self.excList = Preferences.toList(
-            Preferences.Prefs.settings.value('DebugInfo/Exceptions'))
+            Preferences.getSettings().value('DebugInfo/Exceptions'))
         self.excIgnoreList = Preferences.toList(
-            Preferences.Prefs.settings.value('DebugInfo/IgnoredExceptions'))
+            Preferences.getSettings().value('DebugInfo/IgnoredExceptions'))
         self.exceptions = Preferences.toBool(
-            Preferences.Prefs.settings.value(
+            Preferences.getSettings().value(
                 'DebugInfo/ReportExceptions', True))
         self.autoClearShell = Preferences.toBool(
-            Preferences.Prefs.settings.value('DebugInfo/AutoClearShell', True))
+            Preferences.getSettings().value('DebugInfo/AutoClearShell', True))
         self.tracePython = Preferences.toBool(
-            Preferences.Prefs.settings.value('DebugInfo/TracePython', False))
+            Preferences.getSettings().value('DebugInfo/TracePython', False))
         self.autoContinue = Preferences.toBool(
-            Preferences.Prefs.settings.value('DebugInfo/AutoContinue', True))
+            Preferences.getSettings().value('DebugInfo/AutoContinue', True))
         self.enableMultiprocess = Preferences.toBool(
-            Preferences.Prefs.settings.value(
+            Preferences.getSettings().value(
                 'DebugInfo/EnableMultiprocess', False))
         self.multiprocessNoDebugHistory = Preferences.toList(
-            Preferences.Prefs.settings.value(
+            Preferences.getSettings().value(
                 'DebugInfo/MultiprocessNoDebugHistory'))
         self.overrideGlobalConfig = {
-            "enable": Preferences.toBool(Preferences.Prefs.settings.value(
+            "enable": Preferences.toBool(Preferences.getSettings().value(
                 'DebugInfo/OverrideGlobal', False)),
-            "redirect": Preferences.toBool(Preferences.Prefs.settings.value(
+            "redirect": Preferences.toBool(Preferences.getSettings().value(
                 'DebugInfo/RedirectStdinStdout', True)),
         }
         
@@ -976,15 +976,15 @@
         self.envHistory = []
         self.multiprocessNoDebugHistory = []
         
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             'DebugInfo/ScriptsHistory', self.scriptsHistory)
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             'DebugInfo/ArgumentsHistory', self.argvHistory)
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             'DebugInfo/WorkingDirectoryHistory', self.wdHistory)
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             'DebugInfo/EnvironmentHistory', self.envHistory)
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             'DebugInfo/MultiprocessNoDebugHistory',
             self.multiprocessNoDebugHistory)
         
@@ -1000,37 +1000,37 @@
         del self.wdHistory[10:]
         del self.envHistory[10:]
         
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             'DebugInfo/VirtualEnvironment', self.lastUsedVenvName)
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             'DebugInfo/ScriptsHistory', self.scriptsHistory)
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             'DebugInfo/ArgumentsHistory', self.argvHistory)
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             'DebugInfo/WorkingDirectoryHistory', self.wdHistory)
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             'DebugInfo/EnvironmentHistory', self.envHistory)
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             'DebugInfo/Exceptions', self.excList)
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             'DebugInfo/IgnoredExceptions', self.excIgnoreList)
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             'DebugInfo/ReportExceptions', self.exceptions)
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             'DebugInfo/AutoClearShell', self.autoClearShell)
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             'DebugInfo/TracePython', self.tracePython)
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             'DebugInfo/AutoContinue', self.autoContinue)
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             'DebugInfo/EnableMultiprocess', self.enableMultiprocess)
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             'DebugInfo/MultiprocessNoDebugHistory',
             self.multiprocessNoDebugHistory)
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             'DebugInfo/OverrideGlobal',
             self.overrideGlobalConfig["enable"])
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             'DebugInfo/RedirectStdinStdout',
             self.overrideGlobalConfig["redirect"])
         
--- a/eric7/EricNetwork/EricSslCertificatesDialog.py	Sat Sep 25 18:08:10 2021 +0200
+++ b/eric7/EricNetwork/EricSslCertificatesDialog.py	Sat Sep 25 18:12:48 2021 +0200
@@ -69,7 +69,7 @@
         Private slot to populate the server certificates tree.
         """
         certificateDict = Globals.toDict(
-            Preferences.Prefs.settings.value("Ssl/CaCertificatesDict"))
+            Preferences.getSettings().value("Ssl/CaCertificatesDict"))
         for server in certificateDict:
             for cert in QSslCertificate.fromData(certificateDict[server]):
                 self.__createServerCertificateEntry(server, cert)
@@ -172,7 +172,7 @@
             
             # delete the certificate from the user certificate store
             certificateDict = Globals.toDict(
-                Preferences.Prefs.settings.value("Ssl/CaCertificatesDict"))
+                Preferences.getSettings().value("Ssl/CaCertificatesDict"))
             if server in certificateDict:
                 certs = [c.toPem() for c in
                          QSslCertificate.fromData(certificateDict[server])]
@@ -185,7 +185,7 @@
                     certificateDict[server] = pems
                 else:
                     del certificateDict[server]
-            Preferences.Prefs.settings.setValue(
+            Preferences.getSettings().setValue(
                 "Ssl/CaCertificatesDict",
                 certificateDict)
             
@@ -201,7 +201,7 @@
         if certs:
             server = "*"
             certificateDict = Globals.toDict(
-                Preferences.Prefs.settings.value("Ssl/CaCertificatesDict"))
+                Preferences.getSettings().value("Ssl/CaCertificatesDict"))
             if server in certificateDict:
                 sCerts = QSslCertificate.fromData(certificateDict[server])
             else:
@@ -225,7 +225,7 @@
             if server not in certificateDict:
                 certificateDict[server] = QByteArray()
             certificateDict[server].append(pems)
-            Preferences.Prefs.settings.setValue(
+            Preferences.getSettings().setValue(
                 "Ssl/CaCertificatesDict",
                 certificateDict)
             
@@ -253,7 +253,7 @@
         """
         caList = self.__getSystemCaCertificates()
         certificateDict = Globals.toDict(
-            Preferences.Prefs.settings.value("Ssl/CaCertificatesDict"))
+            Preferences.getSettings().value("Ssl/CaCertificatesDict"))
         for server in certificateDict:
             for cert in QSslCertificate.fromData(certificateDict[server]):
                 if cert not in caList:
@@ -269,7 +269,7 @@
         @return list of system certificates (list of QSslCertificate)
         """
         caList = QSslCertificate.fromData(Globals.toByteArray(
-            Preferences.Prefs.settings.value("Help/SystemCertificates")))
+            Preferences.getSettings().value("Help/SystemCertificates")))
         if not caList:
             caList = QSslSocket.systemCaCertificates()
         return caList
@@ -379,7 +379,7 @@
             pems = QByteArray()
             for cert in caCerts:
                 pems.append(cert.toPem() + '\n')
-            Preferences.Prefs.settings.setValue(
+            Preferences.getSettings().setValue(
                 "Help/SystemCertificates", pems)
             
             # delete the certificate from the default certificates
@@ -411,7 +411,7 @@
             pems = QByteArray()
             for cert in caCerts:
                 pems.append(cert.toPem() + '\n')
-            Preferences.Prefs.settings.setValue(
+            Preferences.getSettings().setValue(
                 "Help/SystemCertificates", pems)
             
             self.caCertificatesTree.clear()
--- a/eric7/EricNetwork/EricSslErrorHandler.py	Sat Sep 25 18:08:10 2021 +0200
+++ b/eric7/EricNetwork/EricSslErrorHandler.py	Sat Sep 25 18:12:48 2021 +0200
@@ -46,16 +46,16 @@
         super().__init__(parent)
         
         caList = self.__getSystemCaCertificates()
-        if Preferences.Prefs.settings.contains("Help/CaCertificatesDict"):
+        if Preferences.getSettings().contains("Help/CaCertificatesDict"):
             # port old entries stored under 'Help'
             certificateDict = Globals.toDict(
-                Preferences.Prefs.settings.value("Help/CaCertificatesDict"))
-            Preferences.Prefs.settings.setValue(
+                Preferences.getSettings().value("Help/CaCertificatesDict"))
+            Preferences.getSettings().setValue(
                 "Ssl/CaCertificatesDict", certificateDict)
-            Preferences.Prefs.settings.remove("Help/CaCertificatesDict")
+            Preferences.getSettings().remove("Help/CaCertificatesDict")
         else:
             certificateDict = Globals.toDict(
-                Preferences.Prefs.settings.value("Ssl/CaCertificatesDict"))
+                Preferences.getSettings().value("Ssl/CaCertificatesDict"))
         for server in certificateDict:
             for cert in QSslCertificate.fromData(certificateDict[server]):
                 if cert not in caList:
@@ -121,7 +121,7 @@
         """
         caMerge = {}
         certificateDict = Globals.toDict(
-            Preferences.Prefs.settings.value("Ssl/CaCertificatesDict"))
+            Preferences.getSettings().value("Ssl/CaCertificatesDict"))
         for caServer in certificateDict:
             caMerge[caServer] = QSslCertificate.fromData(
                 certificateDict[caServer])
@@ -195,7 +195,7 @@
                         for cert in caMerge[server]:
                             pems.append(cert.toPem() + b'\n')
                         certificateDict[server] = pems
-                    Preferences.Prefs.settings.setValue(
+                    Preferences.getSettings().setValue(
                         "Ssl/CaCertificatesDict",
                         certificateDict)
             
@@ -267,7 +267,7 @@
         @return list of system certificates (list of QSslCertificate)
         """
         caList = QSslCertificate.fromData(Globals.toByteArray(
-            Preferences.Prefs.settings.value("Ssl/SystemCertificates")))
+            Preferences.getSettings().value("Ssl/SystemCertificates")))
         if not caList:
             caList = QSslConfiguration.systemCaCertificates()
         return caList
--- a/eric7/Network/IRC/IrcNetworkManager.py	Sat Sep 25 18:08:10 2021 +0200
+++ b/eric7/Network/IRC/IrcNetworkManager.py	Sat Sep 25 18:12:48 2021 +0200
@@ -728,7 +728,7 @@
         self.__loaded = False
         self.__saveTimer = AutoSaver(self, self.save)
         
-        self.__settings = Preferences.Prefs.settings
+        self.__settings = Preferences.getSettings()
         
         self.__networks = {}
         self.__identities = {}
--- a/eric7/PluginManager/PluginManager.py	Sat Sep 25 18:08:10 2021 +0200
+++ b/eric7/PluginManager/PluginManager.py	Sat Sep 25 18:12:48 2021 +0200
@@ -565,7 +565,7 @@
         Public method to activate all plugins having the "autoactivate"
         attribute set to True.
         """
-        savedInactiveList = Preferences.Prefs.settings.value(
+        savedInactiveList = Preferences.getSettings().value(
             self.__inactivePluginsKey)
         inactiveList = self.__disabledPlugins[:]
         if savedInactiveList is not None:
@@ -909,7 +909,7 @@
         names = []
         for name in list(self.__inactiveModules.keys()):
             names.append(name)
-        Preferences.Prefs.settings.setValue(self.__inactivePluginsKey, names)
+        Preferences.getSettings().setValue(self.__inactivePluginsKey, names)
         
         self.shutdown.emit()
 
--- a/eric7/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py	Sat Sep 25 18:08:10 2021 +0200
+++ b/eric7/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py	Sat Sep 25 18:12:48 2021 +0200
@@ -1431,82 +1431,82 @@
         """
         Private slot to load the default configuration values.
         """
-        self.__initCategoriesList(Preferences.Prefs.settings.value(
+        self.__initCategoriesList(Preferences.getSettings().value(
             "PEP8/EnabledCheckerCategories",
             ",".join(CodeStyleCheckerDialog.checkCategories.keys())))
-        self.excludeFilesEdit.setText(Preferences.Prefs.settings.value(
+        self.excludeFilesEdit.setText(Preferences.getSettings().value(
             "PEP8/ExcludeFilePatterns", ""))
-        self.excludeMessagesEdit.setText(Preferences.Prefs.settings.value(
+        self.excludeMessagesEdit.setText(Preferences.getSettings().value(
             "PEP8/ExcludeMessages", pycodestyle.DEFAULT_IGNORE))
-        self.includeMessagesEdit.setText(Preferences.Prefs.settings.value(
+        self.includeMessagesEdit.setText(Preferences.getSettings().value(
             "PEP8/IncludeMessages", ""))
         self.repeatCheckBox.setChecked(Preferences.toBool(
-            Preferences.Prefs.settings.value("PEP8/RepeatMessages", False)))
-        self.fixIssuesEdit.setText(Preferences.Prefs.settings.value(
+            Preferences.getSettings().value("PEP8/RepeatMessages", False)))
+        self.fixIssuesEdit.setText(Preferences.getSettings().value(
             "PEP8/FixCodes", ""))
-        self.noFixIssuesEdit.setText(Preferences.Prefs.settings.value(
+        self.noFixIssuesEdit.setText(Preferences.getSettings().value(
             "PEP8/NoFixCodes", "E501"))
         self.fixIssuesCheckBox.setChecked(Preferences.toBool(
-            Preferences.Prefs.settings.value("PEP8/FixIssues", False)))
+            Preferences.getSettings().value("PEP8/FixIssues", False)))
         self.ignoredCheckBox.setChecked(Preferences.toBool(
-            Preferences.Prefs.settings.value("PEP8/ShowIgnored", False)))
-        self.lineLengthSpinBox.setValue(int(Preferences.Prefs.settings.value(
+            Preferences.getSettings().value("PEP8/ShowIgnored", False)))
+        self.lineLengthSpinBox.setValue(int(Preferences.getSettings().value(
             "PEP8/MaxLineLength", pycodestyle.MAX_LINE_LENGTH)))
         # Use MAX_LINE_LENGTH to avoid messages on existing code
         self.docLineLengthSpinBox.setValue(int(
-            Preferences.Prefs.settings.value(
+            Preferences.getSettings().value(
                 "PEP8/MaxDocLineLength", pycodestyle.MAX_LINE_LENGTH)))
         self.blankBeforeTopLevelSpinBox.setValue(
-            int(Preferences.Prefs.settings.value(
+            int(Preferences.getSettings().value(
                 "PEP8/BlankLinesBeforeTopLevel", 2)))
         self.blankBeforeMethodSpinBox.setValue(
-            int(Preferences.Prefs.settings.value(
+            int(Preferences.getSettings().value(
                 "PEP8/BlankLinesBeforeMethod", 1)))
         self.hangClosingCheckBox.setChecked(Preferences.toBool(
-            Preferences.Prefs.settings.value("PEP8/HangClosing", False)))
+            Preferences.getSettings().value("PEP8/HangClosing", False)))
         self.docTypeComboBox.setCurrentIndex(self.docTypeComboBox.findData(
-            Preferences.Prefs.settings.value("PEP8/DocstringType", "pep257")))
-        self.complexitySpinBox.setValue(int(Preferences.Prefs.settings.value(
+            Preferences.getSettings().value("PEP8/DocstringType", "pep257")))
+        self.complexitySpinBox.setValue(int(Preferences.getSettings().value(
             "PEP8/MaxCodeComplexity", 10)))
         self.lineComplexitySpinBox.setValue(
-            int(Preferences.Prefs.settings.value(
+            int(Preferences.getSettings().value(
                 "PEP8/LineComplexity", 15)))
         self.lineComplexityScoreSpinBox.setValue(
-            int(Preferences.Prefs.settings.value(
+            int(Preferences.getSettings().value(
                 "PEP8/LineComplexityScore", 10)))
-        self.encodingsEdit.setText(Preferences.Prefs.settings.value(
+        self.encodingsEdit.setText(Preferences.getSettings().value(
             "PEP8/ValidEncodings",
             MiscellaneousCheckerDefaultArgs["CodingChecker"]
         ))
         self.copyrightFileSizeSpinBox.setValue(int(
-            Preferences.Prefs.settings.value(
+            Preferences.getSettings().value(
                 "PEP8/CopyrightMinFileSize",
                 MiscellaneousCheckerDefaultArgs[
                     "CopyrightChecker"]["MinFilesize"]
             )
         ))
         self.copyrightAuthorEdit.setText(
-            Preferences.Prefs.settings.value(
+            Preferences.getSettings().value(
                 "PEP8/CopyrightAuthor",
                 MiscellaneousCheckerDefaultArgs["CopyrightChecker"]["Author"]
             )
         )
         self.__initFuturesList(
-            Preferences.Prefs.settings.value("PEP8/FutureChecker", ""))
+            Preferences.getSettings().value("PEP8/FutureChecker", ""))
         self.__initBuiltinsIgnoreList(Preferences.toDict(
-            Preferences.Prefs.settings.value(
+            Preferences.getSettings().value(
                 "PEP8/BuiltinsChecker",
                 MiscellaneousCheckerDefaultArgs["BuiltinsChecker"]
             ))
         )
         self.aggressiveCheckBox.setChecked(Preferences.toBool(
-            Preferences.Prefs.settings.value(
+            Preferences.getSettings().value(
                 "PEP8/AggressiveSearch",
                 MiscellaneousCheckerDefaultArgs[
                     "CommentedCodeChecker"]["Aggressive"]
             )))
         self.__initCommentedCodeCheckerWhiteList(Preferences.toList(
-            Preferences.Prefs.settings.value(
+            Preferences.getSettings().value(
                 "PEP8/CommentedCodeWhitelist",
                 MiscellaneousCheckerDefaultArgs[
                     "CommentedCodeChecker"]["WhiteList"]
@@ -1515,86 +1515,86 @@
         
         # type annotations
         self.minAnnotationsCoverageSpinBox.setValue(int(
-            Preferences.Prefs.settings.value(
+            Preferences.getSettings().value(
                 "PEP8/MinimumAnnotationsCoverage",
                 AnnotationsCheckerDefaultArgs["MinimumCoverage"])))
         self.maxAnnotationsComplexitySpinBox.setValue(int(
-            Preferences.Prefs.settings.value(
+            Preferences.getSettings().value(
                 "PEP8/MaximumAnnotationComplexity",
                 AnnotationsCheckerDefaultArgs["MaximumComplexity"])))
         self.maxAnnotationsLengthSpinBox.setValue(int(
-            Preferences.Prefs.settings.value(
+            Preferences.getSettings().value(
                 "PEP8/MaximumAnnotationLength",
                 AnnotationsCheckerDefaultArgs["MaximumLength"])))
         self.suppressNoneReturningCheckBox.setChecked(Preferences.toBool(
-            Preferences.Prefs.settings.value(
+            Preferences.getSettings().value(
                 "PEP8/SuppressNoneReturning",
                 AnnotationsCheckerDefaultArgs["SuppressNoneReturning"])))
         self.suppressDummyArgsCheckBox.setChecked(Preferences.toBool(
-            Preferences.Prefs.settings.value(
+            Preferences.getSettings().value(
                 "PEP8/SuppressDummyArgs",
                 AnnotationsCheckerDefaultArgs["SuppressDummyArgs"])))
         self.allowUntypedDefsCheckBox.setChecked(Preferences.toBool(
-            Preferences.Prefs.settings.value(
+            Preferences.getSettings().value(
                 "PEP8/AllowUntypedDefs",
                 AnnotationsCheckerDefaultArgs["AllowUntypedDefs"])))
         self.allowUntypedNestedCheckBox.setChecked(Preferences.toBool(
-            Preferences.Prefs.settings.value(
+            Preferences.getSettings().value(
                 "PEP8/AllowUntypedNested",
                 AnnotationsCheckerDefaultArgs["AllowUntypedNested"])))
         self.mypyInitReturnCheckBox.setChecked(Preferences.toBool(
-            Preferences.Prefs.settings.value(
+            Preferences.getSettings().value(
                 "PEP8/MypyInitReturn",
                 AnnotationsCheckerDefaultArgs["MypyInitReturn"])))
         self.dispatchDecoratorEdit.setText(", ".join(Preferences.toList(
-            Preferences.Prefs.settings.value(
+            Preferences.getSettings().value(
                 "PEP8/DispatchDecorators",
                 AnnotationsCheckerDefaultArgs["DispatchDecorators"]))))
         self.overloadDecoratorEdit.setText(", ".join(Preferences.toList(
-            Preferences.Prefs.settings.value(
+            Preferences.getSettings().value(
                 "PEP8/OverloadDecorators",
                 AnnotationsCheckerDefaultArgs["OverloadDecorators"]))))
         
         # security
         from .Security.SecurityDefaults import SecurityDefaults
         self.tmpDirectoriesEdit.setPlainText("\n".join(
-            Preferences.toList(Preferences.Prefs.settings.value(
+            Preferences.toList(Preferences.getSettings().value(
                 "PEP8/HardcodedTmpDirectories",
                 SecurityDefaults["hardcoded_tmp_directories"]))))
         self.hashesEdit.setText(", ".join(
-            Preferences.toList(Preferences.Prefs.settings.value(
+            Preferences.toList(Preferences.getSettings().value(
                 "PEP8/InsecureHashes",
                 SecurityDefaults["insecure_hashes"])))),
         self.insecureSslProtocolsEdit.setPlainText("\n".join(
-            Preferences.toList(Preferences.Prefs.settings.value(
+            Preferences.toList(Preferences.getSettings().value(
                 "PEP8/InsecureSslProtocolVersions",
                 SecurityDefaults["insecure_ssl_protocol_versions"])))),
         self.dsaHighRiskCombo.setCurrentText(
-            Preferences.Prefs.settings.value(
+            Preferences.getSettings().value(
                 "PEP8/WeakKeySizeDsaHigh",
                 str(SecurityDefaults["weak_key_size_dsa_high"])))
         self.dsaMediumRiskCombo.setCurrentText(
-            Preferences.Prefs.settings.value(
+            Preferences.getSettings().value(
                 "PEP8/WeakKeySizeDsaMedium",
                 str(SecurityDefaults["weak_key_size_dsa_medium"]))),
         self.rsaHighRiskCombo.setCurrentText(
-            Preferences.Prefs.settings.value(
+            Preferences.getSettings().value(
                 "PEP8/WeakKeySizeRsaHigh",
                 str(SecurityDefaults["weak_key_size_rsa_high"]))),
         self.rsaMediumRiskCombo.setCurrentText(
-            Preferences.Prefs.settings.value(
+            Preferences.getSettings().value(
                 "PEP8/WeakKeySizeRsaMedium",
                 str(SecurityDefaults["weak_key_size_rsa_medium"]))),
         self.ecHighRiskCombo.setCurrentText(
-            Preferences.Prefs.settings.value(
+            Preferences.getSettings().value(
                 "PEP8/WeakKeySizeEcHigh",
                 str(SecurityDefaults["weak_key_size_ec_high"]))),
         self.ecMediumRiskCombo.setCurrentText(
-            Preferences.Prefs.settings.value(
+            Preferences.getSettings().value(
                 "PEP8/WeakKeySizeEcMedium",
                 str(SecurityDefaults["weak_key_size_ec_medium"]))),
         self.typedExceptionsCheckBox.setChecked(Preferences.toBool(
-            Preferences.Prefs.settings.value(
+            Preferences.getSettings().value(
                 "PEP8/CheckTypedException",
                 SecurityDefaults["check_typed_exception"]))),
         
@@ -1606,131 +1606,131 @@
         Private slot to store the current configuration values as
         default values.
         """
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             "PEP8/EnabledCheckerCategories", self.__getCategories(True))
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             "PEP8/ExcludeFilePatterns", self.excludeFilesEdit.text())
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             "PEP8/ExcludeMessages", self.excludeMessagesEdit.text())
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             "PEP8/IncludeMessages", self.includeMessagesEdit.text())
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             "PEP8/RepeatMessages", self.repeatCheckBox.isChecked())
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             "PEP8/FixCodes", self.fixIssuesEdit.text())
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             "PEP8/NoFixCodes", self.noFixIssuesEdit.text())
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             "PEP8/FixIssues", self.fixIssuesCheckBox.isChecked())
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             "PEP8/ShowIgnored", self.ignoredCheckBox.isChecked())
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             "PEP8/MaxLineLength", self.lineLengthSpinBox.value())
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             "PEP8/MaxDocLineLength", self.docLineLengthSpinBox.value())
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             "PEP8/BlankLinesBeforeTopLevel",
             self.blankBeforeTopLevelSpinBox.value())
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             "PEP8/BlankLinesBeforeMethod",
             self.blankBeforeMethodSpinBox.value())
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             "PEP8/HangClosing", self.hangClosingCheckBox.isChecked())
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             "PEP8/DocstringType", self.docTypeComboBox.itemData(
                 self.docTypeComboBox.currentIndex()))
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             "PEP8/MaxCodeComplexity", self.complexitySpinBox.value())
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             "PEP8/LineComplexity", self.lineComplexitySpinBox.value())
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             "PEP8/LineComplexityScore",
             self.lineComplexityScoreSpinBox.value())
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             "PEP8/ValidEncodings", self.encodingsEdit.text())
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             "PEP8/CopyrightMinFileSize", self.copyrightFileSizeSpinBox.value())
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             "PEP8/CopyrightAuthor", self.copyrightAuthorEdit.text())
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             "PEP8/FutureChecker", self.__getSelectedFutureImports())
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             "PEP8/BuiltinsChecker", self.__getBuiltinsIgnoreList())
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             "PEP8/AggressiveSearch", self.aggressiveCheckBox.isChecked())
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             "PEP8/CommentedCodeWhitelist",
             self.__getCommentedCodeCheckerWhiteList())
         
         # type annotations
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             "PEP8/MinimumAnnotationsCoverage",
             self.minAnnotationsCoverageSpinBox.value())
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             "PEP8/MaximumAnnotationComplexity",
             self.maxAnnotationsComplexitySpinBox.value())
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             "PEP8/MaximumAnnotationLength",
             self.maxAnnotationsLengthSpinBox.value())
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             "PEP8/SuppressNoneReturning",
             self.suppressNoneReturningCheckBox.isChecked())
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             "PEP8/SuppressDummyArgs",
             self.suppressDummyArgsCheckBox.isChecked())
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             "PEP8/AllowUntypedDefs",
             self.allowUntypedDefsCheckBox.isChecked())
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             "PEP8/AllowUntypedNested",
             self.allowUntypedNestedCheckBox.isChecked())
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             "PEP8/MypyInitReturn",
             self.mypyInitReturnCheckBox.isChecked())
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             "PEP8/DispatchDecorators",
             [d.strip()
              for d in self.dispatchDecoratorEdit.text().split(",")])
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             "PEP8/OverloadDecorators",
             [d.strip()
              for d in self.overloadDecoratorEdit.text().split(",")])
         
         # security
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             "PEP8/HardcodedTmpDirectories",
             [t.strip()
              for t in self.tmpDirectoriesEdit.toPlainText().splitlines()
              ]),
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             "PEP8/InsecureHashes",
             [h.strip()
              for h in self.hashesEdit.text().split(",")
              ]),
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             "PEP8/InsecureSslProtocolVersions",
             [p.strip()
              for p in self.insecureSslProtocolsEdit.toPlainText().splitlines()
              ]),
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             "PEP8/WeakKeySizeDsaHigh",
             self.dsaHighRiskCombo.currentText()),
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             "PEP8/WeakKeySizeDsaMedium",
             self.dsaMediumRiskCombo.currentText()),
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             "PEP8/WeakKeySizeRsaHigh",
             self.rsaHighRiskCombo.currentText()),
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             "PEP8/WeakKeySizeRsaMedium",
             self.rsaMediumRiskCombo.currentText()),
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             "PEP8/WeakKeySizeEcHigh",
             self.ecHighRiskCombo.currentText()),
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             "PEP8/WeakKeySizeEcMedium",
             self.ecMediumRiskCombo.currentText()),
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             "PEP8/CheckTypedException",
             self.typedExceptionsCheckBox.isChecked()),
     
@@ -1739,122 +1739,122 @@
         """
         Private slot to reset the configuration values to their default values.
         """
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             "PEP8/EnabledCheckerCategories",
             ",".join(CodeStyleCheckerDialog.checkCategories.keys()))
-        Preferences.Prefs.settings.setValue("PEP8/ExcludeFilePatterns", "")
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue("PEP8/ExcludeFilePatterns", "")
+        Preferences.getSettings().setValue(
             "PEP8/ExcludeMessages", pycodestyle.DEFAULT_IGNORE)
-        Preferences.Prefs.settings.setValue("PEP8/IncludeMessages", "")
-        Preferences.Prefs.settings.setValue("PEP8/RepeatMessages", False)
-        Preferences.Prefs.settings.setValue("PEP8/FixCodes", "")
-        Preferences.Prefs.settings.setValue("PEP8/NoFixCodes", "E501")
-        Preferences.Prefs.settings.setValue("PEP8/FixIssues", False)
-        Preferences.Prefs.settings.setValue("PEP8/ShowIgnored", False)
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue("PEP8/IncludeMessages", "")
+        Preferences.getSettings().setValue("PEP8/RepeatMessages", False)
+        Preferences.getSettings().setValue("PEP8/FixCodes", "")
+        Preferences.getSettings().setValue("PEP8/NoFixCodes", "E501")
+        Preferences.getSettings().setValue("PEP8/FixIssues", False)
+        Preferences.getSettings().setValue("PEP8/ShowIgnored", False)
+        Preferences.getSettings().setValue(
             "PEP8/MaxLineLength", pycodestyle.MAX_LINE_LENGTH)
         # Hard reset to pycodestyle preferences
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             "PEP8/MaxDocLineLength", pycodestyle.MAX_DOC_LENGTH)
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             "PEP8/BlankLinesBeforeTopLevel", 2)
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             "PEP8/BlankLinesBeforeMethod", 1)
-        Preferences.Prefs.settings.setValue("PEP8/HangClosing", False)
-        Preferences.Prefs.settings.setValue("PEP8/DocstringType", "pep257")
-        Preferences.Prefs.settings.setValue("PEP8/MaxCodeComplexity", 10)
-        Preferences.Prefs.settings.setValue("PEP8/LineComplexity", 15)
-        Preferences.Prefs.settings.setValue("PEP8/LineComplexityScore", 10)
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue("PEP8/HangClosing", False)
+        Preferences.getSettings().setValue("PEP8/DocstringType", "pep257")
+        Preferences.getSettings().setValue("PEP8/MaxCodeComplexity", 10)
+        Preferences.getSettings().setValue("PEP8/LineComplexity", 15)
+        Preferences.getSettings().setValue("PEP8/LineComplexityScore", 10)
+        Preferences.getSettings().setValue(
             "PEP8/ValidEncodings",
             MiscellaneousCheckerDefaultArgs["CodingChecker"]
         )
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             "PEP8/CopyrightMinFileSize",
             MiscellaneousCheckerDefaultArgs["CopyrightChecker"]["MinFilesize"]
         )
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             "PEP8/CopyrightAuthor",
             MiscellaneousCheckerDefaultArgs["CopyrightChecker"]["Author"]
         )
-        Preferences.Prefs.settings.setValue("PEP8/FutureChecker", "")
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue("PEP8/FutureChecker", "")
+        Preferences.getSettings().setValue(
             "PEP8/BuiltinsChecker",
             MiscellaneousCheckerDefaultArgs["BuiltinsChecker"]
         )
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             "PEP8/AggressiveSearch",
             MiscellaneousCheckerDefaultArgs[
                 "CommentedCodeChecker"]["Aggressive"]
         )
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             "PEP8/CommentedCodeWhitelist",
             MiscellaneousCheckerDefaultArgs[
                 "CommentedCodeChecker"]["WhiteList"]
         )
         
         # type annotations
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             "PEP8/MinimumAnnotationsCoverage",
             AnnotationsCheckerDefaultArgs["MinimumCoverage"])
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             "PEP8/MaximumAnnotationComplexity",
             AnnotationsCheckerDefaultArgs["MaximumComplexity"])
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             "PEP8/MaximumAnnotationLength",
             AnnotationsCheckerDefaultArgs["MaximumLength"])
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             "PEP8/SuppressNoneReturning",
             AnnotationsCheckerDefaultArgs["SuppressNoneReturning"])
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             "PEP8/SuppressDummyArgs",
             AnnotationsCheckerDefaultArgs["SuppressDummyArgs"])
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             "PEP8/AllowUntypedDefs",
             AnnotationsCheckerDefaultArgs["AllowUntypedDefs"])
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             "PEP8/AllowUntypedNested",
             AnnotationsCheckerDefaultArgs["AllowUntypedNested"])
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             "PEP8/MypyInitReturn",
             AnnotationsCheckerDefaultArgs["MypyInitReturn"])
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             "PEP8/DispatchDecorators",
             AnnotationsCheckerDefaultArgs["DispatchDecorators"])
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             "PEP8/OverloadDecorators",
             AnnotationsCheckerDefaultArgs["OverloadDecorators"])
         
         # security
         from .Security.SecurityDefaults import SecurityDefaults
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             "PEP8/HardcodedTmpDirectories",
             SecurityDefaults["hardcoded_tmp_directories"])
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             "PEP8/InsecureHashes",
             SecurityDefaults["insecure_hashes"])
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             "PEP8/InsecureSslProtocolVersions",
             SecurityDefaults["insecure_ssl_protocol_versions"])
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             "PEP8/WeakKeySizeDsaHigh",
             str(SecurityDefaults["weak_key_size_dsa_high"]))
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             "PEP8/WeakKeySizeDsaMedium",
             str(SecurityDefaults["weak_key_size_dsa_medium"]))
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             "PEP8/WeakKeySizeRsaHigh",
             str(SecurityDefaults["weak_key_size_rsa_high"]))
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             "PEP8/WeakKeySizeRsaMedium",
             str(SecurityDefaults["weak_key_size_rsa_medium"]))
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             "PEP8/WeakKeySizeEcHigh",
             str(SecurityDefaults["weak_key_size_ec_high"]))
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             "PEP8/WeakKeySizeEcMedium",
             str(SecurityDefaults["weak_key_size_ec_medium"]))
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             "PEP8/CheckTypedException",
             SecurityDefaults["check_typed_exception"])
         
--- a/eric7/Plugins/PluginTranslator.py	Sat Sep 25 18:08:10 2021 +0200
+++ b/eric7/Plugins/PluginTranslator.py	Sat Sep 25 18:12:48 2021 +0200
@@ -76,7 +76,7 @@
     """
     Module function to prepare for an uninstallation.
     """
-    Preferences.Prefs.settings.remove(TranslatorPlugin.PreferencesKey)
+    Preferences.getSettings().remove(TranslatorPlugin.PreferencesKey)
 
 
 class TranslatorPlugin(QObject):
@@ -177,14 +177,14 @@
         """
         if key in ["EnabledLanguages"]:
             return Preferences.toList(
-                Preferences.Prefs.settings.value(
+                Preferences.getSettings().value(
                     self.PreferencesKey + "/" + key, self.__defaults[key]))
         elif key in ["GoogleEnableDictionary"]:
             return Preferences.toBool(
-                Preferences.Prefs.settings.value(
+                Preferences.getSettings().value(
                     self.PreferencesKey + "/" + key, self.__defaults[key]))
         elif key in ["MsAuthTokenExpire"]:
-            value = Preferences.Prefs.settings.value(
+            value = Preferences.getSettings().value(
                 self.PreferencesKey + "/" + key, self.__defaults[key])
             if isinstance(value, str):
                 if value.startswith("@QDateTime"):
@@ -194,7 +194,7 @@
                     value = QDateTime.fromString(value, Qt.DateFormat.ISODate)
             return value
         else:
-            return Preferences.Prefs.settings.value(
+            return Preferences.getSettings().value(
                 self.PreferencesKey + "/" + key, self.__defaults[key])
     
     def setPreferences(self, key, value):
@@ -205,11 +205,11 @@
         @param value the value to be set
         """
         if key in ["MsAuthTokenExpire"]:
-            Preferences.Prefs.settings.setValue(
+            Preferences.getSettings().setValue(
                 self.PreferencesKey + "/" + key,
                 value.toString(Qt.DateFormat.ISODate))
         else:
-            Preferences.Prefs.settings.setValue(
+            Preferences.getSettings().setValue(
                 self.PreferencesKey + "/" + key, value)
         
         if key in ["EnabledLanguages"]:
--- a/eric7/Plugins/PluginVcsGit.py	Sat Sep 25 18:08:10 2021 +0200
+++ b/eric7/Plugins/PluginVcsGit.py	Sat Sep 25 18:12:48 2021 +0200
@@ -143,7 +143,7 @@
     """
     if not ericApp().getObject("PluginManager").isPluginLoaded(
             "PluginVcsGit"):
-        Preferences.Prefs.settings.remove("Git")
+        Preferences.getSettings().remove("Git")
 
 
 def clearPrivateData():
@@ -264,28 +264,28 @@
                    "ShowCommitterColumns", "ShowCommitIdColumn",
                    "ShowBranchesColumn", "ShowTagsColumn", "FindCopiesHarder",
                    "AggressiveGC"]:
-            return Preferences.toBool(Preferences.Prefs.settings.value(
+            return Preferences.toBool(Preferences.getSettings().value(
                 "Git/" + key, cls.GitDefaults[key]))
         elif key in ["LogLimit", "CommitIdLength", "LogSubjectColumnWidth"]:
-            return int(Preferences.Prefs.settings.value(
+            return int(Preferences.getSettings().value(
                 "Git/" + key, cls.GitDefaults[key]))
         elif key in ["Commits", "RepositoryUrlHistory"]:
-            return Preferences.toList(Preferences.Prefs.settings.value(
+            return Preferences.toList(Preferences.getSettings().value(
                 "Git/" + key))
         elif key in ["LogBrowserGeometry", "StatusDialogGeometry"]:
-            v = Preferences.Prefs.settings.value("Git/" + key)
+            v = Preferences.getSettings().value("Git/" + key)
             if v is not None:
                 return v
             else:
                 return cls.GitDefaults[key]
         elif key in ["LogBrowserSplitterStates", "StatusDialogSplitterStates"]:
-            states = Preferences.Prefs.settings.value("Git/" + key)
+            states = Preferences.getSettings().value("Git/" + key)
             if states is not None:
                 return states
             else:
                 return cls.GitDefaults[key]
         else:
-            return Preferences.Prefs.settings.value(
+            return Preferences.getSettings().value(
                 "Git/" + key, cls.GitDefaults[key])
     
     @classmethod
@@ -296,7 +296,7 @@
         @param key the key of the setting to be set
         @param value the value to be set
         """
-        Preferences.Prefs.settings.setValue("Git/" + key, value)
+        Preferences.getSettings().setValue("Git/" + key, value)
 
     def getConfigPath(self):
         """
--- a/eric7/Plugins/PluginVcsMercurial.py	Sat Sep 25 18:08:10 2021 +0200
+++ b/eric7/Plugins/PluginVcsMercurial.py	Sat Sep 25 18:12:48 2021 +0200
@@ -134,7 +134,7 @@
     """
     if not ericApp().getObject("PluginManager").isPluginLoaded(
             "PluginVcsMercurial"):
-        Preferences.Prefs.settings.remove("Mercurial")
+        Preferences.getSettings().remove("Mercurial")
 
 
 def clearPrivateData():
@@ -258,33 +258,33 @@
         if key in ["StopLogOnCopy", "PullUpdate", "PreferUnbundle",
                    "CreateBackup", "InternalMerge", "ConsiderHidden",
                    "LogBrowserShowFullLog"]:
-            return Preferences.toBool(Preferences.Prefs.settings.value(
+            return Preferences.toBool(Preferences.getSettings().value(
                 "Mercurial/" + key, cls.MercurialDefaults[key]))
         elif key in ["LogLimit", "CommitAuthorsLimit", "ServerPort",
                      "LogMessageColumnWidth"]:
-            return int(Preferences.Prefs.settings.value(
+            return int(Preferences.getSettings().value(
                 "Mercurial/" + key, cls.MercurialDefaults[key]))
         elif key in ["Commits", "CommitAuthors", "RepositoryUrlHistory"]:
-            return Preferences.toList(Preferences.Prefs.settings.value(
+            return Preferences.toList(Preferences.getSettings().value(
                 "Mercurial/" + key, cls.MercurialDefaults[key]))
         elif key in ["LogBrowserGeometry", "StatusDialogGeometry",
                      "StatusDialogSplitterState", "MqStatusDialogGeometry",
                      "MqStatusDialogSplitterState"]:
             # QByteArray values
-            v = Preferences.Prefs.settings.value("Mercurial/" + key)
+            v = Preferences.getSettings().value("Mercurial/" + key)
             if v is not None:
                 return v
             else:
                 return cls.MercurialDefaults[key]
         elif key in ["LogBrowserSplitterStates"]:
             # list of QByteArray values
-            states = Preferences.Prefs.settings.value("Mercurial/" + key)
+            states = Preferences.getSettings().value("Mercurial/" + key)
             if states is not None:
                 return states
             else:
                 return cls.MercurialDefaults[key]
         else:
-            return Preferences.Prefs.settings.value(
+            return Preferences.getSettings().value(
                 "Mercurial/" + key, cls.MercurialDefaults[key])
     
     @classmethod
@@ -295,7 +295,7 @@
         @param key the key of the setting to be set
         @param value the value to be set
         """
-        Preferences.Prefs.settings.setValue("Mercurial/" + key, value)
+        Preferences.getSettings().setValue("Mercurial/" + key, value)
 
     def getGlobalOptions(self):
         """
--- a/eric7/Plugins/PluginVcsPySvn.py	Sat Sep 25 18:08:10 2021 +0200
+++ b/eric7/Plugins/PluginVcsPySvn.py	Sat Sep 25 18:12:48 2021 +0200
@@ -137,7 +137,7 @@
     """
     if not ericApp().getObject("PluginManager").isPluginLoaded(
             "PluginVcsSubversion"):
-        Preferences.Prefs.settings.remove("Subversion")
+        Preferences.getSettings().remove("Subversion")
     
 
 class VcsPySvnPlugin(QObject):
@@ -226,17 +226,17 @@
         @return the requested refactoring setting
         """
         if key in ["StopLogOnCopy"]:
-            return Preferences.toBool(Preferences.Prefs.settings.value(
+            return Preferences.toBool(Preferences.getSettings().value(
                 "Subversion/" + key, self.__subversionDefaults[key]))
         elif key in ["LogLimit"]:
-            return int(Preferences.Prefs.settings.value(
+            return int(Preferences.getSettings().value(
                 "Subversion/" + key,
                 self.__subversionDefaults[key]))
         elif key in ["Commits"]:
-            return Preferences.toList(Preferences.Prefs.settings.value(
+            return Preferences.toList(Preferences.getSettings().value(
                 "Subversion/" + key))
         else:
-            return Preferences.Prefs.settings.value("Subversion/" + key)
+            return Preferences.getSettings().value("Subversion/" + key)
     
     def setPreferences(self, key, value):
         """
@@ -245,7 +245,7 @@
         @param key the key of the setting to be set
         @param value the value to be set
         """
-        Preferences.Prefs.settings.setValue("Subversion/" + key, value)
+        Preferences.getSettings().setValue("Subversion/" + key, value)
     
     def getServersPath(self):
         """
--- a/eric7/Plugins/PluginVcsSubversion.py	Sat Sep 25 18:08:10 2021 +0200
+++ b/eric7/Plugins/PluginVcsSubversion.py	Sat Sep 25 18:12:48 2021 +0200
@@ -143,7 +143,7 @@
     """
     if not ericApp().getObject("PluginManager").isPluginLoaded(
             "PluginVcsSubversion"):
-        Preferences.Prefs.settings.remove("Subversion")
+        Preferences.getSettings().remove("Subversion")
     
 
 class VcsSubversionPlugin(QObject):
@@ -232,17 +232,17 @@
         @return the requested setting
         """
         if key in ["StopLogOnCopy"]:
-            return Preferences.toBool(Preferences.Prefs.settings.value(
+            return Preferences.toBool(Preferences.getSettings().value(
                 "Subversion/" + key, self.__subversionDefaults[key]))
         elif key in ["LogLimit"]:
-            return int(Preferences.Prefs.settings.value(
+            return int(Preferences.getSettings().value(
                 "Subversion/" + key,
                 self.__subversionDefaults[key]))
         elif key in ["Commits"]:
-            return Preferences.toList(Preferences.Prefs.settings.value(
+            return Preferences.toList(Preferences.getSettings().value(
                 "Subversion/" + key))
         else:
-            return Preferences.Prefs.settings.value("Subversion/" + key)
+            return Preferences.getSettings().value("Subversion/" + key)
     
     def setPreferences(self, key, value):
         """
@@ -251,7 +251,7 @@
         @param key the key of the setting to be set
         @param value the value to be set
         """
-        Preferences.Prefs.settings.setValue("Subversion/" + key, value)
+        Preferences.getSettings().setValue("Subversion/" + key, value)
     
     def getServersPath(self):
         """
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.py	Sat Sep 25 18:08:10 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.py	Sat Sep 25 18:12:48 2021 +0200
@@ -45,7 +45,7 @@
         self.__readFile()
         
         self.recentCommitMessages = Preferences.toList(
-            Preferences.Prefs.settings.value('Mercurial/Commits'))
+            Preferences.getSettings().value('Mercurial/Commits'))
         self.recentComboBox.clear()
         self.recentComboBox.addItem("")
         self.recentComboBox.addItems(self.recentCommitMessages)
--- a/eric7/Plugins/WizardPlugins/EricPluginWizard/Templates.py	Sat Sep 25 18:08:10 2021 +0200
+++ b/eric7/Plugins/WizardPlugins/EricPluginWizard/Templates.py	Sat Sep 25 18:12:48 2021 +0200
@@ -99,7 +99,7 @@
     """
     Module function to prepare for an un-installation.
     """
-    Preferences.Prefs.settings.remove({className}.PreferencesKey)
+    Preferences.getSettings().remove({className}.PreferencesKey)
 
 
 '''
--- a/eric7/Preferences/PreferencesLexer.py	Sat Sep 25 18:08:10 2021 +0200
+++ b/eric7/Preferences/PreferencesLexer.py	Sat Sep 25 18:12:48 2021 +0200
@@ -94,7 +94,7 @@
             raise PreferencesLexerLanguageError(language)
         
         # read the last stored values from preferences file
-        self.__lex.readSettings(Preferences.Prefs.settings, "Scintilla")
+        self.__lex.readSettings(Preferences.getSettings(), "Scintilla")
         if self.__lex.hasSubstyles():
             self.__lex.loadSubstyles()
     
@@ -102,7 +102,7 @@
         """
         Public method to write the lexer settings.
         """
-        self.__lex.writeSettings(Preferences.Prefs.settings, "Scintilla")
+        self.__lex.writeSettings(Preferences.getSettings(), "Scintilla")
         if self.__lex.hasSubstyles():
             self.__lex.writeSubstyles()
     
--- a/eric7/Preferences/__init__.py	Sat Sep 25 18:08:10 2021 +0200
+++ b/eric7/Preferences/__init__.py	Sat Sep 25 18:12:48 2021 +0200
@@ -1628,7 +1628,17 @@
     QCoreApplication.setApplicationName(Globals.settingsNameGlobal)
     
     Prefs.settings.value("UI/SingleApplicationMode")
+
+
+def getSettings():
+    """
+    Function to get a reference to the settings object.
     
+    @return reference to the settings object
+    @rtype QSettings
+    """
+    return Prefs.settings
+
 
 def syncPreferences():
     """
--- a/eric7/QScintilla/Editor.py	Sat Sep 25 18:08:10 2021 +0200
+++ b/eric7/QScintilla/Editor.py	Sat Sep 25 18:12:48 2021 +0200
@@ -1834,11 +1834,11 @@
             if pyname and pyname.startswith("Pygments|") else
             'Scintilla/{0}/style0/font'.format(self.lexer_.language())
         )
-        fdesc = Preferences.Prefs.settings.value(key)
+        fdesc = Preferences.getSettings().value(key)
         if fdesc is not None:
             font = QFont([fdesc[0]], int(fdesc[1]))
             self.lexer_.setDefaultFont(font)
-        self.lexer_.readSettings(Preferences.Prefs.settings, "Scintilla")
+        self.lexer_.readSettings(Preferences.getSettings(), "Scintilla")
         if self.lexer_.hasSubstyles():
             self.lexer_.readSubstyles(self)
         
@@ -3597,7 +3597,7 @@
         else:
             if self.lexer_:
                 self.lexer_.readSettings(
-                    Preferences.Prefs.settings, "Scintilla")
+                    Preferences.getSettings(), "Scintilla")
                 if self.lexer_.hasSubstyles():
                     self.lexer_.readSubstyles(self)
                 self.lexer_.initProperties()
@@ -4392,7 +4392,7 @@
         """
         # read the lexer settings and reinit the properties
         if self.lexer_ is not None:
-            self.lexer_.readSettings(Preferences.Prefs.settings, "Scintilla")
+            self.lexer_.readSettings(Preferences.getSettings(), "Scintilla")
             if self.lexer_.hasSubstyles():
                 self.lexer_.readSubstyles(self)
             self.lexer_.initProperties()
--- a/eric7/QScintilla/Lexers/SubstyledLexer.py	Sat Sep 25 18:08:10 2021 +0200
+++ b/eric7/QScintilla/Lexers/SubstyledLexer.py	Sat Sep 25 18:12:48 2021 +0200
@@ -71,7 +71,7 @@
         """
         Public method to load the sub-styles from the settings file.
         """
-        settings = Preferences.Prefs.settings
+        settings = Preferences.getSettings()
         
         # Step 1: check if sub-styles were defined and saved
         subStylesDefined = False
@@ -247,7 +247,7 @@
         if not self.__subStylesInitialized:
             return
         
-        settings = Preferences.Prefs.settings
+        settings = Preferences.getSettings()
         
         # Step 1: remove all sub-style definitions first
         for baseStyle in self.baseStyles:
--- a/eric7/QScintilla/MiniEditor.py	Sat Sep 25 18:08:10 2021 +0200
+++ b/eric7/QScintilla/MiniEditor.py	Sat Sep 25 18:12:48 2021 +0200
@@ -514,11 +514,11 @@
         @param category category the action belongs to (string)
         """
         if act.objectName():
-            accel = Preferences.Prefs.settings.value(
+            accel = Preferences.getSettings().value(
                 "Shortcuts/{0}/{1}/Accel".format(category, act.objectName()))
             if accel is not None:
                 act.setShortcut(QKeySequence(accel))
-            accel = Preferences.Prefs.settings.value(
+            accel = Preferences.getSettings().value(
                 "Shortcuts/{0}/{1}/AltAccel".format(
                     category, act.objectName()))
             if accel is not None:
@@ -2562,7 +2562,7 @@
         """
         Private method to read the settings remembered last time.
         """
-        settings = Preferences.Prefs.settings
+        settings = Preferences.getSettings()
         pos = settings.value("MiniEditor/Position", QPoint(0, 0))
         size = settings.value("MiniEditor/Size", QSize(800, 600))
         self.resize(size)
@@ -2572,7 +2572,7 @@
         """
         Private method to write the settings for reuse.
         """
-        settings = Preferences.Prefs.settings
+        settings = Preferences.getSettings()
         settings.setValue("MiniEditor/Position", self.pos())
         settings.setValue("MiniEditor/Size", self.size())
     
@@ -3399,11 +3399,11 @@
             if pyname and pyname.startswith("Pygments|") else
             'Scintilla/{0}/style0/font'.format(self.lexer_.language())
         )
-        fdesc = Preferences.Prefs.settings.value(key)
+        fdesc = Preferences.getSettings().value(key)
         if fdesc is not None:
             font = QFont([fdesc[0]], int(fdesc[1]))
             self.lexer_.setDefaultFont(font)
-        self.lexer_.readSettings(Preferences.Prefs.settings, "Scintilla")
+        self.lexer_.readSettings(Preferences.getSettings(), "Scintilla")
         if self.lexer_.hasSubstyles():
             self.lexer_.readSubstyles(self.__textEdit)
         
--- a/eric7/QScintilla/Shell.py	Sat Sep 25 18:08:10 2021 +0200
+++ b/eric7/QScintilla/Shell.py	Sat Sep 25 18:12:48 2021 +0200
@@ -277,7 +277,7 @@
         self.__setHistoryIndex()
         # remove obsolete shell histories (Python and Ruby)
         for clientType in ["Python", "Ruby"]:
-            Preferences.Prefs.settings.remove("Shell/Histories/" + clientType)
+            Preferences.getSettings().remove("Shell/Histories/" + clientType)
         
         # clear QScintilla defined keyboard commands
         # we do our own handling through the view manager
@@ -436,12 +436,12 @@
         
         # get the font for style 0 and set it as the default font
         key = 'Scintilla/{0}/style0/font'.format(self.lexer_.language())
-        fdesc = Preferences.Prefs.settings.value(key)
+        fdesc = Preferences.getSettings().value(key)
         if fdesc is not None:
             font = QFont([fdesc[0]], int(fdesc[1]))
             self.lexer_.setDefaultFont(font)
         self.setLexer(self.lexer_)
-        self.lexer_.readSettings(Preferences.Prefs.settings, "Scintilla")
+        self.lexer_.readSettings(Preferences.getSettings(), "Scintilla")
         if self.lexer_.hasSubstyles():
             self.lexer_.readSubstyles(self)
         
@@ -689,7 +689,7 @@
                 self.clientType and
                 self.__historyStyle == ShellHistoryStyle.WINDOWSSTYLE
             ):
-                idx = int(Preferences.Prefs.settings.value(
+                idx = int(Preferences.getSettings().value(
                     "Shell/HistoryIndexes/" + self.clientType, -1))
                 if idx >= len(self.__history):
                     idx = -1
@@ -704,7 +704,7 @@
                 self.clientType and
                 self.__historyStyle == ShellHistoryStyle.WINDOWSSTYLE
             ):
-                Preferences.Prefs.settings.setValue(
+                Preferences.getSettings().setValue(
                     "Shell/HistoryIndexes/" + self.clientType, self.__histidx)
     
     def __isHistoryIndexValid(self):
@@ -731,7 +731,7 @@
         
         @param clientType type of the debug client (string)
         """
-        hl = Preferences.Prefs.settings.value("Shell/Histories/" + clientType)
+        hl = Preferences.getSettings().value("Shell/Histories/" + clientType)
         if hl is not None:
             self.__historyLists[clientType] = hl[-self.__maxHistoryEntries:]
         else:
@@ -753,7 +753,7 @@
         @param clientType type of the debug client (string)
         """
         if clientType in self.__historyLists:
-            Preferences.Prefs.settings.setValue(
+            Preferences.getSettings().setValue(
                 "Shell/Histories/" + clientType,
                 self.__historyLists[clientType])
         
@@ -815,11 +815,11 @@
         """
         Public method to clear all available histories and sync them.
         """
-        Preferences.Prefs.settings.beginGroup("Shell/Histories")
-        for clientType in Preferences.Prefs.settings.childKeys():
+        Preferences.getSettings().beginGroup("Shell/Histories")
+        for clientType in Preferences.getSettings().childKeys():
             self.__historyLists[clientType] = []
             self.saveHistory(clientType)
-        Preferences.Prefs.settings.endGroup()
+        Preferences.getSettings().endGroup()
         
         self.clearHistory()
         
--- a/eric7/QScintilla/ShellWindow.py	Sat Sep 25 18:08:10 2021 +0200
+++ b/eric7/QScintilla/ShellWindow.py	Sat Sep 25 18:12:48 2021 +0200
@@ -182,11 +182,11 @@
         @type str
         """
         if act.objectName():
-            accel = Preferences.Prefs.settings.value(
+            accel = Preferences.getSettings().value(
                 "Shortcuts/{0}/{1}/Accel".format(category, act.objectName()))
             if accel is not None:
                 act.setShortcut(QKeySequence(accel))
-            accel = Preferences.Prefs.settings.value(
+            accel = Preferences.getSettings().value(
                 "Shortcuts/{0}/{1}/AltAccel".format(
                     category, act.objectName()))
             if accel is not None:
@@ -1033,7 +1033,7 @@
         """
         Private method to read the settings remembered last time.
         """
-        settings = Preferences.Prefs.settings
+        settings = Preferences.getSettings()
         pos = settings.value("ShellWindow/Position", QPoint(0, 0))
         size = settings.value("ShellWindow/Size", QSize(800, 600))
         self.resize(size)
@@ -1043,7 +1043,7 @@
         """
         Private method to write the settings for reuse.
         """
-        settings = Preferences.Prefs.settings
+        settings = Preferences.getSettings()
         settings.setValue("ShellWindow/Position", self.pos())
         settings.setValue("ShellWindow/Size", self.size())
         
--- a/eric7/Snapshot/SnapWidget.py	Sat Sep 25 18:08:10 2021 +0200
+++ b/eric7/Snapshot/SnapWidget.py	Sat Sep 25 18:12:48 2021 +0200
@@ -84,18 +84,18 @@
         if SnapshotModes.FREEHAND in supportedModes:
             self.modeCombo.addItem(self.tr("Freehand Selection"),
                                    SnapshotModes.FREEHAND)
-        mode = int(Preferences.Prefs.settings.value("Snapshot/Mode", 0))
+        mode = int(Preferences.getSettings().value("Snapshot/Mode", 0))
         index = self.modeCombo.findData(SnapshotModes(mode))
         if index == -1:
             index = 0
         self.modeCombo.setCurrentIndex(index)
         
-        delay = int(Preferences.Prefs.settings.value("Snapshot/Delay", 0))
+        delay = int(Preferences.getSettings().value("Snapshot/Delay", 0))
         self.delaySpin.setValue(delay)
         
         picturesLocation = QStandardPaths.writableLocation(
             QStandardPaths.StandardLocation.PicturesLocation)
-        self.__filename = Preferences.Prefs.settings.value(
+        self.__filename = Preferences.getSettings().value(
             "Snapshot/Filename",
             os.path.join(picturesLocation,
                          self.tr("snapshot") + "1.png"))
@@ -403,16 +403,16 @@
             elif res == EricMessageBox.Save:
                 self.on_saveButton_clicked()
         
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             "Snapshot/Delay", self.delaySpin.value())
         modeData = self.modeCombo.itemData(self.modeCombo.currentIndex())
         if modeData is not None:
-            Preferences.Prefs.settings.setValue(
+            Preferences.getSettings().setValue(
                 "Snapshot/Mode",
                 modeData.value)
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             "Snapshot/Filename", self.__filename)
-        Preferences.Prefs.settings.sync()
+        Preferences.getSettings().sync()
     
     def __updateCaption(self):
         """
--- a/eric7/Tools/UIPreviewer.py	Sat Sep 25 18:08:10 2021 +0200
+++ b/eric7/Tools/UIPreviewer.py	Sat Sep 25 18:12:48 2021 +0200
@@ -83,7 +83,7 @@
         self.styleCombo.setToolTip(self.tr("Select the GUI Theme"))
         self.styleLayout.addWidget(self.styleCombo)
         self.styleCombo.addItems(sorted(QStyleFactory().keys()))
-        currentStyle = Preferences.Prefs.settings.value('UIPreviewer/style')
+        currentStyle = Preferences.getSettings().value('UIPreviewer/style')
         if currentStyle is not None:
             self.styleCombo.setCurrentIndex(int(currentStyle))
         
@@ -391,7 +391,7 @@
             
             self.lastQStyle = qstyle
             self.lastStyle = sstyle
-            Preferences.Prefs.settings.setValue(
+            Preferences.getSettings().setValue(
                 'UIPreviewer/style', self.styleCombo.currentIndex())
     
     def __updateActions(self):
@@ -511,7 +511,7 @@
                 self.tr("""There is no UI file loaded."""))
             return
         
-        settings = Preferences.Prefs.settings
+        settings = Preferences.getSettings()
         printer = QPrinter(QPrinter.PrinterMode.HighResolution)
         printer.setFullPage(True)
         
@@ -554,7 +554,7 @@
                 self.tr("""There is no UI file loaded."""))
             return
         
-        settings = Preferences.Prefs.settings
+        settings = Preferences.getSettings()
         printer = QPrinter(QPrinter.PrinterMode.HighResolution)
         printer.setFullPage(True)
         
--- a/eric7/UI/BrowserModel.py	Sat Sep 25 18:08:10 2021 +0200
+++ b/eric7/UI/BrowserModel.py	Sat Sep 25 18:12:48 2021 +0200
@@ -384,7 +384,7 @@
         Private method to populate the browser model.
         """
         self.toplevelDirs = []
-        tdp = Preferences.Prefs.settings.value('BrowserModel/ToplevelDirs')
+        tdp = Preferences.getSettings().value('BrowserModel/ToplevelDirs')
         if tdp:
             self.toplevelDirs = tdp
         else:
@@ -489,7 +489,7 @@
         """
         Public slot to save the toplevel directories.
         """
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             'BrowserModel/ToplevelDirs', self.toplevelDirs)
     
     def _addItem(self, itm, parentItem):
--- a/eric7/UI/FindFileWidget.py	Sat Sep 25 18:08:10 2021 +0200
+++ b/eric7/UI/FindFileWidget.py	Sat Sep 25 18:12:48 2021 +0200
@@ -557,7 +557,7 @@
             self.replaceHistory.insert(0, replTxt)
             self.replacetextCombo.clear()
             self.replacetextCombo.addItems(self.replaceHistory)
-            Preferences.Prefs.settings.setValue(
+            Preferences.getSettings().setValue(
                 "FindFileWidget/ReplaceHistory",
                 self.replaceHistory[:30])
         
--- a/eric7/UI/SymbolsWidget.py	Sat Sep 25 18:08:10 2021 +0200
+++ b/eric7/UI/SymbolsWidget.py	Sat Sep 25 18:12:48 2021 +0200
@@ -524,12 +524,12 @@
             fm.height() + 4)
         
         tableIndex = int(
-            Preferences.Prefs.settings.value("Symbols/CurrentTable", 1))
+            Preferences.getSettings().value("Symbols/CurrentTable", 1))
         self.tableCombo.addItems(self.__model.getTableNames())
         self.tableCombo.setCurrentIndex(tableIndex)
         
         index = self.__model.index(
-            int(Preferences.Prefs.settings.value("Symbols/Top", 0)),
+            int(Preferences.getSettings().value("Symbols/Top", 0)),
             0)
         self.symbolsTable.scrollTo(
             index, QAbstractItemView.ScrollHint.PositionAtTop)
@@ -580,7 +580,7 @@
         self.symbolSpinBox.setMinimum(first)
         self.symbolSpinBox.setMaximum(last)
         
-        Preferences.Prefs.settings.setValue("Symbols/CurrentTable", index)
+        Preferences.getSettings().setValue("Symbols/CurrentTable", index)
     
     def __currentRowChanged(self, current, previous):
         """
@@ -589,6 +589,6 @@
         @param current current index (QModelIndex)
         @param previous previous current index (QModelIndex)
         """
-        Preferences.Prefs.settings.setValue("Symbols/Top", current.row())
+        Preferences.getSettings().setValue("Symbols/Top", current.row())
         self.symbolSpinBox.setValue(self.__model.getLocale().toInt(
             self.__model.data(self.__model.index(current.row(), 0)))[0])
--- a/eric7/UI/UserInterface.py	Sat Sep 25 18:08:10 2021 +0200
+++ b/eric7/UI/UserInterface.py	Sat Sep 25 18:12:48 2021 +0200
@@ -7312,7 +7312,7 @@
                     if period == 0:
                         return
                     elif period in [2, 3, 4]:
-                        lastCheck = Preferences.Prefs.settings.value(
+                        lastCheck = Preferences.getSettings().value(
                             "Updates/LastCheckDate", QDate(1970, 1, 1))
                         if lastCheck.isValid():
                             now = QDate.currentDate()
@@ -7398,10 +7398,10 @@
                 if self.__versionCheckProgress is not None:
                     self.__versionCheckProgress.reset()
                     self.__versionCheckProgress = None
-                firstFailure = Preferences.Prefs.settings.value(
+                firstFailure = Preferences.getSettings().value(
                     "Updates/FirstFailedCheckDate", QDate.currentDate())
                 failedDuration = firstFailure.daysTo(QDate.currentDate())
-                Preferences.Prefs.settings.setValue(
+                Preferences.getSettings().setValue(
                     "Updates/FirstFailedCheckDate", firstFailure)
                 if self.manualUpdatesCheck:
                     EricMessageBox.warning(
@@ -7432,8 +7432,8 @@
         if self.showAvailableVersions:
             self.__showAvailableVersionInfos(versions)
         else:
-            Preferences.Prefs.settings.remove("Updates/FirstFailedCheckDate")
-            Preferences.Prefs.settings.setValue(
+            Preferences.getSettings().remove("Updates/FirstFailedCheckDate")
+            Preferences.getSettings().setValue(
                 "Updates/LastCheckDate", QDate.currentDate())
             self.__versionCheckResult(versions)
         
--- a/eric7/ViewManager/ViewManager.py	Sat Sep 25 18:08:10 2021 +0200
+++ b/eric7/ViewManager/ViewManager.py	Sat Sep 25 18:12:48 2021 +0200
@@ -128,7 +128,7 @@
         self.__loadRecent()
         
         self.bookmarked = []
-        bs = Preferences.Prefs.settings.value("Bookmarked/Sources")
+        bs = Preferences.getSettings().value("Bookmarked/Sources")
         if bs is not None:
             self.bookmarked = bs
         
@@ -6322,7 +6322,7 @@
         self.__saveRecent()
         
         # save the list of recently opened projects
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             'Bookmarked/Sources', self.bookmarked)
         
         res = len(self.editors) == 0
--- a/eric7/VirtualEnv/VirtualenvManager.py	Sat Sep 25 18:08:10 2021 +0200
+++ b/eric7/VirtualEnv/VirtualenvManager.py	Sat Sep 25 18:12:48 2021 +0200
@@ -60,10 +60,10 @@
         """
         Private slot to load the virtual environments.
         """
-        self.__virtualEnvironmentsBaseDir = Preferences.Prefs.settings.value(
+        self.__virtualEnvironmentsBaseDir = Preferences.getSettings().value(
             "PyVenv/VirtualEnvironmentsBaseDir", "")
         
-        venvString = Preferences.Prefs.settings.value(
+        venvString = Preferences.getSettings().value(
             "PyVenv/VirtualEnvironments", "{}")     # __IGNORE_WARNING_M613__
         environments = json.loads(venvString)
         
@@ -126,11 +126,11 @@
         """
         Private slot to save the virtual environments.
         """
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             "PyVenv/VirtualEnvironmentsBaseDir",
             self.__virtualEnvironmentsBaseDir)
         
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             "PyVenv/VirtualEnvironments",
             json.dumps(self.__virtualEnvironments)
         )
--- a/eric7/WebBrowser/FeaturePermissions/FeaturePermissionManager.py	Sat Sep 25 18:08:10 2021 +0200
+++ b/eric7/WebBrowser/FeaturePermissions/FeaturePermissionManager.py	Sat Sep 25 18:12:48 2021 +0200
@@ -181,7 +181,7 @@
             self.__featurePermissionsKeys.items()
         ):
             self.__featurePermissions[feature][permission] = (
-                Globals.toList(Preferences.Prefs.settings.value(
+                Globals.toList(Preferences.getSettings().value(
                     FeaturePermissionManager.SettingsKeyFormat.format(key),
                     []
                 ))
@@ -203,7 +203,7 @@
         for (feature, permission), key in (
                 self.__featurePermissionsKeys.items()
         ):
-            Preferences.Prefs.settings.setValue(
+            Preferences.getSettings().setValue(
                 FeaturePermissionManager.SettingsKeyFormat.format(key),
                 self.__featurePermissions[feature][permission])
     
--- a/eric7/WebBrowser/Network/NetworkManager.py	Sat Sep 25 18:08:10 2021 +0200
+++ b/eric7/WebBrowser/Network/NetworkManager.py	Sat Sep 25 18:12:48 2021 +0200
@@ -363,7 +363,7 @@
             WebBrowserLanguagesDialog
         )
         languages = Preferences.toList(
-            Preferences.Prefs.settings.value(
+            Preferences.getSettings().value(
                 "WebBrowser/AcceptLanguages",
                 WebBrowserLanguagesDialog.defaultAcceptLanguages()))
         self.__acceptLanguage = WebBrowserLanguagesDialog.httpString(languages)
--- a/eric7/WebBrowser/WebBrowserLanguagesDialog.py	Sat Sep 25 18:08:10 2021 +0200
+++ b/eric7/WebBrowser/WebBrowserLanguagesDialog.py	Sat Sep 25 18:12:48 2021 +0200
@@ -33,7 +33,7 @@
         self.languagesList.selectionModel().currentChanged.connect(
             self.__currentChanged)
         
-        languages = Preferences.toList(Preferences.Prefs.settings.value(
+        languages = Preferences.toList(Preferences.getSettings().value(
             "WebBrowser/AcceptLanguages", self.defaultAcceptLanguages()))
         self.__model.setStringList(languages)
         
@@ -113,9 +113,9 @@
         """
         result = self.__model.stringList()
         if result == self.defaultAcceptLanguages():
-            Preferences.Prefs.settings.remove("WebBrowser/AcceptLanguages")
+            Preferences.getSettings().remove("WebBrowser/AcceptLanguages")
         else:
-            Preferences.Prefs.settings.setValue(
+            Preferences.getSettings().setValue(
                 "WebBrowser/AcceptLanguages", result)
         super().accept()
     
--- a/eric7/WebBrowser/WebBrowserPage.py	Sat Sep 25 18:08:10 2021 +0200
+++ b/eric7/WebBrowser/WebBrowserPage.py	Sat Sep 25 18:12:48 2021 +0200
@@ -730,7 +730,7 @@
             return False
         
         certificateDict = Globals.toDict(
-            Preferences.Prefs.settings.value("Ssl/CaCertificatesDict"))
+            Preferences.getSettings().value("Ssl/CaCertificatesDict"))
         for server in certificateDict:
             localCAList = QSslCertificate.fromData(certificateDict[server])
             if any(cert in localCAList for cert in certList):
--- a/eric7/WebBrowser/WebBrowserView.py	Sat Sep 25 18:08:10 2021 +0200
+++ b/eric7/WebBrowser/WebBrowserView.py	Sat Sep 25 18:12:48 2021 +0200
@@ -871,7 +871,7 @@
         
         from .WebBrowserLanguagesDialog import WebBrowserLanguagesDialog
         languages = Preferences.toList(
-            Preferences.Prefs.settings.value(
+            Preferences.getSettings().value(
                 "WebBrowser/AcceptLanguages",
                 WebBrowserLanguagesDialog.defaultAcceptLanguages()))
         if languages:
@@ -993,7 +993,7 @@
             
             from .WebBrowserLanguagesDialog import WebBrowserLanguagesDialog
             languages = Preferences.toList(
-                Preferences.Prefs.settings.value(
+                Preferences.getSettings().value(
                     "WebBrowser/AcceptLanguages",
                     WebBrowserLanguagesDialog.defaultAcceptLanguages()))
             if languages:
--- a/eric7/WebBrowser/WebBrowserWebSearchWidget.py	Sat Sep 25 18:08:10 2021 +0200
+++ b/eric7/WebBrowser/WebBrowserWebSearchWidget.py	Sat Sep 25 18:12:48 2021 +0200
@@ -349,14 +349,14 @@
         """
         Public method to save the recently performed web searches.
         """
-        Preferences.Prefs.settings.setValue(
+        Preferences.getSettings().setValue(
             'WebBrowser/WebSearches', self.__recentSearches)
     
     def __loadSearches(self):
         """
         Private method to load the recently performed web searches.
         """
-        searches = Preferences.Prefs.settings.value('WebBrowser/WebSearches')
+        searches = Preferences.getSettings().value('WebBrowser/WebSearches')
         if searches is not None:
             self.__recentSearches = searches
     

eric ide

mercurial