From 2c244222d508a32d3f5ba600944a46b6fdea1a10 Mon Sep 17 00:00:00 2001 From: Kalyan Sriram Date: Mon, 27 Jul 2020 01:03:56 -0700 Subject: [PATCH] Rename selecter to selector --- doc/aerc-stylesets.7.scd | 12 ++++++------ widgets/account-wizard.go | 30 +++++++++++++++--------------- widgets/msgviewer.go | 12 ++++++------ 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/doc/aerc-stylesets.7.scd b/doc/aerc-stylesets.7.scd index 829418e..fd7732d 100644 --- a/doc/aerc-stylesets.7.scd +++ b/doc/aerc-stylesets.7.scd @@ -129,12 +129,12 @@ styling. : The style for the loading spinner. | border : The style used to draw borders. *Only the background color is used*. -| selecter_default -: The default style for the selecter ui element. -| selecter_focused -: The focused item in a selecter ui element. -| selecter_chooser -: The item chooser in a selecter ui element. +| selector_default +: The default style for the selector ui element. +| selector_focused +: The focused item in a selector ui element. +| selector_chooser +: The item chooser in a selector ui element. ## fnmatch style wildcard matching The styleset configuration can be made simpler by using the fnmatch diff --git a/widgets/account-wizard.go b/widgets/account-wizard.go index ae45bb8..59f22e7 100644 --- a/widgets/account-wizard.go +++ b/widgets/account-wizard.go @@ -179,7 +179,7 @@ func NewAccountWizard(conf *config.AercConfig, aerc *Aerc) *AccountWizard { At(7, 0) basics.AddChild(wizard.email). At(8, 0) - selecter := NewSelecter([]string{"Next"}, 0, conf.Ui). + selector := NewSelector([]string{"Next"}, 0, conf.Ui). OnChoose(func(option string) { email := wizard.email.String() if strings.ContainsRune(email, '@') { @@ -203,9 +203,9 @@ func NewAccountWizard(conf *config.AercConfig, aerc *Aerc) *AccountWizard { } wizard.advance(option) }) - basics.AddChild(selecter).At(9, 0) + basics.AddChild(selector).At(9, 0) wizard.basics = []ui.Interactive{ - wizard.accountName, wizard.fullName, wizard.email, selecter, + wizard.accountName, wizard.fullName, wizard.email, selector, } basics.OnInvalidate(func(_ ui.Drawable) { wizard.Invalidate() @@ -261,7 +261,7 @@ func NewAccountWizard(conf *config.AercConfig, aerc *Aerc) *AccountWizard { ui.NewText("Connection mode", conf.Ui.GetStyle(config.STYLE_HEADER))). At(10, 0) - imapMode := NewSelecter([]string{ + imapMode := NewSelector([]string{ "IMAP over SSL/TLS", "IMAP with STARTTLS", "Insecure IMAP", @@ -277,14 +277,14 @@ func NewAccountWizard(conf *config.AercConfig, aerc *Aerc) *AccountWizard { wizard.imapUri() }) incoming.AddChild(imapMode).At(11, 0) - selecter = NewSelecter([]string{"Previous", "Next"}, 1, conf.Ui). + selector = NewSelector([]string{"Previous", "Next"}, 1, conf.Ui). OnChoose(wizard.advance) incoming.AddChild(ui.NewFill(' ')).At(12, 0) incoming.AddChild(wizard.imapStr).At(13, 0) - incoming.AddChild(selecter).At(14, 0) + incoming.AddChild(selector).At(14, 0) wizard.incoming = []ui.Interactive{ wizard.imapUsername, wizard.imapPassword, wizard.imapServer, - imapMode, selecter, + imapMode, selector, } incoming.OnInvalidate(func(_ ui.Drawable) { wizard.Invalidate() @@ -343,7 +343,7 @@ func NewAccountWizard(conf *config.AercConfig, aerc *Aerc) *AccountWizard { ui.NewText("Connection mode", conf.Ui.GetStyle(config.STYLE_HEADER))). At(10, 0) - smtpMode := NewSelecter([]string{ + smtpMode := NewSelector([]string{ "SMTP over SSL/TLS", "SMTP with STARTTLS", "Insecure SMTP", @@ -359,7 +359,7 @@ func NewAccountWizard(conf *config.AercConfig, aerc *Aerc) *AccountWizard { wizard.smtpUri() }) outgoing.AddChild(smtpMode).At(11, 0) - selecter = NewSelecter([]string{"Previous", "Next"}, 1, conf.Ui). + selector = NewSelector([]string{"Previous", "Next"}, 1, conf.Ui). OnChoose(wizard.advance) outgoing.AddChild(ui.NewFill(' ')).At(12, 0) outgoing.AddChild(wizard.smtpStr).At(13, 0) @@ -367,7 +367,7 @@ func NewAccountWizard(conf *config.AercConfig, aerc *Aerc) *AccountWizard { outgoing.AddChild( ui.NewText("Copy sent messages to 'Sent' folder?", conf.Ui.GetStyle(config.STYLE_HEADER))).At(15, 0) - copySent := NewSelecter([]string{"Yes", "No"}, 0, conf.Ui). + copySent := NewSelector([]string{"Yes", "No"}, 0, conf.Ui). Chooser(true).OnChoose(func(option string) { switch option { case "Yes": @@ -377,10 +377,10 @@ func NewAccountWizard(conf *config.AercConfig, aerc *Aerc) *AccountWizard { } }) outgoing.AddChild(copySent).At(16, 0) - outgoing.AddChild(selecter).At(17, 0) + outgoing.AddChild(selector).At(17, 0) wizard.outgoing = []ui.Interactive{ wizard.smtpUsername, wizard.smtpPassword, wizard.smtpServer, - smtpMode, copySent, selecter, + smtpMode, copySent, selector, } outgoing.OnInvalidate(func(_ ui.Drawable) { wizard.Invalidate() @@ -398,7 +398,7 @@ func NewAccountWizard(conf *config.AercConfig, aerc *Aerc) *AccountWizard { "save your settings to accounts.conf.\n\n"+ "To add another account in the future, run ':new-account'.", conf.Ui.GetStyle(config.STYLE_DEFAULT))) - selecter = NewSelecter([]string{ + selector = NewSelector([]string{ "Previous", "Finish & open tutorial", "Finish", @@ -412,8 +412,8 @@ func NewAccountWizard(conf *config.AercConfig, aerc *Aerc) *AccountWizard { wizard.finish(false) } }) - complete.AddChild(selecter).At(1, 0) - wizard.complete = []ui.Interactive{selecter} + complete.AddChild(selector).At(1, 0) + wizard.complete = []ui.Interactive{selector} complete.OnInvalidate(func(_ ui.Drawable) { wizard.Invalidate() }) diff --git a/widgets/msgviewer.go b/widgets/msgviewer.go index 30c83f7..6a91741 100644 --- a/widgets/msgviewer.go +++ b/widgets/msgviewer.go @@ -458,7 +458,7 @@ type PartViewer struct { sink io.WriteCloser source io.Reader term *Terminal - selecter *Selecter + selector *Selector grid *ui.Grid uiConfig config.UIConfig } @@ -530,7 +530,7 @@ func NewPartViewer(acct *AccountView, conf *config.AercConfig, {ui.SIZE_WEIGHT, ui.Const(1)}, }) - selecter := NewSelecter([]string{"Save message", "Pipe to command"}, + selector := NewSelector([]string{"Save message", "Pipe to command"}, 0, acct.UiConfig()). OnChoose(func(option string) { switch option { @@ -541,7 +541,7 @@ func NewPartViewer(acct *AccountView, conf *config.AercConfig, } }) - grid.AddChild(selecter).At(2, 0) + grid.AddChild(selector).At(2, 0) pv := &PartViewer{ conf: conf, @@ -554,7 +554,7 @@ func NewPartViewer(acct *AccountView, conf *config.AercConfig, showHeaders: conf.Viewer.ShowHeaders, sink: pipe, term: term, - selecter: selecter, + selector: selector, grid: grid, uiConfig: acct.UiConfig(), } @@ -686,7 +686,7 @@ func (pv *PartViewer) Draw(ctx *ui.Context) { ) ctx.Printf(0, 2, style, "You can still :save the message or :pipe it to an external command") - pv.selecter.Focus(true) + pv.selector.Focus(true) pv.grid.Draw(ctx) return } @@ -713,7 +713,7 @@ func (pv *PartViewer) Event(event tcell.Event) bool { if pv.term != nil { return pv.term.Event(event) } - return pv.selecter.Event(event) + return pv.selector.Event(event) } type HeaderView struct {