diff --git a/docs/KEYBINDINGS.md b/docs/KEYBINDINGS.md index 82abd3b1..586f7de1 100644 --- a/docs/KEYBINDINGS.md +++ b/docs/KEYBINDINGS.md @@ -57,26 +57,26 @@ Here is an example: **Edit menu:** -| Id | Default | Description | -|:------------------------ | -------------------------------------------------- | ----------------------------------------------- | -| `edit.undo` | CmdOrCtrl+Z | Undo last operation | -| `edit.redo` | CmdOrCtrl+Shift+Z | Redo last operation | -| `edit.cut` | CmdOrCtrl+X | Cut selected text | -| `edit.copy` | CmdOrCtrl+C | Copy selected text | -| `edit.paste` | CmdOrCtrl+V | Paste text | -| `edit.copy-as-markdown` | CmdOrCtrl+Shift+C | Copy selected text as markdown | -| `edit.copy-as-plaintext` | CmdOrCtrl+Shift+V | Copy selected text as plaintext | -| `edit.select-all` | CmdOrCtrl+A | Select all text of the document | -| `edit.duplicate` | CmdOrCtrl+Alt+P | Duplicate the current paragraph | -| `edit.create-paragraph` | CmdOrCtrl+Shift+N | Create a new paragraph after the current one | -| `edit.delete-paragraph` | CmdOrCtrl+Shift+D | Delete current paragraph | -| `edit.find` | CmdOrCtrl+F | Find information in the document | -| `edit.find-next` | CmdOrCtrl+Alt+U | Continue the search and find the next match | -| `edit.find-previous` | CmdOrCtrl+Shift+U | Continue the search and find the previous match | -| `edit.replace` | CmdOrCtrl+Alt+F | Replace the information with a replacement | -| `edit.find-in-folder` | CmdOrCtrl+Shift+F | Find files contain the keyword in opend folder | -| `edit.aidou` | CmdOrCtrl+/ | Show Aidou dialog | -| `edit.screenshot` | Command+Alt+A | Get the screenshot (macOS only) | +| Id | Default | Description | +|:------------------------ | -------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- | +| `edit.undo` | CmdOrCtrl+Z | Undo last operation | +| `edit.redo` | CmdOrCtrl+Shift+Z | Redo last operation | +| `edit.cut` | CmdOrCtrl+X | Cut selected text | +| `edit.copy` | CmdOrCtrl+C | Copy selected text | +| `edit.paste` | CmdOrCtrl+V | Paste text | +| `edit.copy-as-markdown` | CmdOrCtrl+Shift+C | Copy selected text as markdown | +| `edit.copy-as-plaintext` | CmdOrCtrl+Shift+V | Copy selected text as plaintext | +| `edit.select-all` | CmdOrCtrl+A | Select all text of the document | +| `edit.duplicate` | CmdOrCtrl+Alt+P | Duplicate the current paragraph | +| `edit.create-paragraph` | CmdOrCtrl+Shift+N | Create a new paragraph after the current one | +| `edit.delete-paragraph` | CmdOrCtrl+Shift+D | Delete current paragraph | +| `edit.find` | CmdOrCtrl+F | Find information in the document | +| `edit.find-next` | F3 | Continue the search and find the next match (or Cmd+G on macOS) | +| `edit.find-previous` | Shift+F3 | Continue the search and find the previous match (or Shift+Cmd+G on macOS) | +| `edit.replace` | CmdOrCtrl+Alt+F | Replace the information with a replacement | +| `edit.find-in-folder` | CmdOrCtrl+Shift+F | Find files contain the keyword in opend folder | +| `edit.aidou` | CmdOrCtrl+/ | Show Aidou dialog | +| `edit.screenshot` | Command+Alt+A | Get the screenshot (macOS only) | **Paragraph menu:** diff --git a/src/main/keyboard/shortcutHandler.js b/src/main/keyboard/shortcutHandler.js index cd6a4f15..259e6a95 100644 --- a/src/main/keyboard/shortcutHandler.js +++ b/src/main/keyboard/shortcutHandler.js @@ -50,8 +50,8 @@ class Keybindings { ['edit.create-paragraph', 'Shift+CmdOrCtrl+N'], ['edit.delete-paragraph', 'Shift+CmdOrCtrl+D'], ['edit.find', 'CmdOrCtrl+F'], - ['edit.find-next', 'CmdOrCtrl+Alt+U'], - ['edit.find-previous', 'CmdOrCtrl+Shift+U'], + ['edit.find-next', isOsx ? 'Cmd+G' : 'F3'], + ['edit.find-previous', isOsx ? 'Cmd+Shift+G' : 'Shift+F3'], ['edit.replace', 'CmdOrCtrl+Alt+F'], ['edit.find-in-folder', 'Shift+CmdOrCtrl+F'], ['edit.aidou', 'CmdOrCtrl+/'], diff --git a/src/main/menu/templates/edit.js b/src/main/menu/templates/edit.js index 7c6027ac..afc7c357 100755 --- a/src/main/menu/templates/edit.js +++ b/src/main/menu/templates/edit.js @@ -90,7 +90,7 @@ export default function (keybindings, userPreference) { label: 'Find Next', accelerator: keybindings.getAccelerator('edit.find-next'), click (menuItem, browserWindow) { - actions.edit(browserWindow, 'fineNext') + actions.edit(browserWindow, 'findNext') } }, { label: 'Find Previous', diff --git a/src/renderer/commands/index.js b/src/renderer/commands/index.js index c93b457c..24fdaa6e 100644 --- a/src/renderer/commands/index.js +++ b/src/renderer/commands/index.js @@ -194,7 +194,7 @@ const commands = [ // description: 'Edit: Find Next', // execute: async () => { // await delay(150) - // bus.$emit('fineNext', 'fineNext') + // bus.$emit('findNext', 'findNext') // } // }, { // id: 'edit.find-previous',