tabs: rename SelectedTab to SelectedTabContent
This function returns an ui.Drawable. Use a more explicit name. This prepares for adding a new SelectedTab function which will return an ui.Tab. Signed-off-by: Robin Jarry <robin@jarry.cc> Acked-by: Koni Marti <koni.marti@gmail.com>
This commit is contained in:
parent
c49a065496
commit
c841f36513
29 changed files with 36 additions and 36 deletions
|
@ -24,7 +24,7 @@ func (Close) Execute(aerc *widgets.Aerc, args []string) error {
|
|||
if len(args) != 1 {
|
||||
return errors.New("Usage: close")
|
||||
}
|
||||
mv, _ := aerc.SelectedTab().(*widgets.MessageViewer)
|
||||
mv, _ := aerc.SelectedTabContent().(*widgets.MessageViewer)
|
||||
mv.Close()
|
||||
aerc.RemoveTab(mv)
|
||||
return nil
|
||||
|
|
|
@ -35,7 +35,7 @@ func (NextPrevPart) Execute(aerc *widgets.Aerc, args []string) error {
|
|||
return nextPrevPartUsage(args[0])
|
||||
}
|
||||
}
|
||||
mv, _ := aerc.SelectedTab().(*widgets.MessageViewer)
|
||||
mv, _ := aerc.SelectedTabContent().(*widgets.MessageViewer)
|
||||
for ; n > 0; n-- {
|
||||
if args[0] == "prev-part" {
|
||||
mv.PreviousPart()
|
||||
|
|
|
@ -27,7 +27,7 @@ func (NextPrevMsg) Execute(aerc *widgets.Aerc, args []string) error {
|
|||
if err != nil {
|
||||
return err
|
||||
}
|
||||
mv, _ := aerc.SelectedTab().(*widgets.MessageViewer)
|
||||
mv, _ := aerc.SelectedTabContent().(*widgets.MessageViewer)
|
||||
acct := mv.SelectedAccount()
|
||||
if acct == nil {
|
||||
return errors.New("No account selected")
|
||||
|
|
|
@ -25,7 +25,7 @@ func (Open) Aliases() []string {
|
|||
}
|
||||
|
||||
func (Open) Complete(aerc *widgets.Aerc, args []string) []string {
|
||||
mv := aerc.SelectedTab().(*widgets.MessageViewer)
|
||||
mv := aerc.SelectedTabContent().(*widgets.MessageViewer)
|
||||
if mv != nil {
|
||||
if p := mv.SelectedMessagePart(); p != nil {
|
||||
return commands.CompletionFromList(aerc, p.Links, args)
|
||||
|
@ -35,7 +35,7 @@ func (Open) Complete(aerc *widgets.Aerc, args []string) []string {
|
|||
}
|
||||
|
||||
func (Open) Execute(aerc *widgets.Aerc, args []string) error {
|
||||
mv := aerc.SelectedTab().(*widgets.MessageViewer)
|
||||
mv := aerc.SelectedTabContent().(*widgets.MessageViewer)
|
||||
p := mv.SelectedMessagePart()
|
||||
|
||||
if args[0] == "open-link" && len(args) > 1 {
|
||||
|
|
|
@ -99,9 +99,9 @@ func (Save) Execute(aerc *widgets.Aerc, args []string) error {
|
|||
return err
|
||||
}
|
||||
|
||||
mv, ok := aerc.SelectedTab().(*widgets.MessageViewer)
|
||||
mv, ok := aerc.SelectedTabContent().(*widgets.MessageViewer)
|
||||
if !ok {
|
||||
return fmt.Errorf("SelectedTab is not a MessageViewer")
|
||||
return fmt.Errorf("SelectedTabContent is not a MessageViewer")
|
||||
}
|
||||
|
||||
if params.attachments {
|
||||
|
|
|
@ -24,7 +24,7 @@ func (ToggleHeaders) Execute(aerc *widgets.Aerc, args []string) error {
|
|||
if len(args) > 1 {
|
||||
return toggleHeadersUsage(args[0])
|
||||
}
|
||||
mv, _ := aerc.SelectedTab().(*widgets.MessageViewer)
|
||||
mv, _ := aerc.SelectedTabContent().(*widgets.MessageViewer)
|
||||
mv.ToggleHeaders()
|
||||
return nil
|
||||
}
|
||||
|
|
|
@ -25,7 +25,7 @@ func (ToggleKeyPassthrough) Execute(aerc *widgets.Aerc, args []string) error {
|
|||
if len(args) != 1 {
|
||||
return errors.New("Usage: toggle-key-passthrough")
|
||||
}
|
||||
mv, _ := aerc.SelectedTab().(*widgets.MessageViewer)
|
||||
mv, _ := aerc.SelectedTabContent().(*widgets.MessageViewer)
|
||||
keyPassthroughEnabled := mv.ToggleKeyPassthrough()
|
||||
if acct := mv.SelectedAccount(); acct != nil {
|
||||
acct.SetStatus(statusline.Passthrough(keyPassthroughEnabled))
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue