diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json index a96fb7ca6..12964e499 100644 --- a/app/appearance/langs/en_US.json +++ b/app/appearance/langs/en_US.json @@ -313,8 +313,7 @@ "math": "Math Block", "listItem": "List item", "superBlock": "Super block", - "expandAll": "Expand All", - "collapseAll": "Collapse All", + "expand": "Expand", "showDock": "Show Dock", "hideDock": "Hide Dock", "notebookName": "Please enter a notebook name", diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json index 58bc50bcc..65e74d6d8 100644 --- a/app/appearance/langs/es_ES.json +++ b/app/appearance/langs/es_ES.json @@ -313,8 +313,7 @@ "math": "Bloque de matemáticas", "listItem": "Elemento de la lista", "superBlock": "Superbloque", - "expandAll": "Expandir todo", - "collapseAll": "Colapsar todo", + "expand": "Expandir", "showDock": "Mostrar Dock", "hideDock": "Ocultar Dock", "notebookName": "Por favor, introduzca un nombre de cuaderno", diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json index 38c40bf85..3c232774a 100644 --- a/app/appearance/langs/fr_FR.json +++ b/app/appearance/langs/fr_FR.json @@ -313,8 +313,7 @@ "math": "Block de Math", "listItem": "Élément de liste", "superBlock": "Superblock", - "expandAll": "Tout élargir", - "collapseAll": "Tout Collapse", + "expand": "Élargir", "showDock": "Montrer le Dock", "hideDock": "Cacher le Dock", "notebookName": "Veuillez entrer un nom de carnet de notes", diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json index dba8420f9..551ed2452 100644 --- a/app/appearance/langs/zh_CHT.json +++ b/app/appearance/langs/zh_CHT.json @@ -313,8 +313,7 @@ "math": "數學公式塊", "listItem": "列表項", "superBlock": "超級塊", - "expandAll": "全部展開", - "collapseAll": "全部摺疊", + "expand": "展開", "showDock": "顯示停靠欄", "hideDock": "隱藏停靠欄", "notebookName": "請輸入筆記本名稱", diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json index 39c486736..1df0d54b8 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -313,8 +313,7 @@ "math": "数学公式块", "listItem": "列表项", "superBlock": "超级块", - "expandAll": "全部展开", - "collapseAll": "全部折叠", + "expand": "展开", "showDock": "显示停靠栏", "hideDock": "隐藏停靠栏", "notebookName": "请输入笔记本名称", diff --git a/app/src/config/keymap.ts b/app/src/config/keymap.ts index b1631fbca..1fa228972 100644 --- a/app/src/config/keymap.ts +++ b/app/src/config/keymap.ts @@ -281,7 +281,7 @@ export const keymap = { } if (["⌘", "⇧", "⌥", "⌃"].includes(keymapStr.substr(keymapStr.length - 1, 1)) || - ["⌘A", "⌘X", "⌘C", "⌘V", "⌘/", "⌘↑", "⌘↓", "⇧↑", "⇧↓", "⇧→", "⇧←", "⇧⇥", "⇧⌘⇥", "⌃⇥", "⌃⌘⇥", "⇧⌘→", "⇧⌘←", "⌘Home", "⌘End", "⇧↩", "↩", "PageUp", "PageDown", "⌫", "⌦"].includes(keymapStr)) { + ["⌘A", "⌘X", "⌘C", "⌘V", "⌘/", "⇧↑", "⇧↓", "⇧→", "⇧←", "⇧⇥", "⇧⌘⇥", "⌃⇥", "⌃⌘⇥", "⇧⌘→", "⇧⌘←", "⌘Home", "⌘End", "⇧↩", "↩", "PageUp", "PageDown", "⌫", "⌦"].includes(keymapStr)) { showMessage(tip + "] " + window.siyuan.languages.invalid); return; } diff --git a/app/src/constants.ts b/app/src/constants.ts index e76d30c82..020c563f7 100644 --- a/app/src/constants.ts +++ b/app/src/constants.ts @@ -88,7 +88,7 @@ export abstract class Constants { }; // "⌘", "⇧", "⌥", "⌃" - // "⌘A", "⌘X", "⌘C", "⌘V", "⌘/", "⌘↑", "⌘↓", "⇧↑", "⇧↓", "⇧→", "⇧←", "⇧⇥", "⇧⌘⇥", "⌃⇥", "⌃⌘⇥", "⇧⌘→", "⇧⌘←", "⌘Home", "⌘End", "⇧↩", "↩", "PageUp", "PageDown", "⌫", "⌦" 不可自定义 + // "⌘A", "⌘X", "⌘C", "⌘V", "⌘/", "⇧↑", "⇧↓", "⇧→", "⇧←", "⇧⇥", "⇧⌘⇥", "⌃⇥", "⌃⌘⇥", "⇧⌘→", "⇧⌘←", "⌘Home", "⌘End", "⇧↩", "↩", "PageUp", "PageDown", "⌫", "⌦" 不可自定义 public static readonly SIYUAN_KEYMAP: IKeymap = { general: { syncNow: {default: "F9", custom: "F9"}, @@ -126,6 +126,8 @@ export abstract class Constants { hLayout: {default: "", custom: ""}, vLayout: {default: "", custom: ""}, refPopover: {default: "", custom: ""}, + expand: {default: "⌘↓", custom: "⌘↓"}, + collapse: {default: "⌘↑", custom: "⌘↑"}, insertBottom: {default: "⌥⌘.", custom: "⌥⌘."}, refTab: {default: "⇧⌘>", custom: "⇧⌘>"}, openBy: {default: "⌘.", custom: "⌘."}, diff --git a/app/src/layout/dock/Backlinks.ts b/app/src/layout/dock/Backlinks.ts index 0c70308e4..a315fcbe1 100644 --- a/app/src/layout/dock/Backlinks.ts +++ b/app/src/layout/dock/Backlinks.ts @@ -85,11 +85,11 @@ export class Backlinks extends Model { - + - + @@ -108,11 +108,11 @@ export class Backlinks extends Model { - + - + diff --git a/app/src/layout/dock/Bookmark.ts b/app/src/layout/dock/Bookmark.ts index 59b6fa3b5..1fe45e299 100644 --- a/app/src/layout/dock/Bookmark.ts +++ b/app/src/layout/dock/Bookmark.ts @@ -61,11 +61,11 @@ export class Bookmark extends Model { - + - + diff --git a/app/src/layout/dock/Files.ts b/app/src/layout/dock/Files.ts index 3c828a22c..93f40d53a 100644 --- a/app/src/layout/dock/Files.ts +++ b/app/src/layout/dock/Files.ts @@ -69,7 +69,7 @@ export class Files extends Model { - +
diff --git a/app/src/layout/dock/Outline.ts b/app/src/layout/dock/Outline.ts index 0c5097541..730760e74 100644 --- a/app/src/layout/dock/Outline.ts +++ b/app/src/layout/dock/Outline.ts @@ -74,11 +74,11 @@ export class Outline extends Model { ${window.siyuan.languages.outline} - + - + diff --git a/app/src/layout/dock/Tag.ts b/app/src/layout/dock/Tag.ts index b8ff8ee24..b03bfd074 100644 --- a/app/src/layout/dock/Tag.ts +++ b/app/src/layout/dock/Tag.ts @@ -58,11 +58,11 @@ export class Tag extends Model { - + - + diff --git a/app/src/protyle/gutter/index.ts b/app/src/protyle/gutter/index.ts index bb9da3336..aebb849a9 100644 --- a/app/src/protyle/gutter/index.ts +++ b/app/src/protyle/gutter/index.ts @@ -1234,7 +1234,7 @@ export class Gutter { window.siyuan.menus.menu.append(new MenuItem({ label: window.siyuan.languages.fold, - accelerator: `${updateHotkeyTip("⌘↑")}/${updateHotkeyTip("⌥Click")}`, + accelerator: `${updateHotkeyTip(window.siyuan.config.keymap.editor.general.collapse.custom)}/${updateHotkeyTip("⌥Click")}`, click() { setFold(protyle, nodeElement); focusBlock(nodeElement); diff --git a/app/src/protyle/wysiwyg/keydown.ts b/app/src/protyle/wysiwyg/keydown.ts index 1a41e2453..06234f039 100644 --- a/app/src/protyle/wysiwyg/keydown.ts +++ b/app/src/protyle/wysiwyg/keydown.ts @@ -249,7 +249,7 @@ export const keydown = (protyle: IProtyle, editorElement: HTMLElement) => { if (!isCtrl(event) && !event.shiftKey && event.key !== "Backspace" && event.key !== "PageUp" && event.key !== "PageDown" && event.key.indexOf("Arrow") === -1) { protyle.toolbar.isNewEmptyInline = false; } - if (matchHotKey("⌘↑", event)) { + if (matchHotKey(window.siyuan.config.keymap.editor.general.collapse.custom, event)) { const selectElements = protyle.wysiwyg.element.querySelectorAll(".protyle-wysiwyg--select"); if (selectElements.length > 0) { setFold(protyle, selectElements[0]); @@ -270,7 +270,7 @@ export const keydown = (protyle: IProtyle, editorElement: HTMLElement) => { event.preventDefault(); return false; } - if (matchHotKey("⌘↓", event)) { + if (matchHotKey(window.siyuan.config.keymap.editor.general.expand.custom, event)) { const selectElements = protyle.wysiwyg.element.querySelectorAll(".protyle-wysiwyg--select"); if (selectElements.length > 0) { setFold(protyle, selectElements[0], true); diff --git a/app/src/util/globalShortcut.ts b/app/src/util/globalShortcut.ts index 1074c3c86..d3b109d03 100644 --- a/app/src/util/globalShortcut.ts +++ b/app/src/util/globalShortcut.ts @@ -536,7 +536,7 @@ export const globalShortcut = () => { } // 面板折叠展开操作 - if (matchHotKey("⌘↑", event) || matchHotKey("⌘↓", event)) { + if (matchHotKey(window.siyuan.config.keymap.editor.general.collapse.custom, event) || matchHotKey(window.siyuan.config.keymap.editor.general.expand.custom, event)) { let activePanelElement = document.querySelector(".block__icons--active"); if (!activePanelElement) { Array.from(document.querySelectorAll(".layout__wnd--active .layout-tab-container > div")).forEach(item => { @@ -547,11 +547,11 @@ export const globalShortcut = () => { }); } if (activePanelElement) { - if (matchHotKey("⌘↑", event)) { + if (matchHotKey(window.siyuan.config.keymap.editor.general.collapse.custom, event)) { if (activePanelElement.querySelector('.block__icon[data-type="collapse"]')) { activePanelElement.querySelector('.block__icon[data-type="collapse"]').dispatchEvent(new CustomEvent("click")); } - } else if (matchHotKey("⌘↓", event)) { + } else if (matchHotKey(window.siyuan.config.keymap.editor.general.expand.custom, event)) { if (activePanelElement.querySelector('.block__icon[data-type="expand"]')) { activePanelElement.querySelector('.block__icon[data-type="expand"]').dispatchEvent(new CustomEvent("click")); }