1
0
mirror of https://github.com/taigrr/wtf synced 2025-01-18 04:03:14 -08:00

☢️ WTF-1031 Support multiple simultaneous configurations (#1032)

* WTF-1031 Rename WtfApp.app to WtfApp.tviewApp

Signed-off-by: Chris Cummer <chriscummer@me.com>

* WTF-1031 Add scaffolding for main to support multiple WtfApp instances

Signed-off-by: Chris Cummer <chriscummer@me.com>

* WTF-1031 WIP

Signed-off-by: Chris Cummer <chriscummer@me.com>

* Remove common functionality from KeyboardWidget and into Base

Signed-off-by: Chris Cummer <chriscummer@me.com>

* Augment with some descriptive comments

Signed-off-by: Chris Cummer <chriscummer@me.com>

* Add full support for multiple app instances via the AppManager.

Still to do:

* Config support for multiple apps/multiple config files
* The ability to switch between apps

Signed-off-by: Chris Cummer <chriscummer@me.com>

* Move SetTerminal out of main and into its own file

Signed-off-by: Chris Cummer <chriscummer@me.com>
This commit is contained in:
Chris Cummer
2020-12-21 03:25:41 -08:00
committed by GitHub
parent 9ba22f656b
commit fd794707cd
122 changed files with 514 additions and 401 deletions

View File

@@ -15,10 +15,10 @@ type Widget struct {
settings *Settings
}
func NewWidget(app *tview.Application, settings *Settings) *Widget {
func NewWidget(tviewApp *tview.Application, settings *Settings) *Widget {
locationData, err := GetLocationData(settings.city)
widget := Widget{
TextWidget: view.NewTextWidget(app, nil, settings.Common),
TextWidget: view.NewTextWidget(tviewApp, nil, settings.Common),
location: locationData,
lastError: err,

View File

@@ -17,9 +17,9 @@ type Widget struct {
settings *Settings
}
func NewWidget(app *tview.Application, settings *Settings) *Widget {
func NewWidget(tviewApp *tview.Application, settings *Settings) *Widget {
widget := Widget{
TextWidget: view.NewTextWidget(app, nil, settings.Common),
TextWidget: view.NewTextWidget(tviewApp, nil, settings.Common),
settings: settings,
}

View File

@@ -3,6 +3,7 @@ package weather
import "github.com/gdamore/tcell"
func (widget *Widget) initializeKeyboardControls() {
widget.InitializeHelpTextKeyboardControl(widget.ShowHelp)
widget.InitializeRefreshKeyboardControl(widget.Refresh)
widget.SetKeyboardChar("h", widget.PrevSource, "Select previous city")

View File

@@ -20,10 +20,10 @@ type Widget struct {
}
// NewWidget creates and returns a new instance of the weather Widget
func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
func NewWidget(tviewApp *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
widget := Widget{
MultiSourceWidget: view.NewMultiSourceWidget(settings.Common, "cityid", "cityids"),
TextWidget: view.NewTextWidget(app, pages, settings.Common),
TextWidget: view.NewTextWidget(tviewApp, pages, settings.Common),
pages: pages,
settings: settings,