CLEAN: rename some functions for consistancy

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

3 files changed, 6 insertions, 27 deletions

diff --git a/cmds/gui-demo/main.go b/cmds/gui-demo/main.go
index 372f2e2..8eae878 100644
--- a/cmds/gui-demo/main.go
+++ b/cmds/gui-demo/main.go
@@ -34,7 +34,7 @@ func initGUI() {
 	gui.Config.Height = 240
 	gui.Config.Exit = myExit
 	node2 := gui.NewWindow()
-	node2.AddDemoAndlabsUiTab("A Simple andlabs/ui Tab Demo")
+	node2.DemoAndlabsUiTab("A Simple andlabs/ui Tab Demo")
 }
 
 // This demonstrates how to properly interact with the GUI
diff --git a/debug-window.go b/debug-window.go
index 756ebac..19f276d 100644
--- a/debug-window.go
+++ b/debug-window.go
@@ -16,7 +16,7 @@ var nodeNames = make([]string, 100)
 func DebugWindow() {
 	Config.Title = "DebugWindow()"
 	node := NewWindow()
-	node.AddDebugTab("WIT GUI Debug Tab")
+	node.DebugTab("WIT GUI Debug Tab")
 }
 
 // TODO: remove this crap
@@ -236,23 +236,10 @@ func makeWindowDebug() *ui.Box {
 		log.Println("nodeNames[y] =", nodeNames[y])
 		node := Data.findId(nodeNames[y])
 		if (node != nil) {
-			node.AddDebugTab("added this DebugTab")
+			node.DebugTab("added this DebugTab")
 		}
 	})
 
-	/*
-	n1 = addButton(vbox, "Node.DemoTab")
-	n1.OnClicked(func(*ui.Button) {
-		y := nodeCombo.Selected()
-		log.Println("y =", y)
-		log.Println("nodeNames[y] =", nodeNames[y])
-		node := Data.findId(nodeNames[y])
-		if (node != nil) {
-			node.AddDemoTab("ran gui.AddDemoTab() " + strconv.Itoa(Config.counter))
-		}
-	})
-	*/
-
 	n1 = addButton(vbox, "Node.DemoAndlabsUiTab")
 	n1.OnClicked(func(*ui.Button) {
 		y := nodeCombo.Selected()
@@ -260,18 +247,10 @@ func makeWindowDebug() *ui.Box {
 		log.Println("nodeNames[y] =", nodeNames[y])
 		node := Data.findId(nodeNames[y])
 		if (node != nil) {
-			node.AddDemoAndlabsUiTab("ran gui.AddDemoAndlabsUiTab() " + strconv.Itoa(Config.counter))
+			node.DemoAndlabsUiTab("ran gui.AddDemoAndlabsUiTab() " + strconv.Itoa(Config.counter))
 		}
 	})
 
-/*
-	/////////////////////////////////////////////////////
-	vbox = addGroup(hbox, "Numbers")
-	pbar := ui.NewProgressBar()
-	vbox.Append(pbar, false)
-*/
-
-
 	return hbox
 }
 
@@ -351,7 +330,7 @@ func addButton(box *ui.Box, name string) *ui.Button {
 	return button
 }
 
-func (n *Node) AddDebugTab(title string) {
+func (n *Node) DebugTab(title string) {
 	newNode := n.AddTab(title, makeWindowDebug())
 	if (Config.DebugNode) {
 		newNode.Dump()
diff --git a/demo-window-andlabs-ui.go b/demo-window-andlabs-ui.go
index 806dc14..e11ffe9 100644
--- a/demo-window-andlabs-ui.go
+++ b/demo-window-andlabs-ui.go
@@ -8,7 +8,7 @@ import _ "github.com/andlabs/ui/winmanifest"
 // calls to andlabs/ui. This can be used to bypass
 // the obvuscation added in this package if it is desired
 // or needed.
-func (n *Node) AddDemoAndlabsUiTab(title string) {
+func (n *Node) DemoAndlabsUiTab(title string) {
 	newNode := n.AddTab(title, makeAndlabsUiTab())
 	if (Config.DebugNode) {
 		newNode.Dump()