name changes in the gui package

Signed-off-by: Jeff Carr <[email protected]>

1 files changed, 36 insertions, 26 deletions

diff --git a/errorBox.go b/errorBox.go
index c584975..70db592 100644
--- a/errorBox.go
+++ b/errorBox.go
@@ -1,4 +1,4 @@
-/* 
+/*
 	Show a box for a configuration error
 */
 
@@ -7,38 +7,38 @@ package main
 import (
 	"time"
 
+	"go.wit.com/lib/gadgets"
+	"go.wit.com/gui"
 	"go.wit.com/log"
-	"go.wit.com/gui/gui"
-	"go.wit.com/gui/gadgets"
 )
 
 type errorBox struct {
-	ready	bool
-	hidden	bool
+	ready  bool
+	hidden bool
 
-	parent	*gui.Node
-	group	*gui.Node
-	grid	*gui.Node
+	parent *gui.Node
+	group  *gui.Node
+	grid   *gui.Node
 
-	l	*gui.Node
-	b	*gui.Node
+	l *gui.Node
+	b *gui.Node
 
-	fixes	map[string]*anError
+	fixes map[string]*anError
 
 	something *gadgets.OneLiner
 }
 
 type anError struct {
-//	kind ProblemType // what kind of error is it?
-//	action ActionType
-//	aaaa string
-//	status string
+	//	kind ProblemType // what kind of error is it?
+	//	action ActionType
+	//	aaaa string
+	//	status string
 
-	kindLabel *gui.Node
+	kindLabel   *gui.Node
 	actionLabel *gui.Node
-	ipLabel *gui.Node
+	ipLabel     *gui.Node
 	statusLabel *gui.Node
-	button *gui.Node
+	button      *gui.Node
 
 	problem *Problem
 }
@@ -62,19 +62,25 @@ func NewErrorBox(p *gui.Node, name string, ip string) *errorBox {
 }
 
 func (eb *errorBox) Show() {
-	if eb == nil {return}
+	if eb == nil {
+		return
+	}
 	eb.hidden = false
 	eb.group.Show()
 }
 
 func (eb *errorBox) Hide() {
-	if eb == nil {return}
+	if eb == nil {
+		return
+	}
 	eb.hidden = true
 	eb.group.Hide()
 }
 
 func (eb *errorBox) Toggle() {
-	if eb == nil {return}
+	if eb == nil {
+		return
+	}
 	if eb.hidden {
 		eb.Show()
 	} else {
@@ -83,12 +89,16 @@ func (eb *errorBox) Toggle() {
 }
 
 func (eb *errorBox) Ready() bool {
-	if eb == nil {return false}
+	if eb == nil {
+		return false
+	}
 	return eb.ready
 }
 
 func (eb *errorBox) addIPerror(kind ProblemType, action ActionType, ip string) bool {
-	if ! eb.Ready() {return false}
+	if !eb.Ready() {
+		return false
+	}
 	tmp := kind.String() + " " + ip
 	if eb.fixes[tmp] != nil {
 		log.Log(WARN, "Error is already here", kind, ip)
@@ -134,9 +144,9 @@ func (eb *errorBox) fix(key string) bool {
 		log.Log(WARN, "TODO: probably remove this error. key =", key)
 		return true
 	}
-	myErr :=  eb.fixes[key]
+	myErr := eb.fixes[key]
 	log.Log(WARN, "should try to fix", myErr.problem.kind, "here. IP =", myErr.problem.aaaa)
-	if ! me.autofix.GetBool() {
+	if !me.autofix.Checked() {
 		log.Log(WARN, "not autofixing. autofix == false")
 		log.Log(WARN, "problem.kind =", myErr.problem.kind)
 		log.Log(WARN, "problem.action =", myErr.problem.action)
@@ -145,7 +155,7 @@ func (eb *errorBox) fix(key string) bool {
 		log.Log(WARN, "problem.begun =", myErr.problem.begun)
 		log.Log(WARN, "problem.begunResult =", myErr.problem.begunResult)
 		// if  myErr.problem.begunTime != nil {
-			log.Log(WARN, "problem.begunTime =", myErr.problem.begunTime)
+		log.Log(WARN, "problem.begunTime =", myErr.problem.begunTime)
 		// }
 		return false
 	}