github/marktext
5
0
Fork 0
mirror of https://github.com/marktext/marktext.git synced 2025-05-03 00:01:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix double used shortcut (#2198)

Browse Source 
* Fix double used shortcut

* Update documentation
This commit is contained in:
Felix Häusler 2020-06-08 14:03:17 +02:00 committed by GitHub
parent 393139e5c9
commit c53246df13
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/KEYBINDINGS.md
View File

@ -132,7 +132,7 @@ Here is an example:
| `view.command-palette` | <kbd>CmdOrCtrl</kbd>+<kbd>Shift</kbd>+<kbd>P</kbd> | Toggle command palette | | `view.command-palette` | <kbd>CmdOrCtrl</kbd>+<kbd>Shift</kbd>+<kbd>P</kbd> | Toggle command palette |
| `view.source-code-mode` | <kbd>CmdOrCtrl</kbd>+<kbd>Alt</kbd>+<kbd>S</kbd> | Switch to source code mode | | `view.source-code-mode` | <kbd>CmdOrCtrl</kbd>+<kbd>Alt</kbd>+<kbd>S</kbd> | Switch to source code mode |
| `view.typewriter-mode` | <kbd>CmdOrCtrl</kbd>+<kbd>Alt</kbd>+<kbd>T</kbd> | Enable typewriter mode | | `view.typewriter-mode` | <kbd>CmdOrCtrl</kbd>+<kbd>Alt</kbd>+<kbd>T</kbd> | Enable typewriter mode |
| `view.focus-mode` | <kbd>CmdOrCtrl</kbd>+<kbd>Shift</kbd>+<kbd>F</kbd> | Enable focus mode | | `view.focus-mode` | <kbd>CmdOrCtrl</kbd>+<kbd>Shift</kbd>+<kbd>J</kbd> | Enable focus mode |
| `view.toggle-sidebar` | <kbd>CmdOrCtrl</kbd>+<kbd>J</kbd> | Toggle sidebar | | `view.toggle-sidebar` | <kbd>CmdOrCtrl</kbd>+<kbd>J</kbd> | Toggle sidebar |
| `view.toggle-tabbar` | <kbd>CmdOrCtrl</kbd>+<kbd>Alt</kbd>+<kbd>B</kbd> | Toggle tabbar | | `view.toggle-tabbar` | <kbd>CmdOrCtrl</kbd>+<kbd>Alt</kbd>+<kbd>B</kbd> | Toggle tabbar |
| `view.toggle-dev-tools` | <kbd>CmdOrCtrl</kbd>+<kbd>Alt</kbd>+<kbd>I</kbd> | Toggle developer tools (debug mode only) | | `view.toggle-dev-tools` | <kbd>CmdOrCtrl</kbd>+<kbd>Alt</kbd>+<kbd>I</kbd> | Toggle developer tools (debug mode only) |

2
src/main/keyboard/shortcutHandler.js
View File

@ -99,7 +99,7 @@ class Keybindings {
['view.command-palette', 'CmdOrCtrl+Shift+P'], ['view.command-palette', 'CmdOrCtrl+Shift+P'],
['view.source-code-mode', 'CmdOrCtrl+Alt+S'], ['view.source-code-mode', 'CmdOrCtrl+Alt+S'],
['view.typewriter-mode', 'CmdOrCtrl+Alt+T'], ['view.typewriter-mode', 'CmdOrCtrl+Alt+T'],
['view.focus-mode', 'CmdOrCtrl+Shift+F'], ['view.focus-mode', 'CmdOrCtrl+Shift+J'],
['view.toggle-sidebar', 'CmdOrCtrl+J'], ['view.toggle-sidebar', 'CmdOrCtrl+J'],
['view.toggle-tabbar', 'CmdOrCtrl+Alt+B'], ['view.toggle-tabbar', 'CmdOrCtrl+Alt+B'],
['view.toggle-dev-tools', 'CmdOrCtrl+Alt+I'], ['view.toggle-dev-tools', 'CmdOrCtrl+Alt+I'],

10
src/renderer/components/sideBar/search.vue
View File

@ -43,8 +43,7 @@
</div> </div>
<div class="search-message-section" v-if="showNoFolderOpenedMessage"> <div class="search-message-section" v-if="showNoFolderOpenedMessage">
<div>You have not opened a folder.</div> <span>You have not opened a folder.</span>
<a href="javascript:;" @click="openFolder">Open Folder</a>
</div> </div>
<div class="search-message-section" v-if="showNoResultFoundMessage">No results found.</div> <div class="search-message-section" v-if="showNoResultFoundMessage">No results found.</div>
<div class="search-message-section" v-if="searchErrorString">{{ searchErrorString }}</div> <div class="search-message-section" v-if="searchErrorString">{{ searchErrorString }}</div>
@ -74,6 +73,13 @@
<svg :viewBox="EmptyIcon.viewBox" aria-hidden="true"> <svg :viewBox="EmptyIcon.viewBox" aria-hidden="true">
<use :xlink:href="EmptyIcon.url" /> <use :xlink:href="EmptyIcon.url" />
</svg> </svg>
<button
class="button-primary"
v-if="showNoFolderOpenedMessage"
@click="openFolder"
>
Open Folder
</button>
</div> </div>
</div> </div>
</div> </div>