taigrr/wtf
1
0
Fork 0
mirror of https://github.com/taigrr/wtf synced 2025-01-18 04:03:14 -08:00
Code Issues Projects Releases Wiki Activity

WTF-427 Use new keyboard implementation for widgets. Closes #427

Browse Source
This commit is contained in:
Chris Cummer
2019-05-06 08:56:01 -07:00
parent a9c5dc3be8
commit 2d0706c40b
45 changed files with 589 additions and 745 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
modules/todoist/keyboard.go Normal file
View File

@@ -0,0 +1,19 @@
package todoist
import "github.com/gdamore/tcell"
func (widget *Widget) initializeKeyboardControls() {
widget.SetKeyboardChar("/", widget.ShowHelp)
widget.SetKeyboardChar("c", widget.Close)
widget.SetKeyboardChar("d", widget.Delete)
widget.SetKeyboardChar("h", widget.PreviousProject)
widget.SetKeyboardChar("j", widget.Up)
widget.SetKeyboardChar("k", widget.Down)
widget.SetKeyboardChar("l", widget.NextProject)
widget.SetKeyboardChar("r", widget.Refresh)
widget.SetKeyboardKey(tcell.KeyDown, widget.Down)
widget.SetKeyboardKey(tcell.KeyLeft, widget.PreviousProject)
widget.SetKeyboardKey(tcell.KeyRight, widget.NextProject)
widget.SetKeyboardKey(tcell.KeyUp, widget.Up)
}

50
modules/todoist/widget.go
View File

@@ -25,8 +25,10 @@ const HelpText = `
arrow up: Select the previous item in the list
`
// A Widget represents a Todoist widget
type Widget struct {
wtf.HelpfulWidget
wtf.KeyboardWidget
wtf.TextWidget
app *tview.Application
@@ -35,10 +37,12 @@ type Widget struct {
settings *Settings
}
// NewWidget creates a new instance of a widget
func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
widget := Widget{
HelpfulWidget: wtf.NewHelpfulWidget(app, pages, HelpText),
TextWidget: wtf.NewTextWidget(app, settings.common, true),
HelpfulWidget: wtf.NewHelpfulWidget(app, pages, HelpText),
KeyboardWidget: wtf.NewKeyboardWidget(),
TextWidget: wtf.NewTextWidget(app, settings.common, true),
app: app,
settings: settings,
@@ -47,8 +51,10 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *
widget.loadAPICredentials()
widget.loadProjects()
widget.initializeKeyboardControls()
widget.View.SetInputCapture(widget.InputCapture)
widget.HelpfulWidget.SetView(widget.View)
widget.View.SetInputCapture(widget.keyboardIntercept)
return &widget
}
@@ -135,44 +141,6 @@ func (w *Widget) Delete() {
/* -------------------- Unexported Functions -------------------- */
func (w *Widget) keyboardIntercept(event *tcell.EventKey) *tcell.EventKey {
if len(w.projects) == 0 {
return event
}
switch string(event.Rune()) {
case "/":
w.ShowHelp()
return nil
case "r":
w.Refresh()
return nil
case "d":
w.Delete()
return nil
case "c":
w.Close()
return nil
}
switch w.vimBindings(event) {
case tcell.KeyLeft:
w.PreviousProject()
return nil
case tcell.KeyRight:
w.NextProject()
return nil
case tcell.KeyUp:
w.Up()
return nil
case tcell.KeyDown:
w.Down()
return nil
}
return event
}
func (widget *Widget) loadAPICredentials() {
todoist.Token = widget.settings.apiKey
}