Mastodon
/
Whalebird-desktop-client-mac-linux-windows
mirror of https://github.com/h3poteto/whalebird-desktop
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1048 from h3poteto/shortcut/reload 

Add shortcut descript for reload
This commit is contained in:
AkiraFukushima 2019-09-25 23:13:17 +09:00 committed by GitHub
parent dde4c18582 b08a34251a
commit 5d6825a7e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 105 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -27,6 +27,7 @@ Whalebird is a mastodon client for desktop application.
<tr><td> Change accounts </td><td> <kbd>Cmd + 1, 2, 3...</kbd> </td><td> <kbd>Ctrl + 1, 2, 3...</kbd> </td></tr>
<tr><td> Jump to another timeline </td><td> <kbd>Cmd + k</kbd> </td><td> <kbd>Ctrl + k</kbd> </td></tr>
<tr><td> Open new toot window </td><td> <kbd>Cmd + n</kbd> </td><td> <kbd>Ctrl + n</kbd> </td></tr>
<tr><td> Reload current timeline </td><td> <kbd>Cmd + r</kbd> </td><td> <kbd>Ctrl + r</kbd> </td></tr>
<tr><td> Select next toot </td><td> <kbd>j</kbd> </td><td> <kbd>j</kbd> </td></tr>
<tr><td> Select previous toot </td><td> <kbd>k</kbd> </td><td> <kbd>k</kbd> </td></tr>
<tr><td> Switch focus to left column </td><td> <kbd>h</kbd> </td><td> <kbd>h</kbd> </td></tr>

1
src/config/locales/de/translation.missing.json
View File

@ -26,6 +26,7 @@
"ctrl_k": "Jump to other timelines",
"ctrl_n": "Open the new toot modal",
"ctrl_enter": "Post the toot",
"ctrl_r": "Reload current timeline",
"j": "Select the next toot",
"k": "Select the previous toot",
"h": "Switch the focus to left column",

1
src/config/locales/en/translation.json
View File

@ -256,6 +256,7 @@
"ctrl_k": "Jump to other timelines",
"ctrl_n": "Open the new toot modal",
"ctrl_enter": "Post the toot",
"ctrl_r": "Reload current timeline",
"j": "Select the next toot",
"k": "Select the previous toot",
"h": "Switch focus to the left column",

8
src/config/locales/fr/translation.missing.json
View File

@ -1 +1,7 @@
{}
{
"modals": {
"shortcut": {
"ctrl_r": "Reload current timeline"
}
}
}

3
src/config/locales/it/translation.missing.json
View File

