diff --git a/help/SHORTCUTS.md b/help/SHORTCUTS.md index 5514f34e..51c424be 100644 --- a/help/SHORTCUTS.md +++ b/help/SHORTCUTS.md @@ -3,6 +3,7 @@ enableMacro: true define: 'Ctrl/Cmd': '[= $ctx.env.isMacOS ? "Cmd" : "Ctrl" =]' 'Alt/Option': '[= $ctx.env.isMacOS ? "Option" : "Alt" =]' + 'TABS-CLOSE-CURRENT': '[= `${$ctx.env.isMacOS ? "Cmd" : "Ctrl"} +${$ctx.env.isElectron ? "" : ($ctx.env.isMacOS ? "Option" : "Alt") + " +"} W` =]' --- ## Shortcuts @@ -46,6 +47,7 @@ Edit Table Cell | Double Click Cell Edit Table Cell (Popup) | Ctrl/Cmd + Click Copy Heading link | Ctrl/Cmd + Click Heading Switch Editor Tab | Ctrl/Cmd + Alt/Option + Left/Right +Close Editor Current Tab | TABS-CLOSE-CURRENT Toggle Sidebar | Alt/Option + E Toggle Word Wrap | Alt/Option + W Toggle Preview | Alt/Option + V @@ -95,6 +97,7 @@ Zoom Reset | Ctrl/Cmd + 0 编辑表格单元格(弹出框) | Ctrl/Cmd + 单击单元格 复制文档标题链接 | Ctrl/Cmd + 单击标题 切换编辑器 Tab | Ctrl/Cmd + Alt/Option + Left/Right +关闭编辑器当前标签 Tab | TABS-CLOSE-CURRENT 切换侧栏 | Alt/Option + E 切换编辑器自动换行 | Alt/Option + W 切换文档预览显示 | Alt/Option + V diff --git a/src/main/menus.ts b/src/main/menus.ts index caeeda34..60fb5058 100644 --- a/src/main/menus.ts +++ b/src/main/menus.ts @@ -10,7 +10,6 @@ export const getMainMenus = () => process.platform === 'darwin' ? Menu.buildFrom label: 'Application', submenu: [ { type: 'normal', label: $t('app.preferences'), click: () => getAction('show-main-window-setting')() }, - { type: 'normal', label: $t('app.close-window'), accelerator: 'Command+W', click: () => getAction('hide-main-window')() }, { type: 'normal', label: $t('app.toggle-fullscreen'), accelerator: 'Ctrl+command+F', click: () => getAction('toggle-fullscreen')() }, { type: 'normal', label: $t('app.quit'), accelerator: 'Command+Q', click: () => getAction('quit')() } ] diff --git a/src/renderer/components/FileTabs.vue b/src/renderer/components/FileTabs.vue index 5a1c3367..9a526856 100644 --- a/src/renderer/components/FileTabs.vue +++ b/src/renderer/components/FileTabs.vue @@ -5,13 +5,14 @@