--- 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): """