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

Revert "Implement style configuration."

Browse source 
This reverts commit 1ff687ca2b.
This commit is contained in:
Reto Brunner 2020-07-30 23:22:32 +02:00
parent 6ee7b1c3fd
commit 3d784c5d8c
30 changed files with 296 additions and 1044 deletions

5
commands/compose/attach.go
View file

@ -4,9 +4,11 @@ import (
"fmt"
"os"
"strings"
"time"
"git.sr.ht/~sircmpwn/aerc/commands"
"git.sr.ht/~sircmpwn/aerc/widgets"
"github.com/gdamore/tcell"
"github.com/mitchellh/go-homedir"
)
@ -50,7 +52,8 @@ func (Attach) Execute(aerc *widgets.Aerc, args []string) error {
composer, _ := aerc.SelectedTab().(*widgets.Composer)
composer.AddAttachment(path)
aerc.PushSuccess(fmt.Sprintf("Attached %s", pathinfo.Name()))
aerc.PushStatus(fmt.Sprintf("Attached %s", pathinfo.Name()), 10*time.Second).
Color(tcell.ColorDefault, tcell.ColorGreen)
return nil
}

5
commands/compose/detach.go
View file

@ -3,8 +3,10 @@ package compose
import (
"fmt"
"strings"
"time"
"git.sr.ht/~sircmpwn/aerc/widgets"
"github.com/gdamore/tcell"
)
type Detach struct{}
@ -42,7 +44,8 @@ func (Detach) Execute(aerc *widgets.Aerc, args []string) error {
return err
}
aerc.PushSuccess(fmt.Sprintf("Detached %s", path))
aerc.PushStatus(fmt.Sprintf("Detached %s", path), 10*time.Second).
Color(tcell.ColorDefault, tcell.ColorGreen)
return nil
}

15
commands/exec.go
View file

@ -7,6 +7,8 @@ import (
"time"
"git.sr.ht/~sircmpwn/aerc/widgets"
"github.com/gdamore/tcell"
)
type ExecCmd struct{}
@ -33,15 +35,14 @@ func (ExecCmd) Execute(aerc *widgets.Aerc, args []string) error {
if err != nil {
aerc.PushError(" " + err.Error())
} else {
color := tcell.ColorDefault
if cmd.ProcessState.ExitCode() != 0 {
aerc.PushError(fmt.Sprintf(
"%s: completed with status %d", args[0],
cmd.ProcessState.ExitCode()))
} else {
aerc.PushStatus(fmt.Sprintf(
"%s: completed with status %d", args[0],
cmd.ProcessState.ExitCode()), 10*time.Second)
color = tcell.ColorRed
}
aerc.PushStatus(fmt.Sprintf(
"%s: completed with status %d", args[0],
cmd.ProcessState.ExitCode()), 10*time.Second).
Color(tcell.ColorDefault, color)
}
}()
return nil

14
commands/msg/pipe.go
View file

@ -12,6 +12,7 @@ import (
"git.sr.ht/~sircmpwn/aerc/worker/types"
"git.sr.ht/~sircmpwn/getopt"
"github.com/gdamore/tcell"
)
type Pipe struct{}
@ -95,15 +96,14 @@ func (Pipe) Execute(aerc *widgets.Aerc, args []string) error {
if err != nil {
aerc.PushError(" " + err.Error())
} else {
color := tcell.ColorDefault
if ecmd.ProcessState.ExitCode() != 0 {
aerc.PushError(fmt.Sprintf(
"%s: completed with status %d", cmd[0],
ecmd.ProcessState.ExitCode()))
} else {
aerc.PushStatus(fmt.Sprintf(
"%s: completed with status %d", cmd[0],
ecmd.ProcessState.ExitCode()), 10*time.Second)
color = tcell.ColorRed
}
aerc.PushStatus(fmt.Sprintf(
"%s: completed with status %d", cmd[0],
ecmd.ProcessState.ExitCode()), 10*time.Second).
Color(tcell.ColorDefault, color)
}
}