Compare commits

...

47 Commits

Author SHA1 Message Date
Jeff Carr cb3047ab09 quiet output related to expected init() conditions 2025-03-10 04:37:21 -05:00
Jeff Carr bdb93a7b57 andlabs is unstable. need to switch to protobuf 2025-03-05 03:43:38 -06:00
Jeff Carr 8a71fc4012 maybe this will get fyne to work 2025-03-04 01:57:44 -06:00
Jeff Carr cd62709b64 work on tables 2025-02-24 11:00:23 -06:00
Jeff Carr 8ced00be79 build was wrong 2025-02-22 07:18:14 -06:00
Jeff Carr 3184badaec re-disable INFO flag 2025-02-21 18:31:42 -06:00
Jeff Carr 5b9eca7ac0 rm debugging printf 2025-02-21 16:55:26 -06:00
Jeff Carr 3e0b8c3df5 andlabs keeps panic'ing 2025-02-21 13:57:18 -06:00
Jeff Carr b64bf96606 debugging init() 2025-02-13 22:28:59 -06:00
Jeff Carr a264a7d121 add Disable() and Enable() 2025-02-13 21:04:25 -06:00
Jeff Carr 5530d2c6ad subbed in table() 2025-02-13 20:33:04 -06:00
Jeff Carr a16207bd1e stubbed in tables 2025-02-13 20:11:53 -06:00
Jeff Carr 514b39e382 better filename 2025-02-13 14:27:32 -06:00
Jeff Carr 0c0c42ecbb works again 2025-02-13 14:27:13 -06:00
Jeff Carr 9babe64e41 minor 2025-02-12 16:03:23 -06:00
Jeff Carr 17cff379fa clean was not complete 2025-01-09 21:16:04 -06:00
Jeff Carr 331e75e348 more correct build 2024-12-06 01:50:45 -06:00
Jeff Carr 6f08f22ca8 closer to purer plugin testing 2024-12-05 19:08:29 -06:00
Jeff Carr 9d965ee05a minor 2024-12-05 17:43:11 -06:00
Jeff Carr d14f8985e0 no .so 2024-12-03 00:47:13 -06:00
Jeff Carr 2246f8852a use this until 'package plugin' works 2024-12-02 05:16:42 -06:00
Jeff Carr ac6a348f54 add 'make install' for testing 2024-12-01 00:49:52 -06:00
Jeff Carr 03cc26d91f sets go list .Doc to 'plugin' 2024-11-28 22:58:26 -06:00
Jeff Carr c5ecf7ca32 avoid window in window crash. TODO: make it work
Signed-off-by: Jeff Carr <jcarr@wit.com>
2024-02-15 08:15:38 -06:00
Jeff Carr c6f9119c2e part of doc cleanups 2024-02-13 16:16:37 -06:00
Jeff Carr dac22688e2 ignore binary from autotypist automation
Signed-off-by: Jeff Carr <jcarr@wit.com>
2024-02-12 21:35:18 -06:00
Jeff Carr 142be47d3a more node state fixes
Signed-off-by: Jeff Carr <jcarr@wit.com>
2024-02-09 03:44:21 -06:00
Jeff Carr 695f116eec debugging output cleanups
Signed-off-by: Jeff Carr <jcarr@wit.com>
2024-02-07 07:31:28 -06:00
Jeff Carr 99a42bf88b dump old code
Signed-off-by: Jeff Carr <jcarr@wit.com>
2024-02-07 06:58:13 -06:00
Jeff Carr 9aafc45c0b fix textbox
Signed-off-by: Jeff Carr <jcarr@wit.com>
2024-02-05 15:04:01 -06:00
Jeff Carr 1e98d2607b use the new tree functions
Signed-off-by: Jeff Carr <jcarr@wit.com>
2024-02-05 12:06:17 -06:00
Jeff Carr fea47363e0 releases finally work
Signed-off-by: Jeff Carr <jcarr@wit.com>
2024-02-01 16:28:36 -06:00
Jeff Carr 12bfdd93da still debugging nil updates
Signed-off-by: Jeff Carr <jcarr@wit.com>
2024-02-01 12:00:02 -06:00
Jeff Carr 366ce47ed8 release automation
Signed-off-by: Jeff Carr <jcarr@wit.com>
2024-01-30 16:15:31 -06:00
Jeff Carr 15df92f123 this probably has to be golang since it uses proprietary OS toolkits
Signed-off-by: Jeff Carr <jcarr@wit.com>
2024-01-30 10:32:00 -06:00
Jeff Carr a3c149cfbc new release
Signed-off-by: Jeff Carr <jcarr@wit.com>
2024-01-28 22:54:56 -06:00
Jeff Carr 890e294a90 remove old code and notes
Signed-off-by: Jeff Carr <jcarr@wit.com>
2024-01-27 16:10:22 -06:00
Jeff Carr f8059d51d3 release automation
Signed-off-by: Jeff Carr <jcarr@wit.com>
2024-01-27 13:13:07 -06:00
Jeff Carr e1cd1a27a3 nocui works
release automation testing
    try to track disable state

Signed-off-by: Jeff Carr <jcarr@wit.com>
2024-01-27 10:03:01 -06:00
Jeff Carr fbd035f5be release automation failure
Signed-off-by: Jeff Carr <jcarr@wit.com>
2024-01-26 11:22:03 -06:00
Jeff Carr 8a497bf538 new gui release
more quiet output
    allow disabling of more errors
    sets the text on window open
    checkbox state works

Signed-off-by: Jeff Carr <jcarr@wit.com>
2024-01-26 11:18:01 -06:00
Jeff Carr c017dc9be0 new gui release
Signed-off-by: Jeff Carr <jcarr@wit.com>
2024-01-24 21:48:37 -06:00
Jeff Carr dc8e819e01 go mod new tree
Signed-off-by: Jeff Carr <jcarr@wit.com>
2024-01-21 11:34:17 -06:00
Jeff Carr 40f819c3a2 more logging updates
Signed-off-by: Jeff Carr <jcarr@wit.com>
2024-01-21 11:30:12 -06:00
Jeff Carr 4f3255c681 go mod automation work
Signed-off-by: Jeff Carr <jcarr@wit.com>
2024-01-20 20:57:25 -06:00
Jeff Carr 54a01b3bf1 ignore deletes when they are already deleted
Signed-off-by: Jeff Carr <jcarr@wit.com>
2024-01-19 20:35:33 -06:00
Jeff Carr d15fa1cf88 work on handling Direction
Signed-off-by: Jeff Carr <jcarr@wit.com>
2024-01-19 18:12:30 -06:00
28 changed files with 483 additions and 326 deletions

5
.gitignore vendored Normal file
View File

@ -0,0 +1,5 @@
*.swp
*.so
go.mod
go.sum
andlabs

1
.plugin Normal file
View File

@ -0,0 +1 @@
// plugin

27
LICENSE Normal file
View File

@ -0,0 +1,27 @@
Copyright (c) 2009 The Go Authors. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above
copyright notice, this list of conditions and the following disclaimer
in the documentation and/or other materials provided with the
distribution.
* Neither the name of Google Inc. nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

View File

@ -1,7 +1,19 @@
all: plugin VERSION = $(shell git describe --tags)
BUILDTIME = $(shell date +%Y.%m.%d)
plugin: all: clean goimports vet andlabs.so
GO111MODULE="off" go build -v -x -buildmode=plugin -o ../andlabs.so
andlabs.so:
GO111MODULE=off go build -v -x -buildmode=plugin -o andlabs.so \
-ldflags "-X main.VERSION=${VERSION} -X main.BUILDTIME=${BUILDTIME} -X gui.GUIVERSION=${VERSION}"
install: clean
go build -v -buildmode=plugin -o ~/go/lib/andlabs-${VERSION}.so \
-ldflags "-X main.VERSION=${VERSION} -X main.BUILDTIME=${BUILDTIME} -X gui.GUIVERSION=${VERSION}"
cd ~/go/lib && ln -f -s andlabs-${VERSION}.so andlabs.so
clean:
rm -f andlabs andlabs.*so
goget: goget:
GO111MODULE="off" go get -v -t -u GO111MODULE="off" go get -v -t -u
@ -9,6 +21,11 @@ goget:
goimports: goimports:
goimports -w *.go goimports -w *.go
vet:
@GO111MODULE=off go vet
@echo this go plugin builds okay
redomod: redomod:
rm -f go.* rm -f go.*
goimports -w *.go goimports -w *.go

