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

Merge branch 'master' into weathermultisource

Browse Source
This commit is contained in:
Chris Cummer 2019-05-24 17:39:56 -07:00 committed by GitHub
commit 5b183af93e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -2,6 +2,10 @@
## Unreleased ## Unreleased
### 🐞 Fixed
* Todoist now properly updates list items when Refresh is called
## v0.10.3 ## v0.10.3
* Invalid glog dependency removed, by [@bosr](https://github.com/bosr) * Invalid glog dependency removed, by [@bosr](https://github.com/bosr)

8
modules/gitlab/keyboard.go
View File

@ -5,9 +5,9 @@ import "github.com/gdamore/tcell"
func (widget *Widget) initializeKeyboardControls() { func (widget *Widget) initializeKeyboardControls() {
widget.SetKeyboardChar("/", widget.ShowHelp, "Show/hide this help prompt") widget.SetKeyboardChar("/", widget.ShowHelp, "Show/hide this help prompt")
widget.SetKeyboardChar("r", widget.Refresh, "Refresh widget") widget.SetKeyboardChar("r", widget.Refresh, "Refresh widget")
widget.SetKeyboardChar("h", widget.Prev, "Select previous item") widget.SetKeyboardChar("h", widget.PrevSource, "Select previous project")
widget.SetKeyboardChar("l", widget.Next, "Select next item") widget.SetKeyboardChar("l", widget.NextSource, "Select next project")
widget.SetKeyboardKey(tcell.KeyLeft, widget.Prev, "Select previous item") widget.SetKeyboardKey(tcell.KeyLeft, widget.PrevSource, "Select previous project")
widget.SetKeyboardKey(tcell.KeyRight, widget.Next, "Select next item") widget.SetKeyboardKey(tcell.KeyRight, widget.NextSource, "Select next project")
} }

28
modules/gitlab/widget.go
View File

@ -8,10 +8,10 @@ import (
type Widget struct { type Widget struct {
wtf.KeyboardWidget wtf.KeyboardWidget
wtf.MultiSourceWidget
wtf.TextWidget wtf.TextWidget
GitlabProjects []*GitlabProject GitlabProjects []*GitlabProject
Idx int
gitlab *glb.Client gitlab *glb.Client
settings *Settings settings *Settings
@ -26,10 +26,9 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *
} }
widget := Widget{ widget := Widget{
KeyboardWidget: wtf.NewKeyboardWidget(app, pages, settings.common), KeyboardWidget: wtf.NewKeyboardWidget(app, pages, settings.common),
TextWidget: wtf.NewTextWidget(app, settings.common, true), MultiSourceWidget: wtf.NewMultiSourceWidget(settings.common, "repository", "repositories"),
TextWidget: wtf.NewTextWidget(app, settings.common, true),
Idx: 0,
gitlab: gitlab, gitlab: gitlab,
settings: settings, settings: settings,
@ -39,6 +38,7 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *
widget.initializeKeyboardControls() widget.initializeKeyboardControls()
widget.View.SetInputCapture(widget.InputCapture) widget.View.SetInputCapture(widget.InputCapture)
widget.SetDisplayFunction(widget.display)
widget.KeyboardWidget.SetView(widget.View) widget.KeyboardWidget.SetView(widget.View)
@ -55,24 +55,6 @@ func (widget *Widget) Refresh() {
widget.display() widget.display()
} }
func (widget *Widget) Next() {
widget.Idx++
if widget.Idx == len(widget.GitlabProjects) {
widget.Idx = 0
}
widget.display()
}
func (widget *Widget) Prev() {
widget.Idx--
if widget.Idx < 0 {
widget.Idx = len(widget.GitlabProjects) - 1
}
widget.display()
}
func (widget *Widget) HelpText() string { func (widget *Widget) HelpText() string {
return widget.KeyboardWidget.HelpText() return widget.KeyboardWidget.HelpText()
} }

12
modules/todoist/widget.go
View File

@ -53,14 +53,16 @@ func (widget *Widget) ProjectAt(idx int) *Project {
return widget.projects[idx] return widget.projects[idx]
} }
func (w *Widget) Refresh() { func (widget *Widget) Refresh() {
if w.Disabled() || w.CurrentProject() == nil { if widget.Disabled() || widget.CurrentProject() == nil {
w.SetItemCount(0) widget.SetItemCount(0)
return return
} }
w.SetItemCount(len(w.CurrentProject().tasks)) widget.loadProjects()
w.display()
widget.SetItemCount(len(widget.CurrentProject().tasks))
widget.display()
} }
func (widget *Widget) HelpText() string { func (widget *Widget) HelpText() string {