diff --git a/docs/keybindings/Keybindings_en.md b/docs/keybindings/Keybindings_en.md index 9e93d3954..abbe81656 100644 --- a/docs/keybindings/Keybindings_en.md +++ b/docs/keybindings/Keybindings_en.md @@ -12,7 +12,6 @@ R: refresh +: next screen mode (normal/half/fullscreen) _: prev screen mode - /: start search :: execute custom command @@ -30,6 +29,7 @@ i: show git-flow options f: fast-forward this branch from its upstream g: view reset options + /: start search ## Branches Panel (Remote Branches (in Remotes tab)) @@ -42,6 +42,7 @@ d: delete branch r: rebase checked-out branch onto this branch u: set as upstream of checked-out branch + /: start search ## Branches Panel (Remotes Tab) @@ -51,6 +52,7 @@ n: add new remote d: remove remote e: edit remote + /: start search ## Branches Panel (Tags Tab) @@ -61,6 +63,7 @@ P: push tag n: create tag g: view reset options + /: start search ## Commit Files Panel @@ -72,6 +75,13 @@ o: open file space: toggle file included in patch enter: enter file to add selected lines to the patch + /: start search + + +## Commits Panel + +
+ /: start search## Commits Panel (Commits Tab) @@ -127,6 +137,7 @@ enter: stage individual hunks/lines f: fetch g: view upstream reset options + /: start search ## Main Panel (Merging) @@ -184,12 +195,19 @@ C: commit changes using git editor +## Menu Panel + +
+ /: start search ++ ## Stash Panel
space: apply g: pop d: drop + /: start search## Status Panel diff --git a/docs/keybindings/Keybindings_nl.md b/docs/keybindings/Keybindings_nl.md index 61d53097e..661fb9809 100644 --- a/docs/keybindings/Keybindings_nl.md +++ b/docs/keybindings/Keybindings_nl.md @@ -12,7 +12,6 @@ R: verversen +: next screen mode (normal/half/fullscreen) _: prev screen mode - /: start search :: voor aangepast commando uit @@ -30,6 +29,7 @@ i: show git-flow options f: fast-forward this branch from its upstream g: bekijk reset opties + /: start search ## Branches Panel (Remote Branches (in Remotes tab)) @@ -42,6 +42,7 @@ d: verwijder branch r: rebase branch u: set as upstream of checked-out branch + /: start search ## Branches Panel (Remotes Tab) @@ -51,6 +52,7 @@ n: add new remote d: remove remote e: edit remote + /: start search ## Branches Panel (Tags Tab) @@ -61,6 +63,7 @@ P: push tag n: create tag g: bekijk reset opties + /: start search ## Commit bestanden Panel @@ -72,6 +75,13 @@ o: open bestand space: toggle file included in patch enter: enter file to add selected lines to the patch + /: start search + + +## Commits Panel + +
+ /: start search## Commits Panel (Commits Tab) @@ -127,6 +137,7 @@ enter: stage individuele hunks/lijnen f: fetch g: view upstream reset options + /: start search ## Hoofd Panel (Merging) @@ -184,12 +195,19 @@ C: commit veranderingen met de git editor +## Menu Panel + +
+ /: start search ++ ## Stash Panel
space: toepassen g: pop d: drop + /: start search## Status Panel diff --git a/docs/keybindings/Keybindings_pl.md b/docs/keybindings/Keybindings_pl.md index b6a113bc0..e1575cd32 100644 --- a/docs/keybindings/Keybindings_pl.md +++ b/docs/keybindings/Keybindings_pl.md @@ -12,7 +12,6 @@ R: odśwież +: next screen mode (normal/half/fullscreen) _: prev screen mode - /: start search :: execute custom command @@ -30,6 +29,7 @@ i: show git-flow options f: fast-forward this branch from its upstream g: view reset options + /: start search ## Gałęzie Panel (Remote Branches (in Remotes tab)) @@ -42,6 +42,7 @@ d: usuń gałąź r: rebase branch u: set as upstream of checked-out branch + /: start search ## Gałęzie Panel (Remotes Tab) @@ -51,6 +52,7 @@ n: add new remote d: remove remote e: edit remote + /: start search ## Gałęzie Panel (Tags Tab) @@ -61,6 +63,7 @@ P: push tag n: create tag g: view reset options + /: start search ## Commit files Panel @@ -72,6 +75,13 @@ o: otwórz plik space: toggle file included in patch enter: enter file to add selected lines to the patch + /: start search + + +## Commity Panel + +
+ /: start search## Commity Panel (Commits Tab) @@ -127,6 +137,7 @@ enter: zatwierdź pojedyncze linie f: fetch g: view upstream reset options + /: start search ## Main Panel (Merging) @@ -184,12 +195,19 @@ C: commituj zmiany używając edytora z gita +## Menu Panel + +
+ /: start search ++ ## Schowek Panel
space: zastosuj g: wyciągnij d: porzuć + /: start search## Status Panel diff --git a/pkg/gui/keybindings.go b/pkg/gui/keybindings.go index 258409e09..485fead2a 100644 --- a/pkg/gui/keybindings.go +++ b/pkg/gui/keybindings.go @@ -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")}) } }