Compare commits

...

39 Commits

Author SHA1 Message Date
Jeff Carr 25a074d02d still doesn't trap panic 2025-09-05 01:24:41 -05:00
Jeff Carr 9b1e7f102e rearrange output to see if it ever is showing up 2025-09-04 19:18:14 -05:00
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
28 changed files with 518 additions and 382 deletions

4
.gitignore vendored
View File

@ -1 +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:
GO111MODULE="off" go build -v -x -buildmode=plugin -o ../andlabs.so
all: clean goimports vet 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:
GO111MODULE="off" go get -v -t -u
@ -9,6 +21,11 @@ goget:
goimports:
goimports -w *.go
vet:
@GO111MODULE=off go vet
@echo this go plugin builds okay
redomod:
rm -f 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

128
action.go
View File

@ -1,8 +1,6 @@
package main
import (
"errors"
"go.wit.com/log"
"go.wit.com/toolkits/tree"
"go.wit.com/widget"
@ -82,7 +80,6 @@ func ready(n *tree.Node) bool {
func hide(n *tree.Node) {
show(n, false)
n.State.Hidden = true
}
func show(n *tree.Node, b bool) {
@ -106,7 +103,7 @@ func show(n *tree.Node, b bool) {
}
}
func enable(n *tree.Node, b bool) {
func realEnable(n *tree.Node, b bool) {
if !ready(n) {
return
}
@ -151,6 +148,15 @@ 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) {
log.Log(ANDLABS, "widgetDelete()", n.WidgetId, n.WidgetType)
var tk *guiWidget
@ -163,116 +169,44 @@ func widgetDelete(n *tree.Node) {
tk.uiWindow.Destroy()
tk.uiWindow = nil
}
n.DeleteNode()
// n.DeleteNode()
} else {
log.Log(ANDLABS, "DESTROY can't destroy TODO:", n.WidgetId, n.WidgetType)
}
}
func processAction(a *widget.Action) {
log.Log(ANDLABS, "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 {
log.Log(ERROR, "processAction() Something terrible has happened")
log.Log(ERROR, "processAction() treeNode was sent an action", a.ActionType, a)
}
return
func SetTitle(n *tree.Node, s string) {
SetText(n, s)
}
log.Log(ANDLABS, "andlabs processAction() START a.WidgetId =", a.WidgetId, "a.ParentId =", a.ParentId, a.ActionType)
switch a.WidgetType {
case widget.Flag:
log.Log(ERROR, "processAction() RE-IMPLEMENT LOG FLAGS")
return
func SetLabel(n *tree.Node, s string) {
SetText(n, s)
}
if me.treeRoot == nil {
panic("me.treeRoot == nil")
}
if a.ActionType == widget.Add {
n := add(a)
// show(n, !a.State.Hidden)
if a.State.Hidden {
hide(n)
} else {
if a.State.Enable {
// nothing to do
} else {
enable(n, false)
}
}
// pad(n, n.State.Pad)
// expand(n, a.State.Expand)
return
}
n := me.treeRoot.FindWidgetId(a.WidgetId)
func SetText(n *tree.Node, s string) {
if n == nil {
if a.ActionType == widget.Delete {
// this is normal. the widget is aleady deleted
log.Log(WARN, "Tree Error: Add() sent n == nil")
return
}
if a.WidgetType == widget.Window {
// this could happen maybe someday
log.Log(ANDLABS, "processAction() trying on nonexistant window", a.WidgetId, a.ActionType)
if n.TK == nil {
log.Log(WARN, "SetText() Tree sent an action on a widget we didn't seem to have.", n.WidgetId)
return
}
log.Error(errors.New("andlabs processAction() ERROR findWidgetId found nil"), a.ActionType, a.WidgetType)
log.Log(WARN, "processAction() ERROR findWidgetId found nil for id =", a.WidgetId)
log.Log(WARN, "processAction() ERROR findWidgetId found nil", a.ActionType, a.WidgetType)
log.Log(WARN, "processAction() ERROR findWidgetId found nil for id =", a.WidgetId)
if WARN.Bool() {
me.treeRoot.ListWidgets()
}
return
panic("findWidgetId found nil for id = " + string(a.WidgetId))
setText(n, s)
log.Log(ANDLABS, "SetText() (new)", n.WidgetType, n.String(), s)
}
if a.ActionType == widget.Dump {
log.Log(NOW, "processAction() Dump =", a.ActionType, a.WidgetType, n.State.ProgName)
func AddText(n *tree.Node, s string) {
if n == nil {
log.Log(WARN, "Tree Error: Add() sent n == nil")
return
}
switch a.ActionType {
case widget.Delete:
widgetDelete(n)
case widget.Show:
show(n, true)
case widget.Hide:
hide(n)
case widget.Enable:
enable(n, true)
case widget.Disable:
log.Log(ANDLABS, "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
if n.TK == nil {
log.Log(WARN, "AddText() Tree sent an action on a widget we didn't seem to have.", n.WidgetId)
return
}
case widget.Set:
setText(n, a)
case widget.SetText:
log.Log(ANDLABS, "andlabs SetText wid =", n.WidgetId, n.State.Value, a.State.Value)
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)
log.Log(ANDLABS, "AddText()", n.WidgetType, n.String())
// w := n.TK.(*guiWidget)
// w.AddText(s)
addText(n, s)
}

56
add.go
View File

@ -6,16 +6,7 @@ import (
"go.wit.com/widget"
)
func add(a *widget.Action) *tree.Node {
log.Log(ANDLABS, "add()", a.WidgetId, a.WidgetType, 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)
func add(n *tree.Node) {
p := n.Parent
switch n.WidgetType {
case widget.Window:
@ -32,27 +23,60 @@ func add(a *widget.Action) *tree.Node {
newButton(p, n)
case widget.Checkbox:
newCheckbox(p, n)
setChecked(n, a.State.Checked)
setChecked(n, n.State.Checked)
case widget.Spinner:
newSpinner(p, n)
case widget.Slider:
newSlider(p, n)
case widget.Dropdown:
newDropdown(p, n)
setText(n, a)
// setText(n, n.State.DefaultS)
case widget.Combobox:
newCombobox(p, n)
setText(n, a)
// setText(n, n.State.DefaultS)
case widget.Textbox:
newTextbox(p, n)
setText(n, a)
// setText(n, n.State.DefaultS)
/*
case widget.Image:
newImage(p, n)
*/
default:
log.Log(ERROR, "add() error TODO: ", n.WidgetType, n.State.ProgName)
log.Log(ERROR, "add() error TODO: ", n.WidgetType, n.ProgName())
}
}
return n
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)
}
}
}

View File

@ -6,39 +6,23 @@ import (
"go.wit.com/widget"
)
func compareStrings(n *tree.Node, ss []string) {
}
// func (n *node) addText(a *widget.Action) {
func addText(n *tree.Node, a *widget.Action) {
func realAddText(n *tree.Node, s string) {
var tk *guiWidget
tk = n.TK.(*guiWidget)
log.Log(ANDLABS, "addText() START with a.Value =", a.Value)
log.Log(ANDLABS, "addText() START with s =", s)
if tk == nil {
log.Log(ERROR, "addText error. tk == nil", n.State.ProgName, n.WidgetId)
return
}
log.Log(ANDLABS, "addText() Attempt on", n.WidgetType, "with", a.Value)
log.Log(ANDLABS, "addText() Attempt on", n.WidgetType, "with", s)
switch n.WidgetType {
case widget.Dropdown:
for i, s := range a.State.Strings {
log.Log(ANDLABS, "a.State.Strings =", i, s)
_, ok := n.Strings[s]
// If the key exists
if ok {
log.Log(ANDLABS, "string is already in the dropdown", i, s)
} else {
log.Log(ANDLABS, "adding new string to dropdown", i, s)
addDropdownName(n, s)
// TODO: make numbers
n.Strings[s] = 21
}
}
case widget.Combobox:
addComboboxName(n, widget.GetString(a.Value))
addComboboxName(n, s)
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(ANDLABS, "addText() END with a.Value =", a.Value)
log.Log(ANDLABS, "addText() END with =", s)
}

1
box.go
View File

@ -50,7 +50,6 @@ func newBox(n *tree.Node) {
TODO: handle user killing/closing a window using the OS
*/
// func (n *node) rawBox() *ui.Box {
func rawBox(n *tree.Node) *ui.Box {
var box *ui.Box

View File

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

View File

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

View File

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

View File

@ -27,9 +27,9 @@ func newDropdown(p, n *tree.Node) {
i := spin.Selected()
if newt.val == nil {
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 {
n.SetValue(newt.val[i])
n.State.CurrentS = newt.val[i]
}
me.myTree.SendUserEvent(n)
})
@ -93,12 +93,12 @@ func setDropdownName(n *tree.Node, s string) bool {
for i, tmp := range tk.val {
if s == tmp {
n.SetValue(s)
n.State.CurrentS = s
setDropdownInt(n, i)
log.Log(ANDLABS, "SetDropdownInt() worked", tmp, i)
return true
}
}
log.Warn("SetDropdownName() failed", s, n.WidgetId, n.GetProgName())
log.Log(WARN, "SetDropdownName() failed", s, n.WidgetId, n.GetProgName())
return false
}

View File

@ -11,11 +11,9 @@ import (
var NOW *log.LogFlag
var INFO *log.LogFlag
var SPEW *log.LogFlag
var WARN *log.LogFlag
var ERROR *log.LogFlag
var CHANGE *log.LogFlag
var ANDLABS *log.LogFlag
func init() {
@ -25,10 +23,7 @@ func init() {
NOW = log.NewFlag("NOW", true, full, short, "temp debugging stuff")
INFO = log.NewFlag("INFO", false, full, short, "normal debugging stuff")
WARN = log.NewFlag("WARN", false, full, short, "bad things")
SPEW = log.NewFlag("SPEW", false, full, short, "spew stuff")
CHANGE = log.NewFlag("CHANGE", false, full, short, "show when the user does things")
WARN = log.NewFlag("WARN", true, full, short, "bad things")
full = "go.wit.com/gui"
short = "andlabs"

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.13.18
go.wit.com/toolkits/tree v0.13.18
go.wit.com/widget v1.1.9
)
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.13.18 h1:XJNaQWX+8m12p3mH+kYih3zNjb0kScZDFpJa4c2TvKE=
go.wit.com/log v0.13.18/go.mod h1:BaJBfHFqcJSJLXGQ9RHi3XVhPgsStxSMZRlaRxW4kAo=
go.wit.com/toolkits/tree v0.13.18 h1:oGoLNc1Ax9/sM9nrQQvutjbpDAyORA2q/9R2vXprw/0=
go.wit.com/toolkits/tree v0.13.18/go.mod h1:rrcu2kaZH9gAy9DzEgAGNVI8hOB/BsoKaR03zRCcPW0=
go.wit.com/widget v1.1.9 h1:iltjAL8UZu0YPfia8/qyfDx04BDxhj8rURcx0OHVBEc=
go.wit.com/widget v1.1.9/go.mod h1:I8tnD3x3ECbB/CRNnLCdC+uoyk7rK0AEkzK1bQYSqoQ=

191
init.go Normal file
View File

@ -0,0 +1,191 @@
// plugin
package main
import (
"runtime/debug"
"sync"
"time"
"go.wit.com/log"
"go.wit.com/toolkits/tree"
"go.wit.com/dev/andlabs/ui"
// the _ means we only need this for the init()
_ "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 uiMain sync.Once
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) {
// this never happends
defer func() {
if r := recover(); r != nil {
log.Log("YAHOOOO Recovered in queueMain() application:", r)
log.Println("Recovered from panic:", r)
log.Println("Stack trace:")
debug.PrintStack()
me.myTree.SendToolkitPanic()
}
}()
// andlabs puts this inside the gofunction over there
// probably this should be changed around here
// and only andlabs stuff should be sent there?
// it's easier to code it this way however
// also, if it dies here, it get's caught
// usually, this is where it dies
log.Log(ANDLABS, "about to send action into the andlabs ui.QueueMain()")
ui.QueueMain(func() {
processAction(&currentA)
})
}
*/
func guiMain() {
defer func() {
if r := recover(); r != nil {
log.Log(WARN, "YAHOO andlabs GUI recovered in guiMain()")
log.Log(WARN, "Stack trace:")
debug.PrintStack()
log.Log(WARN, "Recovered from panic:", r)
log.Log(WARN, "andlabs GUI recovered in guiMain()")
log.Log(WARN, "YAHOO andlabs GUI recovered in guiMain()")
me.myTree.SendToolkitPanic()
return
}
}()
// TODO: THIS IS THE PROBLEM
ui.Main(func() {
// this is a bad hack for now.
// a better way would be to spawn ui.Main on the first actual window
// that is supposed to be displayed
if r := recover(); r != nil {
log.Log(WARN, "YAHOO andlabs GUI recovered in guiMain()")
log.Log(WARN, "Stack trace:")
debug.PrintStack()
log.Log(WARN, "Recovered from panic:", r)
log.Log(WARN, "andlabs GUI recovered in guiMain()")
log.Log(WARN, "YAHOO andlabs GUI recovered in guiMain()")
me.myTree.SendToolkitPanic()
return
}
time.Sleep(time.Second)
placeholderUI()
me.myTree.InitOK()
// if nothing is working, run this instead to make
// sure you have something
// demoUI()
})
}
func Init() {
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
func initPlugin() {
log.Log(INFO, "Init() START")
log.Log(INFO, "Init()")
// Can you pass values to a plugin init() ? Otherwise, there is no way to safely print
// log.Log(INFO, "init() Setting defaultBehavior = 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.PluginName = "andlabs"
// 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?
// fake out the OS toolkit by making a fake window. This is probably needed for macos & windows
// actually, this probably breaks the macos build
go guiMain()
}
func main() {
}

91
main.go
View File

@ -1,91 +0,0 @@
package main
import (
"runtime/debug"
"sync"
"go.wit.com/log"
"go.wit.com/toolkits/tree"
"go.wit.com/widget"
"go.wit.com/dev/andlabs/ui"
// the _ means we only need this for the init()
_ "go.wit.com/dev/andlabs/ui/winmanifest"
)
var uiMainUndef bool = true
var uiMain sync.Once
var muAction sync.Mutex
func queueMain(currentA widget.Action) {
/*
// this never happends
defer func() {
if r := recover(); r != nil {
log.Warn("YAHOOOO Recovered in queueMain() application:", r)
log.Println("Recovered from panic:", r)
log.Println("Stack trace:")
debug.PrintStack()
me.myTree.SendToolkitPanic()
}
}()
*/
// andlabs puts this inside the gofunction over there
// probably this should be changed around here
// and only andlabs stuff should be sent there?
// it's easier to code it this way however
// also, if it dies here, it get's caught
// usually, this is where it dies
log.Log(ANDLABS, "about to send action into the andlabs ui.QueueMain()")
ui.QueueMain(func() {
processAction(&currentA)
})
}
func guiMain() {
defer func() {
if r := recover(); r != nil {
log.Warn("YAHOOOO Recovered in guiMain application:", r)
log.Warn("Recovered from panic:", r)
log.Warn("Stack trace:")
debug.PrintStack()
me.myTree.SendToolkitPanic()
return
}
}()
ui.Main(func() {
// this is a bad hack for now.
// a better way would be to spawn ui.Main on the first actual window
// that is supposed to be displayed
placeholderUI()
// if nothing is working, run this instead to make
// sure you have something
// demoUI()
})
}
func Init() {
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
func init() {
log.Log(INFO, "Init() START")
log.Log(INFO, "Init()")
// Can you pass values to a plugin init() ? Otherwise, there is no way to safely print
// log.Log(INFO, "init() Setting defaultBehavior = true")
// setDefaultBehavior(true)
me.myTree = tree.New()
me.myTree.PluginName = "andlabs"
me.myTree.ActionFromChannel = queueMain
// 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
// actually, this probably breaks the macos build
go guiMain()
}
func main() {
}

View File

@ -2,6 +2,9 @@ package main
import (
// "os"
"os"
"go.wit.com/dev/andlabs/ui"
_ "go.wit.com/dev/andlabs/ui/winmanifest"
@ -38,6 +41,16 @@ import (
func place(p *tree.Node, n *tree.Node) bool {
log.Log(INFO, "place() 1 START", n.WidgetType, n.GetProgName(), n.GetLabel())
if p == nil {
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
@ -57,13 +70,15 @@ func place(p *tree.Node, n *tree.Node) bool {
log.Sleep(1)
panic("ptk == nil")
}
// p.DumpWidget("parent: ")
// n.DumpWidget("child: ")
log.Log(INFO, "place() switch", p.WidgetType, n.WidgetId, n.GetProgName())
// log.Log(WARN, "place() switch", p.WidgetType, n.WidgetId, n.GetProgName())
switch p.WidgetType {
case widget.Grid:
tk.gridX = n.State.GridOffset.X - 1
tk.gridY = n.State.GridOffset.Y - 1
log.Log(INFO, "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,
tk.gridX, tk.gridY, 1, 1,
false, ui.AlignFill, false, ui.AlignFill)
@ -91,10 +106,7 @@ func place(p *tree.Node, n *tree.Node) bool {
panic("tk.uiControl == nil")
}
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)
// 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.uiTab.Append(n.State.Label, tk.uiControl)
ptk.boxC += 1
return true
case widget.Box:
@ -109,6 +121,10 @@ func place(p *tree.Node, n *tree.Node) bool {
return true
case widget.Window:
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)
return true
default:

View File

@ -6,29 +6,28 @@ import (
"go.wit.com/widget"
)
// func (n *node) setText(a *widget.Action) {
func setText(n *tree.Node, a *widget.Action) {
name := widget.GetString(a.Value)
func realSetText(n *tree.Node, name string) {
// name := widget.GetString(a.Value)
var 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 {
log.Log(ERROR, "setText error. tk == nil", n.GetProgName(), n.WidgetId)
return
}
log.Log(CHANGE, "setText() Attempt on", n.WidgetType, "with", name)
switch n.WidgetType {
case widget.Window:
log.Log(CHANGE, "setText() Attempt to set the title to", name)
tk.uiWindow.SetTitle(a.State.Label)
log.Log(ANDLABS, "setText() Attempt to set the title to", name)
tk.uiWindow.SetTitle(name)
case widget.Tab:
case widget.Group:
tk.uiGroup.SetTitle(a.State.Label)
tk.uiGroup.SetTitle(name)
case widget.Checkbox:
tk.uiCheckbox.SetText(a.State.Label)
tk.uiCheckbox.SetText(name)
case widget.Textbox:
log.Log(ANDLABS, "setText() on Textbox START with text =", name)
if tk.uiEntry != nil {
tk.uiEntry.SetText(name)
}
@ -36,25 +35,25 @@ func setText(n *tree.Node, a *widget.Action) {
tk.uiMultilineEntry.SetText(name)
}
case widget.Label:
tk.uiLabel.SetText(a.State.Label)
tk.uiLabel.SetText(name)
case widget.Button:
tk.uiButton.SetText(a.State.Label)
tk.uiButton.SetText(name)
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:
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:
var orig int
var i int = -1
var s string
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
for i, s = range tk.val {
log.Log(CHANGE, "i, s", i, s)
log.Log(ANDLABS, "i, s", i, s)
if name == s {
tk.uiCombobox.SetSelected(i)
log.Log(CHANGE, "setText() Dropdown worked.", name)
log.Log(ANDLABS, "setText() Dropdown worked.", name)
return
}
}
@ -70,7 +69,7 @@ func setText(n *tree.Node, a *widget.Action) {
case widget.Combobox:
tk.uiEditableCombobox.SetText(name)
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
s.OnChanged(func(spin *ui.Slider) {
n.SetValue(newt.uiSlider.Value())
n.State.CurrentI = newt.uiSlider.Value()
me.myTree.SendUserEvent(n)
})

View File

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

View File

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

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()
newt.uiEntry = e
newt.uiControl = e
newt.uiEntry.SetText(n.State.DefaultS)
e.OnChanged(func(spin *ui.Entry) {
n.SetValue(spin.Text())
n.State.CurrentS = spin.Text()
me.myTree.SendUserEvent(n)
})
} else {
e := ui.NewNonWrappingMultilineEntry()
newt.uiMultilineEntry = e
newt.uiControl = e
newt.uiMultilineEntry.SetText(n.State.DefaultS)
e.OnChanged(func(spin *ui.MultilineEntry) {
n.SetValue(spin.Text())
n.State.CurrentS = spin.Text()
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 (
"go.wit.com/dev/andlabs/ui"
_ "go.wit.com/dev/andlabs/ui/winmanifest"
"go.wit.com/log"
"go.wit.com/widget"
"go.wit.com/toolkits/tree"
)
@ -24,29 +26,20 @@ func newWindow(p, n *tree.Node) {
win.SetBorderless(n.State.Borderless)
win.SetMargined(n.State.Pad)
win.OnClosing(func(*ui.Window) bool {
// show(n, false)
newt.uiWindow = nil // delete the local reference to the window
me.myTree.SendWindowCloseEvent(n)
n.DeleteNode()
// n.DeleteNode()
return true
})
newt.uiWindow = win
newt.uiControl = win
n.TK = newt
if p.WidgetType == widget.Window {
log.Log(WARN, "newWindow() TODO: make this window a tab")
} else {
place(p, n)
}
win.Show()
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)
}
}
*/