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-1031 Support multiple simultaneous configurations (#1032)

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files

1
modules/todo/keyboard.go
View File

@@ -9,6 +9,7 @@ import (
)
func (widget *Widget) initializeKeyboardControls() {
widget.InitializeHelpTextKeyboardControl(widget.ShowHelp)
widget.InitializeRefreshKeyboardControl(widget.Refresh)
widget.SetKeyboardChar("j", widget.Next, "Select next item")

29
modules/todo/widget.go
View File

@@ -22,21 +22,20 @@ const (
// A Widget represents a Todo widget
type Widget struct {
view.ScrollableWidget
app *tview.Application
filePath string
list checklist.Checklist
pages *tview.Pages
settings *Settings
tviewApp *tview.Application
view.ScrollableWidget
}
// NewWidget creates a new instance of a 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{
ScrollableWidget: view.NewScrollableWidget(app, pages, settings.Common),
ScrollableWidget: view.NewScrollableWidget(tviewApp, pages, settings.Common),
app: app,
tviewApp: tviewApp,
settings: settings,
filePath: settings.filePath,
list: checklist.NewChecklist(settings.Sigils.Checkbox.Checked, settings.Sigils.Checkbox.Unchecked),
@@ -117,15 +116,15 @@ func (widget *Widget) newItem() {
widget.SetItemCount(len(widget.list.Items))
widget.persist()
widget.pages.RemovePage("modal")
widget.app.SetFocus(widget.View)
widget.tviewApp.SetFocus(widget.View)
widget.display()
}
widget.addButtons(form, saveFctn)
widget.modalFocus(form)
widget.app.QueueUpdate(func() {
widget.app.Draw()
widget.tviewApp.QueueUpdate(func() {
widget.tviewApp.Draw()
})
}
@@ -166,15 +165,15 @@ func (widget *Widget) updateSelected() {
widget.updateSelectedItem(text)
widget.persist()
widget.pages.RemovePage("modal")
widget.app.SetFocus(widget.View)
widget.tviewApp.SetFocus(widget.View)
widget.display()
}
widget.addButtons(form, saveFctn)
widget.modalFocus(form)
widget.app.QueueUpdate(func() {
widget.app.Draw()
widget.tviewApp.QueueUpdate(func() {
widget.tviewApp.Draw()
})
}
@@ -198,7 +197,7 @@ func (widget *Widget) addButtons(form *tview.Form, saveFctn func()) {
func (widget *Widget) addCancelButton(form *tview.Form) {
cancelFn := func() {
widget.pages.RemovePage("modal")
widget.app.SetFocus(widget.View)
widget.tviewApp.SetFocus(widget.View)
widget.display()
}
@@ -211,10 +210,10 @@ func (widget *Widget) addSaveButton(form *tview.Form, fctn func()) {
}
func (widget *Widget) modalFocus(form *tview.Form) {
widget.app.QueueUpdateDraw(func() {
widget.tviewApp.QueueUpdateDraw(func() {
frame := widget.modalFrame(form)
widget.pages.AddPage("modal", frame, false, true)
widget.app.SetFocus(frame)
widget.tviewApp.SetFocus(frame)
})
}