From 9f8a74c6d9a8c6ef08602774a7132c0f220f83bf Mon Sep 17 00:00:00 2001 From: BurningTreeC Date: Wed, 7 Nov 2018 13:59:21 +0100 Subject: [PATCH] add new-tiddler new-journal new-image keyboard shortcuts (#3512) * add new-tiddler action tiddler * use new-tiddler action-tiddler * use new-tiddler action-tiddler correctly * use new-journal action-tiddler * create new-journal action-tiddler * use new-image action-tiddler * add new-image action-tiddler * create new-image type config users may prefer png over jpeg for example * add new-tiddler keyboard shortcut * add keyboard shortcut configs * add keyboard shortcuts ShortcutInfo * add new-journal Keyboard shortcut * add new-image keyboard shortcut * Create Hidden Setting NewImageType.tid --- core/ui/Actions/new-image.tid | 10 ++++++++++ core/ui/Actions/new-journal.tid | 14 ++++++++++++++ core/ui/Actions/new-tiddler.tid | 5 +++++ core/ui/KeyboardShortcuts/new-image.tid | 7 +++++++ core/ui/KeyboardShortcuts/new-journal.tid | 7 +++++++ core/ui/KeyboardShortcuts/new-tiddler.tid | 7 +++++++ core/ui/PageControls/new-image.tid | 3 +-- core/ui/PageControls/new-journal.tid | 17 +---------------- core/ui/PageControls/newtiddler.tid | 4 ++-- core/wiki/config/NewImageType.tid | 3 +++ core/wiki/config/ShortcutInfo.multids | 3 +++ core/wiki/config/shortcuts/shortcuts.multids | 3 +++ .../Hidden Setting NewImageType.tid | 7 +++++++ 13 files changed, 70 insertions(+), 20 deletions(-) create mode 100644 core/ui/Actions/new-image.tid create mode 100644 core/ui/Actions/new-journal.tid create mode 100644 core/ui/Actions/new-tiddler.tid create mode 100644 core/ui/KeyboardShortcuts/new-image.tid create mode 100644 core/ui/KeyboardShortcuts/new-journal.tid create mode 100644 core/ui/KeyboardShortcuts/new-tiddler.tid create mode 100644 core/wiki/config/NewImageType.tid create mode 100644 editions/tw5.com/tiddlers/hiddensettings/Hidden Setting NewImageType.tid diff --git a/core/ui/Actions/new-image.tid b/core/ui/Actions/new-image.tid new file mode 100644 index 000000000..372933e90 --- /dev/null +++ b/core/ui/Actions/new-image.tid @@ -0,0 +1,10 @@ +title: $:/core/ui/Actions/new-image +tags: $:/tags/Actions +description: create a new image tiddler + +\define get-type() +image/$(imageType)$ +\end +<$vars imageType={{$:/config/NewImageType}}> +<$action-sendmessage $message="tm-new-tiddler" type=<>/> + diff --git a/core/ui/Actions/new-journal.tid b/core/ui/Actions/new-journal.tid new file mode 100644 index 000000000..4c5082f78 --- /dev/null +++ b/core/ui/Actions/new-journal.tid @@ -0,0 +1,14 @@ +title: $:/core/ui/Actions/new-journal +tags: $:/tags/Actions +description: create a new journal tiddler + +<$vars journalTitleTemplate={{$:/config/NewJournal/Title}} journalTags={{$:/config/NewJournal/Tags}} journalText={{$:/config/NewJournal/Text}}> +<$wikify name="journalTitle" text="""<$macrocall $name="now" format=<>/>"""> +<$reveal type="nomatch" state=<> text=""> +<$action-sendmessage $message="tm-new-tiddler" title=<> tags=<> text={{{ [get[]] }}}/> + +<$reveal type="match" state=<> text=""> +<$action-sendmessage $message="tm-new-tiddler" title=<> tags=<> text=<>/> + + + diff --git a/core/ui/Actions/new-tiddler.tid b/core/ui/Actions/new-tiddler.tid new file mode 100644 index 000000000..272b61007 --- /dev/null +++ b/core/ui/Actions/new-tiddler.tid @@ -0,0 +1,5 @@ +title: $:/core/ui/Actions/new-tiddler +tags: $:/tags/Actions +description: create a new empty tiddler + +<$action-sendmessage $message="tm-new-tiddler"/> diff --git a/core/ui/KeyboardShortcuts/new-image.tid b/core/ui/KeyboardShortcuts/new-image.tid new file mode 100644 index 000000000..de9f0d207 --- /dev/null +++ b/core/ui/KeyboardShortcuts/new-image.tid @@ -0,0 +1,7 @@ +title: $:/core/ui/KeyboardShortcuts/new-image +tags: $:/tags/KeyboardShortcut +key: ((new-image)) + +<$navigator story="$:/StoryList" history="$:/HistoryList" openLinkFromInsideRiver={{$:/config/Navigation/openLinkFromInsideRiver}} openLinkFromOutsideRiver={{$:/config/Navigation/openLinkFromOutsideRiver}} relinkOnRename={{$:/config/RelinkOnRename}}> +{{$:/core/ui/Actions/new-image}} + diff --git a/core/ui/KeyboardShortcuts/new-journal.tid b/core/ui/KeyboardShortcuts/new-journal.tid new file mode 100644 index 000000000..466e361da --- /dev/null +++ b/core/ui/KeyboardShortcuts/new-journal.tid @@ -0,0 +1,7 @@ +title: $:/core/ui/KeyboardShortcuts/new-journal +tags: $:/tags/KeyboardShortcut +key: ((new-journal)) + +<$navigator story="$:/StoryList" history="$:/HistoryList" openLinkFromInsideRiver={{$:/config/Navigation/openLinkFromInsideRiver}} openLinkFromOutsideRiver={{$:/config/Navigation/openLinkFromOutsideRiver}} relinkOnRename={{$:/config/RelinkOnRename}}> +{{$:/core/ui/Actions/new-journal}} + diff --git a/core/ui/KeyboardShortcuts/new-tiddler.tid b/core/ui/KeyboardShortcuts/new-tiddler.tid new file mode 100644 index 000000000..91177411a --- /dev/null +++ b/core/ui/KeyboardShortcuts/new-tiddler.tid @@ -0,0 +1,7 @@ +title: $:/core/ui/KeyboardShortcuts/new-tiddler +tags: $:/tags/KeyboardShortcut +key: ((new-tiddler)) + +<$navigator story="$:/StoryList" history="$:/HistoryList" openLinkFromInsideRiver={{$:/config/Navigation/openLinkFromInsideRiver}} openLinkFromOutsideRiver={{$:/config/Navigation/openLinkFromOutsideRiver}} relinkOnRename={{$:/config/RelinkOnRename}}> +{{$:/core/ui/Actions/new-tiddler}} + diff --git a/core/ui/PageControls/new-image.tid b/core/ui/PageControls/new-image.tid index bb9d4cd9c..06d06972d 100644 --- a/core/ui/PageControls/new-image.tid +++ b/core/ui/PageControls/new-image.tid @@ -3,8 +3,7 @@ tags: $:/tags/PageControls caption: {{$:/core/images/new-image-button}} {{$:/language/Buttons/NewImage/Caption}} description: {{$:/language/Buttons/NewImage/Hint}} -<$button tooltip={{$:/language/Buttons/NewImage/Hint}} aria-label={{$:/language/Buttons/NewImage/Caption}} class=<>> -<$action-sendmessage $message="tm-new-tiddler" type="image/jpeg"/> +<$button tooltip={{$:/language/Buttons/NewImage/Hint}} aria-label={{$:/language/Buttons/NewImage/Caption}} class=<> actions={{$:/core/ui/actions/new-image}}> <$list filter="[prefix[yes]]"> {{$:/core/images/new-image-button}} diff --git a/core/ui/PageControls/new-journal.tid b/core/ui/PageControls/new-journal.tid index 6b26b5ed2..8f64c9376 100644 --- a/core/ui/PageControls/new-journal.tid +++ b/core/ui/PageControls/new-journal.tid @@ -3,19 +3,8 @@ tags: $:/tags/PageControls caption: {{$:/core/images/new-journal-button}} {{$:/language/Buttons/NewJournal/Caption}} description: {{$:/language/Buttons/NewJournal/Hint}} -\define journalActions() -<$wikify name="journalTitle" text="""<$macrocall $name="now" format=<>/>"""> -<$reveal type="nomatch" state=<> text=""> -<$action-sendmessage $message="tm-new-tiddler" title=<> tags=<> text={{{ [get[]] }}}/> - -<$reveal type="match" state=<> text=""> -<$action-sendmessage $message="tm-new-tiddler" title=<> tags=<> text=<>/> - - -\end - \define journalButton() -<$button tooltip={{$:/language/Buttons/NewJournal/Hint}} aria-label={{$:/language/Buttons/NewJournal/Caption}} class=<> actions=<>> +<$button tooltip={{$:/language/Buttons/NewJournal/Hint}} aria-label={{$:/language/Buttons/NewJournal/Caption}} class=<> actions={{$:/core/ui/Actions/new-journal}}> <$list filter="[prefix[yes]]"> {{$:/core/images/new-journal-button}} @@ -24,8 +13,4 @@ description: {{$:/language/Buttons/NewJournal/Hint}} \end -<$set name="journalTitleTemplate" value={{$:/config/NewJournal/Title}}> -<$set name="journalTags" value={{$:/config/NewJournal/Tags}}> -<$set name="journalText" value={{$:/config/NewJournal/Text}}> <> - \ No newline at end of file diff --git a/core/ui/PageControls/newtiddler.tid b/core/ui/PageControls/newtiddler.tid index d83c52acd..efc502d5b 100644 --- a/core/ui/PageControls/newtiddler.tid +++ b/core/ui/PageControls/newtiddler.tid @@ -3,11 +3,11 @@ tags: $:/tags/PageControls caption: {{$:/core/images/new-button}} {{$:/language/Buttons/NewTiddler/Caption}} description: {{$:/language/Buttons/NewTiddler/Hint}} -<$button message="tm-new-tiddler" tooltip={{$:/language/Buttons/NewTiddler/Hint}} aria-label={{$:/language/Buttons/NewTiddler/Caption}} class=<>> +<$button actions={{$:/core/ui/Actions/new-tiddler}} tooltip={{$:/language/Buttons/NewTiddler/Hint}} aria-label={{$:/language/Buttons/NewTiddler/Caption}} class=<>> <$list filter="[prefix[yes]]"> {{$:/core/images/new-button}} <$list filter="[prefix[yes]]"> <$text text={{$:/language/Buttons/NewTiddler/Caption}}/> - \ No newline at end of file + diff --git a/core/wiki/config/NewImageType.tid b/core/wiki/config/NewImageType.tid new file mode 100644 index 000000000..3b0c1212b --- /dev/null +++ b/core/wiki/config/NewImageType.tid @@ -0,0 +1,3 @@ +title: $:/config/NewImageType + +jpeg diff --git a/core/wiki/config/ShortcutInfo.multids b/core/wiki/config/ShortcutInfo.multids index 8cd3c488f..8bf424a66 100644 --- a/core/wiki/config/ShortcutInfo.multids +++ b/core/wiki/config/ShortcutInfo.multids @@ -15,6 +15,9 @@ list-bullet: {{$:/language/Buttons/ListBullet/Hint}} list-number: {{$:/language/Buttons/ListNumber/Hint}} mono-block: {{$:/language/Buttons/MonoBlock/Hint}} mono-line: {{$:/language/Buttons/MonoLine/Hint}} +new-image: {{$:/language/Buttons/NewImage/Hint}} +new-journal: {{$:/language/Buttons/NewJournal/Hint}} +new-tiddler: {{$:/language/Buttons/NewTiddler/Hint}} picture: {{$:/language/Buttons/Picture/Hint}} preview: {{$:/language/Buttons/Preview/Hint}} quote: {{$:/language/Buttons/Quote/Hint}} diff --git a/core/wiki/config/shortcuts/shortcuts.multids b/core/wiki/config/shortcuts/shortcuts.multids index 9c135b4d4..2b256fdfa 100644 --- a/core/wiki/config/shortcuts/shortcuts.multids +++ b/core/wiki/config/shortcuts/shortcuts.multids @@ -14,6 +14,9 @@ list-bullet: ctrl-shift-L list-number: ctrl-shift-N mono-block: ctrl-shift-M mono-line: ctrl-M +new-image: alt-I +new-journal: alt-J +new-tiddler: alt-N picture: ctrl-shift-I preview: alt-P quote: ctrl-Q diff --git a/editions/tw5.com/tiddlers/hiddensettings/Hidden Setting NewImageType.tid b/editions/tw5.com/tiddlers/hiddensettings/Hidden Setting NewImageType.tid new file mode 100644 index 000000000..9dc67956f --- /dev/null +++ b/editions/tw5.com/tiddlers/hiddensettings/Hidden Setting NewImageType.tid @@ -0,0 +1,7 @@ +title: Hidden Setting: New-Image Type +tags: [[Hidden Setting]] +type: text/vnd.tiddlywiki + +By default new images are created with the image-type `jpeg` + +The hidden setting in $:/config/NewImageType can be set to another Image-Type which is used for new Image Tiddlers, like `png`