Revert "Add Style configuration"

This reverts commit 0f78f06610c0e8887aba2ae50e99b86477a384b3.

4 files changed, 16 insertions, 10 deletions

diff --git a/commands/compose/attach.go b/commands/compose/attach.go
index 6b8d72fc..2b633dc6 100644
--- a/commands/compose/attach.go
+++ b/commands/compose/attach.go
@@ -8,6 +8,7 @@ import (
 
 	"git.sr.ht/~sircmpwn/aerc/commands"
 	"git.sr.ht/~sircmpwn/aerc/widgets"
+	"github.com/gdamore/tcell"
 	"github.com/mitchellh/go-homedir"
 )
 
@@ -35,23 +36,24 @@ func (Attach) Execute(aerc *widgets.Aerc, args []string) error {
 
 	path, err := homedir.Expand(path)
 	if err != nil {
-		aerc.PushError(" "+err.Error(), 10*time.Second)
+		aerc.PushError(" " + err.Error())
 		return err
 	}
 
 	pathinfo, err := os.Stat(path)
 	if err != nil {
-		aerc.PushError(" "+err.Error(), 10*time.Second)
+		aerc.PushError(" " + err.Error())
 		return err
 	} else if pathinfo.IsDir() {
-		aerc.PushError("Attachment must be a file, not a directory", 10*time.Second)
+		aerc.PushError("Attachment must be a file, not a directory")
 		return nil
 	}
 
 	composer, _ := aerc.SelectedTab().(*widgets.Composer)
 	composer.AddAttachment(path)
 
-	aerc.PushSuccess(fmt.Sprintf("Attached %s", pathinfo.Name()), 10*time.Second)
+	aerc.PushStatus(fmt.Sprintf("Attached %s", pathinfo.Name()), 10*time.Second).
+		Color(tcell.ColorDefault, tcell.ColorGreen)
 
 	return nil
 }
diff --git a/commands/compose/detach.go b/commands/compose/detach.go
index 8bc0e887..e8b07ed6 100644
--- a/commands/compose/detach.go
+++ b/commands/compose/detach.go
@@ -6,6 +6,7 @@ import (
 	"time"
 
 	"git.sr.ht/~sircmpwn/aerc/widgets"
+	"github.com/gdamore/tcell"
 )
 
 type Detach struct{}
@@ -43,7 +44,8 @@ func (Detach) Execute(aerc *widgets.Aerc, args []string) error {
 		return err
 	}
 
-	aerc.PushSuccess(fmt.Sprintf("Detached %s", path), 10*time.Second)
+	aerc.PushStatus(fmt.Sprintf("Detached %s", path), 10*time.Second).
+		Color(tcell.ColorDefault, tcell.ColorGreen)
 
 	return nil
 }
diff --git a/commands/compose/postpone.go b/commands/compose/postpone.go
index 90b6134b..60c9df1a 100644
--- a/commands/compose/postpone.go
+++ b/commands/compose/postpone.go
@@ -63,7 +63,7 @@ func (Postpone) Execute(aerc *widgets.Aerc, args []string) error {
 	go func() {
 		errStr := <-errChan
 		if errStr != "" {
-			aerc.PushError(" "+errStr, 10*time.Second)
+			aerc.PushError(" " + errStr)
 			return
 		}
 
@@ -71,7 +71,7 @@ func (Postpone) Execute(aerc *widgets.Aerc, args []string) error {
 		ctr := datacounter.NewWriterCounter(ioutil.Discard)
 		err = composer.WriteMessage(header, ctr)
 		if err != nil {
-			aerc.PushError(errors.Wrap(err, "WriteMessage").Error(), 10*time.Second)
+			aerc.PushError(errors.Wrap(err, "WriteMessage").Error())
 			composer.Close()
 			return
 		}
@@ -90,7 +90,7 @@ func (Postpone) Execute(aerc *widgets.Aerc, args []string) error {
 				r.Close()
 				composer.Close()
 			case *types.Error:
-				aerc.PushError(" "+msg.Error.Error(), 10*time.Second)
+				aerc.PushError(" " + msg.Error.Error())
 				r.Close()
 				composer.Close()
 			}
diff --git a/commands/compose/send.go b/commands/compose/send.go
index a22be8f8..59ae5d0b 100644
--- a/commands/compose/send.go
+++ b/commands/compose/send.go
@@ -12,6 +12,7 @@ import (
 
 	"github.com/emersion/go-sasl"
 	"github.com/emersion/go-smtp"
+	"github.com/gdamore/tcell"
 	"github.com/google/shlex"
 	"github.com/miolini/datacounter"
 	"github.com/pkg/errors"
@@ -224,7 +225,8 @@ func (Send) Execute(aerc *widgets.Aerc, args []string) error {
 		aerc.PushStatus("Sending...", 10*time.Second)
 		nbytes, err := sendAsync()
 		if err != nil {
-			aerc.SetError(" " + err.Error())
+			aerc.SetStatus(" "+err.Error()).
+				Color(tcell.ColorDefault, tcell.ColorRed)
 			return
 		}
 		if config.CopyTo != "" {
@@ -245,7 +247,7 @@ func (Send) Execute(aerc *widgets.Aerc, args []string) error {
 					composer.SetSent()
 					composer.Close()
 				case *types.Error:
-					aerc.PushError(" "+msg.Error.Error(), 10*time.Second)
+					aerc.PushError(" " + msg.Error.Error())
 					r.Close()
 					composer.Close()
 				}