aboutsummaryrefslogtreecommitdiffstats
path: root/widgets
diff options
context:
space:
mode:
authorDrew DeVault <sir@cmpwn.com>2019-01-13 12:39:06 -0500
committerDrew DeVault <sir@cmpwn.com>2019-01-13 12:39:06 -0500
commit648ca983f6b2ef29378c32d1ebb6d67798f4af6d (patch)
tree4e7ab40def0adafbb0e8170a26bd610ff035cafc /widgets
parent2f5c1db63c55173d15a7ab17a9b75564fabd3648 (diff)
downloadaerc-648ca983f6b2ef29378c32d1ebb6d67798f4af6d.tar.gz
Add basic account widget, populate real acct views
Diffstat (limited to 'widgets')
-rw-r--r--widgets/account.go41
-rw-r--r--widgets/aerc.go31
2 files changed, 45 insertions, 27 deletions
diff --git a/widgets/account.go b/widgets/account.go
new file mode 100644
index 00000000..a2c5ce76
--- /dev/null
+++ b/widgets/account.go
@@ -0,0 +1,41 @@
+package widgets
+
+import (
+ "git.sr.ht/~sircmpwn/aerc2/config"
+ "git.sr.ht/~sircmpwn/aerc2/lib/ui"
+)
+
+type AccountView struct {
+ conf *config.AccountConfig
+ grid *ui.Grid
+ onInvalidate func(d ui.Drawable)
+}
+
+func NewAccountView(conf *config.AccountConfig,
+ statusbar ui.Drawable) *AccountView {
+
+ grid := ui.NewGrid().Rows([]ui.GridSpec{
+ {ui.SIZE_WEIGHT, 1},
+ {ui.SIZE_EXACT, 1},
+ }).Columns([]ui.GridSpec{
+ {ui.SIZE_EXACT, 20},
+ {ui.SIZE_WEIGHT, 1},
+ })
+ grid.AddChild(ui.NewBordered(
+ ui.NewFill('s'), ui.BORDER_RIGHT)).Span(2, 1)
+ grid.AddChild(ui.NewFill('.')).At(0, 1)
+ grid.AddChild(statusbar).At(1, 1)
+ return &AccountView{conf: conf, grid: grid}
+}
+
+func (acct *AccountView) OnInvalidate(onInvalidate func(d ui.Drawable)) {
+ acct.grid.OnInvalidate(onInvalidate)
+}
+
+func (acct *AccountView) Invalidate() {
+ acct.grid.Invalidate()
+}
+
+func (acct *AccountView) Draw(ctx *ui.Context) {
+ acct.grid.Draw(ctx)
+}
diff --git a/widgets/aerc.go b/widgets/aerc.go
index 53f53f71..3bd082eb 100644
--- a/widgets/aerc.go
+++ b/widgets/aerc.go
@@ -7,6 +7,7 @@ import (
"github.com/gdamore/tcell"
+ "git.sr.ht/~sircmpwn/aerc2/config"
libui "git.sr.ht/~sircmpwn/aerc2/lib/ui"
)
@@ -18,7 +19,7 @@ type Aerc struct {
interactive libui.Interactive
}
-func NewAerc(logger *log.Logger) *Aerc {
+func NewAerc(conf *config.AercConfig, logger *log.Logger) *Aerc {
tabs := libui.NewTabs()
mainGrid := libui.NewGrid().Rows([]libui.GridSpec{
@@ -40,34 +41,10 @@ func NewAerc(logger *log.Logger) *Aerc {
mainGrid.AddChild(tabs.TabStrip).At(0, 1)
mainGrid.AddChild(tabs.TabContent).At(1, 0).Span(1, 2)
- acctPlaceholder := func(sidebar, body rune, name string) {
- accountGrid := libui.NewGrid().Rows([]libui.GridSpec{
- {libui.SIZE_WEIGHT, 1},
- {libui.SIZE_EXACT, 1},
- }).Columns([]libui.GridSpec{
- {libui.SIZE_EXACT, 20},
- {libui.SIZE_WEIGHT, 1},
- })
- // Sidebar placeholder
- accountGrid.AddChild(libui.NewBordered(
- libui.NewFill(sidebar), libui.BORDER_RIGHT)).Span(2, 1)
- // Message list placeholder
- accountGrid.AddChild(libui.NewFill(body)).At(0, 1)
- // Statusbar
- accountGrid.AddChild(statusbar).At(1, 1)
- tabs.Add(accountGrid, name)
+ for _, acct := range conf.Accounts {
+ tabs.Add(NewAccountView(&acct, statusbar), acct.Name)
}
- acctPlaceholder('.', '★', "白い星")
- acctPlaceholder(',', '☆', "empty stars")
-
- go (func() {
- for {
- time.Sleep(1 * time.Second)
- tabs.Select((tabs.Selected + 1) % 2)
- }
- })()
-
return &Aerc{
grid: mainGrid,
statusbar: statusbar,