--- a/src/eric7/Preferences/__init__.py Tue Jan 16 14:24:21 2024 +0100 +++ b/src/eric7/Preferences/__init__.py Tue Jan 16 14:35:26 2024 +0100 @@ -4352,67 +4352,5 @@ initPreferences(withMigration=True) initRecentSettings() -########################################################################### -## Functions to deal with existing eric6 configuration -########################################################################### - - -# TODO: remove the function below dealing with eric6 settings -def eric6SettingsName(): - """ - Function to generate the settings file name for eric6. - - @return settings file name - @rtype str - """ - settingsFileName = Prefs.settings.fileName() - return settingsFileName.replace("Eric7", "Eric6").replace("eric7", "eric6") - - -def hasEric6Configuration(): - """ - Function to check, if there is an old eric6 configuration. - - @return flag indicating the existence of an eric6 configuration - @rtype bool - """ - return os.path.exists(eric6SettingsName()) - - -def importEric6Configuration(): - """ - Function to import an old eric6 configuration. - """ - conversions = ( - ("Editor/WrapLongLinesMode", QsciScintilla.WrapMode), - ("Editor/WrapVisualFlag", QsciScintilla.WrapVisualFlag), - ("Editor/WrapIndentMode", QsciScintilla.WrapIndentMode), - ("Editor/EdgeMode", QsciScintilla.EdgeMode), - ("Editor/AutoCompletionSource", QsciScintilla.AutoCompletionSource), - ("Editor/CallTipsStyle", QsciScintilla.CallTipsStyle), - ("Editor/CallTipsPosition", QsciScintilla.CallTipsPosition), - ("Editor/PythonBadIndentation", QsciLexerPython.IndentationWarning), - ("Editor/EOLMode", QsciScintilla.EolMode), - ("WebBrowser/SearchLanguage", QLocale.Language), - ("RefactoringRope/MouseClickGotoModifiers", Qt.KeyboardModifier), - ("RefactoringRope/MouseClickGotoButton", Qt.MouseButton), - ) - - filename = eric6SettingsName() - if filename: - settingsFile = Prefs.settings.fileName() - shutil.copy(filename, settingsFile) - initPreferences() - - # convert enum related settings - for settingsKey, enumType in conversions: - if Prefs.settings.contains(settingsKey): - Prefs.settings.setValue( - settingsKey, enumType(int(Prefs.settings.value(settingsKey))) - ) - - syncPreferences() - - # # eflag: noqa = M201, M613