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, 2 insertions, 206 deletions

diff --git a/toolkit/andlabs/structs.go b/toolkit/andlabs/structs.go
index 2f3fa72..cf3afaf 100644
--- a/toolkit/andlabs/structs.go
+++ b/toolkit/andlabs/structs.go
@@ -1,51 +1,10 @@
 package main
 
-import "log"
+import "git.wit.org/wit/gui/toolkit"
 
 import "github.com/andlabs/ui"
 import _ "github.com/andlabs/ui/winmanifest"
 
-import "github.com/davecgh/go-spew/spew"
-
-var defaultBehavior bool = true
-
-var bookshelf bool // do you want things arranged in the box like a bookshelf or a stack?
-var canvas bool // if set to true, the windows are a raw canvas
-var menubar bool // for windows
-var stretchy bool // expand things like buttons to the maximum size
-var padded bool // add space between things like buttons
-var margin bool // add space around the frames of windows
-
-var DebugToolkit bool
-
-func setDefaultBehavior(s bool) {
-	defaultBehavior = s
-	if (defaultBehavior) {
-		if (DebugToolkit) {
-			log.Println("Setting this toolkit to use the default behavior.")
-			log.Println("This is the 'guessing' part as defined by the wit/gui 'Principles'. Refer to the docs.")
-		}
-		stretchy = false
-		padded = true
-		menubar = true
-		margin = true
-		canvas = false
-		bookshelf = true // 99% of the time, things make a vertical stack of objects
-
-		DebugToolkit = false
-	} else {
-		log.Println("This toolkit is set to ignore the default behavior.")
-	}
-}
-
-func SetDebugToolkit (s bool) {
-	DebugToolkit = s
-}
-
-func GetDebugToolkit () bool {
-	return DebugToolkit
-}
-
 // stores the raw toolkit internals
 type andlabsT struct {
 	id     string
@@ -53,6 +12,7 @@ type andlabsT struct {
 	Name   string
 	Width  int
 	Height int
+	tw	*toolkit.Widget
 
 	OnChanged func(*andlabsT)
 	OnExit    func(*andlabsT)
@@ -83,167 +43,3 @@ type andlabsT struct {
 	val map[int]string
 	text   string
 }
-
-func (t *andlabsT) String() string {
-	return t.GetText()
-}
-
-func forceDump(t *andlabsT) {
-	tmp := DebugToolkit
-	DebugToolkit = true
-	t.Dump()
-	DebugToolkit = tmp
-}
-
-func (t *andlabsT) GetText() string {
-	t.Dump()
-	if (DebugToolkit) {
-		log.Println("gui.Toolkit.Text() Enter")
-		scs := spew.ConfigState{MaxDepth: 1}
-		scs.Dump(t)
-	}
-	if (t.uiEntry != nil) {
-		if (DebugToolkit) {
-			log.Println("gui.Toolkit.Value() =", t.uiEntry.Text())
-		}
-		return t.uiEntry.Text()
-	}
-	if (t.uiMultilineEntry != nil) {
-		if (DebugToolkit) {
-			log.Println("gui.Toolkit.Value() =", t.uiMultilineEntry.Text())
-		}
-		text := t.uiMultilineEntry.Text()
-		if (DebugToolkit) {
-			log.Println("gui.Toolkit.Value() text =", text)
-		}
-		t.text = text
-		return text
-	}
-	if (t.uiCombobox != nil) {
-		if (DebugToolkit) {
-			log.Println("gui.Toolkit.GetText() =", t.text)
-		}
-		return t.text
-	}
-	return ""
-}
-
-func (t *andlabsT) SetText(s string) bool {
-	if (DebugToolkit) {
-		log.Println("gui.Toolkit.Text() Enter")
-		scs := spew.ConfigState{MaxDepth: 1}
-		scs.Dump(t)
-	}
-	if (t.uiEntry != nil) {
-		if (DebugToolkit) {
-			log.Println("gui.Toolkit.Value() =", t.uiEntry.Text)
-		}
-		t.uiEntry.SetText(s)
-		return true
-	}
-	if (t.uiMultilineEntry != nil) {
-		if (DebugToolkit) {
-			log.Println("gui.Toolkit.Value() =", t.uiMultilineEntry.Text)
-		}
-		t.uiMultilineEntry.SetText(s)
-		return true
-	}
-	return false
-}
-
-func sanity(t *andlabsT) bool {
-	if (DebugToolkit) {
-		log.Println("gui.Toolkit.Value() Enter")
-		scs := spew.ConfigState{MaxDepth: 1}
-		scs.Dump(t)
-	}
-	if (t.uiEntry == nil) {
-		if (DebugToolkit) {
-			log.Println("gui.Toolkit.Value() =", t.uiEntry.Text)
-		}
-		return false
-	}
-	return true
-}
-
-func (t *andlabsT) SetValue(i int) bool {
-	log.Println("gui.Toolkit.SetValue() START")
-	if (sanity(t)) {
-		return false
-	}
-	t.Dump()
-	// panic("got to toolkit.SetValue")
-	return true
-}
-
-func (t *andlabsT) Value() int {
-	if (DebugToolkit) {
-		log.Println("gui.Toolkit.Value() Enter")
-		scs := spew.ConfigState{MaxDepth: 1}
-		scs.Dump(t)
-	}
-	if (t == nil) {
-		log.Println("gui.Toolkit.Value() can not get value t == nil")
-		return 0
-	}
-	if (t.uiSlider != nil) {
-		if (DebugToolkit) {
-			log.Println("gui.Toolkit.Value() =", t.uiSlider.Value)
-		}
-		return t.uiSlider.Value()
-	}
-	if (t.uiSpinbox != nil) {
-		if (DebugToolkit) {
-			log.Println("gui.Toolkit.Value() =", t.uiSpinbox.Value)
-		}
-		return t.uiSpinbox.Value()
-	}
-	log.Println("gui.Toolkit.Value() Could not find a ui element to get a value from")
-	return 0
-}
-
-func (t *andlabsT) Dump() {
-	if ! DebugToolkit {
-		return
-	}
-	log.Println("gui.Toolkit.Dump() Name  = ", t.Name, t.Width, t.Height)
-	if (t.uiBox != nil) {
-		log.Println("gui.Toolkit.Dump() uiBox      =", t.uiBox)
-	}
-	if (t.uiButton != nil) {
-		log.Println("gui.Toolkit.Dump() uiButton    =", t.uiButton)
-	}
-	if (t.uiCombobox != nil) {
-		log.Println("gui.Toolkit.Dump() uiCombobox  =", t.uiCombobox)
-	}
-	if (t.uiWindow != nil) {
-		log.Println("gui.Toolkit.Dump() uiWindow    =", t.uiWindow)
-	}
-	if (t.uiTab != nil) {
-		log.Println("gui.Toolkit.Dump() uiTab       =", t.uiTab)
-	}
-	if (t.uiGroup != nil) {
-		log.Println("gui.Toolkit.Dump() uiGroup     =", t.uiGroup)
-	}
-	if (t.uiEntry != nil) {
-		log.Println("gui.Toolkit.Dump() uiEntry     =", t.uiEntry)
-	}
-	if (t.uiMultilineEntry != nil) {
-		log.Println("gui.Toolkit.Dump() uiMultilineEntry =", t.uiMultilineEntry)
-	}
-	if (t.uiSlider != nil) {
-		log.Println("gui.Toolkit.Dump() uiSlider    =", t.uiSlider)
-	}
-	if (t.uiCheckbox != nil) {
-		log.Println("gui.Toolkit.Dump() uiCheckbox  =", t.uiCheckbox)
-	}
-	if (t.OnExit != nil) {
-		log.Println("gui.Toolkit.Dump() OnExit      =", t.OnExit)
-	}
-	if (t.Custom != nil) {
-		log.Println("gui.Toolkit.Dump() Custom      =", t.Custom)
-	}
-	log.Println("gui.Toolkit.Dump() c         =", t.c)
-	log.Println("gui.Toolkit.Dump() val       =", t.val)
-	log.Println("gui.Toolkit.Dump() text      =", t.text)
-}