From c8150e5bab3b1d7ad7e042e23093983bcc1366a1 Mon Sep 17 00:00:00 2001 From: windingwind <33902321+windingwind@users.noreply.github.com> Date: Fri, 28 Jul 2023 19:26:07 +0800 Subject: [PATCH] add: import from clipboard in template editor --- addon/chrome/content/templateEditor.xhtml | 3 ++- addon/locale/en-US/templateEditor.ftl | 8 +++++--- addon/locale/ru-RU/templateEditor.ftl | 8 +++++--- addon/locale/zh-CN/addon.ftl | 4 ++-- addon/locale/zh-CN/templateEditor.ftl | 8 +++++--- src/modules/template/editorWindow.ts | 15 ++++++++++----- 6 files changed, 29 insertions(+), 17 deletions(-) diff --git a/addon/chrome/content/templateEditor.xhtml b/addon/chrome/content/templateEditor.xhtml index 2c1067a..45f4854 100644 --- a/addon/chrome/content/templateEditor.xhtml +++ b/addon/chrome/content/templateEditor.xhtml @@ -153,7 +153,8 @@ wantdropmarker="true" > - + + diff --git a/addon/locale/en-US/templateEditor.ftl b/addon/locale/en-US/templateEditor.ftl index 2c50a22..0ed85ca 100644 --- a/addon/locale/en-US/templateEditor.ftl +++ b/addon/locale/en-US/templateEditor.ftl @@ -15,10 +15,12 @@ more = options = .label = Options -import = - .label = Import note as template +importClipboard = + .label = Import template: from template share code in clipboard +importNote = + .label = Import template: from existing note share = - .label = Copy share code + .label = Copy template share code to clipboard backup = .label = Export backup file restore = diff --git a/addon/locale/ru-RU/templateEditor.ftl b/addon/locale/ru-RU/templateEditor.ftl index 7049bc2..00db9e3 100644 --- a/addon/locale/ru-RU/templateEditor.ftl +++ b/addon/locale/ru-RU/templateEditor.ftl @@ -15,10 +15,12 @@ more = options = .label = Options -import = - .label = Import note as template +importClipboard = + .label = Import template: from template share code in clipboard +importNote = + .label = Import template: from existing note share = - .label = Copy share code + .label = Copy template share code to clipboard backup = .label = Export backup file restore = diff --git a/addon/locale/zh-CN/addon.ftl b/addon/locale/zh-CN/addon.ftl index 02a8f29..35cd80e 100644 --- a/addon/locale/zh-CN/addon.ftl +++ b/addon/locale/zh-CN/addon.ftl @@ -9,9 +9,9 @@ menuFile-openRecent = 打开最近使用的工作区笔记 menuFile-openRecent-empty = 无最近使用的工作区笔记 menuEdit-insertTemplate=插入模板到工作区笔记 -menuEdit-exportTemplate=导出模板到文件... +menuEdit-exportTemplate=运行模板并导出为文件... menuEdit-templateEditor=模板编辑器 -menuEdit-importTemplate=从剪贴板导入新模板 +menuEdit-importTemplate=从剪贴板导入笔记模板 menuTools-syncManager=同步管理器 diff --git a/addon/locale/zh-CN/templateEditor.ftl b/addon/locale/zh-CN/templateEditor.ftl index c36e639..8132140 100644 --- a/addon/locale/zh-CN/templateEditor.ftl +++ b/addon/locale/zh-CN/templateEditor.ftl @@ -14,10 +14,12 @@ more = options = .label = 选项 -import = - .label = 导入笔记 +importClipboard = + .label = 导入笔记模板: 剪贴板中的模板分享代码 +importNote = + .label = 导入笔记模板: 从现有笔记 share = - .label = 复制分享代码 + .label = 复制模板分享代码到剪贴板 backup = .label = 导出模板备份文件 restore = diff --git a/src/modules/template/editorWindow.ts b/src/modules/template/editorWindow.ts index a8929bc..7fac639 100644 --- a/src/modules/template/editorWindow.ts +++ b/src/modules/template/editorWindow.ts @@ -80,11 +80,6 @@ export async function showTemplateEditor() { ?.addEventListener("click", (ev) => { createTemplate(); }); - _window.document - .querySelector("#import") - ?.addEventListener("click", (ev) => { - importNoteTemplate(); - }); _window.document.querySelector("#help")?.addEventListener("click", (ev) => { Zotero.launchURL( "https://github.com/windingwind/zotero-better-notes/blob/master/docs/about-note-template.md", @@ -108,6 +103,16 @@ export async function showTemplateEditor() { ?.addEventListener("click", (ev) => { resetSelectedTemplate(); }); + _window.document + .querySelector("#importClipboard") + ?.addEventListener("click", (ev) => { + addon.hooks.onImportTemplateFromClipboard(); + }); + _window.document + .querySelector("#importNote") + ?.addEventListener("click", (ev) => { + importNoteTemplate(); + }); _window.document .querySelector("#share") ?.addEventListener("click", (ev) => {