summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--generateGui.go76
1 files changed, 36 insertions, 40 deletions
diff --git a/generateGui.go b/generateGui.go
index 4dd65d0..88ea3f3 100644
--- a/generateGui.go
+++ b/generateGui.go
@@ -135,72 +135,71 @@ func guiMain(w io.Writer, FRUITS string, FRUIT string) {
fmt.Fprintln(w, "}")
fmt.Fprintln(w, "")
fmt.Fprintln(w, "// force the application to choose the type of data. this allows the GUI plugin to be smarter")
- fmt.Fprintln(w, "func (t *"+FRUITS+"Table) AddStringFunc(title string, f func(*"+FRUIT+") string) *"+FRUIT+"AnyFunc {")
- fmt.Fprintln(w, " sf := new("+FRUIT+"AnyFunc)")
+ fmt.Fprintln(w, "func (t *"+FRUITS+"Table) AddStringFunc(title string, f func(*"+FRUIT+") string) *"+FRUIT+"Func {")
+ fmt.Fprintln(w, " sf := new("+FRUIT+"Func)")
fmt.Fprintln(w, " sf.f = func(x *"+FRUIT+") any {")
fmt.Fprintln(w, " return f(x)")
fmt.Fprintln(w, " }")
- fmt.Fprintln(w, " sf.attr = new(guipb.ColAttr)")
- fmt.Fprintln(w, " sf.attr.Width = int32(sf.Width)")
- fmt.Fprintln(w, " sf.attr.Type = guipb.ColAttr_STRING")
+ fmt.Fprintln(w, " sf.Attr = new(guipb.ColAttr)")
+ fmt.Fprintln(w, " sf.Attr.Width = int32(sf.Width)")
+ fmt.Fprintln(w, " sf.Attr.Type = guipb.ColAttr_STRING")
fmt.Fprintln(w, " sf.Header = new(guipb.Widget)")
fmt.Fprintln(w, " sf.Header.Name = title")
fmt.Fprintln(w, "")
- fmt.Fprintln(w, " t.anyFuncs = append(t.anyFuncs, sf)")
+ fmt.Fprintln(w, " t.Funcs = append(t.Funcs, sf)")
fmt.Fprintln(w, " return sf")
fmt.Fprintln(w, "}")
fmt.Fprintln(w, "")
fmt.Fprintln(w, "// force the application to choose the type of data. this allows the GUI plugin to be smarter")
- fmt.Fprintln(w, "func (t *"+FRUITS+"Table) AddButtonFunc(title string, f func(*"+FRUIT+") string) *"+FRUIT+"AnyFunc {")
- fmt.Fprintln(w, " sf := new("+FRUIT+"AnyFunc)")
+ fmt.Fprintln(w, "func (t *"+FRUITS+"Table) AddButtonFunc(title string, f func(*"+FRUIT+") string) *"+FRUIT+"Func {")
+ fmt.Fprintln(w, " sf := new("+FRUIT+"Func)")
fmt.Fprintln(w, " sf.f = func(x *"+FRUIT+") any {")
fmt.Fprintln(w, " return f(x)")
fmt.Fprintln(w, " }")
- fmt.Fprintln(w, " sf.attr = new(guipb.ColAttr)")
- fmt.Fprintln(w, " sf.attr.Width = int32(sf.Width)")
- fmt.Fprintln(w, " sf.attr.Type = guipb.ColAttr_STRING")
- fmt.Fprintln(w, " sf.attr.Click = true")
+ fmt.Fprintln(w, " sf.Attr = new(guipb.ColAttr)")
+ fmt.Fprintln(w, " sf.Attr.Width = int32(sf.Width)")
+ fmt.Fprintln(w, " sf.Attr.Type = guipb.ColAttr_STRING")
+ fmt.Fprintln(w, " sf.Attr.Click = true")
fmt.Fprintln(w, " sf.Header = new(guipb.Widget)")
fmt.Fprintln(w, " sf.Header.Name = title")
fmt.Fprintln(w, "")
- fmt.Fprintln(w, " t.anyFuncs = append(t.anyFuncs, sf)")
+ fmt.Fprintln(w, " t.Funcs = append(t.Funcs, sf)")
fmt.Fprintln(w, " return sf")
fmt.Fprintln(w, "}")
fmt.Fprintln(w, "")
fmt.Fprintln(w, "// force the application to choose the type of data. this allows the GUI plugin to be smarter")
- fmt.Fprintln(w, "func (t *"+FRUITS+"Table) AddIntFunc(title string, f func(*"+FRUIT+") int) *"+FRUIT+"AnyFunc {")
- fmt.Fprintln(w, " sf := new("+FRUIT+"AnyFunc)")
+ fmt.Fprintln(w, "func (t *"+FRUITS+"Table) AddIntFunc(title string, f func(*"+FRUIT+") int) *"+FRUIT+"Func {")
+ fmt.Fprintln(w, " sf := new("+FRUIT+"Func)")
fmt.Fprintln(w, " sf.f = func(x *"+FRUIT+") any {")
fmt.Fprintln(w, " return f(x)")
fmt.Fprintln(w, " }")
- fmt.Fprintln(w, " sf.attr = new(guipb.ColAttr)")
- fmt.Fprintln(w, " sf.attr.Width = int32(sf.Width)")
- fmt.Fprintln(w, " sf.attr.Type = guipb.ColAttr_INT")
+ fmt.Fprintln(w, " sf.Attr = new(guipb.ColAttr)")
+ fmt.Fprintln(w, " sf.Attr.Width = int32(sf.Width)")
+ fmt.Fprintln(w, " sf.Attr.Type = guipb.ColAttr_INT")
fmt.Fprintln(w, " sf.Header = new(guipb.Widget)")
fmt.Fprintln(w, " sf.Header.Name = title")
fmt.Fprintln(w, "")
- fmt.Fprintln(w, " t.anyFuncs = append(t.anyFuncs, sf)")
+ fmt.Fprintln(w, " t.Funcs = append(t.Funcs, sf)")
fmt.Fprintln(w, " return sf")
fmt.Fprintln(w, "}")
fmt.Fprintln(w, "")
fmt.Fprintln(w, "// force the application to choose the type of data. this allows the GUI plugin to be smarter")
- fmt.Fprintln(w, "func (t *"+FRUITS+"Table) AddTimeFunc(title string, f func(*"+FRUIT+") time.Time) *"+FRUIT+"AnyFunc {")
- fmt.Fprintln(w, " sf := new("+FRUIT+"AnyFunc)")
+ fmt.Fprintln(w, "func (t *"+FRUITS+"Table) AddTimeFunc(title string, f func(*"+FRUIT+") time.Time) *"+FRUIT+"Func {")
+ fmt.Fprintln(w, " sf := new("+FRUIT+"Func)")
fmt.Fprintln(w, " sf.f = func(x *"+FRUIT+") any {")
fmt.Fprintln(w, " return f(x)")
fmt.Fprintln(w, " }")
- fmt.Fprintln(w, " sf.attr = new(guipb.ColAttr)")
- fmt.Fprintln(w, " sf.attr.Width = int32(sf.Width)")
- fmt.Fprintln(w, " sf.attr.Type = guipb.ColAttr_TIME")
+ fmt.Fprintln(w, " sf.Attr = new(guipb.ColAttr)")
+ fmt.Fprintln(w, " sf.Attr.Width = int32(sf.Width)")
+ fmt.Fprintln(w, " sf.Attr.Type = guipb.ColAttr_TIME")
fmt.Fprintln(w, " sf.Header = new(guipb.Widget)")
fmt.Fprintln(w, " sf.Header.Name = title")
fmt.Fprintln(w, "")
- fmt.Fprintln(w, " // t.timeFuncs = append(t.timeFuncs, sf)")
- fmt.Fprintln(w, " t.anyFuncs = append(t.anyFuncs, sf)")
+ fmt.Fprintln(w, " t.Funcs = append(t.Funcs, sf)")
fmt.Fprintln(w, " return sf")
fmt.Fprintln(w, "}")
fmt.Fprintln(w, "")
- fmt.Fprintln(w, "func (sf *"+FRUIT+"AnyFunc) SetTitle(title string) {")
+ fmt.Fprintln(w, "func (sf *"+FRUIT+"Func) SetTitle(title string) {")
fmt.Fprintln(w, " sf.Header.Name = title")
fmt.Fprintln(w, "}")
fmt.Fprintln(w, "")
@@ -220,12 +219,12 @@ func guiMain(w io.Writer, FRUITS string, FRUIT string) {
fmt.Fprintln(w, " mt.parent.ShowTable(mt.pb)")
fmt.Fprintln(w, "}")
fmt.Fprintln(w, "")
- fmt.Fprintln(w, "type "+FRUIT+"AnyFunc struct {")
+ fmt.Fprintln(w, "type "+FRUIT+"Func struct {")
fmt.Fprintln(w, " // title string")
fmt.Fprintln(w, " f func(*"+FRUIT+") any")
fmt.Fprintln(w, " Custom func(*"+FRUIT+")")
fmt.Fprintln(w, " Width int")
- fmt.Fprintln(w, " attr *guipb.ColAttr")
+ fmt.Fprintln(w, " Attr *guipb.ColAttr")
fmt.Fprintln(w, " Header *guipb.Widget")
fmt.Fprintln(w, "}")
fmt.Fprintln(w, "")
@@ -233,19 +232,16 @@ func guiMain(w io.Writer, FRUITS string, FRUIT string) {
fmt.Fprintln(w, " pb *guipb.Table")
fmt.Fprintln(w, " parent *gui.Node")
fmt.Fprintln(w, " x *"+FRUITS+"")
- fmt.Fprintln(w, " hostnames []string")
- fmt.Fprintln(w, " anyFuncs []*"+FRUIT+"AnyFunc")
+ fmt.Fprintln(w, " Funcs []*"+FRUIT+"Func")
fmt.Fprintln(w, " CustomFunc func(*"+FRUIT+")")
fmt.Fprintln(w, "}")
}
func guiStringFuncs(w io.Writer, ZOOPB string, FRUITS string, FRUIT string) {
- fmt.Fprintln(w, "func (mt *"+FRUITS+"Table) doAnyFuncNew(sf *"+FRUIT+"AnyFunc) bool {")
+ fmt.Fprintln(w, "func (mt *"+FRUITS+"Table) doFuncNew(sf *"+FRUIT+"Func) bool {")
fmt.Fprintln(w, " r := new(guipb.AnyCol)")
- fmt.Fprintln(w, " // r.Header = new(guipb.Widget)")
- fmt.Fprintln(w, " // r.Header.Name = sf.title")
fmt.Fprintln(w, " r.Header = proto.Clone(sf.Header).(*guipb.Widget)")
- fmt.Fprintln(w, " r.Attr = proto.Clone(sf.attr).(*guipb.ColAttr)")
+ fmt.Fprintln(w, " r.Attr = proto.Clone(sf.Attr).(*guipb.ColAttr)")
fmt.Fprintln(w, " r.Attr.Width = int32(sf.Width)")
fmt.Fprintln(w, "")
@@ -286,15 +282,15 @@ func guiStringFuncs(w io.Writer, ZOOPB string, FRUITS string, FRUIT string) {
fmt.Fprintln(w, "}")
fmt.Fprintln(w, "")
fmt.Fprintln(w, "func (mt *"+FRUITS+"Table) MakeTable() {")
- fmt.Fprintln(w, " for _, sf := range mt.anyFuncs {")
- fmt.Fprintln(w, " mt.doAnyFuncNew(sf)")
+ fmt.Fprintln(w, " for _, sf := range mt.Funcs {")
+ fmt.Fprintln(w, " mt.doFuncNew(sf)")
fmt.Fprintln(w, " }")
fmt.Fprintln(w, "}")
}
func guiAddStringFunc(w io.Writer, FRUITS string, FRUIT string, BRAND string) {
fmt.Fprintln(w, "")
- fmt.Fprintln(w, "func (t *"+FRUITS+"Table) Add"+BRAND+"() *"+FRUIT+"AnyFunc {")
+ fmt.Fprintln(w, "func (t *"+FRUITS+"Table) Add"+BRAND+"() *"+FRUIT+"Func {")
fmt.Fprintln(w, " sf := t.AddStringFunc(\""+BRAND+"\", func(m *"+FRUIT+") string {")
fmt.Fprintln(w, " return m."+BRAND+"")
fmt.Fprintln(w, " })")
@@ -304,7 +300,7 @@ func guiAddStringFunc(w io.Writer, FRUITS string, FRUIT string, BRAND string) {
func guiAddIntFunc(w io.Writer, FRUITS string, FRUIT string, BRAND string) {
fmt.Fprintln(w, "")
- fmt.Fprintln(w, "func (t *"+FRUITS+"Table) Add"+BRAND+"() *"+FRUIT+"AnyFunc {")
+ fmt.Fprintln(w, "func (t *"+FRUITS+"Table) Add"+BRAND+"() *"+FRUIT+"Func {")
fmt.Fprintln(w, " custf := t.AddIntFunc(\""+BRAND+"\", func(m *"+FRUIT+") int {")
fmt.Fprintln(w, " return int(m."+BRAND+")")
fmt.Fprintln(w, " })")
@@ -339,7 +335,7 @@ func guiTableCustom(w io.Writer, FRUITS string, fRUITS string, FRUIT string, fRU
fmt.Fprintln(w, " row := mt.x."+FRUITS+"[w.Location.Y-1]")
fmt.Fprintln(w, " // log.Info(\"got to "+fRUITS+"Custom() with\", w.Location.X, w.Location.Y-1)")
fmt.Fprintln(w, "")
- fmt.Fprintln(w, " for i, sf := range mt.anyFuncs {")
+ fmt.Fprintln(w, " for i, sf := range mt.Funcs {")
fmt.Fprintln(w, " if i == int(w.Location.X) {")
fmt.Fprintln(w, " if sf.Custom != nil {")
fmt.Fprintln(w, " log.Info(\"doing Custom() func for button\")")
generated by cgit v1.2.3 (git 2.51.0) at 2025-11-04 23:39:45 +0000