Workaround: Ctrl+Alt shortcut on Windows (#526)

This commit is contained in:
Felix Häusler 2018-10-28 12:00:19 +01:00 committed by Ran Luo
parent 365243eaf6
commit a1853cf73e
3 changed files with 20 additions and 15 deletions

View File

@ -2,6 +2,7 @@ import * as actions from '../actions/edit'
import userPreference from '../preference' import userPreference from '../preference'
const { aidou } = userPreference.getAll() const { aidou } = userPreference.getAll()
const isWindows = process.platform === 'win32'
export default { export default {
label: 'Edit', label: 'Edit',
@ -66,7 +67,7 @@ export default {
} }
}, { }, {
label: 'Find Next', label: 'Find Next',
accelerator: 'Alt+CmdOrCtrl+U', accelerator: (isWindows ? 'Alt+AltGr+CmdOrCtrl' : 'Alt+CmdOrCtrl') + '+U', // WORKAROUND: #523
click (menuItem, browserWindow) { click (menuItem, browserWindow) {
actions.edit(browserWindow, 'fineNext') actions.edit(browserWindow, 'fineNext')
} }
@ -78,7 +79,7 @@ export default {
} }
}, { }, {
label: 'Replace', label: 'Replace',
accelerator: 'Alt+CmdOrCtrl+F', accelerator: (isWindows ? 'Alt+AltGr+CmdOrCtrl' : 'Alt+CmdOrCtrl') + '+F', // WORKAROUND: #523
click (menuItem, browserWindow) { click (menuItem, browserWindow) {
actions.edit(browserWindow, 'replace') actions.edit(browserWindow, 'replace')
} }

View File

@ -1,5 +1,7 @@
import * as actions from '../actions/paragraph' import * as actions from '../actions/paragraph'
const isWindows = process.platform === 'win32'
export default { export default {
id: 'paragraphMenuEntry', id: 'paragraphMenuEntry',
label: 'Paragraph', label: 'Paragraph',
@ -81,7 +83,7 @@ export default {
id: 'codeFencesMenuItem', id: 'codeFencesMenuItem',
label: 'Code Fences', label: 'Code Fences',
type: 'checkbox', type: 'checkbox',
accelerator: 'Alt+CmdOrCtrl+C', accelerator: (isWindows ? 'Alt+AltGr+CmdOrCtrl' : 'Alt+CmdOrCtrl') + '+C', // WORKAROUND: #523
click (menuItem, browserWindow) { click (menuItem, browserWindow) {
actions.paragraph(browserWindow, 'pre') actions.paragraph(browserWindow, 'pre')
} }
@ -89,7 +91,7 @@ export default {
id: 'quoteBlockMenuItem', id: 'quoteBlockMenuItem',
label: 'Quote Block', label: 'Quote Block',
type: 'checkbox', type: 'checkbox',
accelerator: 'Alt+CmdOrCtrl+Q', accelerator: (isWindows ? 'Alt+AltGr+CmdOrCtrl' : 'Alt+CmdOrCtrl') + '+Q', // WORKAROUND: #523
click (menuItem, browserWindow) { click (menuItem, browserWindow) {
actions.paragraph(browserWindow, 'blockquote') actions.paragraph(browserWindow, 'blockquote')
} }
@ -97,7 +99,7 @@ export default {
id: 'mathBlockMenuItem', id: 'mathBlockMenuItem',
label: 'Math Block', label: 'Math Block',
type: 'checkbox', type: 'checkbox',
accelerator: 'Alt+CmdOrCtrl+M', accelerator: (isWindows ? 'Alt+AltGr+CmdOrCtrl' : 'Alt+CmdOrCtrl') + '+M', // WORKAROUND: #523
click (menuItem, browserWindow) { click (menuItem, browserWindow) {
actions.paragraph(browserWindow, 'mathblock') actions.paragraph(browserWindow, 'mathblock')
} }
@ -105,7 +107,7 @@ export default {
id: 'htmlBlockMenuItem', id: 'htmlBlockMenuItem',
label: 'Html Block', label: 'Html Block',
type: 'checkbox', type: 'checkbox',
accelerator: 'Alt+CmdOrCtrl+L', accelerator: (isWindows ? 'Alt+AltGr+CmdOrCtrl' : 'Alt+CmdOrCtrl') + '+L', // WORKAROUND: #523
click (menuItem, browserWindow) { click (menuItem, browserWindow) {
actions.paragraph(browserWindow, 'html') actions.paragraph(browserWindow, 'html')
} }
@ -115,7 +117,7 @@ export default {
id: 'orderListMenuItem', id: 'orderListMenuItem',
label: 'Order List', label: 'Order List',
type: 'checkbox', type: 'checkbox',
accelerator: 'Alt+CmdOrCtrl+O', accelerator: (isWindows ? 'Alt+AltGr+CmdOrCtrl' : 'Alt+CmdOrCtrl') + '+O', // WORKAROUND: #523
click (menuItem, browserWindow) { click (menuItem, browserWindow) {
actions.paragraph(browserWindow, 'ol-order') actions.paragraph(browserWindow, 'ol-order')
} }
@ -123,7 +125,7 @@ export default {
id: 'bulletListMenuItem', id: 'bulletListMenuItem',
label: 'Bullet List', label: 'Bullet List',
type: 'checkbox', type: 'checkbox',
accelerator: 'Alt+CmdOrCtrl+U', accelerator: (isWindows ? 'Alt+AltGr+CmdOrCtrl' : 'Alt+CmdOrCtrl') + '+U', // WORKAROUND: #523
click (menuItem, browserWindow) { click (menuItem, browserWindow) {
actions.paragraph(browserWindow, 'ul-bullet') actions.paragraph(browserWindow, 'ul-bullet')
} }
@ -131,7 +133,7 @@ export default {
id: 'taskListMenuItem', id: 'taskListMenuItem',
label: 'Task List', label: 'Task List',
type: 'checkbox', type: 'checkbox',
accelerator: 'Alt+CmdOrCtrl+X', accelerator: (isWindows ? 'Alt+AltGr+CmdOrCtrl' : 'Alt+CmdOrCtrl') + '+X', // WORKAROUND: #523
click (menuItem, browserWindow) { click (menuItem, browserWindow) {
actions.paragraph(browserWindow, 'ul-task') actions.paragraph(browserWindow, 'ul-task')
} }
@ -141,7 +143,7 @@ export default {
id: 'looseListItemMenuItem', id: 'looseListItemMenuItem',
label: 'Loose List Item', label: 'Loose List Item',
type: 'checkbox', type: 'checkbox',
accelerator: 'Alt+CmdOrCtrl+L', accelerator: (isWindows ? 'Alt+AltGr+CmdOrCtrl' : 'Alt+CmdOrCtrl') + '+L', // WORKAROUND: #523
click (menuItem, browserWindow) { click (menuItem, browserWindow) {
actions.paragraph(browserWindow, 'loose-list-item') actions.paragraph(browserWindow, 'loose-list-item')
} }
@ -159,7 +161,7 @@ export default {
id: 'horizontalLineMenuItem', id: 'horizontalLineMenuItem',
label: 'Horizontal Line', label: 'Horizontal Line',
type: 'checkbox', type: 'checkbox',
accelerator: 'Alt+CmdOrCtrl+-', accelerator: (isWindows ? 'Alt+AltGr+CmdOrCtrl' : 'Alt+CmdOrCtrl') + '+-', // WORKAROUND: #523
click (menuItem, browserWindow) { click (menuItem, browserWindow) {
actions.paragraph(browserWindow, 'hr') actions.paragraph(browserWindow, 'hr')
} }
@ -167,7 +169,7 @@ export default {
id: 'frontMatterMenuItem', id: 'frontMatterMenuItem',
label: 'YAML Front Matter', label: 'YAML Front Matter',
type: 'checkbox', type: 'checkbox',
accelerator: 'Alt+CmdOrCtrl+Y', accelerator: (isWindows ? 'Alt+AltGr+CmdOrCtrl' : 'Alt+CmdOrCtrl') + '+Y', // WORKAROUND: #523
click (menuItem, browserWindow) { click (menuItem, browserWindow) {
actions.paragraph(browserWindow, 'front-matter') actions.paragraph(browserWindow, 'front-matter')
} }

View File

@ -1,5 +1,7 @@
import * as actions from '../actions/view' import * as actions from '../actions/view'
const isWindows = process.platform === 'win32'
let viewMenu = { let viewMenu = {
label: 'View', label: 'View',
submenu: [{ submenu: [{
@ -29,7 +31,7 @@ let viewMenu = {
}, { }, {
id: 'sourceCodeModeMenuItem', id: 'sourceCodeModeMenuItem',
label: 'Source Code Mode', label: 'Source Code Mode',
accelerator: 'Alt+CmdOrCtrl+S', accelerator: (isWindows ? 'Alt+AltGr+CmdOrCtrl' : 'Alt+CmdOrCtrl') + '+S', // WORKAROUND: #523
type: 'checkbox', type: 'checkbox',
checked: false, checked: false,
click (item, browserWindow) { click (item, browserWindow) {
@ -38,7 +40,7 @@ let viewMenu = {
}, { }, {
id: 'typewriterModeMenuItem', id: 'typewriterModeMenuItem',
label: 'Typewriter Mode', label: 'Typewriter Mode',
accelerator: 'Alt+CmdOrCtrl+T', accelerator: (isWindows ? 'Alt+AltGr+CmdOrCtrl' : 'Alt+CmdOrCtrl') + '+T', // WORKAROUND: #523
type: 'checkbox', type: 'checkbox',
checked: false, checked: false,
click (item, browserWindow) { click (item, browserWindow) {
@ -67,7 +69,7 @@ let viewMenu = {
}, { }, {
label: 'Toggle Tab Bar', label: 'Toggle Tab Bar',
id: 'tabBarMenuItem', id: 'tabBarMenuItem',
accelerator: 'Alt+CmdOrCtrl+B', accelerator: (isWindows ? 'Alt+AltGr+CmdOrCtrl' : 'Alt+CmdOrCtrl') + '+B', // WORKAROUND: #523
type: 'checkbox', type: 'checkbox',
checked: false, checked: false,
click (item, browserWindow) { click (item, browserWindow) {