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-400 Move settings-related functions from util.go into common_settings.go

Browse Source
This commit is contained in:
Chris Cummer
2019-04-21 21:19:28 -07:00
parent bd2c6e5c9f
commit 88fdf9702b
20 changed files with 105 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
modules/gerrit/display.go
View File

@@ -2,8 +2,6 @@ package gerrit
import (
"fmt"
"github.com/wtfutil/wtf/wtf"
)
func (widget *Widget) display() {
@@ -16,7 +14,8 @@ func (widget *Widget) display() {
widget.View.SetTitle(widget.ContextualTitle(fmt.Sprintf("%s- %s", widget.Name(), widget.title(project))))
str := wtf.SigilStr(len(widget.GerritProjects), widget.Idx, widget.View) + "\n"
_, _, width, _ := widget.View.GetRect()
str := widget.settings.common.SigilStr(len(widget.GerritProjects), widget.Idx, width) + "\n"
str = str + " [red]Stats[white]\n"
str = str + widget.displayStats(project)
str = str + "\n"
@@ -64,11 +63,12 @@ func (widget *Widget) displayStats(project *GerritProject) string {
return str
}
func (widget *Widget) rowColor(index int) string {
if widget.View.HasFocus() && (index == widget.selected) {
return wtf.DefaultFocussedRowColor()
func (widget *Widget) rowColor(idx int) string {
if widget.View.HasFocus() && (idx == widget.selected) {
widget.settings.common.DefaultFocussedRowColor()
}
return wtf.RowColor("gerrit", index)
return widget.settings.common.RowColor(idx)
}
func (widget *Widget) title(project *GerritProject) string {

5
modules/git/display.go
View File

@@ -4,8 +4,6 @@ import (
"fmt"
"strings"
"unicode/utf8"
"github.com/wtfutil/wtf/wtf"
)
func (widget *Widget) display() {
@@ -18,7 +16,8 @@ func (widget *Widget) display() {
title := fmt.Sprintf("%s - [green]%s[white]", widget.Name(), repoData.Repository)
widget.View.SetTitle(widget.ContextualTitle(title))
str := wtf.SigilStr(len(widget.GitRepos), widget.Idx, widget.View) + "\n"
_, _, width, _ := widget.View.GetRect()
str := widget.settings.common.SigilStr(len(widget.GitRepos), widget.Idx, width) + "\n"
str = str + " [red]Branch[white]\n"
str = str + fmt.Sprintf(" %s", repoData.Branch)
str = str + "\n"

4
modules/github/display.go
View File

@@ -4,7 +4,6 @@ import (
"fmt"
"github.com/google/go-github/github"
"github.com/wtfutil/wtf/wtf"
)
func (widget *Widget) display() {
@@ -16,7 +15,8 @@ func (widget *Widget) display() {
widget.View.SetTitle(widget.ContextualTitle(fmt.Sprintf("%s - %s", widget.Name(), widget.title(repo))))
str := wtf.SigilStr(len(widget.GithubRepos), widget.Idx, widget.View) + "\n"
_, _, width, _ := widget.View.GetRect()
str := widget.settings.common.SigilStr(len(widget.GithubRepos), widget.Idx, width) + "\n"
str = str + " [red]Stats[white]\n"
str = str + widget.displayStats(repo)
str = str + "\n"

5
modules/gitlab/display.go
View File

@@ -2,8 +2,6 @@ package gitlab
import (
"fmt"
"github.com/wtfutil/wtf/wtf"
)
func (widget *Widget) display() {
@@ -16,7 +14,8 @@ func (widget *Widget) display() {
widget.View.SetTitle(fmt.Sprintf("%s- %s", widget.Name(), widget.title(project)))
str := wtf.SigilStr(len(widget.GitlabProjects), widget.Idx, widget.View) + "\n"
_, _, width, _ := widget.View.GetRect()
str := widget.settings.common.SigilStr(len(widget.GitlabProjects), widget.Idx, width) + "\n"
str = str + " [red]Stats[white]\n"
str = str + widget.displayStats(project)
str = str + "\n"

4
modules/gitter/widget.go
View File

@@ -116,10 +116,10 @@ func (widget *Widget) contentFrom(messages []Message) string {
func (widget *Widget) rowColor(idx int) string {
if widget.View.HasFocus() && (idx == widget.selected) {
return wtf.DefaultFocussedRowColor()
widget.settings.common.DefaultFocussedRowColor()
}
return wtf.RowColor("gitter", idx)
return widget.settings.common.RowColor(idx)
}
func (widget *Widget) next() {

4
modules/hackernews/widget.go
View File

@@ -123,10 +123,10 @@ func (widget *Widget) contentFrom(stories []Story) string {
func (widget *Widget) rowColor(idx int) string {
if widget.View.HasFocus() && (idx == widget.selected) {
return wtf.DefaultFocussedRowColor()
widget.settings.common.DefaultFocussedRowColor()
}
return wtf.RowColor("hackernews", idx)
return widget.settings.common.RowColor(idx)
}
func (widget *Widget) next() {

4
modules/jenkins/widget.go
View File

@@ -112,10 +112,10 @@ func (widget *Widget) contentFrom(view *View) string {
func (widget *Widget) rowColor(idx int) string {
if widget.View.HasFocus() && (idx == widget.selected) {
return wtf.DefaultFocussedRowColor()
widget.settings.common.DefaultFocussedRowColor()
}
return wtf.DefaultRowColor()
return widget.settings.common.RowColor(idx)
}
func (widget *Widget) jobColor(job *Job) string {

8
modules/jira/widget.go
View File

@@ -138,14 +138,10 @@ func (widget *Widget) contentFrom(searchResult *SearchResult) string {
func (widget *Widget) rowColor(idx int) string {
if widget.View.HasFocus() && (idx == widget.selected) {
return wtf.DefaultFocussedRowColor()
widget.settings.common.DefaultFocussedRowColor()
}
if idx%2 == 0 {
return widget.settings.colors.rows.even
}
return widget.settings.colors.rows.odd
return widget.settings.common.RowColor(idx)
}
func (widget *Widget) issueTypeColor(issue *Issue) string {

5
modules/mercurial/display.go
View File

@@ -4,8 +4,6 @@ import (
"fmt"
"strings"
"unicode/utf8"
"github.com/wtfutil/wtf/wtf"
)
func (widget *Widget) display() {
@@ -18,7 +16,8 @@ func (widget *Widget) display() {
title := fmt.Sprintf("%s - [green]%s[white]", widget.Name(), repoData.Repository)
widget.View.SetTitle(widget.ContextualTitle(title))
str := wtf.SigilStr(len(widget.Data), widget.Idx, widget.View) + "\n"
_, _, width, _ := widget.View.GetRect()
str := widget.settings.common.SigilStr(len(widget.Data), widget.Idx, width) + "\n"
str = str + " [red]Branch:Bookmark[white]\n"
str = str + fmt.Sprintf(" %s:%s\n", repoData.Branch, repoData.Bookmark)
str = str + "\n"

5
modules/rollbar/widget.go
View File

@@ -110,9 +110,10 @@ func (widget *Widget) contentFrom(result *Result) string {
func (widget *Widget) rowColor(idx int) string {
if widget.View.HasFocus() && (idx == widget.selected) {
return wtf.DefaultFocussedRowColor()
widget.settings.common.DefaultFocussedRowColor()
}
return "white"
return widget.settings.common.RowColor(idx)
}
func statusColor(item *Item) string {

3
modules/textfile/widget.go
View File

@@ -76,7 +76,8 @@ func (widget *Widget) display() {
title := fmt.Sprintf("[green]%s[white]", widget.CurrentSource())
title = widget.ContextualTitle(title)
text := wtf.SigilStr(len(widget.Sources), widget.Idx, widget.View) + "\n"
_, _, width, _ := widget.View.GetRect()
text := widget.settings.common.SigilStr(len(widget.Sources), widget.Idx, width) + "\n"
if widget.settings.format {
text = text + widget.formattedText()

4
modules/todo/display.go
View File

@@ -14,8 +14,8 @@ const checkWidth = 4
func (widget *Widget) display() {
str := ""
newList := checklist.NewChecklist(
widget.settings.common.Sigils.CheckedIcon,
widget.settings.common.Sigils.UncheckedIcon,
widget.settings.common.Sigils.Checkbox.Checked,
widget.settings.common.Sigils.Checkbox.Unchecked,
)
offset := 0

6
modules/todo/widget.go
View File

@@ -54,7 +54,7 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *
app: app,
settings: settings,
filePath: settings.filePath,
list: checklist.NewChecklist(settings.common.Sigils.CheckedIcon, settings.common.Sigils.UncheckedIcon),
list: checklist.NewChecklist(settings.common.Sigils.Checkbox.Checked, settings.common.Sigils.Checkbox.Unchecked),
pages: pages,
}
@@ -234,8 +234,8 @@ func (widget *Widget) persist() {
// items have the correct checked/unchecked icon per the user's preferences
func (widget *Widget) setItemChecks() {
for _, item := range widget.list.Items {
item.CheckedIcon = widget.settings.common.CheckedIcon
item.UncheckedIcon = widget.settings.common.UncheckedIcon
item.CheckedIcon = widget.settings.common.Checkbox.Checked
item.UncheckedIcon = widget.settings.common.Checkbox.Unchecked
}
}

3
modules/todoist/display.go
View File

@@ -19,7 +19,8 @@ func (widget *Widget) display() {
title := fmt.Sprintf("[green]%s[white]", proj.Project.Name)
widget.View.SetTitle(widget.ContextualTitle(title))
str := wtf.SigilStr(len(widget.projects), widget.idx, widget.View) + "\n"
_, _, width, _ := widget.View.GetRect()
str := widget.settings.common.SigilStr(len(widget.projects), widget.idx, width) + "\n"
maxLen := proj.LongestLine()

5
modules/travisci/widget.go
View File

@@ -102,9 +102,10 @@ func (widget *Widget) contentFrom(builds *Builds) string {
func (widget *Widget) rowColor(idx int) string {
if widget.View.HasFocus() && (idx == widget.selected) {
return wtf.DefaultFocussedRowColor()
widget.settings.common.DefaultFocussedRowColor()
}
return "White"
return widget.settings.common.RowColor(idx)
}
func buildColor(build *Build) string {

3
modules/twitter/widget.go
View File

@@ -79,7 +79,8 @@ func (widget *Widget) display() {
return
}
str := wtf.SigilStr(len(widget.Sources), widget.Idx, widget.View) + "\n"
_, _, width, _ := widget.View.GetRect()
str := widget.settings.common.SigilStr(len(widget.Sources), widget.Idx, width) + "\n"
for _, tweet := range tweets {
str = str + widget.format(tweet)
}

3
modules/weatherservices/weather/display.go
View File

@@ -27,7 +27,8 @@ func (widget *Widget) display() {
widget.View.SetTitle(widget.title(cityData))
content := wtf.SigilStr(len(widget.Data), widget.Idx, widget.View) + "\n"
_, _, width, _ := widget.View.GetRect()
content := widget.settings.common.SigilStr(len(widget.Data), widget.Idx, width) + "\n"
content = content + widget.description(cityData) + "\n\n"
content = content + widget.temperatures(cityData) + "\n"
content = content + widget.sunInfo(cityData)