protobuf update works

1 files changed, 7 insertions, 62 deletions

diff --git a/doGui.go b/doGui.go
index 44c5a38..fb15a82 100644
--- a/doGui.go
+++ b/doGui.go
@@ -6,7 +6,6 @@ package main
 // An app to submit patches for the 30 GO GUI repos
 
 import (
-	"fmt"
 	"os"
 	"time"
 
@@ -28,22 +27,14 @@ func doGui() {
 	me.myGui.InitEmbed(resources)
 	me.myGui.Default()
 
-	mainWindow := gadgets.RawBasicWindow("Zookeeper: (inventory your cluster)")
-	mainWindow.Make()
-	mainWindow.Show()
-	mainWindow.Custom = func() {
+	win := gadgets.RawBasicWindow("Zookeeper: (inventory your cluster)")
+	win.Make()
+	win.Show()
+	win.Custom = func() {
 		log.Warn("Main window close")
 		os.Exit(0)
 	}
 
-	drawWindow(mainWindow)
-
-	// sits here forever
-	debug()
-
-}
-
-func drawWindow(win *gadgets.BasicWindow) {
 	box := win.Box()
 
 	vbox := box.NewVerticalBox("BOX2")
@@ -51,23 +42,10 @@ func drawWindow(win *gadgets.BasicWindow) {
 	group1 := vbox.NewGroup("Zookeeper Settings")
 	grid := group1.NewGrid("buildOptions", 0, 0)
 
-	var testWin *genericWindow
-	grid.NewButton("machine list", func() {
-		if testWin != nil {
-			testWin.Toggle()
-			return
-		}
-		testWin = makeMachineWindow(me.machines)
-	})
+	addButtonForZooPB(grid)
 
-	var test2 *genericWindow
-	grid.NewButton("test2", func() {
-		if test2 != nil {
-			test2.Toggle()
-			return
-		}
-		test2 = makeMachineWindow(me.machines)
-	})
+	// sits here forever
+	debug()
 }
 
 func findVersion(m *zoopb.Machine, pkgname string) string {
@@ -77,36 +55,3 @@ 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
-}