diff --git a/generator/textwidget.tpl b/generator/textwidget.tpl index 278e0387..446cdb48 100644 --- a/generator/textwidget.tpl +++ b/generator/textwidget.tpl @@ -26,7 +26,7 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) * HelpfulWidget: wtf.NewHelpfulWidget(app, pages, HelpText), TextWidget: wtf.NewTextWidget(app, settings.common, false), - app: app, + app: app, settings: settings, } @@ -56,7 +56,6 @@ func (widget *Widget) display() { widget.View.SetWrap(false) widget.View.Clear() - widget.View.SetTitle(widget.Name) widget.View.SetText("Some Text") widget.View.Highlight(strconv.Itoa(widget.selected)).ScrollToHighlight() } diff --git a/modules/bamboohr/widget.go b/modules/bamboohr/widget.go index 53a3af6a..4033f967 100644 --- a/modules/bamboohr/widget.go +++ b/modules/bamboohr/widget.go @@ -43,7 +43,6 @@ func (widget *Widget) Refresh() { ) widget.app.QueueUpdateDraw(func() { - widget.View.SetTitle(widget.ContextualTitle(widget.Name())) widget.View.SetText(widget.contentFrom(todayItems)) }) } diff --git a/modules/circleci/widget.go b/modules/circleci/widget.go index 83b00255..718d6998 100644 --- a/modules/circleci/widget.go +++ b/modules/circleci/widget.go @@ -46,7 +46,7 @@ func (widget *Widget) Refresh() { } widget.app.QueueUpdateDraw(func() { - widget.View.SetTitle(fmt.Sprintf("%s - Builds", widget.Name())) + widget.View.SetTitle(fmt.Sprintf("%s - Builds", widget.CommonSettings.Title)) widget.View.SetText(content) }) } diff --git a/modules/datadog/widget.go b/modules/datadog/widget.go index f40372f6..7185db5e 100644 --- a/modules/datadog/widget.go +++ b/modules/datadog/widget.go @@ -40,7 +40,7 @@ func (widget *Widget) Refresh() { content = widget.contentFrom(monitors) } widget.app.QueueUpdateDraw(func() { - widget.View.SetTitle(widget.ContextualTitle(fmt.Sprintf("%s", widget.Name()))) + widget.View.SetTitle(widget.ContextualTitle(fmt.Sprintf("%s", widget.CommonSettings.Title))) widget.View.Clear() widget.View.SetText(content) }) diff --git a/modules/gerrit/display.go b/modules/gerrit/display.go index 74f80316..ecb048a7 100644 --- a/modules/gerrit/display.go +++ b/modules/gerrit/display.go @@ -12,7 +12,7 @@ func (widget *Widget) display() { return } - widget.View.SetTitle(widget.ContextualTitle(fmt.Sprintf("%s- %s", widget.Name(), widget.title(project)))) + widget.View.SetTitle(widget.ContextualTitle(fmt.Sprintf("%s- %s", widget.CommonSettings.Title, widget.title(project)))) _, _, width, _ := widget.View.GetRect() str := widget.settings.common.SigilStr(len(widget.GerritProjects), widget.Idx, width) + "\n" diff --git a/modules/gerrit/widget.go b/modules/gerrit/widget.go index 83f18d31..03b18364 100644 --- a/modules/gerrit/widget.go +++ b/modules/gerrit/widget.go @@ -97,7 +97,6 @@ func (widget *Widget) Refresh() { widget.View.SetWrap(true) widget.app.QueueUpdateDraw(func() { - widget.View.SetTitle(widget.Name()) widget.View.SetText(err.Error()) }) return @@ -110,7 +109,6 @@ func (widget *Widget) Refresh() { } widget.app.QueueUpdateDraw(func() { - widget.View.SetTitle(widget.Name()) widget.display() }) } diff --git a/modules/git/display.go b/modules/git/display.go index 994b6118..4db18818 100644 --- a/modules/git/display.go +++ b/modules/git/display.go @@ -13,7 +13,7 @@ func (widget *Widget) display() { return } - title := fmt.Sprintf("%s - [green]%s[white]", widget.Name(), repoData.Repository) + title := fmt.Sprintf("%s - [green]%s[white]", widget.CommonSettings.Title, repoData.Repository) widget.View.SetTitle(widget.ContextualTitle(title)) _, _, width, _ := widget.View.GetRect() diff --git a/modules/github/display.go b/modules/github/display.go index 46283f84..68f8edf0 100644 --- a/modules/github/display.go +++ b/modules/github/display.go @@ -13,7 +13,7 @@ func (widget *Widget) display() { return } - widget.View.SetTitle(widget.ContextualTitle(fmt.Sprintf("%s - %s", widget.Name(), widget.title(repo)))) + widget.View.SetTitle(widget.ContextualTitle(fmt.Sprintf("%s - %s", widget.CommonSettings.Title, widget.title(repo)))) _, _, width, _ := widget.View.GetRect() str := widget.settings.common.SigilStr(len(widget.GithubRepos), widget.Idx, width) + "\n" diff --git a/modules/gitlab/display.go b/modules/gitlab/display.go index 0d5ad39e..2501d11c 100644 --- a/modules/gitlab/display.go +++ b/modules/gitlab/display.go @@ -12,7 +12,7 @@ func (widget *Widget) display() { return } - widget.View.SetTitle(fmt.Sprintf("%s- %s", widget.Name(), widget.title(project))) + widget.View.SetTitle(fmt.Sprintf("%s- %s", widget.CommonSettings.Title, widget.title(project))) _, _, width, _ := widget.View.GetRect() str := widget.settings.common.SigilStr(len(widget.GitlabProjects), widget.Idx, width) + "\n" diff --git a/modules/gitter/widget.go b/modules/gitter/widget.go index 65e058bd..4566889b 100644 --- a/modules/gitter/widget.go +++ b/modules/gitter/widget.go @@ -59,7 +59,6 @@ func (widget *Widget) Refresh() { room, err := GetRoom(widget.settings.roomURI, widget.settings.apiToken) if err != nil { widget.View.SetWrap(true) - widget.View.SetTitle(widget.Name()) widget.View.SetText(err.Error()) return } @@ -74,7 +73,6 @@ func (widget *Widget) Refresh() { widget.View.SetWrap(true) widget.app.QueueUpdateDraw(func() { - widget.View.SetTitle(widget.Name()) widget.View.SetText(err.Error()) }) } else { @@ -96,7 +94,7 @@ func (widget *Widget) display() { widget.View.SetWrap(true) widget.View.Clear() - widget.View.SetTitle(widget.ContextualTitle(fmt.Sprintf("%s - %s", widget.Name(), widget.settings.roomURI))) + widget.View.SetTitle(widget.ContextualTitle(fmt.Sprintf("%s - %s", widget.CommonSettings.Title, widget.settings.roomURI))) widget.View.SetText(widget.contentFrom(widget.messages)) widget.View.Highlight(strconv.Itoa(widget.selected)).ScrollToHighlight() } diff --git a/modules/hackernews/widget.go b/modules/hackernews/widget.go index 5bcf3473..0c6d2633 100644 --- a/modules/hackernews/widget.go +++ b/modules/hackernews/widget.go @@ -69,7 +69,6 @@ func (widget *Widget) Refresh() { if err != nil { widget.View.SetWrap(true) - widget.View.SetTitle(widget.Name()) widget.View.SetText(err.Error()) } else { var stories []Story @@ -100,7 +99,7 @@ func (widget *Widget) display() { widget.View.SetWrap(false) widget.View.Clear() - widget.View.SetTitle(widget.ContextualTitle(fmt.Sprintf("%s - %sstories", widget.Name(), widget.settings.storyType))) + widget.View.SetTitle(widget.ContextualTitle(fmt.Sprintf("%s - %sstories", widget.CommonSettings.Title, widget.settings.storyType))) widget.View.SetText(widget.contentFrom(widget.stories)) widget.View.Highlight(strconv.Itoa(widget.selected)).ScrollToHighlight() } diff --git a/modules/jenkins/widget.go b/modules/jenkins/widget.go index 16daa58d..1d9da7ce 100644 --- a/modules/jenkins/widget.go +++ b/modules/jenkins/widget.go @@ -71,7 +71,6 @@ func (widget *Widget) Refresh() { widget.View.SetWrap(true) widget.app.QueueUpdateDraw(func() { - widget.View.SetTitle(widget.ContextualTitle(widget.Name())) widget.View.SetText(err.Error()) }) } @@ -91,7 +90,7 @@ func (widget *Widget) display() { widget.View.SetWrap(false) widget.View.Clear() - widget.View.SetTitle(widget.ContextualTitle(fmt.Sprintf("%s: [red]%s", widget.Name(), widget.view.Name))) + widget.View.SetTitle(widget.ContextualTitle(fmt.Sprintf("%s: [red]%s", widget.CommonSettings.Title, widget.view.Name))) widget.View.SetText(widget.contentFrom(widget.view)) widget.View.Highlight(strconv.Itoa(widget.selected)).ScrollToHighlight() } diff --git a/modules/jira/widget.go b/modules/jira/widget.go index bb16f368..c17bff96 100644 --- a/modules/jira/widget.go +++ b/modules/jira/widget.go @@ -64,7 +64,7 @@ func (widget *Widget) Refresh() { widget.View.SetWrap(true) widget.app.QueueUpdateDraw(func() { - widget.View.SetTitle(widget.Name()) + widget.View.SetTitle(widget.CommonSettings.Title) widget.View.SetText(err.Error()) }) } else { @@ -84,7 +84,7 @@ func (widget *Widget) display() { } widget.View.SetWrap(false) - str := fmt.Sprintf("%s- [green]%s[white]", widget.Name(), widget.settings.projects) + str := fmt.Sprintf("%s- [green]%s[white]", widget.CommonSettings.Title, widget.settings.projects) widget.View.Clear() widget.View.SetTitle(widget.ContextualTitle(str)) diff --git a/modules/mercurial/display.go b/modules/mercurial/display.go index 37a42f28..8dae5e94 100644 --- a/modules/mercurial/display.go +++ b/modules/mercurial/display.go @@ -13,7 +13,7 @@ func (widget *Widget) display() { return } - title := fmt.Sprintf("%s - [green]%s[white]", widget.Name(), repoData.Repository) + title := fmt.Sprintf("%s - [green]%s[white]", widget.CommonSettings.Title, repoData.Repository) widget.View.SetTitle(widget.ContextualTitle(title)) _, _, width, _ := widget.View.GetRect() diff --git a/modules/nbascore/widget.go b/modules/nbascore/widget.go index 102c2261..ae17edc5 100644 --- a/modules/nbascore/widget.go +++ b/modules/nbascore/widget.go @@ -50,7 +50,6 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) * func (widget *Widget) Refresh() { widget.app.QueueUpdateDraw(func() { widget.nbascore() - widget.View.SetTitle(widget.ContextualTitle(widget.Name())) }) } diff --git a/modules/newrelic/widget.go b/modules/newrelic/widget.go index 962f4fa5..3a6b611b 100644 --- a/modules/newrelic/widget.go +++ b/modules/newrelic/widget.go @@ -50,7 +50,7 @@ func (widget *Widget) Refresh() { } widget.app.QueueUpdateDraw(func() { - widget.View.SetTitle(widget.ContextualTitle(fmt.Sprintf("%s - [green]%s[white]", widget.Name(), appName))) + widget.View.SetTitle(widget.ContextualTitle(fmt.Sprintf("%s - [green]%s[white]", widget.CommonSettings.Title, appName))) widget.View.Clear() widget.View.SetText(content) }) diff --git a/modules/opsgenie/widget.go b/modules/opsgenie/widget.go index f1e7bca3..91e5bdf9 100644 --- a/modules/opsgenie/widget.go +++ b/modules/opsgenie/widget.go @@ -44,7 +44,6 @@ func (widget *Widget) Refresh() { } widget.app.QueueUpdateDraw(func() { - widget.View.SetTitle(widget.ContextualTitle(widget.Name())) widget.View.SetText(content) }) } diff --git a/modules/pagerduty/widget.go b/modules/pagerduty/widget.go index 3e21d25b..6ae60ffb 100644 --- a/modules/pagerduty/widget.go +++ b/modules/pagerduty/widget.go @@ -45,7 +45,7 @@ func (widget *Widget) Refresh() { } widget.app.QueueUpdateDraw(func() { - widget.View.SetTitle(widget.ContextualTitle(fmt.Sprintf("%s", widget.Name()))) + widget.View.SetTitle(widget.ContextualTitle(fmt.Sprintf("%s", widget.CommonSettings.Title))) widget.View.Clear() }) diff --git a/modules/rollbar/widget.go b/modules/rollbar/widget.go index a88deab0..32b44cdd 100644 --- a/modules/rollbar/widget.go +++ b/modules/rollbar/widget.go @@ -67,7 +67,6 @@ func (widget *Widget) Refresh() { widget.View.SetWrap(true) widget.app.QueueUpdateDraw(func() { - widget.View.SetTitle(widget.Name()) widget.View.SetText(err.Error()) }) } else { @@ -87,7 +86,7 @@ func (widget *Widget) display() { } widget.View.SetWrap(false) - widget.View.SetTitle(widget.ContextualTitle(fmt.Sprintf("%s - %s", widget.Name(), widget.settings.projectName))) + widget.View.SetTitle(widget.ContextualTitle(fmt.Sprintf("%s - %s", widget.CommonSettings.Title, widget.settings.projectName))) widget.View.SetText(widget.contentFrom(widget.items)) } diff --git a/modules/todo/widget.go b/modules/todo/widget.go index 51160637..cc7a1018 100644 --- a/modules/todo/widget.go +++ b/modules/todo/widget.go @@ -75,7 +75,6 @@ func (widget *Widget) Refresh() { widget.app.QueueUpdateDraw(func() { widget.display() - widget.View.SetTitle(widget.ContextualTitle(widget.Name())) }) } diff --git a/modules/travisci/widget.go b/modules/travisci/widget.go index 1d583244..b8a2d866 100644 --- a/modules/travisci/widget.go +++ b/modules/travisci/widget.go @@ -62,7 +62,6 @@ func (widget *Widget) Refresh() { widget.View.SetWrap(true) widget.app.QueueUpdateDraw(func() { - widget.View.SetTitle(widget.Name()) widget.View.SetText(err.Error()) }) } else { @@ -83,7 +82,7 @@ func (widget *Widget) display() { widget.View.SetWrap(false) - widget.View.SetTitle(widget.ContextualTitle(fmt.Sprintf("%s - Builds", widget.Name()))) + widget.View.SetTitle(widget.ContextualTitle(fmt.Sprintf("%s - Builds", widget.CommonSettings.Title))) widget.View.SetText(widget.contentFrom(widget.builds)) } diff --git a/modules/trello/widget.go b/modules/trello/widget.go index e6b46cb2..a4afbe58 100644 --- a/modules/trello/widget.go +++ b/modules/trello/widget.go @@ -47,13 +47,13 @@ func (widget *Widget) Refresh() { if err != nil { widget.View.SetWrap(true) - title = widget.Name() + title = widget.CommonSettings.Title content = err.Error() } else { widget.View.SetWrap(false) title = fmt.Sprintf( "[white]%s: [green]%s ", - widget.Name(), + widget.CommonSettings.Title, widget.settings.board, ) content = widget.contentFrom(searchResult) diff --git a/modules/unknown/widget.go b/modules/unknown/widget.go index b9559805..777e3b3c 100644 --- a/modules/unknown/widget.go +++ b/modules/unknown/widget.go @@ -29,10 +29,9 @@ func NewWidget(app *tview.Application, name string, settings *Settings) *Widget func (widget *Widget) Refresh() { widget.app.QueueUpdateDraw(func() { - widget.View.SetTitle(widget.ContextualTitle(fmt.Sprintf("%s", widget.Name()))) widget.View.Clear() - content := fmt.Sprintf("Widget %s does not exist", widget.Name()) + content := fmt.Sprintf("Widget %s does not exist", widget.CommonSettings.Title) widget.View.SetText(content) }) } diff --git a/modules/victorops/widget.go b/modules/victorops/widget.go index ac92e64c..78ba7cf5 100644 --- a/modules/victorops/widget.go +++ b/modules/victorops/widget.go @@ -44,7 +44,6 @@ func (widget *Widget) Refresh() { } teams, err := Fetch(widget.settings.apiID, widget.settings.apiKey) - widget.View.SetTitle(widget.ContextualTitle(widget.Name())) if err != nil { widget.View.SetWrap(true) diff --git a/modules/zendesk/widget.go b/modules/zendesk/widget.go index 35650973..0a165bd8 100644 --- a/modules/zendesk/widget.go +++ b/modules/zendesk/widget.go @@ -49,7 +49,7 @@ func (widget *Widget) Refresh() { /* -------------------- Unexported Functions -------------------- */ func (widget *Widget) display() { - widget.View.SetTitle(fmt.Sprintf("%s (%d)", widget.Name(), widget.result.Count)) + widget.View.SetTitle(fmt.Sprintf("%s (%d)", widget.CommonSettings.Title, widget.result.Count)) widget.View.SetText(widget.textContent(widget.result.Tickets)) }