diff options
Diffstat (limited to 'cmds/buttonplugin')
| -rw-r--r-- | cmds/buttonplugin/Makefile | 2 | ||||
| -rw-r--r-- | cmds/buttonplugin/log.go | 2 | ||||
| -rw-r--r-- | cmds/buttonplugin/main.go | 11 |
3 files changed, 12 insertions, 3 deletions
diff --git a/cmds/buttonplugin/Makefile b/cmds/buttonplugin/Makefile index 84ff928..1903a67 100644 --- a/cmds/buttonplugin/Makefile +++ b/cmds/buttonplugin/Makefile @@ -7,7 +7,7 @@ # run: build - ./buttonplugin >/tmp/witgui.log.stderr 2>&1 + ./buttonplugin --gui-toolkit gocui >/tmp/witgui.log.stderr 2>&1 build-release: go get -v -u -x . diff --git a/cmds/buttonplugin/log.go b/cmds/buttonplugin/log.go index fb85cfa..70039df 100644 --- a/cmds/buttonplugin/log.go +++ b/cmds/buttonplugin/log.go @@ -9,6 +9,7 @@ import ( "time" "bufio" arg "github.com/alexflint/go-arg" + "git.wit.org/wit/gui" ) @@ -17,6 +18,7 @@ var args struct { Bar bool User string `arg:"env:USER"` Demo bool `help:"run a demo"` + gui.GuiArgs } var f1 *os.File diff --git a/cmds/buttonplugin/main.go b/cmds/buttonplugin/main.go index 7ced40b..4b6a2ff 100644 --- a/cmds/buttonplugin/main.go +++ b/cmds/buttonplugin/main.go @@ -13,6 +13,8 @@ var outfile string = "/tmp/guilogfile" var myGui *gui.Node var buttonCounter int = 5 +var gridW int = 5 +var gridH int = 2 func main() { // This will turn on all debugging @@ -20,7 +22,12 @@ func main() { // myGui = gui.New().LoadToolkit("gocui") // myGui = gui.New().LoadToolkit("andlabs") - myGui = gui.New().Default() + // myGui = gui.New().Default() + if (args.GuiToolkit == nil) { + myGui = gui.New().Default() + } else { + myGui = gui.New().LoadToolkit(args.GuiToolkit[0]) + } buttonWindow() // This is just a optional goroutine to watch that things are alive @@ -42,7 +49,7 @@ func buttonWindow() { g1.NewButton("hello2", func () { log.Println("world2") }) - more2 = g1.NewGrid("gridnuts", 3, 3) + more2 = g1.NewGrid("gridnuts", gridW, gridH) more2.NewLabel("more2") |