diff options
| author | Jeff Carr <[email protected]> | 2022-11-05 10:19:04 -0500 |
|---|---|---|
| committer | Jeff Carr <[email protected]> | 2022-11-05 10:19:04 -0500 |
| commit | 099efb6b24caf9eaad50d7386636a7ac23552bde (patch) | |
| tree | 215685d7153e6d002c921d4f7ad2fa12d52fe323 /cmds | |
| parent | a72d0ab2d0ff58704cc28993ea428b8c6c8825d7 (diff) | |
v0.4.2 more code cleanups and improvementsv0.4.2
Add command line argv handling using go-arg
make hello world dumb stupid simple again
more swtiching to common code
move debugging options to support go-args
more debugging output cleanup
more debugging cleanups
fix null pointer crash
Diffstat (limited to 'cmds')
| -rw-r--r-- | cmds/helloworld/main.go | 50 | ||||
| -rw-r--r-- | cmds/textbox/Makefile | 13 | ||||
| -rw-r--r-- | cmds/textbox/main.go | 104 |
3 files changed, 132 insertions, 35 deletions
diff --git a/cmds/helloworld/main.go b/cmds/helloworld/main.go index bc1ea5a..3ae3b07 100644 --- a/cmds/helloworld/main.go +++ b/cmds/helloworld/main.go @@ -8,57 +8,37 @@ import ( ) func main() { - f, err := os.OpenFile("/tmp/guilogfile", os.O_RDWR | os.O_CREATE | os.O_APPEND, 0666) - if err != nil { - log.Fatalf("error opening file: %v", err) - } - defer f.Close() - - log.SetOutput(f) - log.Println("This is a test log entry") - - gui.Main(initGUI) + gui.Main(myGUI) } // This initializes the first window -func initGUI() { +func myGUI() { var w *gui.Node gui.Config.Title = "Hello World golang wit/gui Window" gui.Config.Width = 640 gui.Config.Height = 480 - gui.Config.Exit = myDefaultExit + gui.Config.Exit = myExit w = gui.NewWindow() - w.Dump() - addDemoTab(w, "A Simple Tab Demo") - addDemoTab(w, "A Second Tab") + addHelloWorld(w, "A Simple Tab") } -func addDemoTab(window *gui.Node, title string) { - var newNode, g *gui.Node +func addHelloWorld(window *gui.Node, title string) { + var newNode, g, tb *gui.Node newNode = window.NewTab(title) - log.Println("addDemoTab() newNode.Dump") - log.Println("addDemoTab() newNode.Dump") - log.Println("addDemoTab() newNode.Dump") - log.Println("addDemoTab() newNode.Dump") - newNode.Dump() - g = newNode.NewGroup("group 1") - log.Println("addDemoTab() g.Dump") - log.Println("addDemoTab() g.Dump") - log.Println("addDemoTab() g.Dump") - log.Println("addDemoTab() g.Dump") - g.Dump() - // os.Exit(0) - dd := g.NewDropdown("demoCombo2") - dd.AddDropdown("more 1") - dd.AddDropdown("more 2") - dd.AddDropdown("more 3") + g = newNode.NewGroup("hello") + tb = g.NewTextbox("hello world box") // when debugging, this string will be used + tb.OnChanged = func(*gui.Node) { + s := tb.GetText() + log.Println("text box =", s) + } + tb.SetText("world") } -func myDefaultExit(n *gui.Node) { - log.Println("You can Do exit() things here") +func myExit(n *gui.Node) { + log.Println("exit() here") os.Exit(0) } diff --git a/cmds/textbox/Makefile b/cmds/textbox/Makefile new file mode 100644 index 0000000..de22345 --- /dev/null +++ b/cmds/textbox/Makefile @@ -0,0 +1,13 @@ +run: build + ./textbox --guidebug + +build-release: + go get -v -u -x . + go build + +build: + GO111MODULE="off" go get -v -x . + GO111MODULE="off" go build + +update: + GO111MODULE="off" go get -v -u -x . diff --git a/cmds/textbox/main.go b/cmds/textbox/main.go new file mode 100644 index 0000000..faf8b86 --- /dev/null +++ b/cmds/textbox/main.go @@ -0,0 +1,104 @@ +// This creates a simple hello world window +package main + +import ( + "os" + "log" + "fmt" + "git.wit.org/wit/gui" + arg "github.com/alexflint/go-arg" +) + +type LogOptions struct { + LogFile string + Verbose bool + GuiDebug bool `help:"open up the wit/gui Debugging Window"` + GuiDemo bool `help:"open the wit/gui Demo Window"` + User string `arg:"env:USER"` +} + +var args struct { + Foo string + Bar bool + LogOptions + gui.GuiOptions +} + + +func main() { + arg.MustParse(&args) + fmt.Println(args.Foo, args.Bar, args.User) + + gui.Config.Options.Debug = args.Debug + gui.Config.Options.DebugChange = args.DebugChange + gui.Config.Options.DebugDump = args.DebugDump + gui.Config.Options.DebugNode = args.DebugNode + gui.Config.Options.DebugTabs = args.DebugTabs + + /* + f, err := os.OpenFile("/tmp/guilogfile", os.O_RDWR | os.O_CREATE | os.O_APPEND, 0666) + if err != nil { + log.Fatalf("error opening file: %v", err) + } + defer f.Close() + + log.SetOutput(f) + log.Println("This is a test log entry") + */ + + gui.Main(initGUI) +} + +// This initializes the first window +func initGUI() { + var w *gui.Node + gui.Config.Title = "Hello World golang wit/gui Window" + gui.Config.Width = 640 + gui.Config.Height = 480 + gui.Config.Exit = myDefaultExit + + w = gui.NewWindow() + w.Dump() + addDemoTab(w, "A Simple Tab Demo") + addDemoTab(w, "A Second Tab") + + if (args.GuiDemo) { + gui.DemoToolkitWindow() + } + + if (args.GuiDebug) { + gui.DebugWindow() + } +} + +func addDemoTab(window *gui.Node, title string) { + var newNode, g, g2, tb *gui.Node + + newNode = window.NewTab(title) + log.Println("addDemoTab() newNode.Dump") + newNode.Dump() + + g = newNode.NewGroup("group 1") + dd := g.NewDropdown("demoCombo2") + dd.AddDropdown("more 1") + dd.AddDropdown("more 2") + dd.AddDropdown("more 3") + dd.OnChanged = func(*gui.Node) { + s := dd.GetText() + tb.SetText("hello world " + args.User + "\n" + s) + } + + g2 = newNode.NewGroup("group 2") + tb = g2.NewTextbox("tb") + log.Println("tb =", tb.GetText()) + tb.OnChanged = func(*gui.Node) { + s := tb.GetText() + log.Println("text =", s) + } +} + +func myDefaultExit(n *gui.Node) { + log.Println("You can Do exit() things here") + os.Exit(0) +} + |
