From cc3fa4b79d0623ea3046b2085a4db2f6f1a69db5 Mon Sep 17 00:00:00 2001 From: Dawid Dziurla Date: Thu, 30 Aug 2018 13:45:11 +0200 Subject: [PATCH] make '?' key visible on every panel --- pkg/gui/branches_panel.go | 1 + pkg/gui/commits_panel.go | 1 + pkg/gui/files_panel.go | 2 +- pkg/gui/stash_panel.go | 1 + pkg/gui/status_panel.go | 1 + 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkg/gui/branches_panel.go b/pkg/gui/branches_panel.go index df4dcff78..61b8f1a2f 100644 --- a/pkg/gui/branches_panel.go +++ b/pkg/gui/branches_panel.go @@ -124,6 +124,7 @@ func (gui *Gui) renderBranchesOptions(g *gocui.Gui) error { "d": gui.Tr.SLocalize("deleteBranch"), "D": gui.Tr.SLocalize("forceDeleteBranch"), "← → ↑ ↓": gui.Tr.SLocalize("navigate"), + "?": gui.Tr.SLocalize("help"), }) } diff --git a/pkg/gui/commits_panel.go b/pkg/gui/commits_panel.go index 0969692b6..2c1cc6178 100644 --- a/pkg/gui/commits_panel.go +++ b/pkg/gui/commits_panel.go @@ -65,6 +65,7 @@ func (gui *Gui) renderCommitsOptions(g *gocui.Gui) error { "g": gui.Tr.SLocalize("resetToThisCommit"), "f": gui.Tr.SLocalize("fixupCommit"), "← → ↑ ↓": gui.Tr.SLocalize("navigate"), + "?": gui.Tr.SLocalize("help"), }) } diff --git a/pkg/gui/files_panel.go b/pkg/gui/files_panel.go index cf98e8a44..90f2b7e84 100644 --- a/pkg/gui/files_panel.go +++ b/pkg/gui/files_panel.go @@ -185,7 +185,7 @@ func (gui *Gui) renderfilesOptions(g *gocui.Gui, file *commands.File) error { "e": gui.Tr.SLocalize("edit"), "a": gui.Tr.SLocalize("toggleStagedAll"), "PgUp/PgDn": gui.Tr.SLocalize("scroll"), - "?": gui.Tr.SLocalize("help"), //TODO make it visible for all panels, not only files + "?": gui.Tr.SLocalize("help"), } if gui.State.HasMergeConflicts { optionsMap["a"] = gui.Tr.SLocalize("abortMerge") diff --git a/pkg/gui/stash_panel.go b/pkg/gui/stash_panel.go index 0c323e254..2c5e631cb 100644 --- a/pkg/gui/stash_panel.go +++ b/pkg/gui/stash_panel.go @@ -37,6 +37,7 @@ func (gui *Gui) renderStashOptions(g *gocui.Gui) error { "g": gui.Tr.SLocalize("pop"), "d": gui.Tr.SLocalize("drop"), "← → ↑ ↓": gui.Tr.SLocalize("navigate"), + "?": gui.Tr.SLocalize("help"), }) } diff --git a/pkg/gui/status_panel.go b/pkg/gui/status_panel.go index 583d7805a..eb7f790f0 100644 --- a/pkg/gui/status_panel.go +++ b/pkg/gui/status_panel.go @@ -46,6 +46,7 @@ func (gui *Gui) renderStatusOptions(g *gocui.Gui) error { "o": gui.Tr.SLocalize("OpenConfig"), "e": gui.Tr.SLocalize("EditConfig"), "u": gui.Tr.SLocalize("CheckForUpdate"), + "?": gui.Tr.SLocalize("help"), }) }