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

Fixing merge conflict

Browse Source
This commit is contained in:
Chris Cummer 2018-06-03 20:58:44 -07:00
commit 5ff80f309a
19 changed files with 31 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bamboohr/widget.go
View File

@ -16,7 +16,7 @@ type Widget struct {
func NewWidget() *Widget {
widget := Widget{
TextWidget: wtf.NewTextWidget(" 👽 BambooHR ", "bamboohr", false),
TextWidget: wtf.NewTextWidget(" BambooHR ", "bamboohr", false),
}
return &widget
@ -37,7 +37,7 @@ func (widget *Widget) Refresh() {
)
widget.UpdateRefreshedAt()
widget.View.SetTitle(fmt.Sprintf(" 👽 Away (%d) ", len(todayItems)))
widget.View.SetTitle(fmt.Sprintf("%s(%d)", widget.Name, len(todayItems)))
widget.View.SetText(fmt.Sprintf("%s", widget.contentFrom(todayItems)))
}

2
clocks/widget.go
View File

@ -18,7 +18,7 @@ type Widget struct {
func NewWidget() *Widget {
widget := Widget{
TextWidget: wtf.NewTextWidget(" 🕗 World Clocks ", "clocks", false),
TextWidget: wtf.NewTextWidget(" World Clocks ", "clocks", false),
}
widget.clockColl = widget.buildClockCollection(Config.UMap("wtf.mods.clocks.locations"))

2
cmdrunner/widget.go
View File

@ -22,7 +22,7 @@ type Widget struct {
func NewWidget() *Widget {
widget := Widget{
TextWidget: wtf.NewTextWidget(" 🏃 Runner ", "cmdrunner", false),
TextWidget: wtf.NewTextWidget(" CmdRunner ", "cmdrunner", false),
args: wtf.ToStrs(Config.UList("wtf.mods.cmdrunner.args")),
cmd: Config.UString("wtf.mods.cmdrunner.cmd"),

5
cryptoexchanges/cryptolive/widget.go
View File

@ -3,9 +3,8 @@ package cryptolive
import (
"encoding/json"
"fmt"
"time"
"net/http"
"time"
"github.com/olebedev/config"
"github.com/senorprogrammer/wtf/wtf"
@ -32,7 +31,7 @@ type Widget struct {
func NewWidget() *Widget {
started = false
widget := Widget{
TextWidget: wtf.NewTextWidget(" $ CryptoLive ", "cryptolive", false),
TextWidget: wtf.NewTextWidget(" CryptoLive ", "cryptolive", false),
updateInterval: Config.UInt("wtf.mods.cryptolive.updateInterval", 10),
}

2
gcal/widget.go
View File

@ -20,7 +20,7 @@ type Widget struct {
func NewWidget() *Widget {
widget := Widget{
TextWidget: wtf.NewTextWidget(" 🍿 Calendar ", "gcal", false),
TextWidget: wtf.NewTextWidget(" Calendar ", "gcal", false),
}
return &widget

2
git/display.go
View File

@ -17,7 +17,7 @@ func (widget *Widget) display() {
}
title := fmt.Sprintf("[green]%s[white]\n", repoData.Repository)
widget.View.SetTitle(fmt.Sprintf(" Git: %s ", title))
widget.View.SetTitle(fmt.Sprintf("%s- %s", widget.Name, title))
str := wtf.SigilStr(len(widget.Data), widget.Idx, widget.View) + "\n"
str = str + " [red]Branch[white]\n"

2
github/display.go
View File

@ -14,7 +14,7 @@ func (widget *Widget) display() {
return
}
widget.View.SetTitle(fmt.Sprintf(" Github: %s ", widget.title(repo)))
widget.View.SetTitle(fmt.Sprintf("%s- %s", widget.Name, widget.title(repo)))
str := wtf.SigilStr(len(widget.GithubRepos), widget.Idx, widget.View) + "\n"
str = str + " [red]Stats[white]\n"

6
jira/widget.go
View File

@ -16,7 +16,7 @@ type Widget struct {
func NewWidget() *Widget {
widget := Widget{
TextWidget: wtf.NewTextWidget("JIRA", "jira", false),
TextWidget: wtf.NewTextWidget(" Jira ", "jira", false),
}
return &widget
@ -35,13 +35,13 @@ func (widget *Widget) Refresh() {
if err != nil {
widget.View.SetWrap(true)
widget.View.SetTitle(fmt.Sprintf(" %s ", widget.Name))
widget.View.SetTitle(fmt.Sprintf("%s", widget.Name))
fmt.Fprintf(widget.View, "%v", err)
} else {
widget.View.SetWrap(false)
widget.View.SetTitle(
fmt.Sprintf(
" %s: [green]%s[white] ",
"%s- [green]%s[white]",
widget.Name,
Config.UString("wtf.mods.jira.project"),
),

2
newrelic/widget.go
View File

@ -39,7 +39,7 @@ func (widget *Widget) Refresh() {
}
widget.UpdateRefreshedAt()
widget.View.SetTitle(fmt.Sprintf(" New Relic: [green]%s[white] ", appName))
widget.View.SetTitle(fmt.Sprintf("%s- [green]%s[white]", widget.Name, appName))
widget.View.Clear()
if depErr != nil {

4
opsgenie/widget.go
View File

@ -17,7 +17,7 @@ type Widget struct {
func NewWidget() *Widget {
widget := Widget{
TextWidget: wtf.NewTextWidget(" ⏰ OpsGenie ", "opsgenie", false),
TextWidget: wtf.NewTextWidget(" OpsGenie ", "opsgenie", false),
}
return &widget
@ -33,7 +33,7 @@ func (widget *Widget) Refresh() {
data, err := Fetch()
widget.UpdateRefreshedAt()
widget.View.SetTitle(" ⏰ On Call ")
widget.View.SetTitle(widget.Name)
if err != nil {
widget.View.SetWrap(true)

2
power/widget.go
View File

@ -18,7 +18,7 @@ type Widget struct {
func NewWidget() *Widget {
widget := Widget{
TextWidget: wtf.NewTextWidget(" ⚡️ Power ", "power", false),
TextWidget: wtf.NewTextWidget(" Power ", "power", false),
Battery: NewBattery(),
}

3
prettyweather/widget.go
View File

@ -22,7 +22,7 @@ type Widget struct {
func NewWidget() *Widget {
widget := Widget{
TextWidget: wtf.NewTextWidget("Pretty Weather", "prettyweather", false),
TextWidget: wtf.NewTextWidget(" Pretty Weather ", "prettyweather", false),
}
return &widget
@ -35,7 +35,6 @@ func (widget *Widget) Refresh() {
widget.UpdateRefreshedAt()
widget.prettyWeather()
widget.View.SetTitle(fmt.Sprintf(" %s ", widget.Name))
widget.View.SetText(fmt.Sprintf("%s", widget.result))
}

2
security/widget.go
View File

@ -17,7 +17,7 @@ type Widget struct {
func NewWidget() *Widget {
widget := Widget{
TextWidget: wtf.NewTextWidget(" 🤺 Security ", "security", false),
TextWidget: wtf.NewTextWidget(" Security ", "security", false),
}
return &widget

2
status/widget.go
View File

@ -18,7 +18,7 @@ type Widget struct {
func NewWidget() *Widget {
widget := Widget{
TextWidget: wtf.NewTextWidget(" 🎉 Status ", "status", false),
TextWidget: wtf.NewTextWidget(" Status ", "status", false),
CurrentIcon: 0,
}

2
system/widget.go
View File

@ -21,7 +21,7 @@ type Widget struct {
func NewWidget(date, version string) *Widget {
widget := Widget{
TextWidget: wtf.NewTextWidget(" Build ", "system", false),
TextWidget: wtf.NewTextWidget(" System ", "system", false),
Date: date,
Version: version,

4
textfile/widget.go
View File

@ -30,7 +30,7 @@ type Widget struct {
func NewWidget(app *tview.Application, pages *tview.Pages) *Widget {
widget := Widget{
TextWidget: wtf.NewTextWidget(" 📄 Text File ", "textfile", true),
TextWidget: wtf.NewTextWidget(" Text File ", "textfile", true),
app: app,
filePath: Config.UString("wtf.mods.textfile.filePath"),
@ -53,7 +53,7 @@ func (widget *Widget) Refresh() {
}
widget.UpdateRefreshedAt()
widget.View.SetTitle(fmt.Sprintf(" 📄 %s ", widget.filePath))
widget.View.SetTitle(fmt.Sprintf("%s %s", widget.Name, widget.filePath))
filePath, _ := wtf.ExpandHomeDir(widget.filePath)

2
todo/widget.go
View File

@ -44,7 +44,7 @@ type Widget struct {
func NewWidget(app *tview.Application, pages *tview.Pages) *Widget {
widget := Widget{
TextWidget: wtf.NewTextWidget(" 📝 Todo ", "todo", true),
TextWidget: wtf.NewTextWidget(" Todo ", "todo", true),
app: app,
filePath: Config.UString("wtf.mods.todo.filename"),

11
wtf.go
View File

@ -155,9 +155,12 @@ var (
)
func makeWidgets(app *tview.Application, pages *tview.Pages) {
// Always in alphabetical order
bamboohr.Config = Config
clocks.Config = Config
cmdrunner.Config = Config
wtf.Config = Config
cryptolive.Config = Config
gcal.Config = Config
git.Config = Config
github.Config = Config
@ -166,20 +169,21 @@ func makeWidgets(app *tview.Application, pages *tview.Pages) {
newrelic.Config = Config
opsgenie.Config = Config
power.Config = Config
prettyweather.Config = Config
security.Config = Config
status.Config = Config
system.Config = Config
textfile.Config = Config
todo.Config = Config
weather.Config = Config
prettyweather.Config = Config
wtf.Config = Config
cryptolive.Config = Config
// Always in alphabetical order
Widgets = []wtf.Wtfable{
bamboohr.NewWidget(),
clocks.NewWidget(),
cmdrunner.NewWidget(),
cryptolive.NewWidget(),
gcal.NewWidget(),
git.NewWidget(app, pages),
github.NewWidget(app, pages),
@ -188,14 +192,13 @@ func makeWidgets(app *tview.Application, pages *tview.Pages) {
newrelic.NewWidget(),
opsgenie.NewWidget(),
power.NewWidget(),
prettyweather.NewWidget(),
security.NewWidget(),
status.NewWidget(),
system.NewWidget(date, version),
textfile.NewWidget(app, pages),
todo.NewWidget(app, pages),
weather.NewWidget(app, pages),
cryptolive.NewWidget(),
prettyweather.NewWidget(),
}
FocusTracker = wtf.FocusTracker{

2
wtf/text_widget.go
View File

@ -27,7 +27,7 @@ func NewTextWidget(name string, configKey string, focusable bool) TextWidget {
enabled: Config.UBool(fmt.Sprintf("wtf.mods.%s.enabled", configKey), false),
focusable: focusable,
Name: name,
Name: Config.UString(fmt.Sprintf("wtf.mods.%s.title", configKey), name),
RefreshInt: Config.UInt(fmt.Sprintf("wtf.mods.%s.refreshInterval", configKey)),
}