diff options
Diffstat (limited to 'pkg/gui')
| -rw-r--r-- | pkg/gui/keybindings.go | 8 | ||||
| -rw-r--r-- | pkg/gui/menu_panel.go | 2 | ||||
| -rw-r--r-- | pkg/gui/quitting.go | 8 | ||||
| -rw-r--r-- | pkg/gui/view_helpers.go | 3 |
4 files changed, 12 insertions, 9 deletions
diff --git a/pkg/gui/keybindings.go b/pkg/gui/keybindings.go index 8248e5e99..283daa779 100644 --- a/pkg/gui/keybindings.go +++ b/pkg/gui/keybindings.go @@ -217,7 +217,7 @@ func (gui *Gui) GetInitialKeybindings() []*Binding { ViewName: "", Key: gui.getKey("universal.return"), Modifier: gocui.ModNone, - Handler: gui.handleQuit, + Handler: gui.handleTopLevelReturn, }, { ViewName: "", @@ -849,12 +849,6 @@ func (gui *Gui) GetInitialKeybindings() []*Binding { Description: gui.Tr.SLocalize("closeMenu"), }, { - ViewName: "menu", - Key: gui.getKey("universal.quit"), - Handler: gui.handleMenuClose, - Description: gui.Tr.SLocalize("closeMenu"), - }, - { ViewName: "information", Key: gocui.MouseLeft, Modifier: gocui.ModNone, diff --git a/pkg/gui/menu_panel.go b/pkg/gui/menu_panel.go index ac0844216..9b2eefac5 100644 --- a/pkg/gui/menu_panel.go +++ b/pkg/gui/menu_panel.go @@ -25,7 +25,7 @@ func (gui *Gui) handleMenuSelect(g *gocui.Gui, v *gocui.View) error { func (gui *Gui) renderMenuOptions() error { optionsMap := map[string]string{ - fmt.Sprintf("%s/%s", gui.getKeyDisplay("universal.return"), gui.getKeyDisplay("universal.quit")): gui.Tr.SLocalize("close"), + gui.getKeyDisplay("universal.return"): gui.Tr.SLocalize("close"), fmt.Sprintf("%s %s", gui.getKeyDisplay("universal.prevItem"), gui.getKeyDisplay("universal.nextItem")): gui.Tr.SLocalize("navigate"), gui.getKeyDisplay("universal.select"): gui.Tr.SLocalize("execute"), } diff --git a/pkg/gui/quitting.go b/pkg/gui/quitting.go index f9ad00177..4a7bba23a 100644 --- a/pkg/gui/quitting.go +++ b/pkg/gui/quitting.go @@ -34,6 +34,14 @@ func (gui *Gui) handleQuit(g *gocui.Gui, v *gocui.View) error { return gui.quit(v) } +func (gui *Gui) handleTopLevelReturn(g *gocui.Gui, v *gocui.View) error { + if gui.Config.GetUserConfig().GetBool("quitOnTopLevelReturn") { + return gui.handleQuit(g, v) + } + + return nil +} + func (gui *Gui) quit(v *gocui.View) error { if gui.State.Updating { return gui.createUpdateQuitConfirmation(gui.g, v) diff --git a/pkg/gui/view_helpers.go b/pkg/gui/view_helpers.go index 429ab46b5..032d05002 100644 --- a/pkg/gui/view_helpers.go +++ b/pkg/gui/view_helpers.go @@ -513,7 +513,8 @@ func (gui *Gui) renderGlobalOptions() error { return gui.renderOptionsMap(map[string]string{ fmt.Sprintf("%s/%s", gui.getKeyDisplay("universal.scrollUpMain"), gui.getKeyDisplay("universal.scrollDownMain")): gui.Tr.SLocalize("scroll"), fmt.Sprintf("%s %s %s %s", gui.getKeyDisplay("universal.prevBlock"), gui.getKeyDisplay("universal.nextBlock"), gui.getKeyDisplay("universal.prevItem"), gui.getKeyDisplay("universal.nextItem")): gui.Tr.SLocalize("navigate"), - fmt.Sprintf("%s/%s", gui.getKeyDisplay("universal.return"), gui.getKeyDisplay("universal.quit")): gui.Tr.SLocalize("close"), + gui.getKeyDisplay("universal.return"): gui.Tr.SLocalize("cancel"), + gui.getKeyDisplay("universal.quit"): gui.Tr.SLocalize("quit"), gui.getKeyDisplay("universal.optionMenu"): gui.Tr.SLocalize("menu"), "1-5": gui.Tr.SLocalize("jump"), }) |