diff --git a/pkg/config/app_config.go b/pkg/config/app_config.go index 0ac3c186..0339747f 100644 --- a/pkg/config/app_config.go +++ b/pkg/config/app_config.go @@ -31,7 +31,7 @@ type UserConfig struct { Reporting string `yaml:"reporting,omitempty"` // ConfirmOnQuit when enabled prompts you to confirm you want to quit when you hit esc or q when no confirmation panels are open - ConfirmOnQuit bool `yaml:"confirmOnQuit,omitempty"` + ConfirmOnQuit bool `yaml:"confirmOnQuit"` // CommandTemplates determines what commands actually get called when we run certain commands CommandTemplates CommandTemplatesConfig `yaml:"commandTemplates,omitempty"` @@ -62,16 +62,19 @@ type GuiConfig struct { ScrollHeight int `yaml:"scrollHeight,omitempty"` // ScrollPastBottom determines whether you can scroll past the bottom of the main view - ScrollPastBottom bool `yaml:"scrollPastBottom,omitempty"` + ScrollPastBottom bool `yaml:"scrollPastBottom"` // MouseEvents is experimental at this point. It's purpose is to allow you to focus panels by clicking on them, and allow for clicking on links - MouseEvents bool `yaml:"mouseEvents,omitempty"` + MouseEvents bool `yaml:"mouseEvents"` // Theme determines what colors and color attributes your panel borders have. I always set inactiveBorderColor to black because in my terminal it's more of a grey, but that doesn't work in your average terminal. I highly recommended finding a combination that works for you Theme ThemeConfig `yaml:"theme,omitempty"` // ShowAllContainers determines whether the Containers panel contains all the containers returned by `docker ps -a`, or just those containers that aren't directly linked to a service. It is probably desirable to enable this if you have multiple containers per service, but otherwise it can cause a lot of clutter - ShowAllContainers bool `yaml:"showAllContainers,omitempty"` + ShowAllContainers bool `yaml:"showAllContainers"` + + // PromptToReturn determines whether you get the 'press enter to return to lazydocker' message after a subprocess has completed. You would set this to true if you often want to see the output of subprocesses before returning to lazydocker. I would default this to false but then people who want it set to true won't even know the config option exists. + PromptToReturn bool `yaml:"promptToReturn"` } // CommandTemplatesConfig determines what commands actually get called when we run certain commands diff --git a/pkg/gui/subprocess.go b/pkg/gui/subprocess.go index 37726e65..11965bc8 100644 --- a/pkg/gui/subprocess.go +++ b/pkg/gui/subprocess.go @@ -72,11 +72,13 @@ func (gui *Gui) runCommand() error { signal.Stop(c) - fmt.Fprintf(os.Stdout, "\n%s", utils.ColoredString(gui.Tr.PressEnterToReturn, color.FgGreen)) + if gui.Config.UserConfig.Gui.PromptToReturn { + fmt.Fprintf(os.Stdout, "\n%s", utils.ColoredString(gui.Tr.PressEnterToReturn, color.FgGreen)) - // wait for enter press - if _, err := fmt.Scanln(); err != nil { - gui.Log.Error(err) + // wait for enter press + if _, err := fmt.Scanln(); err != nil { + gui.Log.Error(err) + } } return nil diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go index 1d42c3e5..9c6ca61f 100644 --- a/pkg/i18n/english.go +++ b/pkg/i18n/english.go @@ -161,6 +161,6 @@ func englishSet() TranslationSet { ConfirmPruneVolumes: "Are you sure you want to prune all unused volumes?", StopService: "Are you sure you want to stop this service's containers? (enter/esc)", StopContainer: "Are you sure you want to stop this container?", - PressEnterToReturn: "Press enter to return to lazydocker", + PressEnterToReturn: "Press enter to return to lazydocker (this prompt can be disabled in your config)", } }