cleaner window code

1 files changed, 19 insertions, 26 deletions

diff --git a/doGui.go b/doGui.go
index 8ee8c30..7eb60e9 100644
--- a/doGui.go
+++ b/doGui.go
@@ -11,17 +11,17 @@ import (
 
 	"go.wit.com/gui"
 	"go.wit.com/lib/gadgets"
-	"go.wit.com/lib/protobuf/zoopb"
 	"go.wit.com/log"
 )
 
-func debug() {
-	for {
-		time.Sleep(90 * time.Second)
-		log.Info("TODO: zookeeper scan here. repo count =")
-		if me.machinesWin != nil {
-			doMachinesUpgradeTable()
-		}
+// refresh the windows & tables the user has open
+func refresh() {
+	time.Sleep(90 * time.Second)
+	if argv.Verbose {
+		log.Info("zookeeper scan here")
+	}
+	if me.zood != nil {
+		doMachinesUpgradeTable()
 	}
 }
 
@@ -45,29 +45,22 @@ func doGui() {
 	group1 := vbox.NewGroup("Zookeeper Settings")
 	grid := group1.NewGrid("buildOptions", 0, 0)
 
-	grid.NewButton("show zoo", func() {
+	grid.NewButton("zood versions", func() {
 		// if the window exists, just toggle it open or closed
-		if me.machinesWin != nil {
-			me.machinesWin.Toggle()
+		if me.zood != nil {
+			me.zood.Toggle()
 			return
 		}
-
-		me.machinesWin = gadgets.NewGenericWindow("Zoo Machines", "Stuff")
-		me.machinesWin.Win.Custom = func() {
-			log.Info("test delete window here")
+		makeZoodWin()
+	})
+	grid.NewButton("update zood versions", func() {
+		if me.zood != nil {
+			doMachinesUpgradeTable()
 		}
-		me.machinesBox = me.machinesWin.Bottom.Box().SetProgName("TBOX")
-		doMachinesUpgradeTable()
 	})
 
-	// sits here forever
-	debug()
-}
-
-func findVersion(m *zoopb.Machine, pkgname string) string {
-	zood := m.Packages.FindByName(pkgname)
-	if zood == nil {
-		return "n/a"
+	// sit here forever refreshing the GUI
+	for {
+		refresh()
 	}
-	return zood.Version
 }