@ -31,6 +31,9 @@
"7_days": "7 days"
}
}
},
"shortcut": {
"ctrl_r": "Reload current timeline"
}
},
"cards": {

1
src/config/locales/ja/translation.json
View File

@ -256,6 +256,7 @@
"ctrl_k": "タイムラインの移動",
"ctrl_n": "トゥートモーダルの表示",
"ctrl_enter": "トゥート送信",
"ctrl_r": "タイムラインを更新",
"j": "次のトゥートを選択",
"k": "前のトゥートを選択",
"h": "右のカラムを選択",

3
src/config/locales/ko/translation.missing.json
View File

@ -51,6 +51,9 @@
"comment": "Additional comments",
"cancel": "Cancel",
"ok": "Report"
},
"shortcut": {
"ctrl_r": "Reload current timeline"
}
},
"cards": {

1
src/config/locales/pl/translation.missing.json
View File

@ -53,6 +53,7 @@
"ok": "Report"
},
"shortcut": {
"ctrl_r": "Reload current timeline",
"h": "Switch the focus to left column",
"l": "Switch the focus to right column",
"?": "Show this help"

8
src/config/locales/zh_cn/translation.missing.json
View File

@ -1 +1,7 @@
{}
{
"modals": {
"shortcut": {
"ctrl_r": "Reload current timeline"
}
}
}

161
src/renderer/components/TimelineSpace/Modals/Shortcut.vue
View File

@ -1,83 +1,82 @@
<template>
<el-dialog
:title="$t('modals.shortcut.title')"
:visible.sync="shortcutModal"
width="500px"
class="shortcut-modal"
>
<table class="shortcuts">
<tbody>
<tr>
<td><kbd>Ctrl(Cmd) + 1, 2, 3...</kbd></td>
<td>{{ $t('modals.shortcut.ctrl_number') }}</td>
</tr>
<tr>
<td><kbd>Ctrl(Cmd) + k</kbd></td>
<td>{{ $t('modals.shortcut.ctrl_k') }}</td>
</tr>
<tr>
<td><kbd>Ctrl(Cmd) + n</kbd></td>
<td>{{ $t('modals.shortcut.ctrl_n') }}</td>
</tr>
<tr>
<td><kbd>Ctrl(Cmd) + Enter</kbd></td>
<td>{{ $t('modals.shortcut.ctrl_enter') }}</td>
</tr>
<tr>
<td><kbd>j</kbd></td>
<td>{{ $t('modals.shortcut.j') }}</td>
</tr>
<tr>
<td><kbd>k</kbd></td>
<td>{{ $t('modals.shortcut.k') }}</td>
</tr>
<tr>
<td><kbd>h</kbd></td>
<td>{{ $t('modals.shortcut.h') }}</td>
</tr>
<tr>
<td><kbd>l</kbd></td>
<td>{{ $t('modals.shortcut.l') }}</td>
</tr>
<tr>
<td><kbd>r</kbd></td>
<td>{{ $t('modals.shortcut.r') }}</td>
</tr>
<tr>
<td><kbd>b</kbd></td>
<td>{{ $t('modals.shortcut.b') }}</td>
</tr>
<tr>
<td><kbd>f</kbd></td>
<td>{{ $t('modals.shortcut.f') }}</td>
</tr>
<tr>
<td><kbd>o</kbd></td>
<td>{{ $t('modals.shortcut.o') }}</td>
</tr>
<tr>
<td><kbd>p</kbd></td>
<td>{{ $t('modals.shortcut.p') }}</td>
</tr>
<tr>
<td><kbd>i</kbd></td>
<td>{{ $t('modals.shortcut.i') }}</td>
</tr>
<tr>
<td><kbd>x</kbd></td>
<td>{{ $t('modals.shortcut.x') }}</td>
</tr>
<tr>
<td><kbd>?</kbd></td>
<td>{{ $t('modals.shortcut.?') }}</td>
</tr>
<tr>
<td><kbd>esc</kbd></td>
<td>{{ $t('modals.shortcut.esc') }}</td>
</tr>
</tbody>
</table>
</el-dialog>
<el-dialog :title="$t('modals.shortcut.title')" :visible.sync="shortcutModal" width="500px" class="shortcut-modal">
<table class="shortcuts">
<tbody>
<tr>
<td><kbd>Ctrl(Cmd) + 1, 2, 3...</kbd></td>
<td>{{ $t('modals.shortcut.ctrl_number') }}</td>
</tr>
<tr>
<td><kbd>Ctrl(Cmd) + k</kbd></td>
<td>{{ $t('modals.shortcut.ctrl_k') }}</td>
</tr>
<tr>
<td><kbd>Ctrl(Cmd) + n</kbd></td>
<td>{{ $t('modals.shortcut.ctrl_n') }}</td>
</tr>
<tr>
<td><kbd>Ctrl(Cmd) + Enter</kbd></td>
<td>{{ $t('modals.shortcut.ctrl_enter') }}</td>
</tr>
<tr>
<td><kbd>Ctrl(Cmd) + r</kbd></td>
<td>{{ $t('modals.shortcut.ctrl_r') }}</td>
</tr>
<tr>
<td><kbd>j</kbd></td>
<td>{{ $t('modals.shortcut.j') }}</td>
</tr>
<tr>
<td><kbd>k</kbd></td>
<td>{{ $t('modals.shortcut.k') }}</td>
</tr>
<tr>
<td><kbd>h</kbd></td>
<td>{{ $t('modals.shortcut.h') }}</td>
</tr>
<tr>
<td><kbd>l</kbd></td>
<td>{{ $t('modals.shortcut.l') }}</td>
</tr>
<tr>
<td><kbd>r</kbd></td>
<td>{{ $t('modals.shortcut.r') }}</td>
</tr>
<tr>
<td><kbd>b</kbd></td>
<td>{{ $t('modals.shortcut.b') }}</td>
</tr>
<tr>
<td><kbd>f</kbd></td>
<td>{{ $t('modals.shortcut.f') }}</td>
</tr>
<tr>
<td><kbd>o</kbd></td>
<td>{{ $t('modals.shortcut.o') }}</td>
</tr>
<tr>
<td><kbd>p</kbd></td>
<td>{{ $t('modals.shortcut.p') }}</td>
</tr>
<tr>
<td><kbd>i</kbd></td>
<td>{{ $t('modals.shortcut.i') }}</td>
</tr>
<tr>
<td><kbd>x</kbd></td>
<td>{{ $t('modals.shortcut.x') }}</td>
</tr>
<tr>
<td><kbd>?</kbd></td>
<td>{{ $t('modals.shortcut.?') }}</td>
</tr>
<tr>
<td><kbd>esc</kbd></td>
<td>{{ $t('modals.shortcut.esc') }}</td>
</tr>
</tbody>
</table>
</el-dialog>
</template>
<script>
@ -85,10 +84,10 @@ export default {
name: 'shortcut',
computed: {
shortcutModal: {
get () {
get() {
return this.$store.state.TimelineSpace.Modals.Shortcut.modalOpen
},
set (value) {
set(value) {
this.$store.commit('TimelineSpace/Modals/Shortcut/changeModal', value)
}
}