From 22795bed77bdc3919406604a38578bee7e2ee3f6 Mon Sep 17 00:00:00 2001 From: Ben Gotow Date: Sat, 16 Mar 2019 13:54:01 -0700 Subject: [PATCH] =?UTF-8?q?Display=20the=20shortcut=20for=20=E2=80=9CFind?= =?UTF-8?q?=20in=20thread=E2=80=9D=20and=20use=20F4/Ctrl-Shift-F=20in=20Ou?= =?UTF-8?q?tlook=20config=20#1372?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../preferences/lib/tabs/keymaps/displayed-keybindings.ts | 1 + app/keymaps/base.json | 4 ---- app/keymaps/templates/Apple Mail.json | 4 ++++ app/keymaps/templates/Gmail.json | 4 ++++ app/keymaps/templates/Inbox by Gmail.json | 4 ++++ app/keymaps/templates/Outlook.json | 6 ++++-- 6 files changed, 17 insertions(+), 6 deletions(-) diff --git a/app/internal_packages/preferences/lib/tabs/keymaps/displayed-keybindings.ts b/app/internal_packages/preferences/lib/tabs/keymaps/displayed-keybindings.ts index ee03df430..f63c7bff2 100644 --- a/app/internal_packages/preferences/lib/tabs/keymaps/displayed-keybindings.ts +++ b/app/internal_packages/preferences/lib/tabs/keymaps/displayed-keybindings.ts @@ -58,6 +58,7 @@ export default [ ['core:focus-item', localized('Open selected conversation')], ['core:previous-item', localized('Move to newer conversation')], ['core:next-item', localized('Move to older conversation')], + ['core:find-in-thread', localized('Find in thread')], ], }, { diff --git a/app/keymaps/base.json b/app/keymaps/base.json index 883b0c005..a8086dfca 100644 --- a/app/keymaps/base.json +++ b/app/keymaps/base.json @@ -42,10 +42,6 @@ "window:select-account-7": "mod+8", "window:select-account-8": "mod+9", - "core:find-in-thread": "mod+f", - "core:find-in-thread-next": "mod+g", - "core:find-in-thread-previous": "mod+shift+g", - "contenteditable:underline": "mod+u", "contenteditable:bold": "mod+b", "contenteditable:italic": "mod+i", diff --git a/app/keymaps/templates/Apple Mail.json b/app/keymaps/templates/Apple Mail.json index 38f50f6bd..ca3187150 100644 --- a/app/keymaps/templates/Apple Mail.json +++ b/app/keymaps/templates/Apple Mail.json @@ -12,6 +12,10 @@ "multiselect-list:select-all": "command+a", + "core:find-in-thread": "mod+f", + "core:find-in-thread-next": "mod+g", + "core:find-in-thread-previous": "mod+shift+g", + "core:previous-item": "command+[", "core:select-up": "shift+command+[", "core:next-item": "command+]", diff --git a/app/keymaps/templates/Gmail.json b/app/keymaps/templates/Gmail.json index c62266d91..748fcc65e 100644 --- a/app/keymaps/templates/Gmail.json +++ b/app/keymaps/templates/Gmail.json @@ -16,6 +16,10 @@ "thread-list:select-starred": "* s", "thread-list:select-unstarred": "* t", + "core:find-in-thread": "mod+f", + "core:find-in-thread-next": "mod+g", + "core:find-in-thread-previous": "mod+shift+g", + "core:pop-sheet": "u", "core:previous-item": "k", "core:select-up": "shift+k", diff --git a/app/keymaps/templates/Inbox by Gmail.json b/app/keymaps/templates/Inbox by Gmail.json index 274e8b78e..c69ed0d14 100644 --- a/app/keymaps/templates/Inbox by Gmail.json +++ b/app/keymaps/templates/Inbox by Gmail.json @@ -14,6 +14,10 @@ "message-list:previous-message": "p", "message-list:next-message": "n", + "core:find-in-thread": "mod+f", + "core:find-in-thread-next": "mod+g", + "core:find-in-thread-previous": "mod+shift+g", + "core:mute-conversation": "m", "core:focus-search": "/", "core:change-category": ".", diff --git a/app/keymaps/templates/Outlook.json b/app/keymaps/templates/Outlook.json index 96e430503..d459bdeff 100644 --- a/app/keymaps/templates/Outlook.json +++ b/app/keymaps/templates/Outlook.json @@ -8,9 +8,11 @@ "core:reply": "mod+r", "core:reply-all": "mod+shift+r", "application:new-message": ["mod+n", "mod+shift+m"], - "core:find-in-thread": "f4", + + "core:find-in-thread": ["mod+shift+f", "f4"], "core:find-in-thread-next": "shift+f4", - "core:find-in-thread-previous": "ctrl+shift+f4", + "core:find-in-thread-previous": "mod+shift+f4", + "core:focus-item": "ctrl+o", "core:mark-as-read": "ctrl+q", "core:mark-as-unread": "ctrl+u",