1 files changed, 25 insertions, 70 deletions

diff --git a/toolkit/andlabs/plugin.go b/toolkit/andlabs/plugin.go
index 8b75766..8cac830 100644
--- a/toolkit/andlabs/plugin.go
+++ b/toolkit/andlabs/plugin.go
@@ -26,31 +26,33 @@ func Send(p *toolkit.Widget, c *toolkit.Widget) {
 	}
 	log(debugPlugin, "Send() child  =", c.Name, ",", c.Action, ",", c.Type)
 
+	/*
 	if (c.Action == "SetMargin") {
-		log(true, "need to implement SetMargin here")
-		setMargin(p, c, c.B)
+		log(debugError, "need to implement SetMargin here")
+		setMargin(c, c.B)
 		return
 	}
+	*/
 
 	switch c.Type {
 	case toolkit.Window:
-		newWindow(c)
+		doWindow(c)
 	case toolkit.Tab:
-		newTab(p, c)
+		doTab(p, c)
 	case toolkit.Group:
-		newGroup(p, c)
+		doGroup(p, c)
 	case toolkit.Button:
 		doButton(p, c)
 	case toolkit.Checkbox:
 		doCheckbox(p, c)
 	case toolkit.Label:
-		newLabel(p, c)
+		doLabel(p, c)
 	case toolkit.Textbox:
 		doTextbox(p, c)
 	case toolkit.Slider:
-		newSlider(p, c)
+		doSlider(p, c)
 	case toolkit.Spinner:
-		newSpinner(p, c)
+		doSpinner(p, c)
 	case toolkit.Dropdown:
 		doDropdown(p, c)
 	case toolkit.Combobox:
@@ -58,79 +60,32 @@ func Send(p *toolkit.Widget, c *toolkit.Widget) {
 	case toolkit.Grid:
 		doGrid(p, c)
 	case toolkit.Flag:
-		log(debugFlag, "plugin Send() flag parent =", p.Name, p.Type)
-		log(debugFlag, "plugin Send() flag child  =", c.Name, c.Type)
-		log(debugFlag, "plugin Send() flag child.Action  =", c.Action)
-		log(debugFlag, "plugin Send() flag child.S  =", c.S)
-		log(debugFlag, "plugin Send() flag child.B  =", c.B)
-		log(debugFlag, "plugin Send() what to flag?")
+		// log(debugFlags, "plugin Send() flag parent =", p.Name, p.Type)
+		// log(debugFlags, "plugin Send() flag child  =", c.Name, c.Type)
+		// log(debugFlags, "plugin Send() flag child.Action  =", c.Action)
+		// log(debugFlags, "plugin Send() flag child.S  =", c.S)
+		// log(debugFlags, "plugin Send() flag child.B  =", c.B)
+		// log(debugFlags, "plugin Send() what to flag?")
 		// should set the checkbox to this value
 		switch c.S {
-		case "Error":
-			debugError = c.B
 		case "Toolkit":
 			debugToolkit = c.B
 		case "Change":
 			debugChange = c.B
+		case "Plugin":
+			debugPlugin = c.B
+		case "Flags":
+			debugFlags = c.B
+		case "Error":
+			debugError = c.B
 		case "Show":
 			ShowDebug()
 		default:
 			log(debugError, "Can't set unknown flag", c.S)
 		}
 	default:
-		log(true, "plugin Send() unknown parent =", p.Name, p.Type)
-		log(true, "plugin Send() unknown child  =", c.Name, c.Type)
-		log(true, "plugin Send() Don't know how to do", c.Type, "yet")
-	}
-}
-
-// delete the child widget from the parent
-// p = parent, c = child
-func destroy(p *toolkit.Widget, c *toolkit.Widget) {
-	log(true, "delete()", c.Name, c.Type)
-
-	pt := mapToolkits[p]
-	ct := mapToolkits[c]
-	if (ct == nil) {
-		log(true, "delete FAILED (ct = mapToolkit[c] == nil) for c", c.Name, c.Type)
-		// this pukes out a whole universe of shit
-		// listMap()
-		return
-	}
-
-	switch ct.Type {
-	case toolkit.Button:
-		log(true, "Should delete Button here:", c.Name)
-		log(true, "Parent:")
-		pt.Dump(true)
-		log(true, "Child:")
-		ct.Dump(true)
-		if (pt.uiBox == nil) {
-			log(true, "Don't know how to destroy this")
-		} else {
-			log(true, "Fuck it, destroy the whole box", pt.Name)
-			// pt.uiBox.Destroy() // You have a bug: You cannot destroy a uiControl while it still has a parent.
-			pt.uiBox.SetPadded(false)
-			pt.uiBox.Delete(4)
-			ct.uiButton.Disable()
-			// ct.uiButton.Hide()
-			ct.uiButton.Destroy()
-		}
-
-	case toolkit.Window:
-		log(true, "Should delete Window here:", c.Name)
-	default:
-		log(true, "Don't know how to delete c =", c.Type, c.Name)
-		log(true, "Don't know how to delete pt =", pt.Type, pt.Name, pt.uiButton)
-		log(true, "Don't know how to delete ct =", ct.Type, ct.Name, ct.uiButton)
-		log(true, "Parent:")
-		pt.Dump(true)
-		log(true, "Child:")
-		ct.Dump(true)
-		log(true, "Fuckit, let's destroy a button", c.Name, c.Type)
-		if (ct.uiButton != nil) {
-			pt.uiBox.Delete(4)
-			ct.uiButton.Destroy()
-		}
+		log(debugError, "plugin Send() unknown parent =", p.Name, p.Type)
+		log(debugError, "plugin Send() unknown child  =", c.Name, c.Type)
+		log(debugError, "plugin Send() Don't know how to do", c.Type, "yet")
 	}
 }