From 8492a21a51c107f743a32231746bf5d38e9b1ccd Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Mon, 14 Jan 2019 08:14:03 -0500 Subject: Send commands up to the top-level aerc widget --- widgets/account.go | 14 ++++++++++---- widgets/aerc.go | 22 ++++++++++++++-------- 2 files changed, 24 insertions(+), 12 deletions(-) (limited to 'widgets') diff --git a/widgets/account.go b/widgets/account.go index 8662c0c..54eb9e9 100644 --- a/widgets/account.go +++ b/widgets/account.go @@ -20,13 +20,14 @@ type AccountView struct { logger *log.Logger interactive ui.Interactive onInvalidate func(d ui.Drawable) + runCmd func(cmd string) error statusline *StatusLine statusbar *ui.Stack worker *types.Worker } -func NewAccountView( - conf *config.AccountConfig, logger *log.Logger) *AccountView { +func NewAccountView(conf *config.AccountConfig, + logger *log.Logger, runCmd func(cmd string) error) *AccountView { statusbar := ui.NewStack() statusline := NewStatusLine() @@ -63,6 +64,7 @@ func NewAccountView( dirlist: dirlist, grid: grid, logger: logger, + runCmd: runCmd, statusline: statusline, statusbar: statusbar, worker: worker, @@ -106,8 +108,12 @@ func (acct *AccountView) Event(event tcell.Event) bool { case *tcell.EventKey: if event.Rune() == ':' { exline := NewExLine(func(command string) { - acct.statusline.Push( - fmt.Sprintf("TODO: execute %s", command), 3*time.Second) + err := acct.runCmd(command) + if err != nil { + acct.statusline.Push( + fmt.Sprintf("Error: %v", err), 3*time.Second). + Color(tcell.ColorRed, tcell.ColorDefault) + } acct.statusbar.Pop() acct.interactive = nil }, func() { diff --git a/widgets/aerc.go b/widgets/aerc.go index cd4b773..9444c9f 100644 --- a/widgets/aerc.go +++ b/widgets/aerc.go @@ -1,6 +1,7 @@ package widgets import ( + "fmt" "log" "github.com/gdamore/tcell" @@ -33,19 +34,19 @@ func NewAerc(conf *config.AercConfig, logger *log.Logger) *Aerc { mainGrid.AddChild(tabs.TabStrip).At(0, 1) mainGrid.AddChild(tabs.TabContent).At(1, 0).Span(1, 2) - accts := make(map[string]*AccountView) + aerc := &Aerc{ + accounts: make(map[string]*AccountView), + grid: mainGrid, + tabs: tabs, + } for _, acct := range conf.Accounts { - view := NewAccountView(&acct, logger) - accts[acct.Name] = view + view := NewAccountView(&acct, logger, aerc.RunCommand) + aerc.accounts[acct.Name] = view tabs.Add(view, acct.Name) } - return &Aerc{ - accounts: accts, - grid: mainGrid, - tabs: tabs, - } + return aerc } func (aerc *Aerc) OnInvalidate(onInvalidate func(d libui.Drawable)) { @@ -66,3 +67,8 @@ func (aerc *Aerc) Event(event tcell.Event) bool { acct, _ := aerc.tabs.Tabs[aerc.tabs.Selected].Content.(*AccountView) return acct.Event(event) } + +func (aerc *Aerc) RunCommand(cmd string) error { + // TODO + return fmt.Errorf("TODO: execute '%s'", cmd) +} -- cgit 1.4.1-2-gfad0 edit/008-sandbox-edit.mu?h=hlt&id=880bfb78741956af52e94c6abab27c0dca620315'>plain) (tree) 
a90faae9 ^


294b2ab3 ^

6f65d591 ^

e00d4854 ^

dd30f56d ^

294b2ab3 ^




6d12a8c4 ^

a90faae9 ^

a90faae9 ^



294b2ab3 ^

a90faae9 ^

dd30f56d ^

71056d61 ^

294b2ab3 ^

898f03cc ^

294b2ab3 ^


ceeb92d4 ^

71056d61 ^

a90faae9 ^

09b8717b ^

a90faae9 ^

02a35f22 ^



294b2ab3 ^

02a35f22 ^




294b2ab3 ^


71056d61 ^

02a35f22 ^






294b2ab3 ^

02a35f22 ^



294b2ab3 ^


71056d61 ^

02a35f22 ^



294b2ab3 ^

6f65d591 ^

02a35f22 ^


294b2ab3 ^




6d12a8c4 ^

02a35f22 ^

02a35f22 ^



294b2ab3 ^

02a35f22 ^


71056d61 ^

294b2ab3 ^

898f03cc ^

294b2ab3 ^


ceeb92d4 ^

71056d61 ^

02a35f22 ^

09b8717b ^

02a35f22 ^

898f03cc ^

a90faae9 ^


294b2ab3 ^

a90faae9 ^



dd30f56d ^

294b2ab3 ^


71056d61 ^

a90faae9 ^






294b2ab3 ^

a90faae9 ^


dd30f56d ^

294b2ab3 ^


71056d61 ^

a90faae9 ^




09b8717b ^

a90faae9 ^

3d8b137c ^

09b8717b ^



4e7186fa ^

ea5e7fd4 ^

ada5eb55 ^

a90faae9 ^



09b8717b ^

2d91279b ^

02a35f22 ^

4a48bedc ^

09b8717b ^

3d8b137c ^

dd660682 ^

09b8717b ^

2d91279b ^

09b8717b ^

3d8b137c ^




dd660682 ^

09b8717b ^

2d91279b ^

09b8717b ^

a90faae9 ^


2d91279b ^

a90faae9 ^

4a48bedc ^

09b8717b ^

2d91279b ^

dd660682 ^


09b8717b ^

ea19d0dc ^

2d91279b ^

09b8717b ^




a90faae9 ^

dd660682 ^

a90faae9 ^

ae244ebd ^


6f65d591 ^

e00d4854 ^

ae244ebd ^


294b2ab3 ^



ab6e672d ^

6d12a8c4 ^

ae244ebd ^




294b2ab3 ^

ae244ebd ^


71056d61 ^

ceeb92d4 ^

898f03cc ^

ab6e672d ^

71056d61 ^






ceeb92d4 ^

71056d61 ^

ae244ebd ^



02a35f22 ^

ae244ebd ^


294b2ab3 ^

ae244ebd ^



ab6e672d ^

ceeb92d4 ^

71056d61 ^


ae244ebd ^


e0d69d3b ^


6f65d591 ^

e0d69d3b ^

dd30f56d ^

e0d69d3b ^

294b2ab3 ^



6f65d591 ^

e0d69d3b ^







11569717 ^


e0d69d3b ^

294b2ab3 ^

e0d69d3b ^

dd30f56d ^

ceeb92d4 ^

898f03cc ^

71056d61 ^


ceeb92d4 ^

71056d61 ^

e0d69d3b ^



02a35f22 ^

e0d69d3b ^


294b2ab3 ^

e0d69d3b ^



dd30f56d ^

71056d61 ^

ceeb92d4 ^

898f03cc ^

71056d61 ^


ceeb92d4 ^

71056d61 ^

e0d69d3b ^


f140f194 ^


6f65d591 ^

f140f194 ^

dd30f56d ^

f140f194 ^

294b2ab3 ^



6f65d591 ^

f140f194 ^








294b2ab3 ^

f140f194 ^

dd30f56d ^

71056d61 ^

ceeb92d4 ^

898f03cc ^

71056d61 ^


ceeb92d4 ^

898f03cc ^

71056d61 ^


f140f194 ^



02a35f22 ^

f140f194 ^



294b2ab3 ^

f140f194 ^



dd30f56d ^

71056d61 ^

ceeb92d4 ^

898f03cc ^

71056d61 ^


ceeb92d4 ^

898f03cc ^

71056d61 ^


f140f194 ^



11569717 ^



f140f194 ^


294b2ab3 ^

f140f194 ^

dd30f56d ^

f140f194 ^

dd30f56d ^

ceeb92d4 ^

898f03cc ^

71056d61 ^


ceeb92d4 ^

71056d61 ^

f140f194 ^


1
2

3

4

5

6

7
8
9
10

11

12

13
14
15

16

17

18

19

20

21

22
23

24

25

26

27

28

29
30
31

32

33
34
35
36

37
38

39

40
41
42
43
44
45

46

47
48
49

50
51

52

53
54
55

56

57

58
59

60
61
62
63

64

65

66
67
68

69

70
71

72

73

74

75
76

77

78

79

80

81

82

83
84

85

86
87
88

89

90
91

92

93
94
95
96
97
98

99

100
101

102

103
104

105

106
107
108
109

110

111

112

113
114
115

116

117

118

119
120
121

122

123

124

125

126

127

128

129

130

131

132
133
134
135

136

137

138

139

140
141

142

143

144

145

146

147
148

149

150

151

152
153
154
155

156

157

158

159
160

161

162

163
164

165
166
167

168

169

170
171
172
173

174

175
176

177

178

179

180

181
182
183
184
185
186

187

188

189
190
191

192

193
194

195

196
197
198

199

200

201
202

203
204

205
206

207

208

209

210

211
212
213

214

215
216
217
218
219
220
221

222
223

224

225

226

227

228

229

230
231

232

233

234
235
236

237

238
239

240

241
242
243

244

245

246

247

248
249

250

251

252
253

254
255

256

257

258

259

260
261
262

263

264
265
266
267
268
269
270
271

272

273

274

275

276

277

278
279

280

281

282
283

284
285
286

287

288
289
290

291

292
293
294

295

296

297

298

299
300

301

302

303
304

305
306
307

308
309
310

311
312

313

314

315

316

317

318

319

320
321

322

323

324
325