convert to pb grid

1 files changed, 99 insertions, 42 deletions

diff --git a/doGui.go b/doGui.go
index e500b04..2ccd9a1 100644
--- a/doGui.go
+++ b/doGui.go
@@ -51,60 +51,83 @@ func drawWindow(win *gadgets.BasicWindow) {
 	group1 := vbox.NewGroup("Zookeeper Settings")
 	grid := group1.NewGrid("buildOptions", 0, 0)
 
-	var tbwin *tableWindow
-	grid.NewButton("show zoo", func() {
-		win.Disable()
-		defer win.Enable()
+	/*
+		var tbwin *tableWindow
+		grid.NewButton("show zoo", func() {
+			win.Disable()
+			defer win.Enable()
 
-		if tbwin == nil {
-			log.Info("show zoo here")
-			tbwin = makeTableWindow()
-			tbwin.showTable(me.machines)
-		}
+			if tbwin == nil {
+				log.Info("show zoo here")
+				tbwin = makeTableWindow()
+				tbwin.showTable(me.machines)
+			}
 
-		if tbwin.Hidden() {
-			tbwin.Show()
-		} else {
-			tbwin.Hide()
-		}
-		return
+			if tbwin.Hidden() {
+				tbwin.Show()
+			} else {
+				tbwin.Hide()
+			}
+			return
+
+		})
+
+		grid.NewButton("update table", func() {
+			newwin := makeTableWindow()
+			newwin.showTable(me.machines)
+			newwin.Show()
+		})
+	*/
 
+	var testWin *genericWindow
+	grid.NewButton("machine list", func() {
+		if testWin != nil {
+			testWin.Toggle()
+			return
+		}
+		testWin = makeMachineWindow(me.machines)
 	})
 
-	grid.NewButton("update table", func() {
-		newwin := makeTableWindow()
-		newwin.showTable(me.machines)
-		newwin.Show()
+	var test2 *genericWindow
+	grid.NewButton("test2", func() {
+		if test2 != nil {
+			test2.Toggle()
+			return
+		}
+		test2 = makeMachineWindow(me.machines)
 	})
 
-	grid.NewButton("me.machines.ShowTable()", func() {
-		t := me.machines.NewTable("test 2")
-		t.AddHostname()
-		t.AddMemory()
-		t.AddCpus()
-		t.AddStringFunc("sMB", func(m *zoopb.Machine) string {
-			return fmt.Sprintf("%d mb", m.Memory/(1024*1024))
-		})
-		t.AddStringFunc("zood", func(m *zoopb.Machine) string {
-			return findVersion(m, "zood")
+	/*
+		grid.NewButton("me.machines.ShowTable()", func() {
+			t := me.machines.NewTable("test 2")
+			t.AddHostname()
+			t.AddMemory()
+			t.AddCpus()
+			t.AddStringFunc("sMB", func(m *zoopb.Machine) string {
+				return fmt.Sprintf("%d mb", m.Memory/(1024*1024))
+			})
+			t.AddStringFunc("zood", func(m *zoopb.Machine) string {
+				return findVersion(m, "zood")
+			})
+			t.AddTimeFunc("age", func(m *zoopb.Machine) time.Time {
+				return m.Laststamp.AsTime()
+			})
+			t.ShowTable()
 		})
-		t.AddTimeFunc("age", func(m *zoopb.Machine) time.Time {
-			return m.Laststamp.AsTime()
-		})
-		t.ShowTable()
-	})
 
-	grid.NewButton("ConfigSave(me.machines)", func() {
-		log.Info("saving config...")
-		me.machines.ConfigSave()
-	})
+		grid.NewButton("ConfigSave(me.machines)", func() {
+			log.Info("saving config...")
+			me.machines.ConfigSave()
+		})
 
-	grid.NewButton("ConfigSave(me.machines2)", func() {
-		log.Info("saving config...")
-		me.machines2.ConfigSave()
-	})
+		grid.NewButton("ConfigSave(me.machines2)", func() {
+			log.Info("saving config...")
+			me.machines2.ConfigSave()
+		})
+	*/
 }
 
+/*
 func (tw *tableWindow) showTable(allm *zoopb.Machines) {
 	all := allm.All()
 	for all.Scan() {
@@ -125,6 +148,7 @@ func (tw *tableWindow) showTable(allm *zoopb.Machines) {
 		tw.grid.NextRow()
 	}
 }
+*/
 
 func findVersion(m *zoopb.Machine, pkgname string) string {
 	zood := m.Packages.FindByName(pkgname)
@@ -133,3 +157,36 @@ func findVersion(m *zoopb.Machine, pkgname string) string {
 	}
 	return zood.Version
 }
+
+func makeMachineWindow(pb *zoopb.Machines) *genericWindow {
+	win := initGenericWindow("Machines registered with Zookeeper", "Buttons of things")
+	grid := win.group.RawGrid()
+	grid.NewButton("List", func() {
+		log.Info("list...")
+	})
+	grid.NewButton("more", func() {
+		log.Info("?")
+	})
+	grid.NextRow()
+	grid.NewButton("smore", func() {
+		log.Info("smore")
+	})
+
+	tbox := win.win.Box().Vertical() // a vertical box (like a stack of books)
+	t := pb.NewTable("test 2")
+	t.SetParent(tbox)
+	t.AddHostname()
+	t.AddMemory()
+	t.AddCpus()
+	t.AddStringFunc("sMB", func(m *zoopb.Machine) string {
+		return fmt.Sprintf("%d mb", m.Memory/(1024*1024))
+	})
+	t.AddStringFunc("zood", func(m *zoopb.Machine) string {
+		return findVersion(m, "zood")
+	})
+	t.AddTimeFunc("age", func(m *zoopb.Machine) time.Time {
+		return m.Laststamp.AsTime()
+	})
+	t.ShowTable()
+	return win
+}