From e5fd1983d3784971c985d60afb419b86facce57e Mon Sep 17 00:00:00 2001 From: Noboru Saito Date: Thu, 16 Jun 2022 11:06:19 +0900 Subject: [PATCH 1/2] Fixed help description Fixed #198. --- README.md | 26 +++++++++++++------------- go.mod | 13 ++++++++----- go.sum | 4 ++-- oviewer/help.go | 10 +++++----- 4 files changed, 28 insertions(+), 25 deletions(-) diff --git a/README.md b/README.md index e6f21025..e98172a9 100644 --- a/README.md +++ b/README.md @@ -388,19 +388,19 @@ It can also be changed after startup. [Q] * output screen and quit [ctrl+q] * set output screen and quit [ctrl+z] * suspend - [h], [ctrl+F1], [ctrl+alt+c] * display help screen - [ctrl+F2], [ctrl+alt+e] * display log screen + [h], [ctrl+alt+c], [ctrl+f1] * display help screen + [ctrl+f2], [ctrl+alt+e] * display log screen [ctrl+l] * screen sync [ctrl+f] * follow mode toggle [ctrl+a] * follow all mode toggle - [ctrl+alt+r] * enable/disable mouse + [ctrl+f3], [ctrl+alt+r] * enable/disable mouse Moving [Enter], [Down], [ctrl+N] * forward by one line [Up], [ctrl+p] * backward by one line - [Home] * go to begin of line - [End] * go to end of line + [Home] * go to top of document + [End] * go to end of document [PageDown], [ctrl+v] * forward by page [PageUp], [ctrl+b] * backward by page [ctrl+d] * forward a half page @@ -409,7 +409,7 @@ It can also be changed after startup. [right] * scroll to right [ctrl+left] * scroll left half screen [ctrl+right] * scroll right half screen - [g] * number of go to line + [g] * go to line(input number) Move document @@ -436,13 +436,13 @@ It can also be changed after startup. [w], [W] * wrap/nowrap toggle [c] * column mode toggle - [C] * color to alternate rows toggle + [C] * alternate rows of style toggle [G] * line number toggle Change Display with Input [p], [P] * view mode selection - [d] * delimiter string + [d] * column delimiter string [H] * number of header lines [ctrl+s] * number of skip lines [t] * TAB width @@ -451,16 +451,16 @@ It can also be changed after startup. [alt+d] * section delimiter regular expression [ctrl+F3], [alt+s] * section start position - [space] * next section - [^] * previous section + [space], [ctrl+down] * next section + [^], [ctrl+up] * previous section [9] * last section [F2] * follow section mode toggle Close and reload [ctrl+F9], [ctrl+alt+s] * close file - [F5], [ctrl+alt+l] * reload file - [F4], [ctrl+alt+w] * watch mode + [ctrl+alt+l], [F5] * reload file + [ctrl+alt+w], [F4] * watch mode [ctrl+w] * set watch interval Key binding when typing @@ -525,4 +525,4 @@ You can customize key bindings. - "ctrl+p" ``` -See [ov.yaml](https://github.com/noborus/ov/blob/master/ov.yaml) for more information.. +See [ov.yaml](https://github.com/noborus/ov/blob/master/ov.yaml) for more information. diff --git a/go.mod b/go.mod index a3c0db9f..7ca5a205 100644 --- a/go.mod +++ b/go.mod @@ -5,23 +5,26 @@ go 1.16 require ( code.rocketnine.space/tslocum/cbind v0.1.5 github.com/atotto/clipboard v0.1.4 - github.com/cespare/xxhash/v2 v2.1.2 // indirect github.com/dgraph-io/ristretto v0.1.0 github.com/fsnotify/fsnotify v1.5.4 github.com/gdamore/tcell/v2 v2.5.1 - github.com/golang/glog v1.0.0 // indirect github.com/jwalton/gchalk v1.3.0 github.com/klauspost/compress v1.15.6 github.com/mattn/go-runewidth v0.0.13 - github.com/pelletier/go-toml/v2 v2.0.2 // indirect github.com/pierrec/lz4 v2.6.1+incompatible github.com/rivo/uniseg v0.2.0 github.com/spf13/cobra v1.4.0 github.com/spf13/viper v1.12.0 - github.com/subosito/gotenv v1.4.0 // indirect github.com/ulikunitz/xz v0.5.10 golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f - golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d // indirect golang.org/x/term v0.0.0-20220526004731-065cf7ba2467 +) + +require ( + github.com/cespare/xxhash/v2 v2.1.2 // indirect + github.com/golang/glog v1.0.0 // indirect + github.com/pelletier/go-toml/v2 v2.0.2 // indirect + github.com/subosito/gotenv v1.4.0 // indirect + golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c // indirect gopkg.in/ini.v1 v1.66.6 // indirect ) diff --git a/go.sum b/go.sum index 688496eb..236f0cc8 100644 --- a/go.sum +++ b/go.sum @@ -637,8 +637,8 @@ golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220502124256-b6088ccd6cba/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d h1:Zu/JngovGLVi6t2J3nmAf3AoTDwuzw85YZ3b9o4yU7s= -golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c h1:aFV+BgZ4svzjfabn8ERpuB4JI4N6/rdy1iusx77G3oU= +golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= diff --git a/oviewer/help.go b/oviewer/help.go index 6786a919..c8039cdb 100644 --- a/oviewer/help.go +++ b/oviewer/help.go @@ -47,8 +47,8 @@ func KeyBindString(k KeyBind) string { fmt.Fprint(&b, "\n") k.writeKeyBind(&b, actionMoveDown, "forward by one line") k.writeKeyBind(&b, actionMoveUp, "backward by one line") - k.writeKeyBind(&b, actionMoveTop, "go to begin of line") - k.writeKeyBind(&b, actionMoveBottom, "go to end of line") + k.writeKeyBind(&b, actionMoveTop, "go to top of document") + k.writeKeyBind(&b, actionMoveBottom, "go to end of document") k.writeKeyBind(&b, actionMovePgDn, "forward by page") k.writeKeyBind(&b, actionMovePgUp, "backward by page") k.writeKeyBind(&b, actionMoveHfDn, "forward a half page") @@ -57,7 +57,7 @@ func KeyBindString(k KeyBind) string { k.writeKeyBind(&b, actionMoveRight, "scroll to right") k.writeKeyBind(&b, actionMoveHfLeft, "scroll left half screen") k.writeKeyBind(&b, actionMoveHfRight, "scroll right half screen") - k.writeKeyBind(&b, actionGoLine, "number of go to line") + k.writeKeyBind(&b, actionGoLine, "go to line(input number)") fmt.Fprint(&b, gchalk.Bold("\n\tMove document\n")) fmt.Fprint(&b, "\n") @@ -84,13 +84,13 @@ func KeyBindString(k KeyBind) string { fmt.Fprint(&b, "\n") k.writeKeyBind(&b, actionWrap, "wrap/nowrap toggle") k.writeKeyBind(&b, actionColumnMode, "column mode toggle") - k.writeKeyBind(&b, actionAlternate, "color to alternate rows toggle") + k.writeKeyBind(&b, actionAlternate, "alternate rows of style toggle") k.writeKeyBind(&b, actionLineNumMode, "line number toggle") fmt.Fprint(&b, gchalk.Bold("\n\tChange Display with Input\n")) fmt.Fprint(&b, "\n") k.writeKeyBind(&b, actionViewMode, "view mode selection") - k.writeKeyBind(&b, actionDelimiter, "delimiter string") + k.writeKeyBind(&b, actionDelimiter, "column delimiter string") k.writeKeyBind(&b, actionHeader, "number of header lines") k.writeKeyBind(&b, actionSkipLines, "number of skip lines") k.writeKeyBind(&b, actionTabWidth, "TAB width") From a24c816042906f69109157c8f577cc141997d6fa Mon Sep 17 00:00:00 2001 From: Noboru Saito Date: Thu, 16 Jun 2022 11:39:57 +0900 Subject: [PATCH 2/2] Revert some incorrect fixes --- README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index e98172a9..c11657bc 100644 --- a/README.md +++ b/README.md @@ -388,12 +388,12 @@ It can also be changed after startup. [Q] * output screen and quit [ctrl+q] * set output screen and quit [ctrl+z] * suspend - [h], [ctrl+alt+c], [ctrl+f1] * display help screen - [ctrl+f2], [ctrl+alt+e] * display log screen + [h], [ctrl+F1], [ctrl+alt+c] * display help screen + [ctrl+F2], [ctrl+alt+e] * display log screen [ctrl+l] * screen sync [ctrl+f] * follow mode toggle [ctrl+a] * follow all mode toggle - [ctrl+f3], [ctrl+alt+r] * enable/disable mouse + [ctrl+alt+r] * enable/disable mouse Moving @@ -451,16 +451,16 @@ It can also be changed after startup. [alt+d] * section delimiter regular expression [ctrl+F3], [alt+s] * section start position - [space], [ctrl+down] * next section - [^], [ctrl+up] * previous section + [space] * next section + [^] * previous section [9] * last section [F2] * follow section mode toggle Close and reload [ctrl+F9], [ctrl+alt+s] * close file - [ctrl+alt+l], [F5] * reload file - [ctrl+alt+w], [F4] * watch mode + [F5], [ctrl+alt+l] * reload file + [F4], [ctrl+alt+w] * watch mode [ctrl+w] * set watch interval Key binding when typing