From 742161675421a942051abed01cb47c0394f4db6d Mon Sep 17 00:00:00 2001
From: Jermolene <jeremy@jermolene.com>
Date: Sat, 8 Aug 2015 13:43:14 +0100
Subject: [PATCH] Make keyboard shortcuts configurable

Fixes #1892
---
 core/ui/EditTemplate.tid                              |  4 ++--
 core/wiki/config/shortcuts/cancel-edit-tiddler.tid    |  3 +++
 core/wiki/config/shortcuts/save-tiddler.tid           |  3 +++
 .../Hidden_Setting__Keyboard_Shortcuts.tid            | 11 +++++++++++
 4 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 core/wiki/config/shortcuts/cancel-edit-tiddler.tid
 create mode 100644 core/wiki/config/shortcuts/save-tiddler.tid
 create mode 100644 editions/tw5.com/tiddlers/hiddensettings/Hidden_Setting__Keyboard_Shortcuts.tid

diff --git a/core/ui/EditTemplate.tid b/core/ui/EditTemplate.tid
index 87380df9a..10c364681 100644
--- a/core/ui/EditTemplate.tid
+++ b/core/ui/EditTemplate.tid
@@ -5,8 +5,8 @@ tc-tiddler-frame tc-tiddler-edit-frame $(missingTiddlerClass)$ $(shadowTiddlerCl
 \end
 <div class=<<frame-classes>>>
 <$set name="storyTiddler" value=<<currentTiddler>>>
-<$keyboard key="escape" message="tm-cancel-tiddler">
-<$keyboard key="ctrl+enter" message="tm-save-tiddler">
+<$keyboard key={{$:/config/shortcuts/cancel-edit-tiddler}} message="tm-cancel-tiddler">
+<$keyboard key={{$:/config/shortcuts/save-tiddler}} message="tm-save-tiddler">
 <$list filter="[all[shadows+tiddlers]tag[$:/tags/EditTemplate]!has[draft.of]]" variable="listItem">
 <$transclude tiddler=<<listItem>>/>
 </$list>
diff --git a/core/wiki/config/shortcuts/cancel-edit-tiddler.tid b/core/wiki/config/shortcuts/cancel-edit-tiddler.tid
new file mode 100644
index 000000000..dbb09ad0f
--- /dev/null
+++ b/core/wiki/config/shortcuts/cancel-edit-tiddler.tid
@@ -0,0 +1,3 @@
+title: $:/config/shortcuts/cancel-edit-tiddler
+
+escape
\ No newline at end of file
diff --git a/core/wiki/config/shortcuts/save-tiddler.tid b/core/wiki/config/shortcuts/save-tiddler.tid
new file mode 100644
index 000000000..da80be94c
--- /dev/null
+++ b/core/wiki/config/shortcuts/save-tiddler.tid
@@ -0,0 +1,3 @@
+title: $:/config/shortcuts/save-tiddler
+
+ctrl+enter
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/hiddensettings/Hidden_Setting__Keyboard_Shortcuts.tid b/editions/tw5.com/tiddlers/hiddensettings/Hidden_Setting__Keyboard_Shortcuts.tid
new file mode 100644
index 000000000..c2e8c7c02
--- /dev/null
+++ b/editions/tw5.com/tiddlers/hiddensettings/Hidden_Setting__Keyboard_Shortcuts.tid
@@ -0,0 +1,11 @@
+created: 20150808123932042
+modified: 20150808124201286
+tags: [[Hidden Settings]]
+title: Hidden Setting: Keyboard Shortcuts
+type: text/vnd.tiddlywiki
+
+Until a proper user interface is built, KeyboardShortcuts can only be altered via hidden settings:
+
+$:/config/shortcuts/cancel-edit-tiddler - keyboard shortcut for cancelling editing
+
+$:/config/shortcuts/save-tiddler - keyboard shortcut for confirming editing a tiddler