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-1031 Support multiple simultaneous configurations (#1032)

Browse Source 
* WTF-1031 Rename WtfApp.app to WtfApp.tviewApp

Signed-off-by: Chris Cummer <chriscummer@me.com>

* WTF-1031 Add scaffolding for main to support multiple WtfApp instances

Signed-off-by: Chris Cummer <chriscummer@me.com>

* WTF-1031 WIP

Signed-off-by: Chris Cummer <chriscummer@me.com>

* Remove common functionality from KeyboardWidget and into Base

Signed-off-by: Chris Cummer <chriscummer@me.com>

* Augment with some descriptive comments

Signed-off-by: Chris Cummer <chriscummer@me.com>

* Add full support for multiple app instances via the AppManager.

Still to do:

* Config support for multiple apps/multiple config files
* The ability to switch between apps

Signed-off-by: Chris Cummer <chriscummer@me.com>

* Move SetTerminal out of main and into its own file

Signed-off-by: Chris Cummer <chriscummer@me.com>
This commit is contained in:
Chris Cummer
2020-12-21 03:25:41 -08:00
committed by GitHub
parent 9ba22f656b
commit fd794707cd
122 changed files with 514 additions and 401 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/azuredevops/widget.go
View File

@@ -19,9 +19,9 @@ type Widget struct {
ctx context.Context
}
func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
func NewWidget(tviewApp *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
widget := Widget{
TextWidget: view.NewTextWidget(app, pages, settings.Common),
TextWidget: view.NewTextWidget(tviewApp, pages, settings.Common),
settings: settings,
}

4
modules/bamboohr/widget.go
View File

@@ -19,9 +19,9 @@ type Widget struct {
items []Item
}
func NewWidget(app *tview.Application, settings *Settings) *Widget {
func NewWidget(tviewApp *tview.Application, settings *Settings) *Widget {
widget := Widget{
TextWidget: view.NewTextWidget(app, nil, settings.Common),
TextWidget: view.NewTextWidget(tviewApp, nil, settings.Common),
settings: settings,
}

10
modules/bargraph/widget.go
View File

@@ -17,15 +17,15 @@ import (
type Widget struct {
view.BarGraph
app *tview.Application
tviewApp *tview.Application
}
// NewWidget Make new instance of widget
func NewWidget(app *tview.Application, settings *Settings) *Widget {
func NewWidget(tviewApp *tview.Application, settings *Settings) *Widget {
widget := Widget{
BarGraph: view.NewBarGraph(app, "Sample Bar Graph", settings.Common),
BarGraph: view.NewBarGraph(tviewApp, "Sample Bar Graph", settings.Common),
app: app,
tviewApp: tviewApp,
}
widget.View.SetWrap(true)
@@ -69,7 +69,7 @@ func (widget *Widget) Refresh() {
widget.View.Clear()
widget.app.QueueUpdateDraw(func() {
widget.tviewApp.QueueUpdateDraw(func() {
display(widget)
})

1
modules/buildkite/keyboard.go
View File

@@ -1,5 +1,6 @@
package buildkite
func (widget *Widget) initializeKeyboardControls() {
widget.InitializeHelpTextKeyboardControl(widget.ShowHelp)
widget.InitializeRefreshKeyboardControl(widget.Refresh)
}

4
modules/buildkite/widget.go
View File

@@ -15,9 +15,9 @@ type Widget struct {
err error
}
func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
func NewWidget(tviewApp *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
widget := Widget{
TextWidget: view.NewTextWidget(app, pages, settings.Common),
TextWidget: view.NewTextWidget(tviewApp, pages, settings.Common),
settings: settings,
}

1
modules/cds/favorites/keyboard.go
View File

@@ -5,6 +5,7 @@ import (
)
func (widget *Widget) initializeKeyboardControls() {
widget.InitializeHelpTextKeyboardControl(widget.ShowHelp)
widget.InitializeRefreshKeyboardControl(widget.Refresh)
widget.SetKeyboardChar("j", widget.Next, "Select next workflow")

4
modules/cds/favorites/widget.go
View File

@@ -27,10 +27,10 @@ type Widget struct {
}
// NewWidget creates a new instance of the widget
func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
func NewWidget(tviewApp *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
widget := Widget{
MultiSourceWidget: view.NewMultiSourceWidget(settings.Common, "workflow", "workflows"),
TextWidget: view.NewTextWidget(app, pages, settings.Common),
TextWidget: view.NewTextWidget(tviewApp, pages, settings.Common),
settings: settings,
}

1
modules/cds/queue/keyboard.go
View File

@@ -5,6 +5,7 @@ import (
)
func (widget *Widget) initializeKeyboardControls() {
widget.InitializeHelpTextKeyboardControl(widget.ShowHelp)
widget.InitializeRefreshKeyboardControl(widget.Refresh)
widget.SetKeyboardChar("j", widget.Next, "Select next workflow")

4
modules/cds/queue/widget.go
View File

@@ -27,10 +27,10 @@ type Widget struct {
}
// NewWidget creates a new instance of the widget
func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
func NewWidget(tviewApp *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
widget := Widget{
MultiSourceWidget: view.NewMultiSourceWidget(settings.Common, "workflow", "workflows"),
TextWidget: view.NewTextWidget(app, pages, settings.Common),
TextWidget: view.NewTextWidget(tviewApp, pages, settings.Common),
settings: settings,
}

1
modules/cds/status/keyboard.go
View File

@@ -5,6 +5,7 @@ import (
)
func (widget *Widget) initializeKeyboardControls() {
widget.InitializeHelpTextKeyboardControl(widget.ShowHelp)
widget.InitializeRefreshKeyboardControl(widget.Refresh)
widget.SetKeyboardChar("j", widget.Next, "Select next line")

4
modules/cds/status/widget.go
View File

@@ -27,10 +27,10 @@ type Widget struct {
}
// NewWidget creates a new instance of the widget
func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
func NewWidget(tviewApp *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
widget := Widget{
MultiSourceWidget: view.NewMultiSourceWidget(settings.Common, "workflow", "workflows"),
TextWidget: view.NewTextWidget(app, pages, settings.Common),
TextWidget: view.NewTextWidget(tviewApp, pages, settings.Common),
settings: settings,
}

4
modules/circleci/widget.go
View File

@@ -14,9 +14,9 @@ type Widget struct {
settings *Settings
}
func NewWidget(app *tview.Application, settings *Settings) *Widget {
func NewWidget(tviewApp *tview.Application, settings *Settings) *Widget {
widget := Widget{
TextWidget: view.NewTextWidget(app, nil, settings.Common),
TextWidget: view.NewTextWidget(tviewApp, nil, settings.Common),
Client: NewClient(settings.apiKey),
settings: settings,

12
modules/clocks/widget.go
View File

@@ -8,18 +8,16 @@ import (
type Widget struct {
view.TextWidget
app *tview.Application
clockColl ClockCollection
dateFormat string
timeFormat string
settings *Settings
}
func NewWidget(app *tview.Application, settings *Settings) *Widget {
func NewWidget(tviewApp *tview.Application, settings *Settings) *Widget {
widget := Widget{
TextWidget: view.NewTextWidget(app, nil, settings.Common),
TextWidget: view.NewTextWidget(tviewApp, nil, settings.Common),
app: app,
settings: settings,
dateFormat: settings.dateFormat,
timeFormat: settings.timeFormat,
@@ -34,10 +32,8 @@ func NewWidget(app *tview.Application, settings *Settings) *Widget {
// Refresh updates the onscreen contents of the widget
func (widget *Widget) Refresh() {
widget.app.QueueUpdateDraw(func() {
sortedClocks := widget.clockColl.Sorted(widget.settings.sort)
widget.display(sortedClocks, widget.dateFormat, widget.timeFormat)
})
sortedClocks := widget.clockColl.Sorted(widget.settings.sort)
widget.display(sortedClocks, widget.dateFormat, widget.timeFormat)
}
/* -------------------- Unexported Functions -------------------- */

4
modules/cmdrunner/widget.go
View File

@@ -27,9 +27,9 @@ type Widget struct {
}
// NewWidget creates a new instance of the widget
func NewWidget(app *tview.Application, settings *Settings) *Widget {
func NewWidget(tviewApp *tview.Application, settings *Settings) *Widget {
widget := Widget{
TextWidget: view.NewTextWidget(app, nil, settings.Common),
TextWidget: view.NewTextWidget(tviewApp, nil, settings.Common),
settings: settings,
buffer: &bytes.Buffer{},

4
modules/cryptoexchanges/bittrex/widget.go
View File

@@ -29,9 +29,9 @@ type Widget struct {
}
// NewWidget Make new instance of widget
func NewWidget(app *tview.Application, settings *Settings) *Widget {
func NewWidget(tviewApp *tview.Application, settings *Settings) *Widget {
widget := Widget{
TextWidget: view.NewTextWidget(app, nil, settings.Common),
TextWidget: view.NewTextWidget(tviewApp, nil, settings.Common),
settings: settings,
summaryList: summaryList{},

4
modules/cryptoexchanges/blockfolio/widget.go
View File

@@ -18,9 +18,9 @@ type Widget struct {
settings *Settings
}
func NewWidget(app *tview.Application, settings *Settings) *Widget {
func NewWidget(tviewApp *tview.Application, settings *Settings) *Widget {
widget := Widget{
TextWidget: view.NewTextWidget(app, nil, settings.Common),
TextWidget: view.NewTextWidget(tviewApp, nil, settings.Common),
device_token: settings.deviceToken,
settings: settings,

4
modules/cryptoexchanges/cryptolive/widget.go
View File

@@ -20,9 +20,9 @@ type Widget struct {
}
// NewWidget Make new instance of widget
func NewWidget(app *tview.Application, settings *Settings) *Widget {
func NewWidget(tviewApp *tview.Application, settings *Settings) *Widget {
widget := Widget{
TextWidget: view.NewTextWidget(app, nil, settings.Common),
TextWidget: view.NewTextWidget(tviewApp, nil, settings.Common),
priceWidget: price.NewWidget(settings.priceSettings),
toplistWidget: toplist.NewWidget(settings.toplistSettings),

1
modules/datadog/keyboard.go
View File

@@ -5,6 +5,7 @@ import (
)
func (widget *Widget) initializeKeyboardControls() {
widget.InitializeHelpTextKeyboardControl(widget.ShowHelp)
widget.InitializeRefreshKeyboardControl(widget.Refresh)
widget.SetKeyboardChar("j", widget.Next, "Select next item")

4
modules/datadog/widget.go
View File

@@ -17,9 +17,9 @@ type Widget struct {
err error
}
func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
func NewWidget(tviewApp *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
widget := Widget{
ScrollableWidget: view.NewScrollableWidget(app, pages, settings.Common),
ScrollableWidget: view.NewScrollableWidget(tviewApp, pages, settings.Common),
settings: settings,
}

1
modules/devto/keyboard.go
View File

@@ -3,6 +3,7 @@ package devto
import "github.com/gdamore/tcell"
func (widget *Widget) initializeKeyboardControls() {
widget.InitializeHelpTextKeyboardControl(widget.ShowHelp)
widget.InitializeRefreshKeyboardControl(widget.Refresh)
widget.SetKeyboardChar("d", widget.Next, "Select next item")

4
modules/devto/widget.go
View File

@@ -19,9 +19,9 @@ type Widget struct {
err error
}
func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
func NewWidget(tviewApp *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
widget := &Widget{
ScrollableWidget: view.NewScrollableWidget(app, pages, settings.Common),
ScrollableWidget: view.NewScrollableWidget(tviewApp, pages, settings.Common),
settings: settings,
}

6
modules/digitalclock/widget.go
View File

@@ -9,16 +9,14 @@ import (
type Widget struct {
view.TextWidget
app *tview.Application
settings *Settings
}
// NewWidget creates a new widget using settings
func NewWidget(app *tview.Application, settings *Settings) *Widget {
func NewWidget(tviewApp *tview.Application, settings *Settings) *Widget {
widget := Widget{
TextWidget: view.NewTextWidget(app, nil, settings.Common),
TextWidget: view.NewTextWidget(tviewApp, nil, settings.Common),
app: app,
settings: settings,
}

1
modules/digitalocean/keyboard.go
View File

@@ -3,6 +3,7 @@ package digitalocean
import "github.com/gdamore/tcell"
func (widget *Widget) initializeKeyboardControls() {
widget.InitializeHelpTextKeyboardControl(widget.ShowHelp)
widget.InitializeRefreshKeyboardControl(widget.Refresh)
widget.SetKeyboardChar("?", widget.showInfo, "Show info about the selected droplet")

6
modules/digitalocean/widget.go
View File

@@ -42,11 +42,11 @@ type Widget struct {
}
// NewWidget creates a new instance of a widget
func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
func NewWidget(tviewApp *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
widget := Widget{
ScrollableWidget: view.NewScrollableWidget(app, pages, settings.Common),
ScrollableWidget: view.NewScrollableWidget(tviewApp, pages, settings.Common),
app: app,
app: tviewApp,
pages: pages,
settings: settings,
}

4
modules/docker/widget.go
View File

@@ -16,9 +16,9 @@ type Widget struct {
displayBuffer string
}
func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
func NewWidget(tviewApp *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
widget := Widget{
TextWidget: view.NewTextWidget(app, pages, settings.Common),
TextWidget: view.NewTextWidget(tviewApp, pages, settings.Common),
settings: settings,
}

4
modules/exchangerates/widget.go
View File

@@ -18,9 +18,9 @@ type Widget struct {
err error
}
func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
func NewWidget(tviewApp *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
widget := Widget{
ScrollableWidget: view.NewScrollableWidget(app, pages, settings.Common),
ScrollableWidget: view.NewScrollableWidget(tviewApp, pages, settings.Common),
settings: settings,
}

1
modules/feedreader/keyboard.go
View File

@@ -3,6 +3,7 @@ package feedreader
import "github.com/gdamore/tcell"
func (widget *Widget) initializeKeyboardControls() {
widget.InitializeHelpTextKeyboardControl(widget.ShowHelp)
widget.InitializeRefreshKeyboardControl(widget.Refresh)
widget.SetKeyboardChar("j", widget.Next, "Select next item")

4
modules/feedreader/widget.go
View File

@@ -63,9 +63,9 @@ func getShowText(feedItem *FeedItem, showType ShowType) string {
}
// NewWidget creates a new instance of a widget
func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
func NewWidget(tviewApp *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
widget := &Widget{
ScrollableWidget: view.NewScrollableWidget(app, pages, settings.Common),
ScrollableWidget: view.NewScrollableWidget(tviewApp, pages, settings.Common),
parser: gofeed.NewParser(),
settings: settings,

4
modules/finnhub/widget.go
View File

@@ -17,10 +17,10 @@ type Widget struct {
}
// NewWidget ..
func NewWidget(app *tview.Application, settings *Settings) *Widget {
func NewWidget(tviewApp *tview.Application, settings *Settings) *Widget {
widget := Widget{
Client: NewClient(settings.symbols, settings.apiKey),
TextWidget: view.NewTextWidget(app, nil, settings.Common),
TextWidget: view.NewTextWidget(tviewApp, nil, settings.Common),
settings: settings,
}

4
modules/football/widget.go
View File

@@ -36,7 +36,7 @@ type Widget struct {
err error
}
func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
func NewWidget(tviewApp *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
var widget Widget
leagueId, err := getLeague(settings.league)
@@ -51,7 +51,7 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *
}
widget = Widget{
TextWidget: view.NewTextWidget(app, pages, settings.Common),
TextWidget: view.NewTextWidget(tviewApp, pages, settings.Common),
Client: NewClient(settings.apiKey),
League: leagueId,
settings: settings,

12
modules/gcal/widget.go
View File

@@ -8,17 +8,17 @@ import (
type Widget struct {
view.TextWidget
app *tview.Application
calEvents []*CalEvent
settings *Settings
err error
settings *Settings
tviewApp *tview.Application
}
func NewWidget(app *tview.Application, settings *Settings) *Widget {
func NewWidget(tviewApp *tview.Application, settings *Settings) *Widget {
widget := Widget{
TextWidget: view.NewTextWidget(app, nil, settings.Common),
TextWidget: view.NewTextWidget(tviewApp, nil, settings.Common),
app: app,
tviewApp: tviewApp,
settings: settings,
}
@@ -37,7 +37,7 @@ func (widget *Widget) Refresh() {
return
}
widget.app.Suspend(widget.authenticate)
widget.tviewApp.Suspend(widget.authenticate)
widget.Refresh()
}

1
modules/gerrit/keyboard.go
View File

@@ -5,6 +5,7 @@ import (
)
func (widget *Widget) initializeKeyboardControls() {
widget.InitializeHelpTextKeyboardControl(widget.ShowHelp)
widget.InitializeRefreshKeyboardControl(widget.Refresh)
widget.SetKeyboardChar("h", widget.prevProject, "Select previous project")

4
modules/gerrit/widget.go
View File

@@ -29,9 +29,9 @@ var (
GerritURLPattern = regexp.MustCompile(`^(http|https)://(.*)$`)
)
func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
func NewWidget(tviewApp *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
widget := Widget{
TextWidget: view.NewTextWidget(app, nil, settings.Common),
TextWidget: view.NewTextWidget(tviewApp, nil, settings.Common),
Idx: 0,

1
modules/git/keyboard.go
View File

@@ -3,6 +3,7 @@ package git
import "github.com/gdamore/tcell"
func (widget *Widget) initializeKeyboardControls() {
widget.InitializeHelpTextKeyboardControl(widget.ShowHelp)
widget.InitializeRefreshKeyboardControl(widget.Refresh)
widget.SetKeyboardChar("l", widget.NextSource, "Select next source")

16
modules/git/widget.go
View File

@@ -23,17 +23,17 @@ type Widget struct {
GitRepos []*GitRepo
app *tview.Application
pages *tview.Pages
settings *Settings
tviewApp *tview.Application
}
func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
func NewWidget(tviewApp *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
widget := Widget{
MultiSourceWidget: view.NewMultiSourceWidget(settings.Common, "repository", "repositories"),
TextWidget: view.NewTextWidget(app, pages, settings.Common),
TextWidget: view.NewTextWidget(tviewApp, pages, settings.Common),
app: app,
tviewApp: tviewApp,
pages: pages,
settings: settings,
}
@@ -55,7 +55,7 @@ func (widget *Widget) Checkout() {
repoToCheckout := widget.GitRepos[widget.Idx]
repoToCheckout.checkout(text)
widget.pages.RemovePage("modal")
widget.app.SetFocus(widget.View)
widget.tviewApp.SetFocus(widget.View)
widget.display()
widget.Refresh()
}
@@ -93,7 +93,7 @@ func (widget *Widget) addButtons(form *tview.Form, checkoutFctn func()) {
func (widget *Widget) addCancelButton(form *tview.Form) {
cancelFn := func() {
widget.pages.RemovePage("modal")
widget.app.SetFocus(widget.View)
widget.tviewApp.SetFocus(widget.View)
widget.display()
}
@@ -102,10 +102,10 @@ func (widget *Widget) addCancelButton(form *tview.Form) {
}
func (widget *Widget) modalFocus(form *tview.Form) {
widget.app.QueueUpdateDraw(func() {
widget.tviewApp.QueueUpdateDraw(func() {
frame := widget.modalFrame(form)
widget.pages.AddPage("modal", frame, false, true)
widget.app.SetFocus(frame)
widget.tviewApp.SetFocus(frame)
})
}

1
modules/github/keyboard.go
View File

@@ -5,6 +5,7 @@ import (
)
func (widget *Widget) initializeKeyboardControls() {
widget.InitializeHelpTextKeyboardControl(widget.ShowHelp)
widget.InitializeRefreshKeyboardControl(widget.Refresh)
widget.SetKeyboardChar("j", widget.Next, "Select next item")

4
modules/github/widget.go
View File

@@ -23,10 +23,10 @@ type Widget struct {
}
// NewWidget creates a new instance of the widget
func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
func NewWidget(tviewApp *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
widget := Widget{
MultiSourceWidget: view.NewMultiSourceWidget(settings.Common, "repository", "repositories"),
TextWidget: view.NewTextWidget(app, pages, settings.Common),
TextWidget: view.NewTextWidget(tviewApp, pages, settings.Common),
settings: settings,
}

1
modules/gitlab/keyboard.go
View File

@@ -5,6 +5,7 @@ import (
)
func (widget *Widget) initializeKeyboardControls() {
widget.InitializeHelpTextKeyboardControl(widget.ShowHelp)
widget.InitializeRefreshKeyboardControl(widget.Refresh)
widget.SetKeyboardChar("j", widget.Next, "Select next item")

4
modules/gitlab/widget.go
View File

@@ -29,12 +29,12 @@ type Widget struct {
}
// NewWidget creates a new instance of the widget
func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
func NewWidget(tviewApp *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
context, err := newContext(settings)
widget := Widget{
MultiSourceWidget: view.NewMultiSourceWidget(settings.Common, "repository", "repositories"),
TextWidget: view.NewTextWidget(app, pages, settings.Common),
TextWidget: view.NewTextWidget(tviewApp, pages, settings.Common),
context: context,
settings: settings,

5
modules/gitlabtodo/keyboard.go
View File

@@ -3,8 +3,9 @@ package gitlabtodo
import "github.com/gdamore/tcell"
func (widget *Widget) initializeKeyboardControls() {
widget.SetKeyboardChar("/", widget.ShowHelp, "Show/hide this help widget")
widget.SetKeyboardChar("r", widget.Refresh, "Refresh widget")
widget.InitializeHelpTextKeyboardControl(widget.ShowHelp)
widget.InitializeRefreshKeyboardControl(widget.Refresh)
widget.SetKeyboardChar("j", widget.Next, "Select next item")
widget.SetKeyboardChar("k", widget.Prev, "Select previous item")
widget.SetKeyboardChar("o", widget.openTodo, "Open todo in browser")

4
modules/gitlabtodo/widget.go
View File

@@ -18,9 +18,9 @@ type Widget struct {
err error
}
func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
func NewWidget(tviewApp *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
widget := &Widget{
ScrollableWidget: view.NewScrollableWidget(app, pages, settings.Common),
ScrollableWidget: view.NewScrollableWidget(tviewApp, pages, settings.Common),
settings: settings,
}

1
modules/gitter/keyboard.go
View File

@@ -3,6 +3,7 @@ package gitter
import "github.com/gdamore/tcell"
func (widget *Widget) initializeKeyboardControls() {
widget.InitializeHelpTextKeyboardControl(widget.ShowHelp)
widget.InitializeRefreshKeyboardControl(widget.Refresh)
widget.SetKeyboardChar("j", widget.Next, "Select next item")

4
modules/gitter/widget.go
View File

@@ -17,9 +17,9 @@ type Widget struct {
}
// NewWidget creates a new instance of a widget
func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
func NewWidget(tviewApp *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
widget := Widget{
ScrollableWidget: view.NewScrollableWidget(app, pages, settings.Common),
ScrollableWidget: view.NewScrollableWidget(tviewApp, pages, settings.Common),
settings: settings,
}

4
modules/googleanalytics/widget.go
View File

@@ -11,9 +11,9 @@ type Widget struct {
settings *Settings
}
func NewWidget(app *tview.Application, settings *Settings) *Widget {
func NewWidget(tviewApp *tview.Application, settings *Settings) *Widget {
widget := Widget{
TextWidget: view.NewTextWidget(app, nil, settings.Common),
TextWidget: view.NewTextWidget(tviewApp, nil, settings.Common),
settings: settings,
}

4
modules/grafana/widget.go
View File

@@ -20,9 +20,9 @@ type Widget struct {
settings *Settings
}
func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
func NewWidget(tviewApp *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
widget := Widget{
TextWidget: view.NewTextWidget(app, nil, settings.Common),
TextWidget: view.NewTextWidget(tviewApp, nil, settings.Common),
Client: NewClient(settings),
Selected: -1,

4
modules/gspreadsheets/widget.go
View File

@@ -17,9 +17,9 @@ type Widget struct {
err error
}
func NewWidget(app *tview.Application, settings *Settings) *Widget {
func NewWidget(tviewApp *tview.Application, settings *Settings) *Widget {
widget := Widget{
TextWidget: view.NewTextWidget(app, nil, settings.Common),
TextWidget: view.NewTextWidget(tviewApp, nil, settings.Common),
settings: settings,
}

1
modules/hackernews/keyboard.go
View File

@@ -3,6 +3,7 @@ package hackernews
import "github.com/gdamore/tcell"
func (widget *Widget) initializeKeyboardControls() {
widget.InitializeHelpTextKeyboardControl(widget.ShowHelp)
widget.InitializeRefreshKeyboardControl(widget.Refresh)
widget.SetKeyboardChar("j", widget.Next, "Select next item")

4
modules/hackernews/widget.go
View File

@@ -18,9 +18,9 @@ type Widget struct {
err error
}
func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
func NewWidget(tviewApp *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
widget := &Widget{
ScrollableWidget: view.NewScrollableWidget(app, pages, settings.Common),
ScrollableWidget: view.NewScrollableWidget(tviewApp, pages, settings.Common),
settings: settings,
}

4
modules/hibp/widget.go
View File

@@ -17,9 +17,9 @@ type Widget struct {
}
// NewWidget creates a new instance of a widget
func NewWidget(app *tview.Application, settings *Settings) *Widget {
func NewWidget(tviewApp *tview.Application, settings *Settings) *Widget {
widget := &Widget{
TextWidget: view.NewTextWidget(app, nil, settings.Common),
TextWidget: view.NewTextWidget(tviewApp, nil, settings.Common),
settings: settings,
}

4
modules/ipaddresses/ipapi/widget.go
View File

@@ -36,9 +36,9 @@ type ipinfo struct {
}
// NewWidget constructor
func NewWidget(app *tview.Application, settings *Settings) *Widget {
func NewWidget(tviewApp *tview.Application, settings *Settings) *Widget {
widget := Widget{
TextWidget: view.NewTextWidget(app, nil, settings.Common),
TextWidget: view.NewTextWidget(tviewApp, nil, settings.Common),
settings: settings,
}

4
modules/ipaddresses/ipinfo/widget.go
View File

@@ -30,9 +30,9 @@ type ipinfo struct {
Organization string `json:"org"`
}
func NewWidget(app *tview.Application, settings *Settings) *Widget {
func NewWidget(tviewApp *tview.Application, settings *Settings) *Widget {
widget := Widget{
TextWidget: view.NewTextWidget(app, nil, settings.Common),
TextWidget: view.NewTextWidget(tviewApp, nil, settings.Common),
settings: settings,
}

1
modules/jenkins/keyboard.go
View File

@@ -3,6 +3,7 @@ package jenkins
import "github.com/gdamore/tcell"
func (widget *Widget) initializeKeyboardControls() {
widget.InitializeHelpTextKeyboardControl(widget.ShowHelp)
widget.InitializeRefreshKeyboardControl(widget.Refresh)
widget.SetKeyboardChar("j", widget.Next, "Select next item")

4
modules/jenkins/widget.go
View File

@@ -17,9 +17,9 @@ type Widget struct {
err error
}
func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
func NewWidget(tviewApp *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
widget := Widget{
ScrollableWidget: view.NewScrollableWidget(app, pages, settings.Common),
ScrollableWidget: view.NewScrollableWidget(tviewApp, pages, settings.Common),
settings: settings,
}

1
modules/jira/keyboard.go
View File

@@ -5,6 +5,7 @@ import (
)
func (widget *Widget) initializeKeyboardControls() {
widget.InitializeHelpTextKeyboardControl(widget.ShowHelp)
widget.InitializeRefreshKeyboardControl(widget.Refresh)
widget.SetKeyboardChar("j", widget.Next, "Select next item")

4
modules/jira/widget.go
View File

@@ -16,9 +16,9 @@ type Widget struct {
err error
}
func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
func NewWidget(tviewApp *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
widget := Widget{
ScrollableWidget: view.NewScrollableWidget(app, pages, settings.Common),
ScrollableWidget: view.NewScrollableWidget(tviewApp, pages, settings.Common),
settings: settings,
}

4
modules/kubernetes/widget.go
View File

@@ -23,9 +23,9 @@ type Widget struct {
}
// NewWidget creates a new instance of the widget
func NewWidget(app *tview.Application, settings *Settings) *Widget {
func NewWidget(tviewApp *tview.Application, settings *Settings) *Widget {
widget := Widget{
TextWidget: view.NewTextWidget(app, nil, settings.Common),
TextWidget: view.NewTextWidget(tviewApp, nil, settings.Common),
objects: settings.objects,
title: settings.title,

6
modules/logger/widget.go
View File

@@ -17,16 +17,14 @@ const (
type Widget struct {
view.TextWidget
app *tview.Application
filePath string
settings *Settings
}
func NewWidget(app *tview.Application, settings *Settings) *Widget {
func NewWidget(tviewApp *tview.Application, settings *Settings) *Widget {
widget := Widget{
TextWidget: view.NewTextWidget(app, nil, settings.Common),
TextWidget: view.NewTextWidget(tviewApp, nil, settings.Common),
app: app,
filePath: log.LogFilePath(),
settings: settings,
}

1
modules/mercurial/keyboard.go
View File

@@ -3,6 +3,7 @@ package mercurial
import "github.com/gdamore/tcell"
func (widget *Widget) initializeKeyboardControls() {
widget.InitializeHelpTextKeyboardControl(widget.ShowHelp)
widget.InitializeRefreshKeyboardControl(widget.Refresh)
widget.SetKeyboardChar("l", widget.NextSource, "Select next source")

16
modules/mercurial/widget.go
View File

@@ -18,19 +18,19 @@ type Widget struct {
view.MultiSourceWidget
view.TextWidget
app *tview.Application
Data []*MercurialRepo
pages *tview.Pages
settings *Settings
tviewApp *tview.Application
}
// NewWidget creates a new instance of a widget
func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
func NewWidget(tviewApp *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
widget := Widget{
MultiSourceWidget: view.NewMultiSourceWidget(settings.Common, "repository", "repositories"),
TextWidget: view.NewTextWidget(app, pages, settings.Common),
TextWidget: view.NewTextWidget(tviewApp, pages, settings.Common),
app: app,
tviewApp: tviewApp,
pages: pages,
settings: settings,
}
@@ -52,7 +52,7 @@ func (widget *Widget) Checkout() {
repoToCheckout := widget.Data[widget.Idx]
repoToCheckout.checkout(text)
widget.pages.RemovePage("modal")
widget.app.SetFocus(widget.View)
widget.tviewApp.SetFocus(widget.View)
widget.display()
@@ -91,7 +91,7 @@ func (widget *Widget) addButtons(form *tview.Form, checkoutFctn func()) {
func (widget *Widget) addCancelButton(form *tview.Form) {
cancelFn := func() {
widget.pages.RemovePage("modal")
widget.app.SetFocus(widget.View)
widget.tviewApp.SetFocus(widget.View)
widget.display()
}
@@ -100,10 +100,10 @@ func (widget *Widget) addCancelButton(form *tview.Form) {
}
func (widget *Widget) modalFocus(form *tview.Form) {
widget.app.QueueUpdateDraw(func() {
widget.tviewApp.QueueUpdateDraw(func() {
frame := widget.modalFrame(form)
widget.pages.AddPage("modal", frame, false, true)
widget.app.SetFocus(frame)
widget.tviewApp.SetFocus(frame)
})
}

1
modules/nbascore/keyboard.go
View File

@@ -3,6 +3,7 @@ package nbascore
import "github.com/gdamore/tcell"
func (widget *Widget) initializeKeyboardControls() {
widget.InitializeHelpTextKeyboardControl(widget.ShowHelp)
widget.InitializeRefreshKeyboardControl(widget.Refresh)
widget.SetKeyboardChar("l", widget.next, "Select next item")

4
modules/nbascore/widget.go
View File

@@ -24,9 +24,9 @@ type Widget struct {
}
// NewWidget creates a new instance of a widget
func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
func NewWidget(tviewApp *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
widget := Widget{
TextWidget: view.NewTextWidget(app, pages, settings.Common),
TextWidget: view.NewTextWidget(tviewApp, pages, settings.Common),
settings: settings,
}

4
modules/newrelic/widget.go
View File

@@ -17,10 +17,10 @@ type Widget struct {
settings *Settings
}
func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
func NewWidget(tviewApp *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
widget := Widget{
MultiSourceWidget: view.NewMultiSourceWidget(settings.Common, "applicationID", "applicationIDs"),
TextWidget: view.NewTextWidget(app, pages, settings.Common),
TextWidget: view.NewTextWidget(tviewApp, pages, settings.Common),
settings: settings,
}

4
modules/opsgenie/widget.go
View File

@@ -15,9 +15,9 @@ type Widget struct {
settings *Settings
}
func NewWidget(app *tview.Application, settings *Settings) *Widget {
func NewWidget(tviewApp *tview.Application, settings *Settings) *Widget {
widget := Widget{
TextWidget: view.NewTextWidget(app, nil, settings.Common),
TextWidget: view.NewTextWidget(tviewApp, nil, settings.Common),
settings: settings,
}

4
modules/pagerduty/widget.go
View File

@@ -23,9 +23,9 @@ type Widget struct {
}
// NewWidget creates and returns an instance of PagerDuty widget
func NewWidget(app *tview.Application, settings *Settings) *Widget {
func NewWidget(tviewApp *tview.Application, settings *Settings) *Widget {
widget := Widget{
TextWidget: view.NewTextWidget(app, nil, settings.Common),
TextWidget: view.NewTextWidget(tviewApp, nil, settings.Common),
settings: settings,
}

1
modules/pihole/keyboard.go
View File

@@ -1,6 +1,7 @@
package pihole
func (widget *Widget) initializeKeyboardControls() {
widget.InitializeHelpTextKeyboardControl(widget.ShowHelp)
widget.InitializeRefreshKeyboardControl(widget.Refresh)
widget.SetKeyboardChar("d", widget.disable, "disable Pi-hole")

5
modules/pihole/widget.go
View File

@@ -15,10 +15,9 @@ type Widget struct {
}
// NewWidget creates a new instance of a widget
//func NewWidget(app *tview.Application, settings *Settings) *Widget {
func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
func NewWidget(tviewApp *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
widget := Widget{
TextWidget: view.NewTextWidget(app, nil, settings.Common),
TextWidget: view.NewTextWidget(tviewApp, nil, settings.Common),
settings: settings,
}

1
modules/pocket/keyboard.go
View File

@@ -3,6 +3,7 @@ package pocket
import "github.com/gdamore/tcell"
func (widget *Widget) initializeKeyboardControls() {
widget.InitializeHelpTextKeyboardControl(widget.ShowHelp)
widget.InitializeRefreshKeyboardControl(widget.Refresh)
widget.SetKeyboardChar("a", widget.toggleLink, "Toggle Link")

4
modules/pocket/widget.go
View File

@@ -21,9 +21,9 @@ type Widget struct {
archivedView bool
}
func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
func NewWidget(tviewApp *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
widget := Widget{
ScrollableWidget: view.NewScrollableWidget(app, nil, settings.Common),
ScrollableWidget: view.NewScrollableWidget(tviewApp, nil, settings.Common),
settings: settings,
client: NewClient(settings.consumerKey, "http://localhost"),
archivedView: false,

4
modules/power/widget.go
View File

@@ -15,9 +15,9 @@ type Widget struct {
settings *Settings
}
func NewWidget(app *tview.Application, settings *Settings) *Widget {
func NewWidget(tviewApp *tview.Application, settings *Settings) *Widget {
widget := Widget{
TextWidget: view.NewTextWidget(app, nil, settings.Common),
TextWidget: view.NewTextWidget(tviewApp, nil, settings.Common),
Battery: NewBattery(),

13
modules/resourceusage/widget.go
View File

@@ -14,18 +14,17 @@ import (
// Widget define wtf widget to register widget later
type Widget struct {
view.BarGraph
app *tview.Application
settings *Settings
tviewApp *tview.Application
view.BarGraph
}
// NewWidget Make new instance of widget
func NewWidget(app *tview.Application, settings *Settings) *Widget {
func NewWidget(tviewApp *tview.Application, settings *Settings) *Widget {
widget := Widget{
BarGraph: view.NewBarGraph(app, settings.Name, settings.Common),
BarGraph: view.NewBarGraph(tviewApp, settings.Name, settings.Common),
app: app,
tviewApp: tviewApp,
settings: settings,
}
@@ -131,7 +130,7 @@ func (widget *Widget) Refresh() {
return
}
widget.app.QueueUpdateDraw(func() {
widget.tviewApp.QueueUpdateDraw(func() {
widget.View.Clear()
display(widget)
})

1
modules/rollbar/keyboard.go
View File

@@ -3,6 +3,7 @@ package rollbar
import "github.com/gdamore/tcell"
func (widget *Widget) initializeKeyboardControls() {
widget.InitializeHelpTextKeyboardControl(widget.ShowHelp)
widget.InitializeRefreshKeyboardControl(widget.Refresh)
widget.SetKeyboardChar("j", widget.Next, "Select next item")

4
modules/rollbar/widget.go
View File

@@ -18,9 +18,9 @@ type Widget struct {
}
// NewWidget creates a new instance of a widget
func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
func NewWidget(tviewApp *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
widget := Widget{
ScrollableWidget: view.NewScrollableWidget(app, pages, settings.Common),
ScrollableWidget: view.NewScrollableWidget(tviewApp, pages, settings.Common),
settings: settings,
}

4
modules/security/widget.go
View File

@@ -14,9 +14,9 @@ type Widget struct {
settings *Settings
}
func NewWidget(app *tview.Application, settings *Settings) *Widget {
func NewWidget(tviewApp *tview.Application, settings *Settings) *Widget {
widget := Widget{
TextWidget: view.NewTextWidget(app, nil, settings.Common),
TextWidget: view.NewTextWidget(tviewApp, nil, settings.Common),
settings: settings,
}

4
modules/spacex/widget.go
View File

@@ -15,9 +15,9 @@ type Widget struct {
err error
}
func NewWidget(app *tview.Application, settings *Settings) *Widget {
func NewWidget(tviewApp *tview.Application, settings *Settings) *Widget {
widget := &Widget{
TextWidget: view.NewTextWidget(app, nil, settings.Common),
TextWidget: view.NewTextWidget(tviewApp, nil, settings.Common),
settings: settings,
}
return widget

1
modules/spotify/keyboard.go
View File

@@ -7,6 +7,7 @@ import (
)
func (widget *Widget) initializeKeyboardControls() {
widget.InitializeHelpTextKeyboardControl(widget.ShowHelp)
widget.InitializeRefreshKeyboardControl(widget.Refresh)
widget.SetKeyboardChar("l", widget.next, "Select next item")

4
modules/spotify/widget.go
View File

@@ -19,9 +19,9 @@ type Widget struct {
}
// NewWidget creates a new instance of a widget
func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
func NewWidget(tviewApp *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
widget := Widget{
TextWidget: view.NewTextWidget(app, pages, settings.Common),
TextWidget: view.NewTextWidget(tviewApp, pages, settings.Common),
Info: spotigopher.Info{},
client: spotigopher.NewClient(),

1
modules/spotifyweb/keyboard.go
View File

@@ -7,6 +7,7 @@ import (
)
func (widget *Widget) initializeKeyboardControls() {
widget.InitializeHelpTextKeyboardControl(widget.ShowHelp)
widget.InitializeRefreshKeyboardControl(widget.Refresh)
widget.SetKeyboardChar("h", widget.selectPrevious, "Select previous item")

4
modules/spotifyweb/widget.go
View File

@@ -60,7 +60,7 @@ func authHandler(w http.ResponseWriter, r *http.Request) {
}
// NewWidget creates a new widget for WTF
func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
func NewWidget(tviewApp *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
redirectURI = "http://localhost:" + settings.callbackPort + "/callback"
auth = spotify.NewAuthenticator(redirectURI, spotify.ScopeUserReadCurrentlyPlaying, spotify.ScopeUserReadPlaybackState, spotify.ScopeUserModifyPlaybackState)
@@ -71,7 +71,7 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *
var playerState *spotify.PlayerState
widget := Widget{
TextWidget: view.NewTextWidget(app, pages, settings.Common),
TextWidget: view.NewTextWidget(tviewApp, pages, settings.Common),
Info: Info{},

4
modules/status/widget.go
View File

@@ -13,9 +13,9 @@ type Widget struct {
settings *Settings
}
func NewWidget(app *tview.Application, settings *Settings) *Widget {
func NewWidget(tviewApp *tview.Application, settings *Settings) *Widget {
widget := Widget{
TextWidget: view.NewTextWidget(app, nil, settings.Common),
TextWidget: view.NewTextWidget(tviewApp, nil, settings.Common),
CurrentIcon: 0,

1
modules/subreddit/keyboard.go
View File

@@ -3,6 +3,7 @@ package subreddit
import "github.com/gdamore/tcell"
func (widget *Widget) initializeKeyboardControls() {
widget.InitializeHelpTextKeyboardControl(widget.ShowHelp)
widget.InitializeRefreshKeyboardControl(widget.Refresh)
widget.SetKeyboardChar("j", widget.Next, "Select next item")

4
modules/subreddit/widget.go
View File

@@ -16,9 +16,9 @@ type Widget struct {
links []Link
}
func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
func NewWidget(tviewApp *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
widget := &Widget{
ScrollableWidget: view.NewScrollableWidget(app, pages, settings.Common),
ScrollableWidget: view.NewScrollableWidget(tviewApp, pages, settings.Common),
settings: settings,
}

4
modules/system/widget.go
View File

@@ -19,9 +19,9 @@ type Widget struct {
systemInfo *SystemInfo
}
func NewWidget(app *tview.Application, date, version string, settings *Settings) *Widget {
func NewWidget(tviewApp *tview.Application, date, version string, settings *Settings) *Widget {
widget := Widget{
TextWidget: view.NewTextWidget(app, nil, settings.Common),
TextWidget: view.NewTextWidget(tviewApp, nil, settings.Common),
Date: date,

1
modules/textfile/keyboard.go
View File

@@ -6,6 +6,7 @@ import (
)
func (widget *Widget) initializeKeyboardControls() {
widget.InitializeHelpTextKeyboardControl(widget.ShowHelp)
widget.InitializeRefreshKeyboardControl(nil)
widget.SetKeyboardChar("l", widget.NextSource, "Select next file")

4
modules/textfile/widget.go
View File

@@ -29,10 +29,10 @@ type Widget struct {
}
// NewWidget creates a new instance of a widget
func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
func NewWidget(tviewApp *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
widget := Widget{
MultiSourceWidget: view.NewMultiSourceWidget(settings.Common, "filePath", "filePaths"),
TextWidget: view.NewTextWidget(app, pages, settings.Common),
TextWidget: view.NewTextWidget(tviewApp, pages, settings.Common),
settings: settings,
}

1
modules/todo/keyboard.go
View File

@@ -9,6 +9,7 @@ import (
)
func (widget *Widget) initializeKeyboardControls() {
widget.InitializeHelpTextKeyboardControl(widget.ShowHelp)
widget.InitializeRefreshKeyboardControl(widget.Refresh)
widget.SetKeyboardChar("j", widget.Next, "Select next item")

29
modules/todo/widget.go
View File

@@ -22,21 +22,20 @@ const (
// A Widget represents a Todo widget
type Widget struct {
view.ScrollableWidget
app *tview.Application
filePath string
list checklist.Checklist
pages *tview.Pages
settings *Settings
tviewApp *tview.Application
view.ScrollableWidget
}
// NewWidget creates a new instance of a widget
func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
func NewWidget(tviewApp *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
widget := Widget{
ScrollableWidget: view.NewScrollableWidget(app, pages, settings.Common),
ScrollableWidget: view.NewScrollableWidget(tviewApp, pages, settings.Common),
app: app,
tviewApp: tviewApp,
settings: settings,
filePath: settings.filePath,
list: checklist.NewChecklist(settings.Sigils.Checkbox.Checked, settings.Sigils.Checkbox.Unchecked),
@@ -117,15 +116,15 @@ func (widget *Widget) newItem() {
widget.SetItemCount(len(widget.list.Items))
widget.persist()
widget.pages.RemovePage("modal")
widget.app.SetFocus(widget.View)
widget.tviewApp.SetFocus(widget.View)
widget.display()
}
widget.addButtons(form, saveFctn)
widget.modalFocus(form)
widget.app.QueueUpdate(func() {
widget.app.Draw()
widget.tviewApp.QueueUpdate(func() {
widget.tviewApp.Draw()
})
}
@@ -166,15 +165,15 @@ func (widget *Widget) updateSelected() {
widget.updateSelectedItem(text)
widget.persist()
widget.pages.RemovePage("modal")
widget.app.SetFocus(widget.View)
widget.tviewApp.SetFocus(widget.View)
widget.display()
}
widget.addButtons(form, saveFctn)
widget.modalFocus(form)
widget.app.QueueUpdate(func() {
widget.app.Draw()
widget.tviewApp.QueueUpdate(func() {
widget.tviewApp.Draw()
})
}
@@ -198,7 +197,7 @@ func (widget *Widget) addButtons(form *tview.Form, saveFctn func()) {
func (widget *Widget) addCancelButton(form *tview.Form) {
cancelFn := func() {
widget.pages.RemovePage("modal")
widget.app.SetFocus(widget.View)
widget.tviewApp.SetFocus(widget.View)
widget.display()
}
@@ -211,10 +210,10 @@ func (widget *Widget) addSaveButton(form *tview.Form, fctn func()) {
}
func (widget *Widget) modalFocus(form *tview.Form) {
widget.app.QueueUpdateDraw(func() {
widget.tviewApp.QueueUpdateDraw(func() {
frame := widget.modalFrame(form)
widget.pages.AddPage("modal", frame, false, true)
widget.app.SetFocus(frame)
widget.tviewApp.SetFocus(frame)
})
}

1
modules/todo_plus/keyboard.go
View File

@@ -3,6 +3,7 @@ package todo_plus
import "github.com/gdamore/tcell"
func (widget *Widget) initializeKeyboardControls() {
widget.InitializeHelpTextKeyboardControl(widget.ShowHelp)
widget.InitializeRefreshKeyboardControl(widget.Refresh)
widget.SetKeyboardChar("d", widget.Delete, "Delete item")

4
modules/todo_plus/widget.go
View File

@@ -19,10 +19,10 @@ type Widget struct {
}
// NewWidget creates a new instance of a widget
func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
func NewWidget(tviewApp *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
widget := Widget{
MultiSourceWidget: view.NewMultiSourceWidget(settings.Common, "project", "projects"),
ScrollableWidget: view.NewScrollableWidget(app, pages, settings.Common),
ScrollableWidget: view.NewScrollableWidget(tviewApp, pages, settings.Common),
settings: settings,
}

1
modules/transmission/keyboard.go
View File

@@ -3,6 +3,7 @@ package transmission
import "github.com/gdamore/tcell"
func (widget *Widget) initializeKeyboardControls() {
widget.InitializeHelpTextKeyboardControl(widget.ShowHelp)
widget.InitializeRefreshKeyboardControl(nil)
widget.SetKeyboardChar("j", widget.Prev, "Select previous item")

4
modules/transmission/widget.go
View File

@@ -21,9 +21,9 @@ type Widget struct {
}
// NewWidget creates a new instance of a widget
func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
func NewWidget(tviewApp *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
widget := Widget{
ScrollableWidget: view.NewScrollableWidget(app, pages, settings.Common),
ScrollableWidget: view.NewScrollableWidget(tviewApp, pages, settings.Common),
settings: settings,
}

1
modules/travisci/keyboard.go
View File

@@ -3,6 +3,7 @@ package travisci
import "github.com/gdamore/tcell"
func (widget *Widget) initializeKeyboardControls() {
widget.InitializeHelpTextKeyboardControl(widget.ShowHelp)
widget.InitializeRefreshKeyboardControl(widget.Refresh)
widget.SetKeyboardChar("j", widget.Next, "Select next item")

4
modules/travisci/widget.go
View File

@@ -17,9 +17,9 @@ type Widget struct {
err error
}
func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
func NewWidget(tviewApp *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
widget := Widget{
ScrollableWidget: view.NewScrollableWidget(app, pages, settings.Common),
ScrollableWidget: view.NewScrollableWidget(tviewApp, pages, settings.Common),
settings: settings,
}

1
modules/twitch/keyboard.go
View File

@@ -3,6 +3,7 @@ package twitch
import "github.com/gdamore/tcell"
func (widget *Widget) initializeKeyboardControls() {
widget.InitializeHelpTextKeyboardControl(widget.ShowHelp)
widget.InitializeRefreshKeyboardControl(widget.Refresh)
widget.SetKeyboardChar("j", widget.Next, "Select next item")

4
modules/twitch/widget.go
View File

@@ -27,9 +27,9 @@ type Stream struct {
Title string
}
func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
func NewWidget(tviewApp *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
widget := &Widget{
ScrollableWidget: view.NewScrollableWidget(app, pages, settings.Common),
ScrollableWidget: view.NewScrollableWidget(tviewApp, pages, settings.Common),
settings: settings,
twitch: NewClient(settings.clientId),
}

1
modules/twitter/keyboard.go
View File

@@ -6,6 +6,7 @@ import (
)
func (widget *Widget) initializeKeyboardControls() {
widget.InitializeHelpTextKeyboardControl(widget.ShowHelp)
widget.InitializeRefreshKeyboardControl(widget.Refresh)
widget.SetKeyboardChar("l", widget.NextSource, "Select next source")

4
modules/twitter/widget.go
View File

@@ -20,10 +20,10 @@ type Widget struct {
settings *Settings
}
func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
func NewWidget(tviewApp *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
widget := Widget{
MultiSourceWidget: view.NewMultiSourceWidget(settings.Common, "screenName", "screenNames"),
TextWidget: view.NewTextWidget(app, pages, settings.Common),
TextWidget: view.NewTextWidget(tviewApp, pages, settings.Common),
idx: 0,
settings: settings,

4
modules/twitterstats/widget.go
View File

@@ -14,9 +14,9 @@ type Widget struct {
settings *Settings
}
func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
func NewWidget(tviewApp *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
widget := Widget{
TextWidget: view.NewTextWidget(app, nil, settings.Common),
TextWidget: view.NewTextWidget(tviewApp, nil, settings.Common),
client: NewClient(settings),
settings: settings,

4
modules/unknown/widget.go
View File

@@ -13,9 +13,9 @@ type Widget struct {
settings *Settings
}
func NewWidget(app *tview.Application, settings *Settings) *Widget {
func NewWidget(tviewApp *tview.Application, settings *Settings) *Widget {
widget := Widget{
TextWidget: view.NewTextWidget(app, nil, settings.Common),
TextWidget: view.NewTextWidget(tviewApp, nil, settings.Common),
settings: settings,
}

4
modules/uptimerobot/keyboard.go
View File

@@ -1,6 +1,6 @@
package uptimerobot
func (widget *Widget) initializeKeyboardControls() {
widget.SetKeyboardChar("/", widget.ShowHelp, "Show/hide this help widget")
widget.SetKeyboardChar("r", widget.Refresh, "Refresh widget")
widget.InitializeHelpTextKeyboardControl(widget.ShowHelp)
widget.InitializeRefreshKeyboardControl(widget.Refresh)
}

4
modules/uptimerobot/widget.go
View File

@@ -21,9 +21,9 @@ type Widget struct {
err error
}
func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
func NewWidget(tviewApp *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
widget := &Widget{
ScrollableWidget: view.NewScrollableWidget(app, pages, settings.Common),
ScrollableWidget: view.NewScrollableWidget(tviewApp, pages, settings.Common),
settings: settings,
}

Some files were not shown because too many files have changed in this diff Show More