From 90f05295a2c1db74665796926d8d3f21e968ffa1 Mon Sep 17 00:00:00 2001 From: Simon Huber Date: Mon, 7 Dec 2020 15:43:44 +0100 Subject: [PATCH] Add missing config options to ControlPanel->Settings->CodeMirror (#5229) * Create cursorBlinkRate.tid * Update config-language.multids * Create indentUnit.tid * Create indentWithTabs.tid * Create smartIndent.tid * Create tabSize.tid --- plugins/tiddlywiki/codemirror/config-language.multids | 9 ++++++++- .../tiddlywiki/codemirror/settings/cursorBlinkRate.tid | 7 +++++++ plugins/tiddlywiki/codemirror/settings/indentUnit.tid | 7 +++++++ .../tiddlywiki/codemirror/settings/indentWithTabs.tid | 8 ++++++++ plugins/tiddlywiki/codemirror/settings/smartIndent.tid | 8 ++++++++ plugins/tiddlywiki/codemirror/settings/tabSize.tid | 7 +++++++ 6 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 plugins/tiddlywiki/codemirror/settings/cursorBlinkRate.tid create mode 100644 plugins/tiddlywiki/codemirror/settings/indentUnit.tid create mode 100644 plugins/tiddlywiki/codemirror/settings/indentWithTabs.tid create mode 100644 plugins/tiddlywiki/codemirror/settings/smartIndent.tid create mode 100644 plugins/tiddlywiki/codemirror/settings/tabSize.tid diff --git a/plugins/tiddlywiki/codemirror/config-language.multids b/plugins/tiddlywiki/codemirror/config-language.multids index 13cd693d9..05a5e6854 100644 --- a/plugins/tiddlywiki/codemirror/config-language.multids +++ b/plugins/tiddlywiki/codemirror/config-language.multids @@ -4,10 +4,14 @@ homeUrl: http://codemirror.net addOnUrl: http://codemirror.net/doc/manual.html#addons configUrl: http://codemirror.net/doc/manual.html#config controlPanel/hint: These settings let you customise the behaviour of [[CodeMirror|$:/plugins/tiddlywiki/codemirror]]. +controlPanel/keyboard: Keyboard shortcuts controlPanel/usage: Usage information +cursorBlinkRate/hint: Cursor blink rate editorFont/hint: Editor font family editorFont/info: Set the font family for the ~CodeMirror text-editor -controlPanel/keyboard: Keyboard shortcuts +indentUnit/hint: How many spaces a block should be indented +indentWithTabs/hint: Enable indenting with tabs +indentWithTabs/info: Whether, when indenting, the first N*`tabSize` spaces should be replaced by N tabs. keyMap/hint: ~CodeMirror keymap keyMap/info: ~The Keyboard KeyMap used within the ~CodeMirror text-editor lineNumbers/hint: Enable line numbers @@ -16,7 +20,10 @@ lineWrapping/hint: Enable line wrapping lineWrapping/info: Whether CodeMirror should scroll or wrap for long lines. Defaults to `false` (scroll). showCursorWhenSelecting/hint: Show cursor, when selecting showCursorWhenSelecting/info: Whether the cursor should be drawn when a selection is active. +smartIndent/hint: Enable smart indent +smartIndent/info: Whether to use the context-sensitive indentation that the mode provides (or just indent the same as the line before). Defaults to `true`. styleActiveLine/hint: Highlight active line styleActiveLine/info: Whether or not to highlight the active text-editor line +tabSize/hint: Width of a tab character theme/hint: Select a theme theme/info: Choose between ~CodeMirror themes diff --git a/plugins/tiddlywiki/codemirror/settings/cursorBlinkRate.tid b/plugins/tiddlywiki/codemirror/settings/cursorBlinkRate.tid new file mode 100644 index 000000000..ba540ea4c --- /dev/null +++ b/plugins/tiddlywiki/codemirror/settings/cursorBlinkRate.tid @@ -0,0 +1,7 @@ +title: $:/core/ui/ControlPanel/Settings/codemirror/cursorBlinkRate +tags: $:/tags/ControlPanel/Settings/CodeMirror +caption: {{$:/language/codemirror/cursorBlinkRate/hint}} + +\define lingo-base() $:/language/codemirror/cursorBlinkRate/ + +|<$link to="$:/config/codemirror/cursorBlinkRate"><> |<$edit-text tiddler="$:/config/codemirror/cursorBlinkRate" default="" placeholder="cursorBlinkRate" tag="input"/> | diff --git a/plugins/tiddlywiki/codemirror/settings/indentUnit.tid b/plugins/tiddlywiki/codemirror/settings/indentUnit.tid new file mode 100644 index 000000000..b463f3e78 --- /dev/null +++ b/plugins/tiddlywiki/codemirror/settings/indentUnit.tid @@ -0,0 +1,7 @@ +title: $:/core/ui/ControlPanel/Settings/codemirror/indentUnit +tags: $:/tags/ControlPanel/Settings/CodeMirror +caption: {{$:/language/codemirror/indentUnit/hint}} + +\define lingo-base() $:/language/codemirror/indentUnit/ + +|<$link to="$:/config/codemirror/indentUnit"><> |<$edit-text tiddler="$:/config/codemirror/indentUnit" default="" placeholder="indentUnit" tag="input"/> | diff --git a/plugins/tiddlywiki/codemirror/settings/indentWithTabs.tid b/plugins/tiddlywiki/codemirror/settings/indentWithTabs.tid new file mode 100644 index 000000000..16c5c9bb6 --- /dev/null +++ b/plugins/tiddlywiki/codemirror/settings/indentWithTabs.tid @@ -0,0 +1,8 @@ +title: $:/core/ui/ControlPanel/Settings/codemirror/indentWithTabs +tags: $:/tags/ControlPanel/Settings/CodeMirror +caption: {{$:/language/codemirror/indentWithTabs/hint}} + +\define lingo-base() $:/language/codemirror/indentWithTabs/ +<> + +<$checkbox tiddler="$:/config/codemirror/indentWithTabs" field="text" checked="true" unchecked="false" default="true"> <$link to="$:/config/codemirror/indentWithTabs"><> diff --git a/plugins/tiddlywiki/codemirror/settings/smartIndent.tid b/plugins/tiddlywiki/codemirror/settings/smartIndent.tid new file mode 100644 index 000000000..3f59e38af --- /dev/null +++ b/plugins/tiddlywiki/codemirror/settings/smartIndent.tid @@ -0,0 +1,8 @@ +title: $:/core/ui/ControlPanel/Settings/codemirror/smartIndent +tags: $:/tags/ControlPanel/Settings/CodeMirror +caption: {{$:/language/codemirror/smartIndent/hint}} + +\define lingo-base() $:/language/codemirror/smartIndent/ +<> + +<$checkbox tiddler="$:/config/codemirror/smartIndent" field="text" checked="true" unchecked="false" default="true"> <$link to="$:/config/codemirror/smartIndent"><> diff --git a/plugins/tiddlywiki/codemirror/settings/tabSize.tid b/plugins/tiddlywiki/codemirror/settings/tabSize.tid new file mode 100644 index 000000000..1ca932b19 --- /dev/null +++ b/plugins/tiddlywiki/codemirror/settings/tabSize.tid @@ -0,0 +1,7 @@ +title: $:/core/ui/ControlPanel/Settings/codemirror/tabSize +tags: $:/tags/ControlPanel/Settings/CodeMirror +caption: {{$:/language/codemirror/tabSize/hint}} + +\define lingo-base() $:/language/codemirror/tabSize/ + +|<$link to="$:/config/codemirror/tabSize"><> |<$edit-text tiddler="$:/config/codemirror/tabSize" default="" placeholder="tabSize" tag="input"/> |