blacklight/aerc
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Correct color of error messages

Browse source
This commit is contained in:
Drew DeVault 2019-03-30 13:05:00 -04:00
parent 84965d680c
commit 2958579ee7
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
commands/account/pipe.go
View file

@ -32,13 +32,13 @@ func Pipe(aerc *widgets.Aerc, args []string) error {
pipe, err := cmd.StdinPipe() pipe, err := cmd.StdinPipe()
if err != nil { if err != nil {
aerc.PushStatus(" "+err.Error(), 10*time.Second). aerc.PushStatus(" "+err.Error(), 10*time.Second).
Color(tcell.ColorRed, tcell.ColorWhite) Color(tcell.ColorDefault, tcell.ColorRed)
return return
} }
term, err := widgets.NewTerminal(cmd) term, err := widgets.NewTerminal(cmd)
if err != nil { if err != nil {
aerc.PushStatus(" "+err.Error(), 10*time.Second). aerc.PushStatus(" "+err.Error(), 10*time.Second).
Color(tcell.ColorRed, tcell.ColorWhite) Color(tcell.ColorDefault, tcell.ColorRed)
return return
} }
host := widgets.NewTermHost(term, aerc.Config()) host := widgets.NewTermHost(term, aerc.Config())
@ -50,7 +50,7 @@ func Pipe(aerc *widgets.Aerc, args []string) error {
term.OnClose = func(err error) { term.OnClose = func(err error) {
if err != nil { if err != nil {
aerc.PushStatus(" "+err.Error(), 10*time.Second). aerc.PushStatus(" "+err.Error(), 10*time.Second).
Color(tcell.ColorRed, tcell.ColorWhite) Color(tcell.ColorDefault, tcell.ColorRed)
} else { } else {
// TODO: Tab-specific status stacks // TODO: Tab-specific status stacks
aerc.PushStatus("Process complete, press any key to close.", aerc.PushStatus("Process complete, press any key to close.",
@ -63,7 +63,7 @@ func Pipe(aerc *widgets.Aerc, args []string) error {
_, err := io.Copy(pipe, reader) _, err := io.Copy(pipe, reader)
if err != nil { if err != nil {
aerc.PushStatus(" "+err.Error(), 10*time.Second). aerc.PushStatus(" "+err.Error(), 10*time.Second).
Color(tcell.ColorRed, tcell.ColorWhite) Color(tcell.ColorDefault, tcell.ColorRed)
} }
pipe.Close() pipe.Close()
}() }()

2
commands/term.go
View file

@ -39,7 +39,7 @@ func Term(aerc *widgets.Aerc, args []string) error {
aerc.RemoveTab(host) aerc.RemoveTab(host)
if err != nil { if err != nil {
aerc.PushStatus(" "+err.Error(), 10*time.Second). aerc.PushStatus(" "+err.Error(), 10*time.Second).
Color(tcell.ColorRed, tcell.ColorWhite) Color(tcell.ColorDefault, tcell.ColorRed)
} }
} }
return nil return nil

2
widgets/account.go
View file

@ -185,6 +185,6 @@ func (acct *AccountView) onMessage(msg types.WorkerMessage) {
case *types.Error: case *types.Error:
acct.logger.Printf("%v", msg.Error) acct.logger.Printf("%v", msg.Error)
acct.host.SetStatus(fmt.Sprintf("%v", msg.Error)). acct.host.SetStatus(fmt.Sprintf("%v", msg.Error)).
Color(tcell.ColorRed, tcell.ColorDefault) Color(tcell.ColorDefault, tcell.ColorRed)
} }
} }

2
widgets/aerc.go
View file

@ -251,7 +251,7 @@ func (aerc *Aerc) BeginExCommand() {
err := aerc.cmd(cmd) err := aerc.cmd(cmd)
if err != nil { if err != nil {
aerc.PushStatus(" "+err.Error(), 10*time.Second). aerc.PushStatus(" "+err.Error(), 10*time.Second).
Color(tcell.ColorRed, tcell.ColorWhite) Color(tcell.ColorDefault, tcell.ColorRed)
} }
aerc.statusbar.Pop() aerc.statusbar.Pop()
aerc.focus(previous) aerc.focus(previous)