Preference pages refactoring

Former-commit-id: aa78646a

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/DBeaverPreferences.java

@@ -35,6 +35,7 @@ public final class DBeaverPreferences
     public static final String NAVIGATOR_GROUP_BY_DRIVER = "navigator.group.by.driver"; //$NON-NLS-1$
     public static final String NAVIGATOR_EDITOR_FULL_NAME = "navigator.editor.full-name"; //$NON-NLS-1$
     public static final String NAVIGATOR_CONNECTION_DOUBLE_CLICK = "navigator.connection.doubleClick"; //$NON-NLS-1$
+    public static final String NAVIGATOR_SHOW_SQL_PREVIEW = "navigator.editor.show.preview"; //$NON-NLS-1$
 
     public static final String KEEP_STATEMENT_OPEN = "keep.statement.open"; //$NON-NLS-1$
 

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/DBeaverPreferencesInitializer.java

@@ -73,6 +73,7 @@ public class DBeaverPreferencesInitializer extends AbstractPreferenceInitializer
         PrefUtils.setDefaultPreferenceValue(store, DBeaverPreferences.NAVIGATOR_GROUP_BY_DRIVER, false);
         PrefUtils.setDefaultPreferenceValue(store, DBeaverPreferences.NAVIGATOR_EDITOR_FULL_NAME, false);
         PrefUtils.setDefaultPreferenceValue(store, DBeaverPreferences.NAVIGATOR_CONNECTION_DOUBLE_CLICK, NavigatorViewBase.DoubleClickBehavior.SQL_EDITOR.name());
+        PrefUtils.setDefaultPreferenceValue(store, DBeaverPreferences.NAVIGATOR_SHOW_SQL_PREVIEW, true);
 
         // Common
         PrefUtils.setDefaultPreferenceValue(store, DBeaverPreferences.KEEP_STATEMENT_OPEN, false);

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/EditConnectionWizard.java

@@ -130,7 +130,6 @@ public class EditConnectionWizard extends ConnectionWizard
         rsPage.addSubPage(new PrefPageResultSetBinaries(), "Binaries", "Binary data representation");
         rsPage.addSubPage(new PrefPageDataFormat(), "Data Formatting", "Data formatting preferences");
         rsPage.addSubPage(new PrefPageResultSetPresentation(), "Presentation", "ResultSets UI & presentation");
-        addPreferencePage(new PrefPageEntityEditor(), "Database Editor", "Database object editor settings");
         WizardPrefPage sqlPage = addPreferencePage(new PrefPageSQLEditor(), "SQL Editor", "SQL editor settings");
         sqlPage.addSubPage(new PrefPageSQLExecute(), "SQL Processing", "SQL processing settings");
     }

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/preferences/PrefPageEntityEditor.java

@@ -45,6 +45,7 @@ public class PrefPageEntityEditor extends AbstractPrefPage implements IWorkbench
     private Button keepEditorsOnRestart;
     private Button refreshEditorOnOpen;
     private Button editorFullName;
+    private Button showPreviewOnSave;
 
     public PrefPageEntityEditor()
     {
@@ -74,8 +75,7 @@ public class PrefPageEntityEditor extends AbstractPrefPage implements IWorkbench
             refreshEditorOnOpen.setToolTipText("Refreshes object from database every time you open this object's editor.\nYou may need this option if your database structure changes frequently (e.g. by SQL scripts).");
 
             editorFullName = UIUtils.createCheckbox(groupEditors, "Show full object names in editors", false);
-            editorFullName.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, true, false, 2, 1));
-
+            showPreviewOnSave = UIUtils.createCheckbox(groupEditors, "Show SQL preview dialog on save", false);
         }
 
         performDefaults();
@@ -91,6 +91,7 @@ public class PrefPageEntityEditor extends AbstractPrefPage implements IWorkbench
         keepEditorsOnRestart.setSelection(store.getBoolean(DBeaverPreferences.UI_KEEP_DATABASE_EDITORS));
         refreshEditorOnOpen.setSelection(store.getBoolean(DBeaverPreferences.NAVIGATOR_REFRESH_EDITORS_ON_OPEN));
         editorFullName.setSelection(store.getBoolean(DBeaverPreferences.NAVIGATOR_EDITOR_FULL_NAME));
+        showPreviewOnSave.setSelection(store.getBoolean(DBeaverPreferences.NAVIGATOR_SHOW_SQL_PREVIEW));
     }
 
     @Override
@@ -101,6 +102,7 @@ public class PrefPageEntityEditor extends AbstractPrefPage implements IWorkbench
         store.setValue(DBeaverPreferences.UI_KEEP_DATABASE_EDITORS, keepEditorsOnRestart.getSelection());
         store.setValue(DBeaverPreferences.NAVIGATOR_REFRESH_EDITORS_ON_OPEN, refreshEditorOnOpen.getSelection());
         store.setValue(DBeaverPreferences.NAVIGATOR_EDITOR_FULL_NAME, editorFullName.getSelection());
+        store.setValue(DBeaverPreferences.NAVIGATOR_SHOW_SQL_PREVIEW, showPreviewOnSave.getSelection());
 
         PrefUtils.savePreferenceStore(store);