fix paths

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

1 files changed, 49 insertions, 51 deletions

diff --git a/widget.go b/widget.go
index 2dd4fe9..4383722 100644
--- a/widget.go
+++ b/widget.go
@@ -1,16 +1,15 @@
 package debugger
 
 import (
-	"strconv"
 	"errors"
+	"strconv"
 
-	"go.wit.com/log"
 	"go.wit.com/gui/gui"
-	"go.wit.com/gui/widget"
-	"go.wit.com/gui/gadgets"
+	"go.wit.com/lib/gadgets"
+	"go.wit.com/lib/widget"
+	"go.wit.com/log"
 )
 
-
 /*
 func setActiveWidget(w *gui.Node) {
 	if (w == nil) {
@@ -59,22 +58,21 @@ func DebugWidgetWindow(p *gui.Node) *gadgets.BasicWindow {
 	g2 = g.NewGroup("bool B:")
 	activeLabelNewB = g2.NewCheckbox("tmp bool")
 
-
 	// common things that should work against each widget
 	g = w.Box().NewGroup("common things")
-	g.NewButton("Enable()", func () {
+	g.NewButton("Enable()", func() {
 		activeWidget.Enable()
 	})
-	g.NewButton("Disable()", func () {
+	g.NewButton("Disable()", func() {
 		activeWidget.Disable()
 	})
-	g.NewButton("Show()", func () {
+	g.NewButton("Show()", func() {
 		activeWidget.Show()
 	})
-	g.NewButton("Hide()", func () {
+	g.NewButton("Hide()", func() {
 		activeWidget.Hide()
 	})
-	g.NewButton("Dump()", func () {
+	g.NewButton("Dump()", func() {
 		activeWidget.Dump()
 	})
 
@@ -84,42 +82,42 @@ func DebugWidgetWindow(p *gui.Node) *gadgets.BasicWindow {
 	debugAddWidgetButtons(g)
 
 	g = w.Box().NewGroup("change things")
-	g.NewButton("AddText()", func () {
+	g.NewButton("AddText()", func() {
 		activeWidget.AddText(activeLabelNewName.String())
 		/*
-		activeWidget.S = activeLabelNewName.S
-		a := newAction(activeWidget, toolkit.AddText)
-		sendAction(a)
+			activeWidget.S = activeLabelNewName.S
+			a := newAction(activeWidget, toolkit.AddText)
+			sendAction(a)
 		*/
 	})
