go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-03-17 21:18:31 +02:00
Code Issues Releases Activity

fix search keybindings in docs

Browse Source
This commit is contained in:
hitsuji_no_shippo 2020-03-10 11:54:55 +09:00 committed by Jesse Duffield
parent 1be0ff8da7
commit ac0c3b9f92
4 changed files with 63 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
docs/keybindings/Keybindings_en.md
View File

@ -12,7 +12,6 @@
<kbd>R</kbd>: refresh
<kbd>+</kbd>: next screen mode (normal/half/fullscreen)
<kbd>_</kbd>: prev screen mode
<kbd>/</kbd>: start search
<kbd>:</kbd>: execute custom command
</pre>
@ -30,6 +29,7 @@
<kbd>i</kbd>: show git-flow options
<kbd>f</kbd>: fast-forward this branch from its upstream
<kbd>g</kbd>: view reset options
<kbd>/</kbd>: start search
</pre>
## Branches Panel (Remote Branches (in Remotes tab))
@ -42,6 +42,7 @@
<kbd>d</kbd>: delete branch
<kbd>r</kbd>: rebase checked-out branch onto this branch
<kbd>u</kbd>: set as upstream of checked-out branch
<kbd>/</kbd>: start search
</pre>
## Branches Panel (Remotes Tab)
@ -51,6 +52,7 @@
<kbd>n</kbd>: add new remote
<kbd>d</kbd>: remove remote
<kbd>e</kbd>: edit remote
<kbd>/</kbd>: start search
</pre>
## Branches Panel (Tags Tab)
@ -61,6 +63,7 @@
<kbd>P</kbd>: push tag
<kbd>n</kbd>: create tag
<kbd>g</kbd>: view reset options
<kbd>/</kbd>: start search
</pre>
## Commit Files Panel
@ -72,6 +75,13 @@
<kbd>o</kbd>: open file
<kbd>space</kbd>: toggle file included in patch
<kbd>enter</kbd>: enter file to add selected lines to the patch
<kbd>/</kbd>: start search
</pre>
## Commits Panel
<pre>
<kbd>/</kbd>: start search
</pre>
## Commits Panel (Commits Tab)
@ -127,6 +137,7 @@
<kbd>enter</kbd>: stage individual hunks/lines
<kbd>f</kbd>: fetch
<kbd>g</kbd>: view upstream reset options
<kbd>/</kbd>: start search
</pre>
## Main Panel (Merging)
@ -184,12 +195,19 @@
<kbd>C</kbd>: commit changes using git editor
</pre>
## Menu Panel
<pre>
<kbd>/</kbd>: start search
</pre>
## Stash Panel
<pre>
<kbd>space</kbd>: apply
<kbd>g</kbd>: pop
<kbd>d</kbd>: drop
<kbd>/</kbd>: start search
</pre>
## Status Panel

20
docs/keybindings/Keybindings_nl.md
View File

@ -12,7 +12,6 @@
<kbd>R</kbd>: verversen
<kbd>+</kbd>: next screen mode (normal/half/fullscreen)
<kbd>_</kbd>: prev screen mode
<kbd>/</kbd>: start search
<kbd>:</kbd>: voor aangepast commando uit
</pre>
@ -30,6 +29,7 @@
<kbd>i</kbd>: show git-flow options
<kbd>f</kbd>: fast-forward this branch from its upstream
<kbd>g</kbd>: bekijk reset opties
<kbd>/</kbd>: start search
</pre>
## Branches Panel (Remote Branches (in Remotes tab))
@ -42,6 +42,7 @@
<kbd>d</kbd>: verwijder branch
<kbd>r</kbd>: rebase branch
<kbd>u</kbd>: set as upstream of checked-out branch
<kbd>/</kbd>: start search
</pre>
## Branches Panel (Remotes Tab)
@ -51,6 +52,7 @@
<kbd>n</kbd>: add new remote
<kbd>d</kbd>: remove remote
<kbd>e</kbd>: edit remote
<kbd>/</kbd>: start search
</pre>
## Branches Panel (Tags Tab)
@ -61,6 +63,7 @@
<kbd>P</kbd>: push tag
<kbd>n</kbd>: create tag
<kbd>g</kbd>: bekijk reset opties
<kbd>/</kbd>: start search
</pre>
## Commit bestanden Panel
@ -72,6 +75,13 @@
<kbd>o</kbd>: open bestand
<kbd>space</kbd>: toggle file included in patch
<kbd>enter</kbd>: enter file to add selected lines to the patch
<kbd>/</kbd>: start search
</pre>
## Commits Panel
<pre>
<kbd>/</kbd>: start search
</pre>
## Commits Panel (Commits Tab)
@ -127,6 +137,7 @@
<kbd>enter</kbd>: stage individuele hunks/lijnen
<kbd>f</kbd>: fetch
<kbd>g</kbd>: view upstream reset options
<kbd>/</kbd>: start search
</pre>
## Hoofd Panel (Merging)
@ -184,12 +195,19 @@
<kbd>C</kbd>: commit veranderingen met de git editor
</pre>
## Menu Panel
<pre>
<kbd>/</kbd>: start search
</pre>
## Stash Panel
<pre>
<kbd>space</kbd>: toepassen
<kbd>g</kbd>: pop
<kbd>d</kbd>: drop
<kbd>/</kbd>: start search
</pre>
## Status Panel

