diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json index 3020a918e..2775bb8a6 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -859,7 +859,7 @@ "insertBefore": "光标所在块前插入空块", "insertAfter": "光标所在块后插入空块", "list1": "列表", - "insert": "插入元素", + "element": "元素", "closeTab": "关闭当前页签", "keymap": "快捷键", "clearFontStyle": "清除样式", diff --git a/app/src/config/keymap.ts b/app/src/config/keymap.ts index bb699eca1..0cf12e261 100644 --- a/app/src/config/keymap.ts +++ b/app/src/config/keymap.ts @@ -159,7 +159,7 @@ export const keymap = { - ${window.siyuan.languages.insert} + ${window.siyuan.languages.element}
${keymap._genItem(window.siyuan.config.keymap.editor.insert, "editor" + Constants.ZWSP + "insert")}
diff --git a/app/src/constants.ts b/app/src/constants.ts index e846dd98d..4e688ae76 100644 --- a/app/src/constants.ts +++ b/app/src/constants.ts @@ -427,6 +427,8 @@ export abstract class Constants { "inline-code": {default: "⌘G", custom: "⌘G"}, link: {default: "⌘K", custom: "⌘K"}, check: {default: "⌘L", custom: "⌘L"}, + "ordered-list": {default: "", custom: ""}, + list: {default: "", custom: ""}, table: {default: "⌘O", custom: "⌘O"}, code: {default: "⇧⌘K", custom: "⇧⌘K"}, clearInline: {default: "⌘\\", custom: "⌘\\"}, diff --git a/app/src/protyle/gutter/index.ts b/app/src/protyle/gutter/index.ts index 4c3093b47..7f96d17c6 100644 --- a/app/src/protyle/gutter/index.ts +++ b/app/src/protyle/gutter/index.ts @@ -617,12 +617,14 @@ export class Gutter { icon: "iconList", label: window.siyuan.languages.list, protyle, + accelerator: window.siyuan.config.keymap.editor.insert.list.custom, selectsElement, type: "Blocks2ULs" })); turnIntoSubmenu.push(this.turnsIntoOne({ icon: "iconOrderedList", label: window.siyuan.languages["ordered-list"], + accelerator: window.siyuan.config.keymap.editor.insert["ordered-list"].custom, protyle, selectsElement, type: "Blocks2OLs" @@ -630,6 +632,7 @@ export class Gutter { turnIntoSubmenu.push(this.turnsIntoOne({ icon: "iconCheck", label: window.siyuan.languages.check, + accelerator: window.siyuan.config.keymap.editor.insert.check.custom, protyle, selectsElement, type: "Blocks2TLs" @@ -970,6 +973,7 @@ export class Gutter { turnIntoSubmenu.push(this.turnsIntoOne({ icon: "iconList", label: window.siyuan.languages.list, + accelerator: window.siyuan.config.keymap.editor.insert.list.custom, protyle, selectsElement: [nodeElement], type: "Blocks2ULs" @@ -977,6 +981,7 @@ export class Gutter { turnIntoSubmenu.push(this.turnsIntoOne({ icon: "iconOrderedList", label: window.siyuan.languages["ordered-list"], + accelerator: window.siyuan.config.keymap.editor.insert["ordered-list"].custom, protyle, selectsElement: [nodeElement], type: "Blocks2OLs" @@ -984,6 +989,7 @@ export class Gutter { turnIntoSubmenu.push(this.turnsIntoOne({ icon: "iconCheck", label: window.siyuan.languages.check, + accelerator: window.siyuan.config.keymap.editor.insert.check.custom, protyle, selectsElement: [nodeElement], type: "Blocks2TLs" @@ -1137,6 +1143,7 @@ export class Gutter { turnIntoSubmenu.push(this.turnsOneInto({ icon: "iconList", label: window.siyuan.languages.list, + accelerator: window.siyuan.config.keymap.editor.insert.list.custom, protyle, nodeElement, id, @@ -1145,6 +1152,7 @@ export class Gutter { turnIntoSubmenu.push(this.turnsOneInto({ icon: "iconCheck", label: window.siyuan.languages.check, + accelerator: window.siyuan.config.keymap.editor.insert.check.custom, protyle, nodeElement, id, @@ -1154,6 +1162,7 @@ export class Gutter { turnIntoSubmenu.push(this.turnsOneInto({ icon: "iconList", label: window.siyuan.languages.list, + accelerator: window.siyuan.config.keymap.editor.insert.list.custom, protyle, nodeElement, id, @@ -1162,6 +1171,7 @@ export class Gutter { turnIntoSubmenu.push(this.turnsOneInto({ icon: "iconOrderedList", label: window.siyuan.languages["ordered-list"], + accelerator: window.siyuan.config.keymap.editor.insert["ordered-list"].custom, protyle, nodeElement, id, @@ -1171,6 +1181,7 @@ export class Gutter { turnIntoSubmenu.push(this.turnsOneInto({ icon: "iconOrderedList", label: window.siyuan.languages["ordered-list"], + accelerator: window.siyuan.config.keymap.editor.insert["ordered-list"].custom, protyle, nodeElement, id, @@ -1179,6 +1190,7 @@ export class Gutter { turnIntoSubmenu.push(this.turnsOneInto({ icon: "iconCheck", label: window.siyuan.languages.check, + accelerator: window.siyuan.config.keymap.editor.insert.check.custom, protyle, nodeElement, id,