-	g.NewButton("SetText()", func () {
+	g.NewButton("SetText()", func() {
 		activeWidget.SetText(activeLabelNewName.String())
 		/*
-		activeWidget.S = activeLabelNewName.String()
-		a := newAction(activeWidget, toolkit.SetText)
-		sendAction(a)
+			activeWidget.S = activeLabelNewName.String()
+			a := newAction(activeWidget, toolkit.SetText)
+			sendAction(a)
 		*/
 	})
-	g.NewButton("Margin()", func () {
+	g.NewButton("Margin()", func() {
 		activeWidget.Margin()
 		/*
-		a := newAction(activeWidget, toolkit.Margin)
-		sendAction(a)
+			a := newAction(activeWidget, toolkit.Margin)
+			sendAction(a)
 		*/
 	})
-	g.NewButton("Unmargin()", func () {
+	g.NewButton("Unmargin()", func() {
 		activeWidget.Unmargin()
 	})
-	g.NewButton("Pad()", func () {
+	g.NewButton("Pad()", func() {
 		activeWidget.Pad()
 	})
-	g.NewButton("Unpad()", func () {
+	g.NewButton("Unpad()", func() {
 		activeWidget.Unpad()
 	})
-	g.NewButton("Move(junk)", func () {
+	g.NewButton("Move(junk)", func() {
 		log.Warn("gui.Node Move() not implemented yet")
 	})
-	g.NewButton("Delete()", func () {
+	g.NewButton("Delete()", func() {
 		activeWidget.Delete(activeWidget)
 	})
 
@@ -127,7 +125,7 @@ func DebugWidgetWindow(p *gui.Node) *gadgets.BasicWindow {
 	activeJunk = w.Box().NewGroup("junk:")
 	activeJunk.NewLabel("test junk")
 
-	if (activeWidget == nil) {
+	if activeWidget == nil {
 		setActiveWidget(me.myGui)
 	}
 
@@ -135,24 +133,24 @@ func DebugWidgetWindow(p *gui.Node) *gadgets.BasicWindow {
 }
 
 func debugAddWidgetButtons(n *gui.Node) {
-	n.NewButton("Dropdown", func () {
+	n.NewButton("Dropdown", func() {
 		a := activeWidget.NewDropdown()
 		a.AddText("this is better than tcl/tk")
 		a.AddText("make something for tim for qflow")
 		a.AddText("and for riscv")
-		a.Custom = func () {
+		a.Custom = func() {
 			log.Log(WARN, "custom dropdown() a =", a.GetProgName(), a.String())
 		}
 	})
-	n.NewButton("Combobox", func () {
+	n.NewButton("Combobox", func() {
 		a := activeWidget.NewCombobox()
 		a.AddText("mirrors.wit.com")
 		a.AddText("go.wit.com")
-		a.Custom = func () {
+		a.Custom = func() {
 			log.Log(WARN, "custom combobox() a =", a.GetProgName(), a.String())
 		}
 	})
-	n.NewButton("Grid", func () {
+	n.NewButton("Grid", func() {
 		// Grid numbering by (X,Y)
 		// -----------------------------
 		// -- (1,1) -- (2,1) -- (3,1) --
@@ -163,25 +161,25 @@ func debugAddWidgetButtons(n *gui.Node) {
 		debugGrid = activeWidget.NewGrid("tmp grid", 2, 3)
 		debugGridLabel = debugGrid.NewLabel("mirrors.wit.com")
 		/*
-		debugGrid.SetNext(0,1)
-		debugGrid.NewLabel("foo (0,1)")
-		debugGrid.SetNext(1,1)
-		debugGrid.NewLabel("foo (1,1)")
-		debugGrid.SetNext(2,1)
-		debugGrid.NewLabel("foo (2,1)")
+			debugGrid.SetNext(0,1)
+			debugGrid.NewLabel("foo (0,1)")
+			debugGrid.SetNext(1,1)
+			debugGrid.NewLabel("foo (1,1)")
+			debugGrid.SetNext(2,1)
+			debugGrid.NewLabel("foo (2,1)")
 		*/
 		// SetDebug(false)
 		DebugWidgetWindow(debugGrid)
 	})
-	n.NewButton("Image", func () {
+	n.NewButton("Image", func() {
 		activeWidget.NewImage("image")
 	})
-	n.NewButton("Box(horizontal)", func () {
+	n.NewButton("Box(horizontal)", func() {
 		a := activeWidget.NewBox("hBox", true)
 		a.NewLabel("hBox")
 		a.NewLabel("hBox 2")
 	})
-	n.NewButton("Box(vertical)", func () {
+	n.NewButton("Box(vertical)", func() {
 		a := activeWidget.NewBox("vBox", false)
 		a.NewLabel("vBox")
 		a.NewLabel("vBox 2")
@@ -211,13 +209,13 @@ func debugAddWidgetButton(n *gui.Node) {
 	activeLabelNewType.AddText("Color")
 	activeLabelNewType.AddText("Dialog")
 
-	n.NewButton("Add", func () {
-		name :=  activeLabelNewName.String()
-		newX :=  widget.GetInt(activeLabelNewX.String())
-		newY :=  widget.GetInt(activeLabelNewY.String())
-		newB :=  widget.GetBool(activeLabelNewB.String())
+	n.NewButton("Add", func() {
+		name := activeLabelNewName.String()
+		newX := widget.GetInt(activeLabelNewX.String())
+		newY := widget.GetInt(activeLabelNewY.String())
+		newB := widget.GetBool(activeLabelNewB.String())
 
-		if (newY == -1) {
+		if newY == -1 {
 			name = name + " (" + strconv.Itoa(activeWidget.NextW) + "," + strconv.Itoa(activeWidget.NextH) + ")"
 		} else {
 			// activeWidget.SetNext(newX, newY)
@@ -243,19 +241,19 @@ func debugAddWidgetButton(n *gui.Node) {
 		case "Box":
 			activeWidget.NewBox(name, newB)
 		case "Button":
-			activeWidget.NewButton(name, func () {
+			activeWidget.NewButton(name, func() {
 				log.Log(WARN, "got to button", name)
 			})
 		case "Checkbox":
 			a := activeWidget.NewCheckbox("DBG")
-			a.Custom = func () {
+			a.Custom = func() {
 				log.Log(WARN, "custom checkox func a=", a.String())
 			}
 		case "Dropdown":
 			a := activeWidget.NewDropdown()
 			a.AddText(name + " yay")
 			a.AddText(name + " haha")
-			a.Custom = func () {
+			a.Custom = func() {
 				log.Log(WARN, "WTF a=", a.String())
 			}
 		case "Combobox":