20
docs/keybindings/Keybindings_pl.md
View File

@ -12,7 +12,6 @@
<kbd>R</kbd>: odśwież
<kbd>+</kbd>: next screen mode (normal/half/fullscreen)
<kbd>_</kbd>: prev screen mode
<kbd>/</kbd>: start search
<kbd>:</kbd>: execute custom command
</pre>
@ -30,6 +29,7 @@
<kbd>i</kbd>: show git-flow options
<kbd>f</kbd>: fast-forward this branch from its upstream
<kbd>g</kbd>: view reset options
<kbd>/</kbd>: start search
</pre>
## Gałęzie Panel (Remote Branches (in Remotes tab))
@ -42,6 +42,7 @@
<kbd>d</kbd>: usuń gałąź
<kbd>r</kbd>: rebase branch
<kbd>u</kbd>: set as upstream of checked-out branch
<kbd>/</kbd>: start search
</pre>
## Gałęzie Panel (Remotes Tab)
@ -51,6 +52,7 @@
<kbd>n</kbd>: add new remote
<kbd>d</kbd>: remove remote
<kbd>e</kbd>: edit remote
<kbd>/</kbd>: start search
</pre>
## Gałęzie Panel (Tags Tab)
@ -61,6 +63,7 @@
<kbd>P</kbd>: push tag
<kbd>n</kbd>: create tag
<kbd>g</kbd>: view reset options
<kbd>/</kbd>: start search
</pre>
## Commit files Panel
@ -72,6 +75,13 @@
<kbd>o</kbd>: otwórz plik
<kbd>space</kbd>: toggle file included in patch
<kbd>enter</kbd>: enter file to add selected lines to the patch
<kbd>/</kbd>: start search
</pre>
## Commity Panel
<pre>
<kbd>/</kbd>: start search
</pre>
## Commity Panel (Commits Tab)
@ -127,6 +137,7 @@
<kbd>enter</kbd>: zatwierdź pojedyncze linie
<kbd>f</kbd>: fetch
<kbd>g</kbd>: view upstream reset options
<kbd>/</kbd>: start search
</pre>
## Main Panel (Merging)
@ -184,12 +195,19 @@
<kbd>C</kbd>: commituj zmiany używając edytora z gita
</pre>
## Menu Panel
<pre>
<kbd>/</kbd>: start search
</pre>
## Schowek Panel
<pre>
<kbd>space</kbd>: zastosuj
<kbd>g</kbd>: wyciągnij
<kbd>d</kbd>: porzuć
<kbd>/</kbd>: start search
</pre>
## Status Panel

18
pkg/gui/keybindings.go
View File

@ -333,13 +333,6 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
Handler: gui.prevScreenMode,
Description: gui.Tr.SLocalize("prevScreenMode"),
},
{
ViewName: "",
Key: gui.getKey("universal.startSearch"),
Modifier: gocui.ModNone,
Handler: gui.handleOpenSearch,
Description: gui.Tr.SLocalize("startSearch"),
},
{
ViewName: "status",
Key: gui.getKey("universal.openFile"),
@ -672,10 +665,11 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
Handler: gui.handlePrevCommitsTab,
},
{
ViewName: "commits",
Key: gui.getKey("universal.startSearch"),
Modifier: gocui.ModNone,
Handler: gui.handleOpenSearchForCommitsPanel,
ViewName: "commits",
Key: gui.getKey("universal.startSearch"),
Modifier: gocui.ModNone,
Handler: gui.handleOpenSearchForCommitsPanel,
Description: gui.Tr.SLocalize("startSearch"),
},
{
ViewName: "commits",
@ -1469,7 +1463,7 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
// we need a specific keybinding for the commits panel beacuse it usually lazyloads commits
if listView.viewName != "commits" {
bindings = append(bindings, &Binding{ViewName: listView.viewName, Contexts: []string{listView.context}, Key: gui.getKey("universal.startSearch"), Modifier: gocui.ModNone, Handler: gui.handleOpenSearch})
bindings = append(bindings, &Binding{ViewName: listView.viewName, Contexts: []string{listView.context}, Key: gui.getKey("universal.startSearch"), Modifier: gocui.ModNone, Handler: gui.handleOpenSearch, Description: gui.Tr.SLocalize("startSearch")})
}
}