aboutsummaryrefslogtreecommitdiffstats
path: root/widgets/aerc.go
diff options
context:
space:
mode:
authorDrew DeVault <sir@cmpwn.com>2019-01-13 13:33:43 -0500
committerDrew DeVault <sir@cmpwn.com>2019-01-13 13:33:43 -0500
commitc286d3da6ba8636412db5c3b72fda739a06e7f6c (patch)
tree88388b6eb0d3ae1d3c8d23163b6b6b7506e9acf7 /widgets/aerc.go
parentb76deea9635d56bfa740127683e43bf817f5e3be (diff)
downloadaerc-c286d3da6ba8636412db5c3b72fda739a06e7f6c.tar.gz
Move ex line into account
Diffstat (limited to 'widgets/aerc.go')
-rw-r--r--widgets/aerc.go49
1 files changed, 9 insertions, 40 deletions
diff --git a/widgets/aerc.go b/widgets/aerc.go
index 58e8972e..cd4b7736 100644
--- a/widgets/aerc.go
+++ b/widgets/aerc.go
@@ -1,9 +1,7 @@
package widgets
import (
- "fmt"
"log"
- "time"
"github.com/gdamore/tcell"
@@ -12,12 +10,9 @@ import (
)
type Aerc struct {
- accounts map[string]*AccountView
- grid *libui.Grid
- tabs *libui.Tabs
- statusbar *libui.Stack
- statusline *StatusLine
- interactive libui.Interactive
+ accounts map[string]*AccountView
+ grid *libui.Grid
+ tabs *libui.Tabs
}
func NewAerc(conf *config.AercConfig, logger *log.Logger) *Aerc {
@@ -31,10 +26,6 @@ func NewAerc(conf *config.AercConfig, logger *log.Logger) *Aerc {
{libui.SIZE_WEIGHT, 1},
})
- statusbar := libui.NewStack()
- statusline := NewStatusLine()
- statusbar.Push(statusline)
-
// TODO: Grab sidebar size from config and via :set command
mainGrid.AddChild(libui.NewText("aerc").
Strategy(libui.TEXT_CENTER).
@@ -45,17 +36,15 @@ func NewAerc(conf *config.AercConfig, logger *log.Logger) *Aerc {
accts := make(map[string]*AccountView)
for _, acct := range conf.Accounts {
- view := NewAccountView(&acct, logger, statusbar)
+ view := NewAccountView(&acct, logger)
accts[acct.Name] = view
tabs.Add(view, acct.Name)
}
return &Aerc{
- accounts: accts,
- grid: mainGrid,
- statusbar: statusbar,
- statusline: statusline,
- tabs: tabs,
+ accounts: accts,
+ grid: mainGrid,
+ tabs: tabs,
}
}
@@ -74,26 +63,6 @@ func (aerc *Aerc) Draw(ctx *libui.Context) {
}
func (aerc *Aerc) Event(event tcell.Event) bool {
- switch event := event.(type) {
- case *tcell.EventKey:
- if event.Rune() == ':' {
- exline := NewExLine(func(command string) {
- aerc.statusline.Push(fmt.Sprintf("TODO: execute %s", command),
- 3*time.Second)
- aerc.statusbar.Pop()
- aerc.interactive = nil
- }, func() {
- aerc.statusbar.Pop()
- aerc.interactive = nil
- })
- aerc.interactive = exline
- aerc.statusbar.Push(exline)
- return true
- }
- }
- if aerc.interactive != nil {
- return aerc.interactive.Event(event)
- } else {
- return false
- }
+ acct, _ := aerc.tabs.Tabs[aerc.tabs.Selected].Content.(*AccountView)
+ return acct.Event(event)
}