From 138eff381a675480678ad636b3ceb68819760536 Mon Sep 17 00:00:00 2001
From: Jeff Carr <jcarr@wit.com>
Date: Sun, 12 May 2019 23:02:39 -0700
Subject: [PATCH] more code cleanup

Signed-off-by: Jeff Carr <jcarr@wit.com>
---
 examples.go |  16 ++++++++
 gui.go      | 106 +++++-----------------------------------------------
 2 files changed, 26 insertions(+), 96 deletions(-)

diff --git a/examples.go b/examples.go
index 64973c9..df9c5b5 100644
--- a/examples.go
+++ b/examples.go
@@ -8,6 +8,9 @@ import _ "github.com/andlabs/ui/winmanifest"
 
 import "github.com/davecgh/go-spew/spew"
 
+var jcarrButton *ui.Button
+var jcarrEntry  *ui.MultilineEntry
+
 func buttonClick(button *ui.Button) {
 	log.Println("hostname =", config.String("hostname"), button)
 	spew.Dump(button)
@@ -200,3 +203,16 @@ func makeDataChoosersPage() ui.Control {
 
 	return hbox
 }
+
+func AddChoosersDemo() {
+	maintab.Append("Choosers examples", makeDataChoosersPage())
+	maintab.SetMargined(tabcount, true)
+	tabcount += 1
+}
+
+// This hangs on GTK
+func AddEntriesDemo() {
+	maintab.Append("Group examples", makeGroupEntries())
+	tabcount += 1
+	maintab.SetMargined(tabcount, true)
+}
diff --git a/gui.go b/gui.go
index 1ac1623..5b9e56d 100644
--- a/gui.go
+++ b/gui.go
@@ -1,21 +1,16 @@
 package gui
 
 import "log"
-import "time"
-// import "fmt"
 
-import "github.com/gookit/config"
 import "github.com/andlabs/ui"
 import _ "github.com/andlabs/ui/winmanifest"
 
-// import "github.com/davecgh/go-spew/spew"
+var mainwin	*ui.Window
+var maintab	*ui.Tab
+var tabcount	int
 
-var mainwin *ui.Window
-var maintab *ui.Tab
-var tabcount int
-
-var jcarrButton *ui.Button
-var jcarrEntry  *ui.MultilineEntry
+var Width	int
+var Height	int
 
 type InputData struct {
 	Index		int
@@ -25,7 +20,7 @@ type InputData struct {
 }
 
 func setupUI() {
-	mainwin = ui.NewWindow("Cloud Control Panel", config.Int("width"), config.Int("height"), false)
+	mainwin = ui.NewWindow("Cloud Control Panel", Width, Height, false)
 	mainwin.OnClosing(func(*ui.Window) bool {
 		ui.Quit()
 		return true
@@ -39,41 +34,15 @@ func setupUI() {
 	mainwin.SetChild(maintab)
 	mainwin.SetMargined(true)
 
-	// maintab.Append("List examples", makeNumbersPage())
 	tabcount = 0
-	// maintab.SetMargined(tabcount, true)
-
-/*
-	maintab.Append("Choosers examples", makeDataChoosersPage())
-	tabcount += 1
-	maintab.SetMargined(tabcount, true)
-
-	maintab.Append("Group examples", makeGroupEntries())
-	tabcount += 1
-	maintab.SetMargined(tabcount, true)
-*/
-
 	mainwin.Show()
 }
 
-func AddChoosersDemo() {
-	maintab.Append("Choosers examples", makeDataChoosersPage())
-	maintab.SetMargined(tabcount, true)
-	tabcount += 1
-}
-
 func AddNewTab(mytab *ui.Tab, newbox ui.Control, tabOffset int) {
 	mytab.Append("Cloud Info", newbox)
 	mytab.SetMargined(tabOffset, true)
 }
 
-// This hangs on GTK
-func AddEntriesDemo() {
-	maintab.Append("Group examples", makeGroupEntries())
-	tabcount += 1
-	maintab.SetMargined(tabcount, true)
-}
-
 func initColumnNames(mh *TableData, cellJWC string, junk string) {
 	if (cellJWC == "BG") {
 		mh.generatedColumnTypes = append(mh.generatedColumnTypes, ui.TableColor{})
@@ -116,59 +85,6 @@ func initRow(mh *TableData, row int, parts []InputData) {
 	}
 }
 
-func AddSampleTableTab(mytab *ui.Tab, mytabcount int, name string, rowcount int, parts []InputData) {
-	mh := new(TableData)
-
-	mh.RowCount    = rowcount
-	mh.Rows        = make([]RowData, mh.RowCount)
-
-	// This is the standard callback function from libUI when the user does something
-	mh.libUIevent      = defaultSetCellValue
-
-	tmpBTindex := 0
-
-	for key, foo := range parts {
-		log.Println(key, foo)
-		initColumnNames(mh, foo.CellType, foo.Heading)
-	}
-
-	time.Sleep(1 * 1000 * 1000 * 1000)
-
-	for row := 0; row < mh.RowCount; row++ {
-		initRow(mh, row, parts)
-	}
-	log.Println(mh)
-
-	model := ui.NewTableModel(mh)
-	table := ui.NewTable(
-		&ui.TableParams{
-			Model:	model,
-			RowBackgroundColorModelColumn:	tmpBTindex,
-	})
-
-	for key, foo := range parts {
-		log.Println(key, foo)
-		initColumnNames(mh, foo.CellType, foo.Heading)
-		if (foo.CellType == "BG") {
-		} else if (foo.CellType == "BUTTON") {
-			tmpBTindex += 1
-			table.AppendButtonColumn("button3", tmpBTindex, ui.TableModelColumnAlwaysEditable)
-		} else if (foo.CellType == "TEXTCOLOR") {
-			tmpBTindex += 1
-			appendTextColorColumn   (mh, table, tmpBTindex, tmpBTindex + 1, "testcolor")
-			tmpBTindex += 1
-		} else if (foo.CellType == "TEXT") {
-			tmpBTindex += 1
-			appendTextColumn        (mh, table, tmpBTindex, "jwc1col")
-		} else {
-			panic("I don't know what this is in initColumnNames")
-		}
-	}
-
-	mytab.Append(name, table)
-	mytab.SetMargined(mytabcount, true)
-}
-
 func AddTableTab(mytab *ui.Tab, mytabcount int, name string, rowcount int, parts []InputData) *TableData {
 	mh := new(TableData)
 
@@ -223,10 +139,8 @@ func AddTableTab(mytab *ui.Tab, mytabcount int, name string, rowcount int, parts
 }
 
 func DoGUI() {
-	ui.Main(setupUI)
-
-	log.Println("GUI exited. Not sure what to do here. os.Exit() ?")
-
-	// not sure how to pass this back to the main program
-	// onExit()
+	for {
+		ui.Main(setupUI)
+		log.Println("GUI exited. Not sure what to do here. os.Exit() ?")
+	}
 }