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 name and configKey values from widget to settings

Browse Source
This commit is contained in:
Chris Cummer
2019-04-17 17:16:26 -07:00
parent d174bd1497
commit b50c762dab
93 changed files with 351 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/gcal/settings.go
View File

@@ -5,6 +5,8 @@ import (
"github.com/wtfutil/wtf/cfg"
)
const configKey = "gcal"
type colors struct {
day string
description string
@@ -30,11 +32,11 @@ type Settings struct {
withLocation bool
}
func NewSettingsFromYAML(ymlConfig *config.Config) *Settings {
localConfig, _ := ymlConfig.Get("wtf.mods.gcal")
func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
localConfig, _ := ymlConfig.Get("wtf.mods." + configKey)
settings := Settings{
common: cfg.NewCommonSettingsFromYAML(ymlConfig),
common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
conflictIcon: localConfig.UString("conflictIcon", "🚨"),
currentIcon: localConfig.UString("currentIcon", "🔸"),

2
modules/gcal/widget.go
View File

@@ -20,7 +20,7 @@ type Widget struct {
func NewWidget(app *tview.Application, settings *Settings) *Widget {
widget := Widget{
TextWidget: wtf.NewTextWidget(app, "Calendar", "gcal", true),
TextWidget: wtf.NewTextWidget(app, settings.common.Name, settings.common.ConfigKey, true),
app: app,
ch: make(chan struct{}),