From 12be6979b4d38453883fa47719b967b45ca55bdc Mon Sep 17 00:00:00 2001
From: "Bhajneet S.K" <bhajneet@gmail.com>
Date: Sat, 30 May 2020 10:37:52 -0400
Subject: [PATCH] fix(frontend/settings): clarify navigator hotkey names and
 descriptions

this was done to reduce confusion for the user and to highlight more specific reasons for the hotkeys existing. superfluous descriptions were removed so the more advanced hotkeys which require a description were better highlighted/noted
---
 app/frontend/src/lib/keyMap.js | 43 ++++++++++++++++------------------
 1 file changed, 20 insertions(+), 23 deletions(-)

diff --git a/app/frontend/src/lib/keyMap.js b/app/frontend/src/lib/keyMap.js
index f6257364..eafa9fcd 100644
--- a/app/frontend/src/lib/keyMap.js
+++ b/app/frontend/src/lib/keyMap.js
@@ -116,50 +116,47 @@ export const COPY_SHORTCUTS = decorateGroup( {
 
 // Navigator-specific hotkeys
 export const NAVIGATOR_SHORTCUTS = decorateGroup( {
+  restoreLine: {
+    name: 'Activate Line',
+    description: 'Activates the line prior to a cleared screen',
+    sequences: [ 'enter', 'return' ],
+  },
   nextLine: {
-    name: 'Go Next Line',
-    description: 'Advances to the next line.',
+    name: 'Next Line',
     sequences: [ 'down', 'right', 'tab', 'PageDown', 'l' ],
   },
   previousLine: {
-    name: 'Go Previous Line',
-    description: 'Goes to the previous line.',
+    name: 'Previous Line',
     sequences: [ 'up', 'left', 'shift+tab', 'PageUp', 'j' ],
   },
   firstLine: {
-    name: 'Jump First Line',
-    description: 'Jumps to first line. If on first line, jumps to last line of previous shabad.',
+    name: 'First Line',
+    description: 'Go to first line. If on first line, then go to last line of previous entry.',
     sequences: [ 'ctrl+up', 'home' ],
   },
   lastLine: {
-    name: 'Jump Last Line',
-    description: 'Jumps to last line. If on last line, jumps to last line of previous shabad.',
+    name: 'Last Line',
+    description: 'Go to last line. If on last line, then go to first line of next entry.',
     sequences: [ 'ctrl+down', 'end' ],
   },
   autoToggle: {
-    name: 'Auto Jump',
-    description: 'Jumps to main line, or to the next available line.',
+    name: 'Autoselect Line',
+    description: 'Go to main line or next jump line.',
     sequences: [ 'space', 'b' ],
   },
   setMainLine: {
-    name: 'Set Main Line',
-    description: 'Sets the main line.',
+    name: 'Reset Main Line',
     sequences: [ 'ctrl+space' ],
   },
-  goJumpLine: {
-    name: 'Jump Next Non-Main Line',
-    description: 'Jumps to the next line if on the main line.',
-    sequences: [ 'shift+.' ],
-  },
   goMainLine: {
-    name: 'Jump Main Line',
-    description: 'Jumps to the main line.',
+    description: 'Go to main line without changing position of next jump line.',
+    name: 'Skip to Main Line',
     sequences: [ 'shift+,' ],
   },
-  restoreLine: {
-    name: 'Activate Line',
-    description: 'Activates the line prior to a cleared screen',
-    sequences: [ 'enter', 'return' ],
+  goJumpLine: {
+    name: 'Skip to Jump Line',
+    description: 'Go to the non-main, jump line.',
+    sequences: [ 'shift+.' ],
   },
 } )( 'Navigator' )