From 0f78f06610c0e8887aba2ae50e99b86477a384b3 Mon Sep 17 00:00:00 2001
From: Reto Brunner <reto@labrat.space>
Date: Wed, 27 May 2020 07:37:02 +0200
Subject: Add Style configuration

The following functionalities are added to configure aerc ui styles.
- Read stylesets from file with very basic fnmatch wildcard matching
- Add default styleset
- Support different stylesets as part of UiConfig allowing contextual
  styles.
- Move widgets/ui elements to use the stylesets.
- Add configuration manual for the styleset
---
 commands/compose/attach.go   | 10 ++++------
 commands/compose/detach.go   |  4 +---
 commands/compose/postpone.go |  6 +++---
 commands/compose/send.go     |  6 ++----
 4 files changed, 10 insertions(+), 16 deletions(-)

(limited to 'commands/compose')

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