Merge pull request #764 from h3poteto/iss-750

fixes #750 Update shortcut help for switching focus
h3poteto · Dec 3, 2018 · 7fd49a9 · 7fd49a9
2 parents 1a5f25d + ec2f10b
commit 7fd49a9
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -29,14 +29,17 @@ Whalebird is a mastodon client for desktop application.
 <tr><td> Open new toot window            </td><td>             <kbd>Cmd + n</kbd>             </td><td> <kbd>Ctrl + n</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>
+<tr><td> Switch focus to right column    </td><td>             <kbd>l</kbd>                   </td><td> <kbd>l</kbd>          </td></tr>
 <tr><td> Reply to the toot               </td><td>             <kbd>r</kbd>                   </td><td> <kbd>r</kbd>          </td></tr>
 <tr><td> Reblog the toot                 </td><td>             <kbd>b</kbd>                   </td><td> <kbd>b</kbd>          </td></tr>
 <tr><td> Favourite the toot              </td><td>             <kbd>f</kbd>                   </td><td> <kbd>f</kbd>          </td></tr>
 <tr><td> Open details of the toot        </td><td>             <kbd>o</kbd>                   </td><td> <kbd>o</kbd>          </td></tr>
 <tr><td> Open account profile of the toot</td><td>             <kbd>p</kbd>                   </td><td> <kbd>p</kbd>          </td></tr>
 <tr><td> Open the images                 </td><td>             <kbd>i</kbd>                   </td><td> <kbd>i</kbd>          </td></tr>
 <tr><td> Show/hide CW and NSFW           </td><td>             <kbd>x</kbd>                   </td><td> <kbd>x</kbd>          </td></tr>
-<tr><td> Close current page              </td><td>             <kbd>esc</kbd>                 </td><td> <kbd>esc</kbd>          </td></tr>
+<tr><td> Close current page              </td><td>             <kbd>esc</kbd>                 </td><td> <kbd>esc</kbd>        </td></tr>
+<tr><td> Show shortcut keys              </td><td>             <kbd>?</kbd>                   </td><td> <kbd>?</kbd>           </td></tr>
 </tbody>
 </table>
 

diff --git a/src/config/locales/de/translation.missing.json b/src/config/locales/de/translation.missing.json
@@ -22,6 +22,8 @@
   },
   "modals": {
     "shortcut": {
+      "h": "Switch the focus to left column",
+      "l": "Switch the focus to right column",
       "?": "Show this help"
     }
   }

diff --git a/src/config/locales/en/translation.json b/src/config/locales/en/translation.json
@@ -230,6 +230,8 @@
       "ctrl_enter": "Post the toot",
       "j": "Select the next toot",
       "k": "Select the previous toot",
+      "h": "Switch the focus to left column",
+      "l": "Switch the focus to right column",
       "r": "Reply to the toot",
       "b": "Reblog the toot",
       "f": "Favourite the toot",

diff --git a/src/config/locales/fr/translation.missing.json b/src/config/locales/fr/translation.missing.json
@@ -22,6 +22,8 @@
   },
   "modals": {
     "shortcut": {
+      "h": "Switch the focus to left column",
+      "l": "Switch the focus to right column",
       "?": "Show this help"
     }
   }

diff --git a/src/config/locales/ja/translation.json b/src/config/locales/ja/translation.json
@@ -229,6 +229,8 @@
       "ctrl_enter": "トゥート送信",
       "j": "次のトゥートを選択",
       "k": "前のトゥートを選択",
+      "h": "右のカラムを選択",
+      "l": "左のカラムを選択",
       "r": "リプライ",
       "b": "ブースト",
       "f": "お気に入り",
@@ -289,7 +291,7 @@
     "account": "アカウント",
     "tag": "ハッシュタグ",
     "keyword": "キーワード",
-    "toot": "トゥート時"
+    "toot": "トゥート"
   },
   "lists": {
     "index": {

diff --git a/src/config/locales/ko/translation.missing.json b/src/config/locales/ko/translation.missing.json
@@ -22,6 +22,8 @@
   },
   "modals": {
     "shortcut": {
+      "h": "Switch the focus to left column",
+      "l": "Switch the focus to right column",
       "?": "Show this help"
     }
   }

diff --git a/src/config/locales/pl/translation.missing.json b/src/config/locales/pl/translation.missing.json
@@ -22,6 +22,8 @@
   },
   "modals": {
     "shortcut": {
+      "h": "Switch the focus to left column",
+      "l": "Switch the focus to right column",
       "?": "Show this help"
     }
   }

diff --git a/src/renderer/components/TimelineSpace/Modals/Shortcut.vue b/src/renderer/components/TimelineSpace/Modals/Shortcut.vue
@@ -31,6 +31,14 @@
         <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>