diff -r ab8580937d4b -r 1d66b6af60ed eric7/Preferences/ConfigurationDialog.py --- a/eric7/Preferences/ConfigurationDialog.py Sat Sep 11 19:40:25 2021 +0200 +++ b/eric7/Preferences/ConfigurationDialog.py Sat Sep 11 19:47:02 2021 +0200 @@ -239,20 +239,6 @@ "editorAPIsPage": [self.tr("APIs"), "preferences-api", "EditorAPIsPage", "0editorPage", None], - "editorAutocompletionPage": - [self.tr("Autocompletion"), - "preferences-autocompletion", - "EditorAutocompletionPage", "0editorPage", None], - "editorAutocompletionQScintillaPage": - [self.tr("QScintilla"), "qscintilla", - "EditorAutocompletionQScintillaPage", - "editorAutocompletionPage", None], - "editorCalltipsPage": - [self.tr("Calltips"), "preferences-calltips", - "EditorCalltipsPage", "0editorPage", None], - "editorCalltipsQScintillaPage": - [self.tr("QScintilla"), "qscintilla", - "EditorCalltipsQScintillaPage", "editorCalltipsPage", None], "editorDocViewerPage": [self.tr("Documentation Viewer"), "codeDocuViewer", "EditorDocViewerPage", "0editorPage", None], @@ -283,6 +269,31 @@ [self.tr("Exporters"), "preferences-exporters", "EditorExportersPage", "0editorPage", None], + # TODO: change eric Assistant and rope + "1editorAutocompletionPage": + [self.tr("Autocompletion"), + "preferences-autocompletion", + "EditorAutocompletionPage", "0editorPage", None], + "editorAutocompletionQScintillaPage": + [self.tr("QScintilla"), "qscintilla", + "EditorAutocompletionQScintillaPage", + "1editorAutocompletionPage", None], + "editorAutocompletionJediPage": + [self.tr("Jedi"), "jedi", + "EditorAutoCompletionJediPage", + "1editorAutocompletionPage", None], + + # TODO: change eric Assistant and rope + "1editorCalltipsPage": + [self.tr("Calltips"), "preferences-calltips", + "EditorCalltipsPage", "0editorPage", None], + "editorCalltipsQScintillaPage": + [self.tr("QScintilla"), "qscintilla", + "EditorCalltipsQScintillaPage", "1editorCalltipsPage", None], + "editorCalltipsJediPage": + [self.tr("Jedi"), "jedi", + "EditorCallTipsJediPage", "1editorCalltipsPage", None], + "1editorLexerPage": [self.tr("Highlighters"), "preferences-highlighting-styles", @@ -306,6 +317,10 @@ [self.tr("Mouse Click Handlers"), "preferences-mouse-click-handler", "EditorMouseClickHandlerPage", "0editorPage", None], + "editorMouseClickHandlerJediPage": + [self.tr("Jedi"), "jedi", + "EditorMouseClickHandlerJediPage", + "1editorMouseClickHandlers", None], "0helpPage": [self.tr("Help"), "preferences-help",