From 403dc4780b2c907f3292f4d6504ad5af2a0df7f1 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Wed, 6 Oct 2021 02:02:39 -0500 Subject: BUILD: remove old rules that don't work anymore Signed-off-by: Jeff Carr --- Makefile | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 2b7dd82..31212b9 100644 --- a/Makefile +++ b/Makefile @@ -1,19 +1,4 @@ -# simple sortcut to push all git changes -push: - git checkout devel - git pull - git add --all - -git commit -a -s - git push - # should update every go dependancy (?) update: git pull - go get -v -t -u ./... - -merge-devel: - git checkout master - git pull origin master - git merge devel - git push origin master - git checkout devel + GO111MODULE="off" go get -v -t -u ./... -- cgit v1.2.3 From e93fe915a6747dce10d7314dc968ebb734265ed0 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Wed, 6 Oct 2021 05:14:24 -0500 Subject: BUILD: suck it up and try to use go.mod Signed-off-by: Jeff Carr --- Makefile | 5 +++-- go.mod | 9 +++++++++ go.sum | 8 ++++++++ structs.go | 6 ++++++ window.go | 4 ++++ 5 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 go.mod create mode 100644 go.sum (limited to 'Makefile') diff --git a/Makefile b/Makefile index 31212b9..df5d201 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,5 @@ # should update every go dependancy (?) update: - git pull - GO111MODULE="off" go get -v -t -u ./... + # git pull + wit go update + # go get -v -t -u ./... diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..c72bbca --- /dev/null +++ b/go.mod @@ -0,0 +1,9 @@ +module git.wit.org/wit/gui + +go 1.17 + +require ( + github.com/andlabs/ui v0.0.0-20200610043537-70a69d6ae31e + github.com/davecgh/go-spew v1.1.1 + golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d +) diff --git a/go.sum b/go.sum new file mode 100644 index 0000000..27ff5d2 --- /dev/null +++ b/go.sum @@ -0,0 +1,8 @@ +github.com/andlabs/ui v0.0.0-20200610043537-70a69d6ae31e h1:wSQCJiig/QkoUnpvelSPbLiZNWvh2yMqQTQvIQqSUkU= +github.com/andlabs/ui v0.0.0-20200610043537-70a69d6ae31e/go.mod h1:5G2EjwzgZUPnnReoKvPWVneT8APYbyKkihDVAHUi0II= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d h1:RNPAfi2nHY7C2srAV8A49jpsYr0ADedCk1wq6fTMTvs= +golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM= +golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= diff --git a/structs.go b/structs.go index 59190f6..ac67588 100644 --- a/structs.go +++ b/structs.go @@ -44,6 +44,12 @@ type GuiData struct { buttonMap map[*ui.Button]*GuiButton } +type GuiTab struct { + Name string // field for human readable name + Number int // the andlabs/ui tab index + Window *GuiWindow // the parent Window +} + // // stores information on the 'window' // diff --git a/window.go b/window.go index da4f1a8..a6c5b4f 100644 --- a/window.go +++ b/window.go @@ -148,6 +148,7 @@ func CreateWindow(title string, tabname string, x int, y int, custom func() ui.C func CreateBlankWindow(title string, x int, y int) *GuiBox { box := mapWindow(nil, title, x, y) + log.Println("gui.CreateBlankWindow() title = box.Name =", box.Name) window := ui.NewWindow(box.Name, x, y, false) window.SetBorderless(false) @@ -178,6 +179,7 @@ func initBlankWindow() ui.Control { var master = 0 func mapWindow(window *ui.Window, title string, x int, y int) *GuiBox { + log.Println("gui.WindowMap START title =", title) if (Data.WindowMap[title] != nil) { log.Println("Data.WindowMap[title] already exists title =", title) master = master + 1 @@ -188,6 +190,7 @@ func mapWindow(window *ui.Window, title string, x int, y int) *GuiBox { panic("Data.WindowMap[newGuiWindow.Name] already exists") return nil } + log.Println("gui.WindowMap START title =", title) var newGuiWindow GuiWindow newGuiWindow.Width = x newGuiWindow.Height = y @@ -201,6 +204,7 @@ func mapWindow(window *ui.Window, title string, x int, y int) *GuiBox { var box GuiBox box.Window = &newGuiWindow + box.Name = title return &box } -- cgit v1.2.3 From 883159b940e711fbd3560edff8fcc3a2c2f68612 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Wed, 6 Oct 2021 11:17:43 -0500 Subject: EXAMPLE: further improvements to the example Signed-off-by: Jeff Carr --- Makefile | 14 +++++++++--- gui-example/Makefile | 4 ++-- gui-example/main.go | 6 +++--- main.go | 12 ++++++----- window-debug.go | 60 +++++++++++++++++++++++++++++++--------------------- 5 files changed, 59 insertions(+), 37 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index df5d201..7225bce 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,13 @@ +all: + @echo + @echo "make examples # will run all the examples" + @echo "make update # full git update" + @echo + # should update every go dependancy (?) update: - # git pull - wit go update - # go get -v -t -u ./... + git pull + go get -v -t -u ./... + +examples: + make -C gui-example diff --git a/gui-example/Makefile b/gui-example/Makefile index b705093..5028ebd 100644 --- a/gui-example/Makefile +++ b/gui-example/Makefile @@ -1,5 +1,5 @@ run: build - ~/go/bin/gui-example + ./gui-example build: - GO111MODULE="off" go install + GO111MODULE="off" go build diff --git a/gui-example/main.go b/gui-example/main.go index f3e4c48..1ff286d 100644 --- a/gui-example/main.go +++ b/gui-example/main.go @@ -16,8 +16,8 @@ func customExit(gw *gui.GuiWindow) { func main() { log.Println("starting my Control Panel") - gui.Config.Width = 1000 - gui.Config.Height = 400 + gui.Config.Width = 800 + gui.Config.Height = 300 gui.Config.Exit = customExit go gui.Main(initGUI) @@ -37,7 +37,7 @@ func watchGUI() { time.Sleep(time.Second) if i == 3 { log.Println("Sending ExampleWindow to gui.Queue()") - gui.Queue(gui.ExampleWindow) + gui.Queue(gui.DebugWindow) } } } diff --git a/main.go b/main.go index 6d371a6..09d105f 100644 --- a/main.go +++ b/main.go @@ -23,7 +23,6 @@ func Queue(f func()) { ui.QueueMain(f) } -// gui.Main(gui.MainExample()) func ExampleWindow() { log.Println("START gui.ExampleWindow()") @@ -37,12 +36,15 @@ func ExampleWindow() { window.UiWindow.Show() } -func TestExample() { - log.Println("gui.initUI() inside ui.Main()") +func DebugWindow() { + log.Println("START gui.ExampleWindow()") - box := InitWindow(nil, "test", 0) + title := "Debug Window" + box := InitWindow(nil, title, 0) window := box.Window - log.Println("StartNewWindow() box =", box) + log.Println("box =", box) + log.Println("window =", window) + box.AddDebugTab("jcarr Debug") window.UiWindow.Show() } diff --git a/window-debug.go b/window-debug.go index 6d757a2..bf93a9b 100644 --- a/window-debug.go +++ b/window-debug.go @@ -1,10 +1,12 @@ package gui -import "log" -import "github.com/andlabs/ui" -import _ "github.com/andlabs/ui/winmanifest" +import ( + "log" -import "github.com/davecgh/go-spew/spew" + "github.com/andlabs/ui" + _ "github.com/andlabs/ui/winmanifest" + "github.com/davecgh/go-spew/spew" +) var names = make([]string, 100) @@ -12,12 +14,12 @@ func makeWindowDebug() ui.Control { hbox := ui.NewHorizontalBox() hbox.SetPadded(true) -///////////////////////////////////////////////////// + ///////////////////////////////////////////////////// vbox := addGroup(hbox, "Numbers") pbar := ui.NewProgressBar() vbox.Append(pbar, false) -///////////////////////////////////////////////////// + ///////////////////////////////////////////////////// vbox = addGroup(hbox, "WindowMap 2") cbox := ui.NewCombobox() @@ -35,7 +37,7 @@ func makeWindowDebug() ui.Control { dumpBox(names[x]) }) -///////////////////////////////////////////////////// + ///////////////////////////////////////////////////// vbox = addGroup(hbox, "Buttons") b1 := addButton(vbox, "dumpBox(name)") @@ -46,6 +48,16 @@ func makeWindowDebug() ui.Control { dumpBox(names[x]) }) + dump2 := addButton(vbox, "Dump Boxes") + dump2.OnClicked(func(*ui.Button) { + DumpBoxes() + }) + + dump1 := addButton(vbox, "Dump MAP") + dump1.OnClicked(func(*ui.Button) { + DumpMap() + }) + b2 := addButton(vbox, "SetMargined()") b2.OnClicked(func(*ui.Button) { x := cbox.Selected() @@ -53,13 +65,13 @@ func makeWindowDebug() ui.Control { log.Println("findBox; names[x] =", names[x]) findBox(names[x]) gw := findBox(names[x]) - if (gw == nil) { + if gw == nil { return } - if (gw.UiTab == nil) { + if gw.UiTab == nil { return } - if (gw.TabNumber == nil) { + if gw.TabNumber == nil { return } scs := spew.ConfigState{MaxDepth: 1} @@ -76,10 +88,10 @@ func makeWindowDebug() ui.Control { log.Println("findBox; names[x] =", names[x]) findBox(names[x]) gw := findBox(names[x]) - if (gw == nil) { + if gw == nil { return } - if (gw.UiTab == nil) { + if gw.UiTab == nil { return } gw.UiTab.Hide() @@ -92,10 +104,10 @@ func makeWindowDebug() ui.Control { log.Println("findBox; names[x] =", names[x]) findBox(names[x]) gw := findBox(names[x]) - if (gw == nil) { + if gw == nil { return } - if (gw.UiTab == nil) { + if gw.UiTab == nil { return } gw.UiTab.Show() @@ -108,13 +120,13 @@ func makeWindowDebug() ui.Control { log.Println("findBox; names[x] =", names[x]) findBox(names[x]) gw := findBox(names[x]) - if (gw == nil) { + if gw == nil { return } - if (gw.UiTab == nil) { + if gw.UiTab == nil { return } - if (gw.TabNumber == nil) { + if gw.TabNumber == nil { return } gw.UiTab.Delete(*gw.TabNumber) @@ -145,7 +157,7 @@ func addGroup(b *ui.Box, name string) *ui.Box { func findBox(s string) *GuiWindow { for name, window := range Data.WindowMap { - if (name == s) { + if name == s { return window } } @@ -154,11 +166,11 @@ func findBox(s string) *GuiWindow { func dumpBox(s string) { for name, window := range Data.WindowMap { - if (name != s) { + if name != s { continue } log.Println("gui.DumpBoxes() MAP: ", name) - if (window.TabNumber == nil) { + if window.TabNumber == nil { log.Println("gui.DumpBoxes() \tWindows.TabNumber = nil") } else { log.Println("gui.DumpBoxes() \tWindows.TabNumber =", *window.TabNumber) @@ -169,18 +181,18 @@ func dumpBox(s string) { log.Println("gui.DumpBoxes()\tWindow.UiTab =", window.UiTab) for name, abox := range window.BoxMap { log.Printf("gui.DumpBoxes() \tBOX mapname=%-12s abox.Name=%-12s", name, abox.Name) - if (name == "MAINBOX") { - if (Config.Debug) { + if name == "MAINBOX" { + if Config.Debug { scs := spew.ConfigState{MaxDepth: 1} scs.Dump(abox.UiBox) } } } - if (window.UiTab != nil) { + if window.UiTab != nil { pages := window.UiTab.NumPages() log.Println("gui.DumpBoxes()\tWindow.UiTab.NumPages() =", pages) tabSetMargined(window.UiTab) - if (Config.Debug) { + if Config.Debug { scs := spew.ConfigState{MaxDepth: 2} scs.Dump(window.UiTab) } -- cgit v1.2.3