From 2da300f2fbcb188783ce9a5384fe1d10c75461f9 Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Thu, 23 Mar 2023 22:32:41 +1100 Subject: move diffing menu action to controller --- pkg/gui/keybindings.go | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) (limited to 'pkg/gui/keybindings.go') diff --git a/pkg/gui/keybindings.go b/pkg/gui/keybindings.go index 11c7f3640..040d634b8 100644 --- a/pkg/gui/keybindings.go +++ b/pkg/gui/keybindings.go @@ -29,6 +29,19 @@ func (gui *Gui) outsideFilterMode(f func() error) func() error { } } +func (gui *Gui) validateNotInFilterMode() bool { + if gui.State.Modes.Filtering.Active() { + _ = gui.c.Confirm(types.ConfirmOpts{ + Title: gui.c.Tr.MustExitFilterModeTitle, + Prompt: gui.c.Tr.MustExitFilterModePrompt, + HandleConfirm: gui.helpers.Mode.ExitFilterMode, + }) + + return false + } + return true +} + // only to be called from the cheatsheet generate script. This mutates the Gui struct. func (self *Gui) GetCheatsheetKeybindings() []*types.Binding { self.g = &gocui.Gui{} @@ -188,20 +201,6 @@ func (self *Gui) GetInitialKeybindings() ([]*types.Binding, []*gocui.ViewMouseBi Handler: self.handleCopySelectedSideContextItemToClipboard, Description: self.c.Tr.LcCopyCommitFileNameToClipboard, }, - { - ViewName: "", - Key: opts.GetKey(opts.Config.Universal.DiffingMenu), - Handler: self.handleCreateDiffingMenuPanel, - Description: self.c.Tr.LcOpenDiffingMenu, - OpensMenu: true, - }, - { - ViewName: "", - Key: opts.GetKey(opts.Config.Universal.DiffingMenuAlt), - Handler: self.handleCreateDiffingMenuPanel, - Description: self.c.Tr.LcOpenDiffingMenu, - OpensMenu: true, - }, { ViewName: "", Key: opts.GetKey(opts.Config.Universal.ExtrasMenu), -- cgit v1.2.3