From 508a2f022e7b9215326fc94f18906571a05cf2f5 Mon Sep 17 00:00:00 2001 From: LonwoLonwo Date: Mon, 7 Jun 2021 14:02:55 +0300 Subject: [PATCH] #8110 add Format and SQL Completion to connection settings --- .../src/org/jkiss/dbeaver/core/CoreMessages.java | 4 ++++ .../org/jkiss/dbeaver/core/CoreResources.properties | 4 ++++ .../jkiss/dbeaver/core/CoreResources_de.properties | 12 ++++++++++++ .../jkiss/dbeaver/core/CoreResources_es.properties | 4 ++++ .../jkiss/dbeaver/core/CoreResources_fr.properties | 2 ++ .../jkiss/dbeaver/core/CoreResources_ru.properties | 4 ++++ .../ui/dialogs/connection/EditConnectionWizard.java | 4 ++++ 7 files changed, 34 insertions(+) diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreMessages.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreMessages.java index 3a9c8e7c28..c4dcbd5347 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreMessages.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreMessages.java @@ -508,6 +508,10 @@ public class CoreMessages extends NLS { public static String dialog_connection_edit_wizard_presentation_description; public static String dialog_connection_edit_wizard_sql_editor; public static String dialog_connection_edit_wizard_sql_editor_description; + public static String dialog_connection_edit_wizard_sql_code_completion; + public static String dialog_connection_edit_wizard_sql_code_completion_description; + public static String dialog_connection_edit_wizard_sql_formatting; + public static String dialog_connection_edit_wizard_sql_formatting_description; public static String dialog_connection_edit_wizard_sql_processing; public static String dialog_connection_edit_wizard_sql_processing_description; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreResources.properties b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreResources.properties index ff7a0a7caa..d24b4d3e12 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreResources.properties +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreResources.properties @@ -485,6 +485,10 @@ dialog_connection_edit_wizard_presentation = Presentation dialog_connection_edit_wizard_presentation_description = ResultSets UI & presentation dialog_connection_edit_wizard_sql_editor = SQL Editor dialog_connection_edit_wizard_sql_editor_description = SQL editor settings +dialog_connection_edit_wizard_sql_code_completion = Code Completion +dialog_connection_edit_wizard_sql_code_completion_description = Code Completion settings +dialog_connection_edit_wizard_sql_formatting = SQL Formatting +dialog_connection_edit_wizard_sql_formatting_description = SQL Formatting settings dialog_connection_edit_wizard_sql_processing = SQL Processing dialog_connection_edit_wizard_sql_processing_description = SQL processing settings diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreResources_de.properties b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreResources_de.properties index 715ac6fe0f..70158074b4 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreResources_de.properties +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreResources_de.properties @@ -166,10 +166,22 @@ dialog_connection_edit_wizard_shell_cmd_variables_hint_label = Sie k\u00F6nnen V dialog_connection_edit_wizard_shell_cmd_variables_hint_title = Variablen +dialog_connection_edit_wizard_transactions = Transaktionen + +dialog_connection_edit_wizard_transactions_description = Transaktionsmanagementeinstellungen + +dialog_connection_edit_wizard_resultset = Daten-Editor + +dialog_connection_edit_wizard_resultset_description = Daten-Viewer-Voreinstellungen + dialog_connection_edit_wizard_sql_editor = SQL-Editor dialog_connection_edit_wizard_sql_editor_description = Einstellungen SQL-Editor +dialog_connection_edit_wizard_sql_code_completion = SQL-Autovervollst\u00E4ndigen + +dialog_connection_edit_wizard_sql_formatting = SQL-Formatierung + dialog_connection_edit_wizard_sql_processing = SQL-Verarbeitung dialog_connection_edit_wizard_sql_processing_description = Einstellungen SQL-Verarbeitung diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreResources_es.properties b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreResources_es.properties index 48b4516a34..4325588444 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreResources_es.properties +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreResources_es.properties @@ -193,6 +193,10 @@ dialog_connection_edit_wizard_sql_editor = Editor SQL dialog_connection_edit_wizard_sql_editor_description = Ajustes del editor SQL +dialog_connection_edit_wizard_sql_code_completion = Autocompletar SQL + +dialog_connection_edit_wizard_sql_formatting = Formatear SQL + dialog_connection_edit_wizard_sql_processing = Procesamiento SQL dialog_connection_edit_wizard_sql_processing_description = Ajustes del procesamiento de SQL diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreResources_fr.properties b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreResources_fr.properties index 1f2a68045a..9000d93367 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreResources_fr.properties +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreResources_fr.properties @@ -533,6 +533,8 @@ dialog_connection_edit_wizard_presentation = Pr\u00E9sentation dialog_connection_edit_wizard_presentation_description = Interface r\u00E9sultats & pr\u00E9sentation dialog_connection_edit_wizard_sql_editor = Editeur SQL dialog_connection_edit_wizard_sql_editor_description = Param\u00E8tres de l'\u00E9diteur SQL +dialog_connection_edit_wizard_sql_code_completion = Compl\u00E9tion SQL +dialog_connection_edit_wizard_sql_formatting = Formatage SQL dialog_connection_edit_wizard_sql_processing = Traitement SQL dialog_connection_edit_wizard_sql_processing_description = Param\u00E8tres de traitement SQL diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreResources_ru.properties b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreResources_ru.properties index 7ed98cfe1e..c2409b398d 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreResources_ru.properties +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreResources_ru.properties @@ -104,6 +104,10 @@ dialog_connection_edit_wizard_presentation = \u041F\u0440\u0435\u0434\u0441\u044 dialog_connection_edit_wizard_presentation_description = \u0414\u0430\u043D\u043D\u044B\u0435 \u0432 UI & \u043F\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u043B\u0435\u043D\u0438\u0435 dialog_connection_edit_wizard_sql_editor = SQL \u0440\u0435\u0434\u0430\u043A\u0442\u043E\u0440 dialog_connection_edit_wizard_sql_editor_description = \u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 SQL \u0440\u0435\u0434\u0430\u043A\u0442\u043E\u0440\u0430 +dialog_connection_edit_wizard_sql_code_completion = \u0410\u0432\u0442\u043E-\u0434\u043E\u043F\u043E\u043B\u043D\u0435\u043D\u0438\u0435 \u043A\u043E\u0434\u0430 +dialog_connection_edit_wizard_sql_code_completion_description = \u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u0430\u0432\u0442\u043E-\u0434\u043E\u043F\u043E\u043B\u043D\u0435\u043D\u0438\u044F \u043A\u043E\u0434\u0430 +dialog_connection_edit_wizard_sql_formatting = SQL \u0424\u043E\u0440\u043C\u0430\u0442\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u0435 +dialog_connection_edit_wizard_sql_formatting_description = \u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 SQL \u0444\u043E\u0440\u043C\u0430\u0442\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u044F dialog_connection_edit_wizard_sql_processing = \u0412\u044B\u043F\u043E\u043B\u043D\u0435\u043D\u0438\u0435 SQL dialog_connection_edit_wizard_sql_processing_description = \u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u0432\u044B\u043F\u043E\u043B\u043D\u0435\u043D\u0438\u044F SQL diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/EditConnectionWizard.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/EditConnectionWizard.java index a75b6a4f50..8388f91caf 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/EditConnectionWizard.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/EditConnectionWizard.java @@ -42,8 +42,10 @@ import org.jkiss.dbeaver.ui.UIUtils; import org.jkiss.dbeaver.ui.actions.datasource.DataSourceHandler; import org.jkiss.dbeaver.ui.dialogs.BaseAuthDialog; import org.jkiss.dbeaver.ui.editors.data.preferences.*; +import org.jkiss.dbeaver.ui.editors.sql.preferences.PrefPageSQLCompletion; import org.jkiss.dbeaver.ui.editors.sql.preferences.PrefPageSQLEditor; import org.jkiss.dbeaver.ui.editors.sql.preferences.PrefPageSQLExecute; +import org.jkiss.dbeaver.ui.editors.sql.preferences.PrefPageSQLFormat; import org.jkiss.dbeaver.ui.preferences.*; import org.jkiss.dbeaver.utils.GeneralUtils; import org.jkiss.utils.CommonUtils; @@ -171,6 +173,8 @@ public class EditConnectionWizard extends ConnectionWizard pagePresentation.addSubPage(PrefPageResultSetPresentationGrid.PAGE_ID, EditConnectionWizard.class, new PrefPageResultSetPresentationGrid()); pagePresentation.addSubPage(PrefPageResultSetPresentationPlainText.PAGE_ID, EditConnectionWizard.class, new PrefPageResultSetPresentationPlainText()); WizardPrefPage sqlPage = addPreferencePage(new PrefPageSQLEditor(), CoreMessages.dialog_connection_edit_wizard_sql_editor, CoreMessages.dialog_connection_edit_wizard_sql_editor_description); + sqlPage.addSubPage(new PrefPageSQLCompletion(), CoreMessages.dialog_connection_edit_wizard_sql_code_completion, CoreMessages.dialog_connection_edit_wizard_sql_code_completion_description); + sqlPage.addSubPage(new PrefPageSQLFormat(), CoreMessages.dialog_connection_edit_wizard_sql_formatting, CoreMessages.dialog_connection_edit_wizard_sql_formatting_description); sqlPage.addSubPage(new PrefPageSQLExecute(), CoreMessages.dialog_connection_edit_wizard_sql_processing, CoreMessages.dialog_connection_edit_wizard_sql_processing_description); } -- GitLab