ready for version v0.7.4

    start deprecating toolkit.Widget
    switch to variable name 'ParentId'
    use 'ActionType' and 'WidgetType'
    preliminary redraw()
    final definition of variables 'Name' and 'Text'
    more cleaning of the code
    remove lots of dumb code
    bind 'd' key press to dump out debugging info
    early color handling in gocui!

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

1 files changed, 34 insertions, 60 deletions

diff --git a/toolkit/widget.go b/toolkit/widget.go
index 339690e..0a1dda3 100644
--- a/toolkit/widget.go
+++ b/toolkit/widget.go
@@ -7,6 +7,8 @@ type ActionType int
 //
 // All Toolkit interactions should be done via a channel or Queue()
 // TODO: FIGURE OUT HOW TO IMPLEMENT THIS
+// https://ieftimov.com/post/golang-datastructures-trees/
+// TODO: protobuf ?
 //
 // This is the only thing that is passed between the toolkit plugin
 //
@@ -28,7 +30,7 @@ type Widget struct {
 	Callback  func()
 
 	// re-adding an id to test channels
-	id     int
+	Id     int
 
 	// This is how the values are passed back and forth
 	// values from things like checkboxes & dropdown's
@@ -38,30 +40,17 @@ type Widget struct {
 	// maybe safe if there is correctly working Custom() between goroutines?
 	// (still probably not, almost certainly not. not possible. layer violation?)
 	S	string // not safe to have 'S'
-
-	// This GUI is intended for simple things
-	// We are not laying out PDF's here
-	// This is used for things like a slider(0,100)
-	Width  int
-	Height int
-	X      int
-	Y      int
-
-	// Put space around elements to improve look & feel
-	Margin	bool
-
-	// Make widgets fill up the space available
-	Expand	bool
 }
 
 type Action struct {
-	Type ActionType
-	ActionT ActionType
-	WidgetT WidgetType
+	ActionType ActionType
+	WidgetType WidgetType
 
 	WidgetId int
-	WhereId int
-	Title string
+	ParentId int
+
+	Text string  // what is visable to the user
+	Name string  // a name useful for programming
 
 	// this should be the widget
 	// if the action is New, Hide, Enable, etc
@@ -92,31 +81,30 @@ type Action struct {
 	Expand	bool
 }
 
-
-// https://ieftimov.com/post/golang-datastructures-trees/
-// TODO: protobuf ?
 const (
 	Unknown WidgetType = iota
-	Window
-	Tab	// internally, this should be a window (?)
-	Frame	// should windows and tab's be frames (?)
-	Grid	// a grid of frames ?
-	Group	// internally, this should be a grid (?)
-	Box	// internally, this should be a grid (?)
+	Root	// the master 'root' node of the binary tree
+	Flag	// used to send configuration values to plugins
+	Window	// in certain gui's (ncurses), these are tabs
+	Tab	// internally, this is a window
+	Frame	// deprecate?
+	Grid	// like drawers in a chest
+	Group	// like the 'Appetizers' section on a menu
+	Box	// a vertical or horizontal stack of widgets
 	Button
-	Checkbox
+	Checkbox // select 'on' or 'off'
 	Dropdown
-	Combobox // dropdown with edit=true (?)
+	Combobox // dropdown with edit=true
 	Label
-	Textbox	// is this a Label with edit=true?
-	Slider
-	Spinner
-	Image
-	Area
-	Form
-	Font
-	Color
-	Dialog
+	Textbox	// is this a Label with edit=true
+	Slider // like a progress bar
+	Spinner // like setting the oven temperature
+	Image // TODO
+	Area // TODO
+	Form // TODO
+	Font // TODO
+	Color // TODO
+	Dialog // TODO
 )
 
 const (
@@ -124,7 +112,6 @@ const (
 	Delete
 	Get
 	Set
-	SetFlag
 	GetText
 	SetText
 	AddText
@@ -139,11 +126,14 @@ const (
 	Append
 	Move
 	Dump
-	Flag
 )
 
 func (s WidgetType) String() string {
 	switch s {
+	case Root:
+		return "Root"
+	case Flag:
+		return "Flag"
 	case Window:
 		return "Window"
 	case Tab:
@@ -187,7 +177,7 @@ func (s WidgetType) String() string {
 	case Unknown:
 		return "Unknown"
 	}
-	return "Widget.Type.String() Error"
+	return "WidgetType.String() Error"
 }
 
 func (s ActionType) String() string {
@@ -200,8 +190,6 @@ func (s ActionType) String() string {
 		return "Get"
 	case Set:
 		return "Set"
-	case SetFlag:
-		return "SetFlag"
 	case GetText:
 		return "GetText"
 	case SetText:
@@ -228,22 +216,8 @@ func (s ActionType) String() string {
 		return "Append"
 	case Move:
 		return "Move"
-	case Flag:
-		return "Flag"
 	case Dump:
 		return "Dump"
 	}
-	return "Action.Type.String() Error"
-}
-
-// this is hopefully just used in a very few places for
-// debuging the interaction between go apps and the underlying
-// toolkits. Hopefully this is less prone to problems and can
-// detect memory leaks, threading problems, memory allocation & mapping errors, etc
-func (w *Widget) GetId() int {
-	return w.id
-}
-
-func (w *Widget) SetId(i int) {
-	w.id = i
+	return "ActionType.String() Error"
 }