IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Allow the user to configure tabs in the SQL editor. Fixes #1406

Browse Source
This commit is contained in:
Surinder Kumar
2016-08-19 11:40:19 +01:00
committed by Dave Page
parent 0f99c3b60c
commit 761b54ce69
7 changed files with 73 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
web/pgadmin/tools/sqleditor/__init__.py
View File

@@ -128,6 +128,34 @@ class SqlEditorModule(PgAdminModule):
category_label=gettext('Options')
)
self.sql_font_size = self.preference.register(
'Options', 'sql_font_size',
gettext("Font size"), 'numeric', '1',
min_val=0.1,
max_val=10,
category_label=gettext('Display'),
help_str=gettext('The font size to use for the SQL text boxes and editors. '
'The value specified is in "em" units, in which 1 is the default relative font size. '
'For example, to increase the font size by 20% use a value of 1.2, or to reduce by 20%, '
'use a value of 0.8. Minimum 0.1, maximum 10.')
)
self.tab_size = self.preference.register(
'Options', 'tab_size',
gettext("Tab size"), 'integer', 4,
min_val=2,
max_val=8,
category_label=gettext('Options'),
help_str=gettext('The number of spaces per tab. Minimum 2, maximum 8.')
)
self.use_spaces = self.preference.register(
'Options', 'use_spaces',
gettext("Use spaces?"), 'boolean', False,
category_label=gettext('Options'),
help_str=gettext('Specifies whether or not to insert spaces instead of tabs when the tab key is used.')
)
blueprint = SqlEditorModule(MODULE_NAME, __name__, static_url_path='/static')
@@ -979,9 +1007,13 @@ def auto_complete(trans_id):
@login_required
def script():
"""render the required javascript"""
return Response(response=render_template("sqleditor/js/sqleditor.js", _=gettext),
return Response(response=render_template("sqleditor/js/sqleditor.js",
tab_size=blueprint.tab_size.get(),
use_spaces=blueprint.use_spaces.get(),
_=gettext),
status=200,
mimetype="application/javascript")
mimetype="application/javascript"
)
def is_begin_required(query):

6
web/pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js
View File

@@ -212,7 +212,8 @@ define(
CodeMirror.pgadminLoopRangeFinder, CodeMirror.pgadminCaseRangeFinder)
},
gutters: ["CodeMirror-linenumbers", "CodeMirror-foldgutter"],
extraKeys: pgBrowser.editor_shortcut_keys
extraKeys: pgBrowser.editor_shortcut_keys,
tabSize: pgAdmin.Browser.editor_options.tabSize
});
// Create main wcDocker instance
@@ -254,7 +255,8 @@ define(
CodeMirror.pgadminLoopRangeFinder, CodeMirror.pgadminCaseRangeFinder)
},
gutters: ["CodeMirror-linenumbers", "CodeMirror-foldgutter"],
extraKeys: pgBrowser.editor_shortcut_keys
extraKeys: pgBrowser.editor_shortcut_keys,
tabSize: pgAdmin.Browser.editor_options.tabSize
});
// Create panels for 'Data Output', 'Explain', 'Messages' and 'History'