The debugging window is finally useful

    the gui enabled debugging works
        --gui-debug works from the command line
        The debug window can now select things
        debugging now includes widget types
        all the debug flags work
        finally working debugging flags via gui checkboxes
    add debian packaging rules
    use log() in the toolkit
    use a standard log() to simplify debugging flags
    add reference to 'GO Style Guide'
    use the same LICENSE from the GO developers.
    TODO: make this threadsafe
    TODO: fix plugin stuff

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

1 files changed, 21 insertions, 31 deletions

diff --git a/toolkit/andlabs/button.go b/toolkit/andlabs/button.go
index bd80683..9933e1f 100644
--- a/toolkit/andlabs/button.go
+++ b/toolkit/andlabs/button.go
@@ -1,21 +1,20 @@
 package main
 
-import "log"
-// import "os"
+import (
+	"github.com/andlabs/ui"
+	_ "github.com/andlabs/ui/winmanifest"
 
+	"git.wit.org/wit/gui/toolkit"
+)
 
-import "github.com/andlabs/ui"
-import _ "github.com/andlabs/ui/winmanifest"
-
-import "git.wit.org/wit/gui/toolkit"
 func NewButton(parentW *toolkit.Widget, w *toolkit.Widget) {
 	var t, newt *andlabsT
 	var b *ui.Button
-	log.Println("gui.andlabs.NewButton()", w.Name)
+	log(debugToolkit, "gui.andlabs.NewButton()", w.Name)
 
 	t = mapToolkits[parentW]
 	if (t == nil) {
-		log.Println("go.andlabs.NewButton() toolkit struct == nil. name=", parentW.Name, w.Name)
+		log(debugToolkit, "go.andlabs.NewButton() toolkit struct == nil. name=", parentW.Name, w.Name)
 		return
 	}
 
@@ -28,38 +27,29 @@ func NewButton(parentW *toolkit.Widget, w *toolkit.Widget) {
 	newt.uiButton = b
 
 	b.OnClicked(func(*ui.Button) {
-		if (DebugToolkit) {
-			log.Println("TODO: IN TOOLKIT GOROUTINE. SHOULD LEAVE HERE VIA channels. button name =", w.Name)
-			log.Println("FOUND WIDGET!", w)
-		}
-		if (w.Custom != nil) {
-			w.Custom()
-			return
-		}
-		if (w.Event != nil) {
-			w.Event(w)
+		log(debugChange, "TODO: SHOULD LEAVE Button click HERE VIA channels. button name =", w.Name)
+		log(debugChange, "FOUND WIDGET =", w)
+		if (w.Custom == nil) {
+			log(debugChange, "WIDGET DOES NOT have Custom()")
+			log(debugChange, "TODO: NOTHING TO DO button name =", w.Name)
 			return
 		}
-		t.Dump()
-		newt.Dump()
-		if (DebugToolkit) {
-			log.Println("TODO: LEFT TOOLKIT GOROUTINE WITH NOTHING TO DO button name =", w.Name)
-		}
+		// t.Dump()
+		// newt.Dump()
+		log(debugChange, "Running w.Custom()")
+		w.Custom()
 	})
 
-	if (DebugToolkit) {
-		log.Println("gui.Toolbox.NewButton() about to append to Box parent t:", w.Name)
-		t.Dump()
-		log.Println("gui.Toolbox.NewButton() about to append to Box new t:", w.Name)
-		newt.Dump()
-	}
+	log(debugToolkit, "gui.Toolbox.NewButton() about to append to Box parent t:", w.Name)
+	log(debugToolkit, "gui.Toolbox.NewButton() about to append to Box new t:", w.Name)
+
 	if (t.uiBox != nil) {
 		t.uiBox.Append(b, stretchy)
 	} else if (t.uiWindow != nil) {
 		t.uiWindow.SetChild(b)
 	} else {
-		log.Println("ERROR: wit/gui andlabs couldn't place this button in a box or a window")
-		log.Println("ERROR: wit/gui andlabs couldn't place this button in a box or a window")
+		log(debugToolkit, "ERROR: wit/gui andlabs couldn't place this button in a box or a window")
+		log(debugToolkit, "ERROR: wit/gui andlabs couldn't place this button in a box or a window")
 		return
 	}