From 7d1770754ff432b0c6f153c066e4c749683b563f Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Sun, 2 Jun 2019 10:23:53 -0400 Subject: [PATCH] Add date to message viewer --- widgets/msgviewer.go | 12 +++++++++--- widgets/providesmessage.go | 4 ++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/widgets/msgviewer.go b/widgets/msgviewer.go index 9230ba3..45a5ed0 100644 --- a/widgets/msgviewer.go +++ b/widgets/msgviewer.go @@ -60,7 +60,7 @@ func NewMessageViewer(acct *AccountView, conf *config.AercConfig, store *lib.MessageStore, msg *types.MessageInfo) *MessageViewer { grid := ui.NewGrid().Rows([]ui.GridSpec{ - {ui.SIZE_EXACT, 3}, // TODO: Based on number of header rows + {ui.SIZE_EXACT, 4}, // TODO: Based on number of header rows {ui.SIZE_WEIGHT, 1}, }).Columns([]ui.GridSpec{ {ui.SIZE_WEIGHT, 1}, @@ -71,6 +71,7 @@ func NewMessageViewer(acct *AccountView, conf *config.AercConfig, {ui.SIZE_EXACT, 1}, {ui.SIZE_EXACT, 1}, {ui.SIZE_EXACT, 1}, + {ui.SIZE_EXACT, 1}, }).Columns([]ui.GridSpec{ {ui.SIZE_WEIGHT, 1}, {ui.SIZE_WEIGHT, 1}, @@ -85,12 +86,17 @@ func NewMessageViewer(acct *AccountView, conf *config.AercConfig, Name: "To", Value: formatAddresses(msg.Envelope.To), }).At(0, 1) + headers.AddChild( + &HeaderView{ + Name: "Date", + Value: msg.Envelope.Date.Format("Mon Jan 2, 2006 at 3:04 PM"), + }).At(1, 0).Span(1, 2) headers.AddChild( &HeaderView{ Name: "Subject", Value: msg.Envelope.Subject, - }).At(1, 0).Span(1, 2) - headers.AddChild(ui.NewFill(' ')).At(2, 0).Span(1, 2) + }).At(2, 0).Span(1, 2) + headers.AddChild(ui.NewFill(' ')).At(3, 0).Span(1, 2) var err error switcher := &PartSwitcher{} diff --git a/widgets/providesmessage.go b/widgets/providesmessage.go index 341f83f..7be8e7e 100644 --- a/widgets/providesmessage.go +++ b/widgets/providesmessage.go @@ -1,14 +1,14 @@ package widgets import ( - "git.sr.ht/~sircmpwn/aerc/worker/types" "git.sr.ht/~sircmpwn/aerc/lib" "git.sr.ht/~sircmpwn/aerc/lib/ui" + "git.sr.ht/~sircmpwn/aerc/worker/types" ) type ProvidesMessage interface { ui.Drawable - Store() *lib.MessageStore + Store() *lib.MessageStore SelectedMessage() *types.MessageInfo SelectedAccount() *AccountView }