3
README.md Normal file
View File

@ -0,0 +1,3 @@
// TODO: make a fake 'plugin' channel of communication to andlabs for mswindows
// Windows doesn't support plugins. How can I keep andlabs and only compile it on windows?
// https://forum.heroiclabs.com/t/setting-up-goland-to-compile-plugins-on-windows/594/5

195
action.go
View File

@ -1,8 +1,6 @@
package main package main
import ( import (
"errors"
"go.wit.com/log" "go.wit.com/log"
"go.wit.com/toolkits/tree" "go.wit.com/toolkits/tree"
"go.wit.com/widget" "go.wit.com/widget"
@ -14,20 +12,26 @@ import (
// and that there already a widget created // and that there already a widget created
func notNew(n *tree.Node) bool { func notNew(n *tree.Node) bool {
if n == nil { if n == nil {
log.Warn("ready() n = nil") log.Log(ERROR, "notNew() n = nil")
return true return true
} }
if n.TK != nil { if n.TK != nil {
log.Warn("ready() n.TK = nil", n.WidgetId, n.GetProgName()) log.Log(ERROR, "notNew() n.TK = nil", n.WidgetId, n.GetProgName())
return true return true
} }
if n.Parent == nil { if n.Parent == nil {
log.Warn("ready() n.Parent = nil", n.WidgetId, n.GetProgName()) log.Log(ERROR, "notNew() n.Parent = nil", n.WidgetId, n.GetProgName())
return true return true
} }
if n.Parent.TK == nil { if n.Parent.TK == nil {
log.Warn("ready() n.Parent.TK = nil", n.WidgetId, n.GetProgName()) if n.Parent.WidgetId == 0 {
log.Warn("ready() n.Parent.TK = nil", n.Parent.WidgetId, n.Parent.GetProgName()) // this is normal if the widget type is a window
if n.WidgetType == widget.Window {
return true
}
}
log.Log(ERROR, "notNew() n.Parent.TK = nil", n.WidgetId, n.GetProgName())
log.Log(ERROR, "notNew() n.Parent.TK = nil", n.Parent.WidgetId, n.Parent.GetProgName())
return true return true
} }
// this means you can add a new widgets // this means you can add a new widgets
@ -36,11 +40,11 @@ func notNew(n *tree.Node) bool {
func tkbad(n *tree.Node) bool { func tkbad(n *tree.Node) bool {
if n == nil { if n == nil {
log.Warn("ready() n = nil") log.Log(ERROR, "tkbad() n = nil")
return true return true
} }
if n.TK == nil { if n.TK == nil {
log.Warn("ready() n.TK = nil", n.WidgetId, n.GetProgName()) log.Log(ERROR, "tkbad() n.TK = nil", n.WidgetId, n.GetProgName())
return true return true
} }
return false return false
@ -49,25 +53,35 @@ func tkbad(n *tree.Node) bool {
// this makes sure widget and it's parent exists // this makes sure widget and it's parent exists
func ready(n *tree.Node) bool { func ready(n *tree.Node) bool {
if n == nil { if n == nil {
log.Warn("ready() n = nil") log.Log(ERROR, "ready() n = nil")
return false return false
} }
if n.TK == nil { if n.TK == nil {
log.Warn("ready() n.TK = nil", n.WidgetId, n.GetProgName()) log.Log(ERROR, "ready() n.TK = nil", n.WidgetId, n.GetProgName())
return false return false
} }
if n.Parent == nil { if n.Parent == nil {
log.Warn("ready() n.Parent = nil", n.WidgetId, n.GetProgName()) log.Log(ERROR, "ready() n.Parent = nil", n.WidgetId, n.GetProgName())
return false return false
} }
if n.Parent.TK == nil { if n.Parent.TK == nil {
log.Warn("ready() n.Parent.TK = nil", n.WidgetId, n.GetProgName()) if n.Parent.WidgetId == 0 {
log.Warn("ready() n.Parent.TK = nil", n.Parent.WidgetId, n.Parent.GetProgName()) // this is normal if the widget type is a window
if n.WidgetType == widget.Window {
return false
}
}
log.Log(ERROR, "ready() n.Parent.TK = nil", n.WidgetId, n.GetProgName())
log.Log(ERROR, "ready() n.Parent.TK = nil", n.Parent.WidgetId, n.Parent.GetProgName())
return false return false
} }
return true return true
} }
func hide(n *tree.Node) {
show(n, false)
}
func show(n *tree.Node, b bool) { func show(n *tree.Node, b bool) {
if tkbad(n) { if tkbad(n) {
return return
@ -89,15 +103,12 @@ func show(n *tree.Node, b bool) {
} }
} }
func enable(n *tree.Node, b bool) { func realEnable(n *tree.Node, b bool) {
var tk *guiWidget if !ready(n) {
tk = n.TK.(*guiWidget)
if n == nil {
panic("WHAT? enable was passed nil. How does this even happen?")
}
if tk == nil {
return return
} }
var tk *guiWidget
tk = n.TK.(*guiWidget)
if tk.uiControl == nil { if tk.uiControl == nil {
return return
} }
@ -112,7 +123,7 @@ func pad(n *tree.Node, b bool) {
if tkbad(n) { if tkbad(n) {
return return
} }
log.Warn("pad() on WidgetId =", n.WidgetId) log.Log(ANDLABS, "pad() on WidgetId =", n.WidgetId)
t := n.TK.(*guiWidget) t := n.TK.(*guiWidget)
if t == nil { if t == nil {
@ -137,105 +148,65 @@ func pad(n *tree.Node, b bool) {
} }
} }
func showWidget(n *tree.Node) {
log.Info("not implemented in andlabs yet")
// widgetDelete(n)
}
func hideWidget(n *tree.Node) {
widgetDelete(n)
}
func widgetDelete(n *tree.Node) { func widgetDelete(n *tree.Node) {
log.Log(NOW, "widgetDelete()", n.WidgetId) log.Log(ANDLABS, "widgetDelete()", n.WidgetId, n.WidgetType)
var tk *guiWidget var tk *guiWidget
tk = n.TK.(*guiWidget) tk = n.TK.(*guiWidget)
if n.WidgetType == widget.Window { if n.WidgetType == widget.Window {
log.Warn("DESTROY uiWindow here") log.Log(ANDLABS, "DESTROY uiWindow here")
log.Warn("NEED TO REMOVE n from parent.Children") log.Log(ANDLABS, "DESTROY NEED TO REMOVE n from parent.Children")
if tk.uiWindow != nil { if tk.uiWindow != nil {
tk.uiWindow.Destroy() tk.uiWindow.Destroy()
tk.uiWindow = nil tk.uiWindow = nil
} }
n.DeleteNode() // n.DeleteNode()
}
}
func processAction(a *widget.Action) {
log.Warn("processAction() START a.ActionType =", a.ActionType, "a.Value", a.Value)
if a.ActionType == widget.ToolkitInit {
Init()
return
}
switch a.WidgetType {
case widget.Root:
if me.treeRoot == nil {
log.Log(INFO, "processAction() found the treeRoot")
me.treeRoot = me.myTree.AddNode(a)
} else { } else {
log.Warn("processAction() Something terrible has happened") log.Log(ANDLABS, "DESTROY can't destroy TODO:", n.WidgetId, n.WidgetType)
log.Warn("processAction() treeNode was sent an action", a.ActionType, a)
} }
return }
}
func SetTitle(n *tree.Node, s string) {
log.Warn("andlabs processAction() START a.WidgetId =", a.WidgetId, "a.ParentId =", a.ParentId, a.ActionType) SetText(n, s)
switch a.WidgetType { }
case widget.Flag:
log.Log(ERROR, "processAction() RE-IMPLEMENT LOG FLAGS") func SetLabel(n *tree.Node, s string) {
return SetText(n, s)
} }
if me.treeRoot == nil { func SetText(n *tree.Node, s string) {
panic("me.treeRoot == nil") if n == nil {
} log.Log(WARN, "Tree Error: Add() sent n == nil")
return
if a.ActionType == widget.Add { }
n := add(a) if n.TK == nil {
show(n, n.State.Visable) log.Log(WARN, "SetText() Tree sent an action on a widget we didn't seem to have.", n.WidgetId)
// pad(n, n.State.Pad) return
// expand(n, a.State.Expand) }
return setText(n, s)
} log.Log(ANDLABS, "SetText() (new)", n.WidgetType, n.String(), s)
}
n := me.treeRoot.FindWidgetId(a.WidgetId)
if n == nil { func AddText(n *tree.Node, s string) {
log.Error(errors.New("andlabs processAction() ERROR findWidgetId found nil"), a.ActionType, a.WidgetType) if n == nil {
log.Log(NOW, "processAction() ERROR findWidgetId found nil for id =", a.WidgetId) log.Log(WARN, "Tree Error: Add() sent n == nil")
log.Log(NOW, "processAction() ERROR findWidgetId found nil", a.ActionType, a.WidgetType) return
log.Log(NOW, "processAction() ERROR findWidgetId found nil for id =", a.WidgetId) }
me.treeRoot.ListWidgets() if n.TK == nil {
return log.Log(WARN, "AddText() Tree sent an action on a widget we didn't seem to have.", n.WidgetId)
panic("findWidgetId found nil for id = " + string(a.WidgetId)) return
} }
log.Log(ANDLABS, "AddText()", n.WidgetType, n.String())
if a.ActionType == widget.Dump { // w := n.TK.(*guiWidget)
log.Log(NOW, "processAction() Dump =", a.ActionType, a.WidgetType, n.State.ProgName) // w.AddText(s)
return addText(n, s)
}
switch a.ActionType {
case widget.Delete:
widgetDelete(n)
case widget.Show:
show(n, true)
case widget.Hide:
show(n, false)
case widget.Enable:
enable(n, true)
case widget.Disable:
log.Warn("andlabs got disable for", n.WidgetId, n.State.ProgName)
enable(n, false)
case widget.Checked:
setChecked(n, a.State.Checked)
case widget.Get:
setText(n, a)
case widget.GetText:
switch a.WidgetType {
case widget.Textbox:
a.Value = n.State.Value
}
case widget.Set:
setText(n, a)
case widget.SetText:
setText(n, a)
case widget.AddText:
addText(n, a)
default:
log.Log(ERROR, "processAction() Unknown =", a.ActionType, a.WidgetType)
}
log.Log(INFO, "processAction() END =", a.ActionType, a.WidgetType)
} }

55
add.go
View File

@ -6,23 +6,12 @@ import (
"go.wit.com/widget" "go.wit.com/widget"
) )
func add(a *widget.Action) *tree.Node { func add(n *tree.Node) {
log.Warn("andlabs add()", a.WidgetId, a.State.ProgName)
if a.WidgetType == widget.Root {
if me.treeRoot == nil {
me.treeRoot = me.myTree.AddNode(a)
}
return me.treeRoot
}
n := me.myTree.AddNode(a)
p := n.Parent p := n.Parent
switch n.WidgetType { switch n.WidgetType {
case widget.Window: case widget.Window:
log.Warn("SPEEDY Add window", n.WidgetId, n.GetProgName())
newWindow(p, n) newWindow(p, n)
case widget.Group: case widget.Group:
log.Warn("SPEEDY Add Group", n.WidgetId, n.GetProgName())
newGroup(p, n) newGroup(p, n)
case widget.Grid: case widget.Grid:
newGrid(n) newGrid(n)
@ -34,22 +23,60 @@ func add(a *widget.Action) *tree.Node {
newButton(p, n) newButton(p, n)
case widget.Checkbox: case widget.Checkbox:
newCheckbox(p, n) newCheckbox(p, n)
setChecked(n, n.State.Checked)
case widget.Spinner: case widget.Spinner:
newSpinner(p, n) newSpinner(p, n)
case widget.Slider: case widget.Slider:
newSlider(p, n) newSlider(p, n)
case widget.Dropdown: case widget.Dropdown:
newDropdown(p, n) newDropdown(p, n)
// setText(n, n.State.DefaultS)
case widget.Combobox: case widget.Combobox:
newCombobox(p, n) newCombobox(p, n)
// setText(n, n.State.DefaultS)
case widget.Textbox: case widget.Textbox:
newTextbox(p, n) newTextbox(p, n)
// setText(n, n.State.DefaultS)
/* /*
case widget.Image: case widget.Image:
newImage(p, n) newImage(p, n)
*/ */
default: default:
log.Log(ERROR, "add() error TODO: ", n.WidgetType, n.State.ProgName) log.Log(ERROR, "add() error TODO: ", n.WidgetType, n.ProgName())
}
}
func newAdd(n *tree.Node) {
if n == nil {
log.Log(WARN, "Tree Error: Add() sent n == nil")
return
}
if n.WidgetType == widget.Root {
me.treeRoot = n
return
}
if me.treeRoot == nil {
panic("test")
}
add(n)
if n.TK == nil {
if n.WidgetId == 1 || n.WidgetId == 2 {
// this is normal at plugin init() time
} else {
// this probably shouldn't be happening
log.Log(WARN, "newAdd() Tree sent an action on a widget we didn't seem to have.", n.WidgetId, n.WidgetType, n.ProgName())
}
// Probably something went wrong and we should reset / redraw everything?
n.TK = initWidget(n)
}
// show(n, !a.State.Hidden)
if n.Hidden() {
hide(n)
} else {
if n.State.Enable {
// nothing to do
} else {
realEnable(n, false)
}
} }
return n
} }

View File

@ -6,39 +6,23 @@ import (
"go.wit.com/widget" "go.wit.com/widget"
) )
func compareStrings(n *tree.Node, ss []string) { func realAddText(n *tree.Node, s string) {
}
// func (n *node) addText(a *widget.Action) {
func addText(n *tree.Node, a *widget.Action) {
var tk *guiWidget var tk *guiWidget
tk = n.TK.(*guiWidget) tk = n.TK.(*guiWidget)
log.Warn("andlabs addText() START with a.Value =", a.Value) log.Log(ANDLABS, "addText() START with s =", s)
if tk == nil { if tk == nil {
log.Log(ERROR, "addText error. tk == nil", n.State.ProgName, n.WidgetId) log.Log(ERROR, "addText error. tk == nil", n.State.ProgName, n.WidgetId)
return return
} }
log.Warn("andlabs addText() Attempt on", n.WidgetType, "with", a.Value) log.Log(ANDLABS, "addText() Attempt on", n.WidgetType, "with", s)
switch n.WidgetType { switch n.WidgetType {
case widget.Dropdown: case widget.Dropdown:
for i, s := range a.State.Strings {
log.Warn("andlabs a.State.Strings =", i, s)
_, ok := n.Strings[s]
// If the key exists
if ok {
log.Warn("andlabs a.State.Strings is here", i, s)
} else {
log.Warn("andlabs is not here", i, s)
addDropdownName(n, s) addDropdownName(n, s)
// TODO: make numbers
n.Strings[s] = 21
}
}
case widget.Combobox: case widget.Combobox:
addComboboxName(n, widget.GetString(a.Value)) addComboboxName(n, s)
default: default:
log.Log(ERROR, "plugin Send() Don't know how to addText on", n.WidgetType, "yet", a.ActionType) log.Log(ERROR, "addText() doesn't work on", n.WidgetType)
} }
log.Log(CHANGE, "addText() END with a.Value =", a.Value) log.Log(ANDLABS, "addText() END with =", s)
} }

33
box.go
View File

@ -31,26 +31,25 @@ func newBox(n *tree.Node) {
} }
/* /*
rawBox -- hack to arbitrarily add a box in andlabs to work rawBox -- hack to arbitrarily add a box in andlabs to work
around the problem that a "group" can not have one entry in it around the problem that a "group" can not have one entry in it
TODO: fix this so that a box is "added on demand" that is, TODO: fix this so that a box is "added on demand" that is,
if "go.wit.com/gui" sends you a 2nd thing to add to a group, if "go.wit.com/gui" sends you a 2nd thing to add to a group,
automatically add a box then. The problem with this, is the macos, windows and linux gtk automatically add a box then. The problem with this, is the macos, windows and linux gtk
will panic on a move when an chind object is disasociated from the group will panic on a move when an chind object is disasociated from the group
I haven't had time to try to debug this, so, instead, it's just probably better to always I haven't had time to try to debug this, so, instead, it's just probably better to always
add a box here. There doesn't seem to be any real issue with forcing a box to be inserted add a box here. There doesn't seem to be any real issue with forcing a box to be inserted
into the toolkits that is "outside" the binary tree of widgets. This only means, that on into the toolkits that is "outside" the binary tree of widgets. This only means, that on
a destroy of the tree, this box must be checked a destroy of the tree, this box must be checked
even that is a probably not senario however since clicking on the close box in the toolkit even that is a probably not senario however since clicking on the close box in the toolkit
has the operating system destroy everything in the window. it may or may not be possible has the operating system destroy everything in the window. it may or may not be possible
to control that behavior. at this time, it's "undetermined" and the best course of action to control that behavior. at this time, it's "undetermined" and the best course of action
is to detect the window is destroyed and then remove all the toolkit information is to detect the window is destroyed and then remove all the toolkit information
from all the nodes in the binary tree from all the nodes in the binary tree
TODO: handle user killing/closing a window using the OS TODO: handle user killing/closing a window using the OS
*/ */
// func (n *node) rawBox() *ui.Box {
func rawBox(n *tree.Node) *ui.Box { func rawBox(n *tree.Node) *ui.Box {
var box *ui.Box var box *ui.Box

View File

@ -7,7 +7,6 @@ import (
_ "go.wit.com/dev/andlabs/ui/winmanifest" _ "go.wit.com/dev/andlabs/ui/winmanifest"
) )
// func (p *node) newButton(n *node) {
func newButton(p *tree.Node, n *tree.Node) { func newButton(p *tree.Node, n *tree.Node) {
if notNew(n) { if notNew(n) {
return return

View File

@ -21,8 +21,8 @@ func newCheckbox(p *tree.Node, n *tree.Node) {
newt.uiCheckbox.OnToggled(func(spin *ui.Checkbox) { newt.uiCheckbox.OnToggled(func(spin *ui.Checkbox) {
var b bool var b bool
b = newt.checked() b = newt.checked()
n.SetValue(b) n.State.Checked = b
log.Warn("Checkbox is now =", b) log.Log(ANDLABS, "Checkbox is now =", b)
me.myTree.SendUserEvent(n) me.myTree.SendUserEvent(n)
}) })
@ -34,7 +34,7 @@ func (t *guiWidget) checked() bool {
return t.uiCheckbox.Checked() return t.uiCheckbox.Checked()
} }
func setChecked(n *tree.Node, b bool) { func realSetChecked(n *tree.Node, b bool) {
if n.WidgetType != widget.Checkbox { if n.WidgetType != widget.Checkbox {
} }
var tk *guiWidget var tk *guiWidget

View File

@ -23,24 +23,22 @@ func newCombobox(p, n *tree.Node) {
newt.val = make(map[int]string) newt.val = make(map[int]string)
cb.OnChanged(func(spin *ui.EditableCombobox) { cb.OnChanged(func(spin *ui.EditableCombobox) {
n.SetValue(spin.Text()) n.State.CurrentS = spin.Text()
log.Warn("combobox changed =" + spin.Text() + ".") log.Log(ANDLABS, "combobox changed ="+spin.Text()+".")
me.myTree.SendUserEvent(n) me.myTree.SendUserEvent(n)
}) })
n.TK = newt n.TK = newt
place(p, n) place(p, n)
log.Warn("add combobox entries on create:", n.State.Strings) log.Log(ANDLABS, "add combobox entries on create:", n.State.Strings)
log.Warn("add combobox entries on create:", n.State.Strings)
log.Warn("add combobox entries on create:", n.State.Strings)
// add the initial combobox entries // add the initial combobox entries
for i, s := range n.State.Strings { for i, s := range n.State.Strings {
log.Warn("add combobox entries on create", n.GetProgName(), i, s) log.Log(ANDLABS, "add combobox entries on create progname:", n.GetProgName(), "State.Strings =", i, s)
addComboboxName(n, s) addComboboxName(n, s)
} }
cur := n.String() cur := n.CurrentS()
log.Warn("add combobox: TODO: set default value on create", n.GetProgName(), cur) log.Log(ANDLABS, "add combobox: set default value on create to", cur)
setComboboxName(n, cur) setComboboxName(n, cur)
} }
@ -50,7 +48,7 @@ func addComboboxName(n *tree.Node, s string) {
} }
var tk *guiWidget var tk *guiWidget
tk = n.TK.(*guiWidget) tk = n.TK.(*guiWidget)
log.Log(INFO, "addComboboxName()", n.WidgetId, "add:", s) log.Log(ANDLABS, "addComboboxName()", n.WidgetId, "add:", s)
tk.uiEditableCombobox.Append(s) tk.uiEditableCombobox.Append(s)
if tk.val == nil { if tk.val == nil {
@ -61,7 +59,7 @@ func addComboboxName(n *tree.Node, s string) {
// If this is the first menu added, set the dropdown to it // If this is the first menu added, set the dropdown to it
if tk.c == 0 { if tk.c == 0 {
log.Log(INFO, "THIS IS THE FIRST combobox", s) log.Log(ANDLABS, "addComboboxName() first string:", s)
tk.uiEditableCombobox.SetText(s) tk.uiEditableCombobox.SetText(s)
} }
tk.c = tk.c + 1 tk.c = tk.c + 1
@ -73,7 +71,7 @@ func setComboboxName(n *tree.Node, s string) bool {
} }
var tk *guiWidget var tk *guiWidget
tk = n.TK.(*guiWidget) tk = n.TK.(*guiWidget)
log.Log(INFO, "SetComboboxName()", n.WidgetId, ",", s) log.Log(ANDLABS, "SetComboboxName()", n.WidgetId, ",", s)
tk.uiEditableCombobox.SetText(s) tk.uiEditableCombobox.SetText(s)
return false return false
} }

View File

@ -27,9 +27,9 @@ func newDropdown(p, n *tree.Node) {
i := spin.Selected() i := spin.Selected()
if newt.val == nil { if newt.val == nil {
log.Log(ERROR, "make map didn't work") log.Log(ERROR, "make map didn't work")
n.SetValue("map did not work. ui.Combobox error") n.State.CurrentS = "map did not work. ui.Combobox error"
} else { } else {
n.SetValue(newt.val[i]) n.State.CurrentS = newt.val[i]
} }
me.myTree.SendUserEvent(n) me.myTree.SendUserEvent(n)
}) })
@ -37,19 +37,17 @@ func newDropdown(p, n *tree.Node) {
n.TK = newt n.TK = newt
place(p, n) place(p, n)
log.Warn("add dropdown entries on create:", n.State.Strings) log.Log(ANDLABS, "add dropdown entries on create:", n.State.Strings)
log.Warn("add dropdown entries on create:", n.State.Strings)
log.Warn("add dropdown entries on create:", n.State.Strings)
if n.State.Strings == nil { if n.State.Strings == nil {
return return
} }
// add the initial dropdown entries // add the initial dropdown entries
for i, s := range n.State.Strings { for i, s := range n.State.Strings {
log.Warn("add dropdown: add entries on create", n.GetProgName(), i, s) log.Log(ANDLABS, "add dropdown: add entries on create", n.GetProgName(), i, s)
addDropdownName(n, s) addDropdownName(n, s)
} }
cur := n.String() cur := n.String()
log.Warn("add dropdown: set default value on create", n.GetProgName(), cur) log.Log(ANDLABS, "add dropdown: set default value on create", n.GetProgName(), cur)
setDropdownName(n, cur) setDropdownName(n, cur)
} }
@ -95,12 +93,12 @@ func setDropdownName(n *tree.Node, s string) bool {
for i, tmp := range tk.val { for i, tmp := range tk.val {
if s == tmp { if s == tmp {
n.SetValue(s) n.State.CurrentS = s
setDropdownInt(n, i) setDropdownInt(n, i)
log.Warn("SetDropdownInt() worked", tmp, i) log.Log(ANDLABS, "SetDropdownInt() worked", tmp, i)
return true return true
} }
} }
log.Warn("SetDropdownName() failed", s) log.Log(WARN, "SetDropdownName() failed", s, n.WidgetId, n.GetProgName())
return false return false
} }

View File

@ -11,12 +11,10 @@ import (
var NOW *log.LogFlag var NOW *log.LogFlag
var INFO *log.LogFlag var INFO *log.LogFlag
var SPEW *log.LogFlag
var WARN *log.LogFlag var WARN *log.LogFlag
var ERROR *log.LogFlag var ERROR *log.LogFlag
var CHANGE *log.LogFlag var ANDLABS *log.LogFlag
var TOOLKIT *log.LogFlag
func init() { func init() {
full := "go.wit.com/toolkits/andlabs" full := "go.wit.com/toolkits/andlabs"
@ -26,9 +24,9 @@ func init() {
INFO = log.NewFlag("INFO", false, full, short, "normal debugging stuff") INFO = log.NewFlag("INFO", false, full, short, "normal debugging stuff")
WARN = log.NewFlag("WARN", true, full, short, "bad things") WARN = log.NewFlag("WARN", true, full, short, "bad things")
SPEW = log.NewFlag("SPEW", false, full, short, "spew stuff")
ERROR = log.NewFlag("ERROR", false, full, short, "toolkit errors") full = "go.wit.com/gui"
CHANGE = log.NewFlag("ERROR", false, full, short, "show when the user does things") short = "andlabs"
TOOLKIT = log.NewFlag("ERROR", false, full, short, "andlabs specific stuff") ERROR = log.NewFlag("ERROR", false, full, short, "andlab toolkit errors")
ANDLABS = log.NewFlag("ANDLABS", false, full, short, "andlabs specific stuff")
} }

12
go.mod
View File

@ -1,12 +0,0 @@
module go.wit.com/toolkits/andlabs
go 1.21.4
require (
go.wit.com/dev/andlabs/ui v0.0.1
go.wit.com/log v0.5.5
go.wit.com/toolkits/tree v0.0.5
go.wit.com/widget v1.1.6
)
require go.wit.com/dev/davecgh/spew v1.1.4 // indirect

10
go.sum
View File

@ -1,10 +0,0 @@
go.wit.com/dev/andlabs/ui v0.0.1 h1:SowOybLBu/qUOqp905EZikz5/iPa3GpmnCAPzNOYajM=
go.wit.com/dev/andlabs/ui v0.0.1/go.mod h1:mlKEEe05ZJURzjh1LtjzdGMHVbJm9a7BUaVpA9cHxsM=
go.wit.com/dev/davecgh/spew v1.1.4 h1:C9hj/rjlUpdK+E6aroyLjCbS5MFcyNUOuP1ICLWdNek=
go.wit.com/dev/davecgh/spew v1.1.4/go.mod h1:sihvWmnQ/09FWplnEmozt90CCVqBtGuPXM811tgfhFA=
go.wit.com/log v0.5.5 h1:bK3b94uVKgev4jB5wg06FnvCFBEapQICTSH2YW+CWr4=
go.wit.com/log v0.5.5/go.mod h1:BaJBfHFqcJSJLXGQ9RHi3XVhPgsStxSMZRlaRxW4kAo=
go.wit.com/toolkits/tree v0.0.5 h1:weWlg58OSPtEOOD40G1P5CJ5nNJIYfJ6vMuJb8sGzUE=
go.wit.com/toolkits/tree v0.0.5/go.mod h1:n4F2seonm1aYMml+YGOpCqWo0bkFwT/RH834J6f5/iE=
go.wit.com/widget v1.1.6 h1:av2miF5vlohMfARA/QGPTPfgW/ADup1c+oeAOKgroPY=
go.wit.com/widget v1.1.6/go.mod h1:I8tnD3x3ECbB/CRNnLCdC+uoyk7rK0AEkzK1bQYSqoQ=

View File

@ -1,3 +1,4 @@
// plugin
package main package main
import ( import (
@ -6,48 +7,115 @@ import (
"go.wit.com/log" "go.wit.com/log"
"go.wit.com/toolkits/tree" "go.wit.com/toolkits/tree"
"go.wit.com/widget"
"go.wit.com/dev/andlabs/ui" "go.wit.com/dev/andlabs/ui"
// the _ means we only need this for the init() // the _ means we only need this for the init()
_ "go.wit.com/dev/andlabs/ui/winmanifest" _ "go.wit.com/dev/andlabs/ui/winmanifest"
) )
// sent via -ldflags
var VERSION string
var BUILDTIME string
var PLUGIN string = "andlabs"
var uiMainUndef bool = true var uiMainUndef bool = true
var uiMain sync.Once var uiMain sync.Once
var muAction sync.Mutex var muAction sync.Mutex
/*
func newaction(n *tree.Node, atype widget.ActionType) {
ui.QueueMain(func() {
newAction(n, atype)
})
}
*/
func queueAdd(n *tree.Node) {
ui.QueueMain(func() {
newAdd(n)
})
}
func enableWidget(n *tree.Node) {
ui.QueueMain(func() {
realEnable(n, true)
})
}
func disableWidget(n *tree.Node) {
ui.QueueMain(func() {
realEnable(n, false)
})
}
func setTitle(n *tree.Node, s string) {
ui.QueueMain(func() {
SetText(n, s)
})
}
func setLabel(n *tree.Node, s string) {
ui.QueueMain(func() {
realSetText(n, s)
})
}
func setText(n *tree.Node, s string) {
ui.QueueMain(func() {
realSetText(n, s)
})
}
func addText(n *tree.Node, s string) {
ui.QueueMain(func() {
realAddText(n, s)
})
}
func setChecked(n *tree.Node, b bool) {
ui.QueueMain(func() {
realSetChecked(n, b)
})
}
func toolkitClose() {
ui.QueueMain(func() {
ui.Quit()
})
}
/*
func queueMain(currentA widget.Action) { func queueMain(currentA widget.Action) {
/*
// this never happends // this never happends
defer func() { defer func() {
if r := recover(); r != nil { if r := recover(); r != nil {
log.Warn("YAHOOOO Recovered in queueMain() application:", r) log.Log("YAHOOOO Recovered in queueMain() application:", r)
log.Println("Recovered from panic:", r) log.Println("Recovered from panic:", r)
log.Println("Stack trace:") log.Println("Stack trace:")
debug.PrintStack() debug.PrintStack()
me.myTree.SendToolkitPanic() me.myTree.SendToolkitPanic()
} }
}() }()
*/
// andlabs puts this inside the gofunction over there // andlabs puts this inside the gofunction over there
// probably this should be changed around here // probably this should be changed around here
// and only andlabs stuff should be sent there? // and only andlabs stuff should be sent there?
// it's easier to code it this way however // it's easier to code it this way however
// also, if it dies here, it get's caught // also, if it dies here, it get's caught
// usually, this is where it dies // usually, this is where it dies
log.Warn("about to send action into the andlabs ui.QueueMain()") log.Log(ANDLABS, "about to send action into the andlabs ui.QueueMain()")
ui.QueueMain(func() { ui.QueueMain(func() {
processAction(&currentA) processAction(&currentA)
}) })
} }
*/
func guiMain() { func guiMain() {
defer func() { defer func() {
if r := recover(); r != nil { if r := recover(); r != nil {
log.Warn("YAHOOOO Recovered in guiMain application:", r) log.Log(WARN, "YAHOOOO Recovered in guiMain application:", r)
log.Println("Recovered from panic:", r) log.Log(WARN, "Recovered from panic:", r)
log.Println("Stack trace:") log.Log(WARN, "Stack trace:")
debug.PrintStack() debug.PrintStack()
me.myTree.SendToolkitPanic() me.myTree.SendToolkitPanic()
return return
@ -59,6 +127,8 @@ func guiMain() {
// that is supposed to be displayed // that is supposed to be displayed
placeholderUI() placeholderUI()
me.myTree.InitOK()
// if nothing is working, run this instead to make // if nothing is working, run this instead to make
// sure you have something // sure you have something
// demoUI() // demoUI()
@ -66,20 +136,34 @@ func guiMain() {
} }
func Init() { func Init() {
log.Warn("Init() TODO: move init() to here") log.Log(WARN, "Init() TODO: move init() to here")
} }
// This is important. This sets the defaults for the gui. Without this, there isn't correct padding, etc // This is important. This sets the defaults for the gui. Without this, there isn't correct padding, etc
func init() { func initPlugin() {
log.Log(INFO, "Init() START") log.Log(INFO, "Init() START")
log.Log(INFO, "Init()") log.Log(INFO, "Init()")
// Can you pass values to a plugin init() ? Otherwise, there is no way to safely print // Can you pass values to a plugin init() ? Otherwise, there is no way to safely print
// log.Log(INFO, "init() Setting defaultBehavior = true") // log.Log(INFO, "init() Setting defaultBehavior = true")
// setDefaultBehavior(true) // setDefaultBehavior(true)
me.myTree = initTree()
// me.ok = true // this tells init() it's okay to work with gocui
/*
me.myTree = tree.New() me.myTree = tree.New()
me.myTree.PluginName = "andlabs" me.myTree.PluginName = "andlabs"
me.myTree.ActionFromChannel = queueMain // me.myTree.ActionFromChannel = queueMain
me.myTree.NodeAction = queueAction
me.myTree.Add = queueAdd
me.myTree.SetTitle = queueSetTitle
me.myTree.SetLabel = queueSetLabel
me.myTree.SetText = queueSetText
me.myTree.AddText = queueAddText
me.myTree.SetChecked = queueSetChecked
me.myTree.ToolkitClose = queueToolkitClose
*/
// TODO: this is messed up. run ui.Main() from the first add? Initialize it with an empty thing first? // TODO: this is messed up. run ui.Main() from the first add? Initialize it with an empty thing first?
// fake out the OS toolkit by making a fake window. This is probably needed for macos & windows // fake out the OS toolkit by making a fake window. This is probably needed for macos & windows

View File

@ -2,6 +2,9 @@ package main
import ( import (
// "os" // "os"
"os"
"go.wit.com/dev/andlabs/ui" "go.wit.com/dev/andlabs/ui"
_ "go.wit.com/dev/andlabs/ui/winmanifest" _ "go.wit.com/dev/andlabs/ui/winmanifest"
@ -37,41 +40,53 @@ import (
// ----------------------------- // -----------------------------
func place(p *tree.Node, n *tree.Node) bool { func place(p *tree.Node, n *tree.Node) bool {
log.Warn("SPEEDY newplace() 1 START", n.WidgetId, n.GetProgName(), n.GetLabel(), n.String())
log.Warn("SPEEDY newplace() n.State.Strings =", n.State.Strings)
log.Log(INFO, "place() 1 START", n.WidgetType, n.GetProgName(), n.GetLabel()) log.Log(INFO, "place() 1 START", n.WidgetType, n.GetProgName(), n.GetLabel())
if !ready(n) { if p == nil {
log.Warn("place() 1 START not ready()") log.Log(WARN, "place() parent == nil")
os.Exit(-1)
return false
}
if n == nil {
log.Log(WARN, "place() node == nil")
os.Exit(-1)
return false
}
if !ready(n) {
if n.WidgetType == widget.Window {
// TODO: figure out window in window placement
return true
}
log.Log(ERROR, "place() 1 START not ready()", n.WidgetType, n.GetProgName(), n.GetLabel())
return false return false
} }
log.Log(INFO, "place() 1 START ready()")
var tk, ptk *guiWidget var tk, ptk *guiWidget
tk = n.TK.(*guiWidget) tk = n.TK.(*guiWidget)
ptk = p.TK.(*guiWidget) ptk = p.TK.(*guiWidget)
log.Warn("SPEEDY newplace() 2 START", n.WidgetId, n.GetProgName(), n.GetLabel())
if ptk == nil { if ptk == nil {
log.Log(ERROR, "ptk == nil", p.GetProgName(), p.ParentId, p.WidgetType, ptk) log.Log(ERROR, "ptk == nil", p.GetProgName(), p.ParentId, p.WidgetType, ptk)
log.Log(ERROR, "n = ", n.GetProgName(), n.ParentId, n.WidgetType, tk) log.Log(ERROR, "n = ", n.GetProgName(), n.ParentId, n.WidgetType, tk)
log.Warn("SPEEDY ptk == nil", n.WidgetId, n.GetProgName()) log.Log(ERROR, "SPEEDY ptk == nil", n.WidgetId, n.GetProgName())
log.Sleep(1) log.Sleep(1)
panic("ptk == nil") panic("ptk == nil")
} }
// p.DumpWidget("parent: ")
// n.DumpWidget("child: ")
log.Log(INFO, "place() switch", p.WidgetType) // log.Log(WARN, "place() switch", p.WidgetType, n.WidgetId, n.GetProgName())
log.Warn("SPEEDY newplace() before switch", n.WidgetId, n.GetProgName())
switch p.WidgetType { switch p.WidgetType {
case widget.Grid: case widget.Grid:
tk.gridX = n.State.GridOffset.X - 1 tk.gridX = n.State.GridOffset.X - 1
tk.gridY = n.State.GridOffset.Y - 1 tk.gridY = n.State.GridOffset.Y - 1
log.Warn("place() on Grid at gridX,gridY", tk.gridX, tk.gridY) // log.Log(WARN, "place() on Grid at gridX,gridY", tk.gridX, tk.gridY)
ptk.uiGrid.Append(tk.uiControl, ptk.uiGrid.Append(tk.uiControl,
tk.gridX, tk.gridY, 1, 1, tk.gridX, tk.gridY, 1, 1,
false, ui.AlignFill, false, ui.AlignFill) false, ui.AlignFill, false, ui.AlignFill)
return true return true
case widget.Group: case widget.Group:
if ptk.uiBox == nil { if ptk.uiBox == nil {
log.Log(WARN, "place() andlabs hack group to use add a box", n.GetProgName(), n.WidgetType) log.Log(ANDLABS, "place() andlabs hack group to use add a box", n.GetProgName(), n.WidgetType)
n.State.Direction = widget.Vertical
ptk.uiBox = rawBox(n) ptk.uiBox = rawBox(n)
ptk.uiGroup.SetChild(ptk.uiBox) ptk.uiGroup.SetChild(ptk.uiBox)
} }
@ -91,14 +106,10 @@ func place(p *tree.Node, n *tree.Node) bool {
panic("tk.uiControl == nil") panic("tk.uiControl == nil")
} }
log.Log(ERROR, "CHECK LOGIC ON THIS. APPENDING directly into a window without a tab") log.Log(ERROR, "CHECK LOGIC ON THIS. APPENDING directly into a window without a tab")
// log.Log(ERROR, "THIS SHOULD NEVER HAPPEN ??????? trying to place() node=", n.WidgetId, n.GetProgName(), n.Text, n.WidgetType) ptk.uiTab.Append(n.State.Label, tk.uiControl)
// log.Log(ERROR, "THIS SHOULD NEVER HAPPEN ??????? trying to place() on parent=", p.WidgetId, p.GetProgName(), p.Text, p.WidgetType)
// panic("tk.uiControl == nil")
ptk.uiTab.Append(widget.GetString(n.State.Value), tk.uiControl)
ptk.boxC += 1 ptk.boxC += 1
return true return true
case widget.Box: case widget.Box:
log.Warn("SPEEDY Add Something to Box", n.WidgetId, n.GetProgName())
log.Log(INFO, "place() uiBox =", ptk.uiBox) log.Log(INFO, "place() uiBox =", ptk.uiBox)
log.Log(INFO, "place() uiControl =", tk.uiControl) log.Log(INFO, "place() uiControl =", tk.uiControl)
if n.WidgetType == widget.Textbox { if n.WidgetType == widget.Textbox {
@ -109,12 +120,16 @@ func place(p *tree.Node, n *tree.Node) bool {
ptk.boxC += 1 ptk.boxC += 1
return true return true
case widget.Window: case widget.Window:
log.Warn("SPEEDY Add Something to Window", n.WidgetId, n.GetProgName()) log.Log(INFO, "Adding Something to Window", n.WidgetId, n.GetProgName())
if n.WidgetType == widget.Window {
log.Log(INFO, "TODO: make window in a window a tab", n.WidgetId, n.GetProgName())
return true
}
ptk.uiWindow.SetChild(tk.uiControl) ptk.uiWindow.SetChild(tk.uiControl)
return true return true
default: default:
log.Log(ERROR, "place() how? Parent =", p.WidgetId, p.WidgetType) log.Log(ERROR, "place() how? Parent =", p.WidgetId, p.WidgetType)
} }
log.Warn("SPEEDY newplace() return", n.WidgetId, n.GetProgName()) log.Log(ERROR, "newplace() returned without doing anything", n.WidgetId, n.GetProgName())
return false return false
} }

View File

@ -6,22 +6,20 @@ import (
"go.wit.com/widget" "go.wit.com/widget"
) )
// func (n *node) setText(a *widget.Action) { func realSetText(n *tree.Node, name string) {
func setText(n *tree.Node, a *widget.Action) { // name := widget.GetString(a.Value)
name := widget.GetString(a.Value)
var tk *guiWidget var tk *guiWidget
tk = n.TK.(*guiWidget) tk = n.TK.(*guiWidget)
log.Log(CHANGE, "setText() START with text =", name) log.Log(ANDLABS, "setText() START with text =", name, n.WidgetType)
if tk == nil { if tk == nil {
log.Log(ERROR, "setText error. tk == nil", n.GetProgName(), n.WidgetId) log.Log(ERROR, "setText error. tk == nil", n.GetProgName(), n.WidgetId)
return return
} }
log.Log(CHANGE, "setText() Attempt on", n.WidgetType, "with", name)
switch n.WidgetType { switch n.WidgetType {
case widget.Window: case widget.Window:
log.Warn("setText() Attempt to set the title to", name) log.Log(ANDLABS, "setText() Attempt to set the title to", name)
tk.uiWindow.SetTitle(name) tk.uiWindow.SetTitle(name)
case widget.Tab: case widget.Tab:
case widget.Group: case widget.Group:
@ -29,6 +27,7 @@ func setText(n *tree.Node, a *widget.Action) {
case widget.Checkbox: case widget.Checkbox:
tk.uiCheckbox.SetText(name) tk.uiCheckbox.SetText(name)
case widget.Textbox: case widget.Textbox:
log.Log(ANDLABS, "setText() on Textbox START with text =", name)
if tk.uiEntry != nil { if tk.uiEntry != nil {
tk.uiEntry.SetText(name) tk.uiEntry.SetText(name)
} }
@ -40,21 +39,21 @@ func setText(n *tree.Node, a *widget.Action) {
case widget.Button: case widget.Button:
tk.uiButton.SetText(name) tk.uiButton.SetText(name)
case widget.Slider: case widget.Slider:
log.Log(ERROR, "setText() on slider unknown", a.ActionType, "on checkbox", n.GetProgName()) log.Log(ERROR, "setText() on slider unknown", n.GetProgName())
case widget.Spinner: case widget.Spinner:
log.Log(ERROR, "setText() on spinner unknown", a.ActionType, "on checkbox", n.GetProgName()) log.Log(ERROR, "setText() on spinner unknown", n.GetProgName())
case widget.Dropdown: case widget.Dropdown:
var orig int var orig int
var i int = -1 var i int = -1
var s string var s string
orig = tk.uiCombobox.Selected() orig = tk.uiCombobox.Selected()
log.Log(CHANGE, "try to set the Dropdown to", name, "from", orig) log.Log(ANDLABS, "try to set the Dropdown to", name, "from", orig)
// try to find the string // try to find the string
for i, s = range tk.val { for i, s = range tk.val {
log.Log(CHANGE, "i, s", i, s) log.Log(ANDLABS, "i, s", i, s)
if name == s { if name == s {
tk.uiCombobox.SetSelected(i) tk.uiCombobox.SetSelected(i)
log.Log(CHANGE, "setText() Dropdown worked.", name) log.Log(ANDLABS, "setText() Dropdown worked.", name)
return return
} }
} }
@ -70,7 +69,7 @@ func setText(n *tree.Node, a *widget.Action) {
case widget.Combobox: case widget.Combobox:
tk.uiEditableCombobox.SetText(name) tk.uiEditableCombobox.SetText(name)
default: default:
log.Log(ERROR, "plugin Send() Don't know how to setText on", n.WidgetType, "yet", a.ActionType) log.Log(ERROR, "plugin Send() Don't know how to setText on", n.WidgetType, "yet")
} }
log.Log(CHANGE, "setText() END with name =") log.Log(ANDLABS, "setText() END with name =")
} }

View File

@ -22,7 +22,7 @@ func newSlider(p, n *tree.Node) {
newt.uiControl = s newt.uiControl = s
s.OnChanged(func(spin *ui.Slider) { s.OnChanged(func(spin *ui.Slider) {
n.SetValue(newt.uiSlider.Value()) n.State.CurrentI = newt.uiSlider.Value()
me.myTree.SendUserEvent(n) me.myTree.SendUserEvent(n)
}) })

View File

@ -18,7 +18,7 @@ func newSpinner(p, n *tree.Node) {
newt.uiControl = s newt.uiControl = s
s.OnChanged(func(s *ui.Spinbox) { s.OnChanged(func(s *ui.Spinbox) {
n.SetValue(newt.uiSpinbox.Value()) n.State.CurrentI = newt.uiSpinbox.Value()
me.myTree.SendUserEvent(n) me.myTree.SendUserEvent(n)
}) })

View File

@ -1,15 +1,15 @@
package main package main
import ( import (
"sync"
"go.wit.com/toolkits/tree" "go.wit.com/toolkits/tree"
"go.wit.com/dev/andlabs/ui" "go.wit.com/dev/andlabs/ui"
_ "go.wit.com/dev/andlabs/ui/winmanifest" _ "go.wit.com/dev/andlabs/ui/winmanifest"
) )
// var andlabs map[int]*andlabsT var initOnce sync.Once // run initPlugin() only once
// var callback func(int) bool
// var callback chan toolkit.Action
// It's probably a terrible idea to call this 'me' // It's probably a terrible idea to call this 'me'
var me config var me config

20
tab.go
View File

@ -32,16 +32,16 @@ func (p *node) newTab(n *node) {
} }
t := p.tk t := p.tk
log.Log(TOOLKIT, "newTab() START", n.WidgetId, n.ParentId) log.Log(ANDLABS, "newTab() START", n.WidgetId, n.ParentId)
if t.uiTab == nil { if t.uiTab == nil {
// this means you have to make a new tab // this means you have to make a new tab
log.Log(TOOLKIT, "newTab() GOOD. This should be the first tab:", n.WidgetId, n.ParentId) log.Log(ANDLABS, "newTab() GOOD. This should be the first tab:", n.WidgetId, n.ParentId)
newt = rawTab(t.uiWindow, widget.GetString(n.value)) newt = rawTab(t.uiWindow, widget.GetString(n.value))
t.uiTab = newt.uiTab t.uiTab = newt.uiTab
} else { } else {
// this means you have to append a tab // this means you have to append a tab
log.Log(TOOLKIT, "newTab() GOOD. This should be an additional tab:", n.WidgetId, n.ParentId) log.Log(ANDLABS, "newTab() GOOD. This should be an additional tab:", n.WidgetId, n.ParentId)
if n.WidgetType == widget.Tab { if n.WidgetType == widget.Tab {
// andlabs doesn't have multiple tab widgets so make a fake one? // andlabs doesn't have multiple tab widgets so make a fake one?
// this makes a guiWidget internal structure with the parent values // this makes a guiWidget internal structure with the parent values
@ -63,18 +63,16 @@ func (p *node) newTab(n *node) {
func tabSetMargined(tab *ui.Tab, b bool) { func tabSetMargined(tab *ui.Tab, b bool) {
c := tab.NumPages() c := tab.NumPages()
for i := 0; i < c; i++ { for i := 0; i < c; i++ {
log.Log(TOOLKIT, "SetMargined", i, b) log.Log(ANDLABS, "SetMargined", i, b)
tab.SetMargined(i, b) tab.SetMargined(i, b)
} }
} }
func rawTab(w *ui.Window, name string) *guiWidget { func rawTab(w *ui.Window, name string) *guiWidget {
var newt guiWidget var newt guiWidget
log.Log(TOOLKIT, "rawTab() START", name) log.Log(ANDLABS, "rawTab() START", name)
if w == nil { if w == nil {
log.Log(ERROR, "UiWindow == nil. I can't add a tab without a window")
log.Log(ERROR, "UiWindow == nil. I can't add a tab without a window")
log.Log(ERROR, "UiWindow == nil. I can't add a tab without a window") log.Log(ERROR, "UiWindow == nil. I can't add a tab without a window")
// sleep(1) // sleep(1)
return nil return nil
@ -84,20 +82,20 @@ func rawTab(w *ui.Window, name string) *guiWidget {
w.SetChild(tab) w.SetChild(tab)
newt.uiTab = tab newt.uiTab = tab
newt.uiControl = tab newt.uiControl = tab
log.Log(TOOLKIT, "rawTab() END", name) log.Log(ANDLABS, "rawTab() END", name)
return &newt return &newt
} }
/* /*
func (t *guiWidget) appendTab(name string) *guiWidget { func (t *guiWidget) appendTab(name string) *guiWidget {
var newT guiWidget var newT guiWidget
log.Log(TOOLKIT, "appendTab() ADD", name) log.Log(ANDLABS, "appendTab() ADD", name)
if t.uiTab == nil { if t.uiTab == nil {
log.Log(TOOLKIT, "UiWindow == nil. I can't add a widget without a place to put it") log.Log(ANDLABS, "UiWindow == nil. I can't add a widget without a place to put it")
panic("should never have happened. wit/gui/toolkit has ui.Tab == nil") panic("should never have happened. wit/gui/toolkit has ui.Tab == nil")
} }
log.Log(TOOLKIT, "appendTab() START name =", name) log.Log(ANDLABS, "appendTab() START name =", name)
var hbox *ui.Box var hbox *ui.Box
if defaultBehavior { if defaultBehavior {

13
table.go Normal file
View File

@ -0,0 +1,13 @@
// Copyright 2017-2025 WIT.COM Inc. All rights reserved.
// Use of this source code is governed by the GPL 3.0
package main
import (
"go.wit.com/lib/protobuf/guipb"
"go.wit.com/log"
)
func showTable(t *guipb.Table) {
log.Info("should show table here")
}

View File

@ -17,18 +17,20 @@ func newTextbox(p, n *tree.Node) {
e := ui.NewEntry() e := ui.NewEntry()
newt.uiEntry = e newt.uiEntry = e
newt.uiControl = e newt.uiControl = e
newt.uiEntry.SetText(n.State.DefaultS)
e.OnChanged(func(spin *ui.Entry) { e.OnChanged(func(spin *ui.Entry) {
n.SetValue(spin.Text()) n.State.CurrentS = spin.Text()
me.myTree.SendUserEvent(n) me.myTree.SendUserEvent(n)
}) })
} else { } else {
e := ui.NewNonWrappingMultilineEntry() e := ui.NewNonWrappingMultilineEntry()
newt.uiMultilineEntry = e newt.uiMultilineEntry = e
newt.uiControl = e newt.uiControl = e
newt.uiMultilineEntry.SetText(n.State.DefaultS)
e.OnChanged(func(spin *ui.MultilineEntry) { e.OnChanged(func(spin *ui.MultilineEntry) {
n.SetValue(spin.Text()) n.State.CurrentS = spin.Text()
me.myTree.SendUserEvent(n) me.myTree.SendUserEvent(n)
}) })
} }

31
tree.go
View File

@ -1,31 +0,0 @@
package main
/*
This code should be common to all gui plugins
There are some helper functions that are probably going to be
the same everywhere. Mostly due to handling the binary tree structure
and the channel communication
For now, it's just a symlink to the 'master' version in
./toolkit/nocui/common.go
*/
import (
"go.wit.com/widget"
)
// Other goroutines must use this to access the GUI
//
// You can not acess / process the GUI thread directly from
// other goroutines. This is due to the nature of how
// Linux, MacOS and Windows work (they all work differently. suprise. surprise.)
//
// this sets the channel to send user events back from the plugin
func Callback(guiCallback chan widget.Action) {
me.myTree.Callback(guiCallback)
}
func PluginChannel() chan widget.Action {
return me.myTree.PluginChannel()
}

79
treeInit.go Normal file
View File

@ -0,0 +1,79 @@
// Copyright 2017-2025 WIT.COM Inc. All rights reserved.
// Use of this source code is governed by the GPL 3.0
/*
DO NOT EDIT THIS FILE
this file is the same for every GUI toolkit plugin
when you are making a new GUI toolkit plugin for
a specific toolkit, you just need to define these
functions.
for example, in the "gocui" toolkit, the functions
below are what triggers the "gocui" GO package
to draw labels, buttons, windows, etc
If you are starting out trying to make a new GUI toolkit,
all you have to do is copy this file over. Then
work on making these functions. addWidget(), setText(), etc.
That's it!
*/
package main
/*
This is reference code for toolkit developers
This is how information is passed in GO back to the application
via the GO 'plugin' concept
TODO: switch this to protocol buffers
*/
import (
"go.wit.com/toolkits/tree"
"go.wit.com/widget"
)
// Other goroutines must use this to access the GUI
//
// You can not acess / process the GUI thread directly from
// other goroutines. This is due to the nature of how
// Linux, MacOS and Windows work (they all work differently. suprise. surprise.)
//
// this sets the channel to send user events back from the plugin
func Callback(guiCallback chan widget.Action) {
me.myTree.Callback(guiCallback)
}
func PluginChannel() chan widget.Action {
initOnce.Do(initPlugin)
return me.myTree.PluginChannel()
}
func FrozenChannel() chan widget.Action {
return me.myTree.FrozenChannel()
}
func initTree() *tree.TreeInfo {
t := tree.New()
t.PluginName = PLUGIN
t.Add = newAdd
t.SetTitle = setTitle
t.SetLabel = setLabel
t.SetText = setText
t.AddText = addText
t.Enable = enableWidget
t.Disable = disableWidget
t.Show = showWidget
t.Hide = hideWidget
t.SetChecked = setChecked
t.ToolkitClose = toolkitClose
t.ShowTable = showTable
return t
}

View File

@ -3,6 +3,8 @@ package main
import ( import (
"go.wit.com/dev/andlabs/ui" "go.wit.com/dev/andlabs/ui"
_ "go.wit.com/dev/andlabs/ui/winmanifest" _ "go.wit.com/dev/andlabs/ui/winmanifest"
"go.wit.com/log"
"go.wit.com/widget"
"go.wit.com/toolkits/tree" "go.wit.com/toolkits/tree"
) )
@ -20,33 +22,24 @@ func newWindow(p, n *tree.Node) {
newt = new(guiWidget) newt = new(guiWidget)
// bool == false is if the OS defined border on the window should be used // bool == false is if the OS defined border on the window should be used
win := ui.NewWindow(n.GetProgName(), 640, 480, n.State.Borderless) win := ui.NewWindow(n.GetProgName(), 40, 40, n.State.Borderless)
win.SetBorderless(n.State.Borderless) win.SetBorderless(n.State.Borderless)
win.SetMargined(n.State.Pad) win.SetMargined(n.State.Pad)
win.OnClosing(func(*ui.Window) bool { win.OnClosing(func(*ui.Window) bool {
// show(n, false) newt.uiWindow = nil // delete the local reference to the window
me.myTree.SendWindowCloseEvent(n) me.myTree.SendWindowCloseEvent(n)
n.DeleteNode() // n.DeleteNode()
return true return true
}) })
newt.uiWindow = win newt.uiWindow = win
newt.uiControl = win newt.uiControl = win
n.TK = newt n.TK = newt
if p.WidgetType == widget.Window {
log.Log(WARN, "newWindow() TODO: make this window a tab")
} else {
place(p, n) place(p, n)
}
win.Show() win.Show()
return return
} }
/*
func (n *node) SetWindowTitle(title string) {
log.Log(CHANGE, "toolkit NewWindow", widget.GetString(n.value), "title", title)
win := n.tk.uiWindow
if win == nil {
log.Log(ERROR, "Error: no window", n.WidgetId)
} else {
win.SetTitle(title)
log.Log(CHANGE, "Setting the window title", title)
}
}
*/