change around the gui

1 files changed, 9 insertions, 13 deletions

diff --git a/doGui.go b/doGui.go
index ac46def..6a34bee 100644
--- a/doGui.go
+++ b/doGui.go
@@ -16,18 +16,15 @@ import (
 
 func doGui() {
 	log.Warn("init basicWindow state")
-	win := gadgets.RawBasicWindow("Create .deb files for GO applications")
-	win.Make()
+	win := gadgets.NewGenericWindow("Create .deb files for GO applications", "things")
 	win.Custom = func() {
 		log.Info("got to close")
 		os.Exit(0)
 	}
 
-	box1 := win.Box()
-	// me.cBox = newControl(box1)
-	cbox := newControl(box1)
+	var cbox *controlBox
 
-	vbox := box1.Box().Horizontal()
+	vbox := win.Middle.Box().Horizontal()
 	group1 := vbox.NewGroup("controls").Horizontal() // Vertical()
 
 	group1.NewButton("go build", func() {
@@ -59,20 +56,19 @@ func doGui() {
 			log.Info("build worked")
 			os.Exit(0)
 		} else {
-			log.Warn("build failed", err)
+			log.Warn("build failed with err:", err)
 		}
 		win.Enable()
 	})
 
-	win.Show()
+	grid := win.Middle.RawGrid()
+	cbox = newControl(grid)
 }
 
 // This initializes the control box
-func newControl(parent *gui.Node) *controlBox {
-	var c *controlBox
-	c = new(controlBox)
-	c.group = parent.NewGroup("choices")
-	c.grid = c.group.NewGrid("gridiron", 8, 1)
+func newControl(grid *gui.Node) *controlBox {
+	c := new(controlBox)
+	c.grid = grid
 
 	c.Package = gadgets.NewOneLiner(c.grid, "Package")
 	c.grid.NextRow()