diff options
author | Jesse Duffield <jessedduffield@gmail.com> | 2020-08-15 16:36:39 +1000 |
---|---|---|
committer | Jesse Duffield <jessedduffield@gmail.com> | 2020-08-15 18:01:43 +1000 |
commit | d9fa02c53bb9b401f1b5ca07e8ed239862052a42 (patch) | |
tree | 9ce89793ba22ffc190ab6133365035dda4ec1ade /pkg/gui/credentials_panel.go | |
parent | c44ee71ad4ca44a407613c1e91f7d720acfa84f6 (diff) |
clean up interface for popup panels
Diffstat (limited to 'pkg/gui/credentials_panel.go')
-rw-r--r-- | pkg/gui/credentials_panel.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkg/gui/credentials_panel.go b/pkg/gui/credentials_panel.go index 9333c2e7a..7858f26f4 100644 --- a/pkg/gui/credentials_panel.go +++ b/pkg/gui/credentials_panel.go @@ -20,7 +20,7 @@ func (gui *Gui) promptUserForCredential(passOrUname string) string { credentialsView.Title = gui.Tr.SLocalize("CredentialsPassword") credentialsView.Mask = '*' } - err := gui.switchFocus(g, gui.g.CurrentView(), credentialsView) + err := gui.switchFocus(gui.g.CurrentView(), credentialsView) if err != nil { return err } @@ -43,7 +43,7 @@ func (gui *Gui) handleSubmitCredential(g *gocui.Gui, v *gocui.View) error { if err != nil { nextView = gui.getFilesView() } - err = gui.switchFocus(g, nil, nextView) + err = gui.switchFocus(nil, nextView) if err != nil { return err } @@ -57,7 +57,7 @@ func (gui *Gui) handleCloseCredentialsView(g *gocui.Gui, v *gocui.View) error { } gui.credentials <- "" - return gui.switchFocus(g, nil, gui.getFilesView()) + return gui.switchFocus(nil, gui.getFilesView()) } func (gui *Gui) handleCredentialsViewFocused(g *gocui.Gui, v *gocui.View) error { @@ -72,7 +72,7 @@ func (gui *Gui) handleCredentialsViewFocused(g *gocui.Gui, v *gocui.View) error "keyBindConfirm": "enter", }, ) - gui.renderString(g, "options", message) + gui.renderString("options", message) return nil } @@ -85,7 +85,7 @@ func (gui *Gui) handleCredentialsPopup(cmdErr error) { errMessage = gui.Tr.SLocalize("PassUnameWrong") } // we are not logging this error because it may contain a password - _ = gui.createSpecificErrorPanel(errMessage, gui.getFilesView(), false) + gui.createErrorPanel(errMessage) } else { _ = gui.closeConfirmationPrompt(gui.g, true) } |