diff --git a/doGui.go b/doGui.go index 2ccd9a1..44c5a38 100644 --- a/doGui.go +++ b/doGui.go @@ -51,34 +51,6 @@ 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() - - if tbwin == nil { - log.Info("show zoo here") - tbwin = makeTableWindow() - tbwin.showTable(me.machines) - } - - 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 { @@ -96,60 +68,8 @@ func drawWindow(win *gadgets.BasicWindow) { } 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") - }) - 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.machines2)", func() { - log.Info("saving config...") - me.machines2.ConfigSave() - }) - */ } -/* -func (tw *tableWindow) showTable(allm *zoopb.Machines) { - all := allm.All() - for all.Scan() { - m := all.Next() - tw.grid.NewLabel(m.Hostname) - tw.grid.NewLabel(fmt.Sprintf("%d", m.Cpus)) - gb := m.Memory / (1024 * 1024) - ms := fmt.Sprintf("%d MB", gb) - tw.grid.NewLabel(ms) - tw.grid.NewLabel(m.Distro) - tw.grid.NewLabel(findVersion(m, "zood")) - tw.grid.NewLabel(findVersion(m, "bash")) - dur := m.Laststamp.AsTime() - tw.grid.NewLabel(fmt.Sprintf("%v", time.Since(dur))) - tw.grid.NewButton("upgrade", func() { - log.Info("figure out upgrade", m.Hostname) - }) - tw.grid.NextRow() - } -} -*/ - func findVersion(m *zoopb.Machine, pkgname string) string { zood := m.Packages.FindByName(pkgname) if zood == nil {