From f0144233f917c36bf13245fcdd58665f92f104df Mon Sep 17 00:00:00 2001 From: William Grant Date: Sun, 25 Mar 2018 23:04:16 +0200 Subject: [PATCH 1/8] Fullscreen shortcut for non macOS is now F11 --- lib/main-menu.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/main-menu.js b/lib/main-menu.js index ddf5ee54e..036256f2b 100644 --- a/lib/main-menu.js +++ b/lib/main-menu.js @@ -287,7 +287,7 @@ const window = { }, { label: 'Toggle Full Screen', - accelerator: 'Command+Control+F', + accelerator: process.platform === 'darwin' ? 'Command+Control+F' : 'F11', selector: 'toggleFullScreen:' }, { From ee78e113de148a839754f58acab13f06a6d0a33e Mon Sep 17 00:00:00 2001 From: William Grant Date: Tue, 27 Mar 2018 20:52:58 +0200 Subject: [PATCH 2/8] Moved 'Toggle Fullscreen' to the View label used non-OS specific fullscreen --- lib/main-menu.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/main-menu.js b/lib/main-menu.js index 036256f2b..37debc522 100644 --- a/lib/main-menu.js +++ b/lib/main-menu.js @@ -230,6 +230,13 @@ const view = { BrowserWindow.getFocusedWindow().toggleDevTools() } }, + { + label: 'Toggle Full Screen', + accelerator: macOS ? 'Command+Control+F' : 'F11', + click () { + mainWindow.setFullScreen(!mainWindow.isFullScreen()) + } + }, { type: 'separator' }, @@ -285,11 +292,6 @@ const window = { accelerator: 'Command+M', selector: 'performMiniaturize:' }, - { - label: 'Toggle Full Screen', - accelerator: process.platform === 'darwin' ? 'Command+Control+F' : 'F11', - selector: 'toggleFullScreen:' - }, { label: 'Close', accelerator: 'Command+W', From 9a445e34fd50c381ec29230240b14a55a24a94b4 Mon Sep 17 00:00:00 2001 From: William Grant Date: Tue, 27 Mar 2018 21:06:59 +0200 Subject: [PATCH 3/8] fixed trailing spaces --- lib/main-menu.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/main-menu.js b/lib/main-menu.js index 37debc522..f0830863e 100644 --- a/lib/main-menu.js +++ b/lib/main-menu.js @@ -233,7 +233,7 @@ const view = { { label: 'Toggle Full Screen', accelerator: macOS ? 'Command+Control+F' : 'F11', - click () { + click () { mainWindow.setFullScreen(!mainWindow.isFullScreen()) } }, From e1e3cc7999a8404669e14447c11a61269c58378b Mon Sep 17 00:00:00 2001 From: William Grant Date: Wed, 28 Mar 2018 19:17:40 +0200 Subject: [PATCH 4/8] moved label to a better position --- lib/main-menu.js | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/lib/main-menu.js b/lib/main-menu.js index f0830863e..644491ece 100644 --- a/lib/main-menu.js +++ b/lib/main-menu.js @@ -230,13 +230,6 @@ const view = { BrowserWindow.getFocusedWindow().toggleDevTools() } }, - { - label: 'Toggle Full Screen', - accelerator: macOS ? 'Command+Control+F' : 'F11', - click () { - mainWindow.setFullScreen(!mainWindow.isFullScreen()) - } - }, { type: 'separator' }, @@ -263,6 +256,16 @@ const view = { click () { mainWindow.webContents.send('top:focus-search') } + }, + { + type: 'separator' + }, + { + label:'Toggle Full Screen', + accelerator: macOS ? 'Command+Control+F' : 'F11', + click () { + mainWindow.setFullScreen(!mainWindow.isFullScreen()) + } } ] } From 11f8cfe0e6aa00dc64bf0ee57ea85ccf9291e127 Mon Sep 17 00:00:00 2001 From: William Grant Date: Wed, 28 Mar 2018 19:21:36 +0200 Subject: [PATCH 5/8] fixed label key-spacing --- lib/main-menu.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/main-menu.js b/lib/main-menu.js index 644491ece..e253fdbf1 100644 --- a/lib/main-menu.js +++ b/lib/main-menu.js @@ -261,7 +261,7 @@ const view = { type: 'separator' }, { - label:'Toggle Full Screen', + label: 'Toggle Full Screen', accelerator: macOS ? 'Command+Control+F' : 'F11', click () { mainWindow.setFullScreen(!mainWindow.isFullScreen()) From b46b9581050914212fcc056a794dd37426214fea Mon Sep 17 00:00:00 2001 From: William Grant Date: Fri, 30 Mar 2018 11:05:20 +0200 Subject: [PATCH 6/8] updated for separate methods for full screen depending on the platform --- lib/main-menu.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/main-menu.js b/lib/main-menu.js index e253fdbf1..cb4f1f4ad 100644 --- a/lib/main-menu.js +++ b/lib/main-menu.js @@ -263,9 +263,7 @@ const view = { { label: 'Toggle Full Screen', accelerator: macOS ? 'Command+Control+F' : 'F11', - click () { - mainWindow.setFullScreen(!mainWindow.isFullScreen()) - } + selector: macOS ? 'toggleFullScreen:' : mainWindow.setFullScreen(!mainWindow.isFullScreen()) } ] } From a32cfc8aff3c6336cf136722cc9347b9f4c533c4 Mon Sep 17 00:00:00 2001 From: William Grant Date: Fri, 30 Mar 2018 13:01:18 +0200 Subject: [PATCH 7/8] Revert "updated for separate methods for full screen depending on the platform" This reverts commit b46b9581050914212fcc056a794dd37426214fea. --- lib/main-menu.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/main-menu.js b/lib/main-menu.js index cb4f1f4ad..e253fdbf1 100644 --- a/lib/main-menu.js +++ b/lib/main-menu.js @@ -263,7 +263,9 @@ const view = { { label: 'Toggle Full Screen', accelerator: macOS ? 'Command+Control+F' : 'F11', - selector: macOS ? 'toggleFullScreen:' : mainWindow.setFullScreen(!mainWindow.isFullScreen()) + click () { + mainWindow.setFullScreen(!mainWindow.isFullScreen()) + } } ] } From 1d4f1764fcb8b9dfe0379f02406bbeebc20dff08 Mon Sep 17 00:00:00 2001 From: William Grant Date: Tue, 17 Apr 2018 18:22:54 +0200 Subject: [PATCH 8/8] Changed top:focus-search shortcut --- browser/main/NoteList/index.js | 4 ++-- lib/main-menu.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/browser/main/NoteList/index.js b/browser/main/NoteList/index.js index e97f7aefc..c4da63580 100644 --- a/browser/main/NoteList/index.js +++ b/browser/main/NoteList/index.js @@ -281,8 +281,8 @@ class NoteList extends React.Component { ee.emit('detail:focus') } - // F or S key - if (e.keyCode === 70 || e.keyCode === 83) { + // L or S key + if (e.keyCode === 76 || e.keyCode === 83) { e.preventDefault() ee.emit('top:focus-search') } diff --git a/lib/main-menu.js b/lib/main-menu.js index e253fdbf1..e1e2a83af 100644 --- a/lib/main-menu.js +++ b/lib/main-menu.js @@ -252,7 +252,7 @@ const view = { }, { label: 'Focus Search', - accelerator: 'Control+S', + accelerator: 'CommandOrControl+Shift+L', click () { mainWindow.webContents.send('top:focus-search') } @@ -275,7 +275,7 @@ let editorFocused // Define extra shortcut keys mainWindow.webContents.on('before-input-event', (event, input) => { // Synonyms for Search (Find) - if (input.control && input.key === 'f' && input.type === 'keyDown') { + if (input.control && input.key === 'l' && input.type === 'keyDown') { if (!editorFocused) { mainWindow.webContents.send('top:focus-search') event.preventDefault()