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

Update title handling so that config based title can be used

Browse Source 
There is already default handling of title. Remove instances where people are unknowingly overriding it
For instances where we want to set special things, make sure to use CommonSettings.Title, so people can still override
This commit is contained in:
Sean Smith 2019-04-27 23:40:38 -04:00 committed by Chris Cummer
parent 305dd78ad4
commit 17d53ca39a
25 changed files with 21 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
generator/textwidget.tpl
View File

@ -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()
}

1
modules/bamboohr/widget.go
View File

@ -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))
})
}

2
modules/circleci/widget.go
View File

@ -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)
})
}

2
modules/datadog/widget.go
View File

@ -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)
})

2
modules/gerrit/display.go
View File

@ -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"

2
modules/gerrit/widget.go
View File

@ -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()
})
}

2
modules/git/display.go
View File

@ -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()

2
modules/github/display.go
View File

@ -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"

2
modules/gitlab/display.go
View File

@ -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"

4
modules/gitter/widget.go
View File

@ -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()
}

3
modules/hackernews/widget.go
View File

@ -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()
}

3
modules/jenkins/widget.go
View File

@ -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()
}

4
modules/jira/widget.go
View File

@ -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))

2
modules/mercurial/display.go
View File

@ -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()

1
modules/nbascore/widget.go
View File

@ -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()))
})
}

2
modules/newrelic/widget.go
View File

@ -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)
})

1
modules/opsgenie/widget.go
View File

@ -44,7 +44,6 @@ func (widget *Widget) Refresh() {
}
widget.app.QueueUpdateDraw(func() {
widget.View.SetTitle(widget.ContextualTitle(widget.Name()))
widget.View.SetText(content)
})
}

2
modules/pagerduty/widget.go
View File

@ -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()
})

3
modules/rollbar/widget.go
View File

@ -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))
}

1
modules/todo/widget.go
View File

@ -75,7 +75,6 @@ func (widget *Widget) Refresh() {
widget.app.QueueUpdateDraw(func() {
widget.display()
widget.View.SetTitle(widget.ContextualTitle(widget.Name()))
})
}

3
modules/travisci/widget.go
View File

@ -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))
}

4
modules/trello/widget.go
View File

@ -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)

3
modules/unknown/widget.go
View File

@ -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)
})
}

1
modules/victorops/widget.go
View File

@ -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)

2
modules/zendesk/widget.go
View File

@ -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))
}