go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-04-25 12:24:47 +02:00
Code Issues Releases Activity

add renderGlobalOptions

Browse Source 
render only global options for all panels
This commit is contained in:
Dawid Dziurla 2018-09-04 16:07:31 +02:00
parent 97ad4a1643
commit e21f739f4f
No known key found for this signature in database
GPG Key ID: 7B6D8368172E9B0B
7 changed files with 23 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/gui/branches_panel.go
View File

@ -115,10 +115,7 @@ func (gui *Gui) getSelectedBranch(v *gocui.View) commands.Branch {
} }
func (gui *Gui) renderBranchesOptions(g *gocui.Gui) error { func (gui *Gui) renderBranchesOptions(g *gocui.Gui) error {
return gui.renderOptionsMap(g, map[string]string{ return gui.renderGlobalOptions(g)
"← → ↑ ↓": gui.Tr.SLocalize("navigate"),
"?": gui.Tr.SLocalize("help"),
})
} }
// may want to standardise how these select methods work // may want to standardise how these select methods work

5
pkg/gui/commits_panel.go
View File

@ -59,10 +59,7 @@ func (gui *Gui) handleResetToCommit(g *gocui.Gui, commitView *gocui.View) error
} }
func (gui *Gui) renderCommitsOptions(g *gocui.Gui) error { func (gui *Gui) renderCommitsOptions(g *gocui.Gui) error {
return gui.renderOptionsMap(g, map[string]string{ return gui.renderGlobalOptions(g)
"← → ↑ ↓": gui.Tr.SLocalize("navigate"),
"?": gui.Tr.SLocalize("help"),
})
} }
func (gui *Gui) handleCommitSelect(g *gocui.Gui, v *gocui.View) error { func (gui *Gui) handleCommitSelect(g *gocui.Gui, v *gocui.View) error {

17
pkg/gui/files_panel.go
View File

@ -172,22 +172,7 @@ func (gui *Gui) handleIgnoreFile(g *gocui.Gui, v *gocui.View) error {
} }
func (gui *Gui) renderfilesOptions(g *gocui.Gui, file *commands.File) error { func (gui *Gui) renderfilesOptions(g *gocui.Gui, file *commands.File) error {
optionsMap := map[string]string{ return gui.renderGlobalOptions(g)
"PgUp/PgDn": gui.Tr.SLocalize("scroll"),
"← → ↑ ↓": gui.Tr.SLocalize("navigate"),
"?": gui.Tr.SLocalize("help"),
}
if gui.State.HasMergeConflicts {
optionsMap["a"] = gui.Tr.SLocalize("abortMerge")
optionsMap["m"] = gui.Tr.SLocalize("resolveMergeConflicts")
}
if file == nil {
return gui.renderOptionsMap(g, optionsMap)
}
if file.Tracked {
optionsMap["d"] = gui.Tr.SLocalize("checkout")
}
return gui.renderOptionsMap(g, optionsMap)
} }
func (gui *Gui) handleFileSelect(g *gocui.Gui, v *gocui.View) error { func (gui *Gui) handleFileSelect(g *gocui.Gui, v *gocui.View) error {

12
pkg/gui/gui.go
View File

@ -348,6 +348,18 @@ func (gui *Gui) renderAppStatus(g *gocui.Gui) error {
return nil return nil
} }
func (gui *Gui) renderGlobalOptions(g *gocui.Gui) error {
return gui.renderOptionsMap(g, map[string]string{
"R": gui.Tr.SLocalize("refresh"),
"p": gui.Tr.SLocalize("pull"),
"P": gui.Tr.SLocalize("push"),
"PgUp/PgDn": gui.Tr.SLocalize("scroll"),
"← → ↑ ↓": gui.Tr.SLocalize("navigate"),
"esc/q": gui.Tr.SLocalize("close"),
"?": gui.Tr.SLocalize("help"),
})
}
func (gui *Gui) goEvery(g *gocui.Gui, interval time.Duration, function func(*gocui.Gui) error) { func (gui *Gui) goEvery(g *gocui.Gui, interval time.Duration, function func(*gocui.Gui) error) {
go func() { go func() {
for range time.Tick(interval) { for range time.Tick(interval) {

5
pkg/gui/stash_panel.go
View File

@ -33,10 +33,7 @@ func (gui *Gui) getSelectedStashEntry(v *gocui.View) *commands.StashEntry {
} }
func (gui *Gui) renderStashOptions(g *gocui.Gui) error { func (gui *Gui) renderStashOptions(g *gocui.Gui) error {
return gui.renderOptionsMap(g, map[string]string{ return gui.renderGlobalOptions(g)
"← → ↑ ↓": gui.Tr.SLocalize("navigate"),
"?": gui.Tr.SLocalize("help"),
})
} }
func (gui *Gui) handleStashEntrySelect(g *gocui.Gui, v *gocui.View) error { func (gui *Gui) handleStashEntrySelect(g *gocui.Gui, v *gocui.View) error {

4
pkg/gui/status_panel.go
View File

@ -42,9 +42,7 @@ func (gui *Gui) refreshStatus(g *gocui.Gui) error {
} }
func (gui *Gui) renderStatusOptions(g *gocui.Gui) error { func (gui *Gui) renderStatusOptions(g *gocui.Gui) error {
return gui.renderOptionsMap(g, map[string]string{ return gui.renderGlobalOptions(g)
"?": gui.Tr.SLocalize("help"),
})
} }
func (gui *Gui) handleCheckForUpdate(g *gocui.Gui, v *gocui.View) error { func (gui *Gui) handleCheckForUpdate(g *gocui.Gui, v *gocui.View) error {

6
pkg/i18n/english.go
View File

@ -78,6 +78,12 @@ func addEnglish(i18nObject *i18n.Bundle) error {
}, &i18n.Message{ }, &i18n.Message{
ID: "refresh", ID: "refresh",
Other: "refresh", Other: "refresh",
}, &i18n.Message{
ID: "push",
Other: "push",
}, &i18n.Message{
ID: "pull",
Other: "pull",
}, &i18n.Message{ }, &i18n.Message{
ID: "addPatch", ID: "addPatch",
Other: "add patch", Other: "add patch",