Skip to content

Commit

Permalink
Merge pull request #199 from noborus/fix-help-text
Browse files Browse the repository at this point in the history
Fixed help description
  • Loading branch information
noborus committed Jun 16, 2022
2 parents f153266 + a24c816 commit a9bbd4d
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 18 deletions.
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -399,8 +399,8 @@ It can also be changed after startup.

[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
Expand All @@ -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

Expand All @@ -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
Expand Down Expand Up @@ -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.
13 changes: 8 additions & 5 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
10 changes: 5 additions & 5 deletions oviewer/help.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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")
Expand All @@ -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")
Expand Down

0 comments on commit a9bbd4d

Please sign in to comment.