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

Constantize the defaultFocus value for each module

Browse Source
This commit is contained in:
Chris Cummer
2019-09-18 20:34:53 -07:00
parent d6208b4730
commit bf877f5fa7
120 changed files with 421 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/weatherservices/weather/settings.go
View File

@@ -7,7 +7,10 @@ import (
"github.com/wtfutil/wtf/cfg"
)
const defaultTitle = "Weather"
const (
defaultFocusable = true
defaultTitle = "Weather"
)
type colors struct {
current string
@@ -24,9 +27,8 @@ type Settings struct {
}
func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings {
settings := Settings{
common: cfg.NewCommonSettingsFromModule(name, defaultTitle, ymlConfig, globalConfig),
common: cfg.NewCommonSettingsFromModule(name, defaultTitle, defaultFocusable, ymlConfig, globalConfig),
apiKey: ymlConfig.UString("apiKey", ymlConfig.UString("apikey", os.Getenv("WTF_OWM_API_KEY"))),
cityIDs: ymlConfig.UList("cityids"),

2
modules/weatherservices/weather/widget.go
View File

@@ -25,7 +25,7 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *
widget := Widget{
KeyboardWidget: view.NewKeyboardWidget(app, pages, settings.common),
MultiSourceWidget: view.NewMultiSourceWidget(settings.common, "cityid", "cityids"),
TextWidget: view.NewTextWidget(app, settings.common, true),
TextWidget: view.NewTextWidget(app, settings.common),
pages: pages,
settings: settings,