From b7fea7a44df831badbb10cb29bdee24bf259972d Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Thu, 10 Nov 2022 19:45:32 +1100 Subject: [PATCH] separate quit and close options --- pkg/gui/gui.go | 2 +- pkg/gui/menu_panel.go | 2 +- pkg/i18n/english.go | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/gui/gui.go b/pkg/gui/gui.go index 585cdd02..337b5cd7 100644 --- a/pkg/gui/gui.go +++ b/pkg/gui/gui.go @@ -149,7 +149,7 @@ func (gui *Gui) renderGlobalOptions() error { return gui.renderOptionsMap(map[string]string{ "PgUp/PgDn": gui.Tr.Scroll, "← → ↑ ↓": gui.Tr.Navigate, - "esc/q": gui.Tr.Close, + "q": gui.Tr.Quit, "b": gui.Tr.ViewBulkCommands, "x": gui.Tr.Menu, }) diff --git a/pkg/gui/menu_panel.go b/pkg/gui/menu_panel.go index 4fea3707..99c65807 100644 --- a/pkg/gui/menu_panel.go +++ b/pkg/gui/menu_panel.go @@ -106,7 +106,7 @@ func (gui *Gui) Menu(opts CreateMenuOptions) error { func (gui *Gui) renderMenuOptions() error { optionsMap := map[string]string{ - "esc/q": gui.Tr.Close, + "esc": gui.Tr.Close, "↑ ↓": gui.Tr.Navigate, "enter": gui.Tr.Execute, } diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go index 64dea9f9..4d9aa1d2 100644 --- a/pkg/i18n/english.go +++ b/pkg/i18n/english.go @@ -12,6 +12,7 @@ type TranslationSet struct { Execute string Scroll string Close string + Quit string ErrorTitle string NoViewMachingNewLineFocusedSwitchStatement string OpenConfig string @@ -156,6 +157,7 @@ func englishSet() TranslationSet { Navigate: "navigate", Execute: "execute", Close: "close", + Quit: "quit", Menu: "menu", MenuTitle: "Menu", Scroll: "scroll",