loggging output cleanupsv0.12.16

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

1 files changed, 15 insertions, 28 deletions

diff --git a/basicWindow.go b/basicWindow.go
index 855e7b3..81f6d72 100644
--- a/basicWindow.go
+++ b/basicWindow.go
@@ -28,7 +28,7 @@ func NewBasicWindow(parent *gui.Node, title string) *BasicWindow {
 		title:    title,
 		vertical: false,
 	}
-	log.Warn("NewBasicWindow() END")
+	log.Log(GADGETS, "NewBasicWindow() END")
 
 	return w
 }
@@ -46,7 +46,7 @@ func (w *BasicWindow) Hide() {
 	if !w.Ready() {
 		return
 	}
-	log.Warn("BasicWindow.Hide() here")
+	log.Log(GADGETS, "BasicWindow.Hide() here")
 	w.win.Hide()
 	w.hidden = true
 	return
@@ -93,17 +93,6 @@ func (w *BasicWindow) StandardClose() {
 		return
 	}
 	w.win.Custom = w.win.StandardClose
-	/*
-			log.Warn("BasicWindow.Custom() closed. TODO: handle this", w.title)
-			log.Warn("BasicWindow.Custom() closed. handled properly?", w.title)
-			if w.Custom != nil {
-				log.Warn("BasicWindow.Custom() HAS CUSTOM")
-				w.Custom()
-				return
-			}
-			w.win.StandardExit()
-		}
-	*/
 	return
 }
 
@@ -113,10 +102,9 @@ func (w *BasicWindow) StandardExit() {
 		return
 	}
 	w.win.Custom = func() {
-		log.Warn("BasicWindow.Custom() closed. TODO: handle this", w.title)
-		log.Warn("BasicWindow.Custom() closed. handled properly?", w.title)
+		log.Log(GADGETS, "BasicWindow.Custom() closed. handled properly?", w.title)
 		if w.Custom != nil {
-			log.Warn("BasicWindow.Custom() HAS CUSTOM")
+			log.Log(GADGETS, "BasicWindow.Custom() HAS CUSTOM")
 			w.Custom()
 			return
 		}
@@ -155,26 +143,26 @@ func (w *BasicWindow) Box() *gui.Node {
 }
 
 func (w *BasicWindow) Vertical() {
-	log.Warn("BasicWindow() Vertical() START w.vertical =", w.vertical, w.title)
+	log.Log(GADGETS, "BasicWindow() Vertical() START w.vertical =", w.vertical, w.title)
 	if w == nil {
 		return
 	}
 	w.vertical = true
-	log.Warn("BasicWindow() Vertical() END w.vertical =", w.vertical, w.title)
+	log.Log(GADGETS, "BasicWindow() Vertical() END w.vertical =", w.vertical, w.title)
 }
 
 func (w *BasicWindow) Horizontal() {
-	log.Warn("BasicWindow() Horizontal() START w.vertical =", w.vertical, w.title)
+	log.Log(GADGETS, "BasicWindow() Horizontal() START w.vertical =", w.vertical, w.title)
 	if w == nil {
 		return
 	}
 	w.vertical = false
-	log.Warn("BasicWindow() Horizontal() END w.vertical =", w.vertical, w.title)
+	log.Log(GADGETS, "BasicWindow() Horizontal() END w.vertical =", w.vertical, w.title)
 }
 
 func (w *BasicWindow) Make() {
 	if w.win != nil {
-		log.Warn("BasicWindow.Make() window was already created")
+		log.Log(GADGETS, "BasicWindow.Make() window was already created")
 		return
 	}
 	w.win = w.parent.RawWindow(w.title)
@@ -185,8 +173,7 @@ func (w *BasicWindow) Make() {
 	// I like to call this Sierpinski mode
 	if w.win.Custom == nil {
 		w.win.Custom = func() {
-			log.Warn("BasicWindow.Custom() closed. TODO: handle this", w.title)
-			log.Warn("BasicWindow.Custom() closed. handled properly?", w.title)
+			log.Log(GADGETS, "BasicWindow.Custom() closed. handled properly?", w.title)
 			if w.Custom != nil {
 				w.Custom()
 			}
@@ -194,10 +181,10 @@ func (w *BasicWindow) Make() {
 	}
 	if w.vertical {
 		w.box = w.win.NewVerticalBox("BW VBOX")
-		log.Log(INFO, "BasicWindow.Make() made NewVerticalBox", w.title)
+		log.Log(GADGETS, "BasicWindow.Make() made NewVerticalBox", w.title)
 	} else {
 		w.box = w.win.NewHorizontalBox("BW HBOX")
-		log.Log(INFO, "BasicWindow.Make() made NewHorizontalBox", w.title)
+		log.Log(GADGETS, "BasicWindow.Make() made NewHorizontalBox", w.title)
 	}
 	w.win.SetVisable(false)
 
@@ -209,16 +196,16 @@ func (w *BasicWindow) TestDraw() {
 		return
 	}
 	if w.win == nil {
-		log.Warn("BasicWindow.TestDraw() can't draw on window == nil")
+		log.Log(GADGETS, "BasicWindow.TestDraw() can't draw on window == nil")
 		w.Make()
 	}
-	log.Warn("BasicWindow.TestDraw() RUNNING HERE")
+	log.Log(GADGETS, "BasicWindow.TestDraw() RUNNING HERE")
 	w.win.TestDraw()
 }
 
 func (w *BasicWindow) Draw() {
 	if w.win == nil {
-		log.Warn("BasicWindow.Draw() needs Make()")
+		log.Log(GADGETS, "BasicWindow.Draw() needs Make()")
 		w.Make()
 	}
 	w.win.TestDraw()