From 0405ab64a423aead770b5589a335244403fbe07f Mon Sep 17 00:00:00 2001
From: Jeff Carr <jcarr@wit.com>
Date: Sun, 23 Apr 2023 11:30:39 -0500
Subject: [PATCH] misc

Signed-off-by: Jeff Carr <jcarr@wit.com>
---
 window-main.go => gui.go | 17 ++++++-----------
 main.go                  |  5 ++++-
 2 files changed, 10 insertions(+), 12 deletions(-)
 rename window-main.go => gui.go (96%)

diff --git a/window-main.go b/gui.go
similarity index 96%
rename from window-main.go
rename to gui.go
index e57fa2c..3edc981 100644
--- a/window-main.go
+++ b/gui.go
@@ -10,15 +10,6 @@ import (
 var myGui *gui.Node
 var mainWindow *gui.Node
 
-func initGUI() {
-	myGui = gui.New().LoadToolkit("gocui")
-	mainWindow = myGui.NewWindow("wit new machine setup").SetText("wit new machine setup")
-
-	mainWindow.Custom = customExit
-
-	mainTab(mainWindow)
-}
-
 func customExit() {
 	log.Println("Should Exit Here")
 	// window := gui.Data.WindowMap["Debugging2"]
@@ -40,10 +31,14 @@ func writeRes(indir string, outdir string, name string) {
 	ioutil.WriteFile(outdir + name, tmp, 0644)
 }
 
-func mainTab(n *gui.Node) {
+//	myGui = gui.New().LoadToolkit("gocui")
+func drawWindow() {
 	var g *gui.Node
 
-	newTab := n.NewTab("mainTab")
+	mainWindow = myGui.NewWindow("wit new machine setup").SetText("wit new machine setup")
+	mainWindow.Custom = customExit
+
+	newTab := mainWindow.NewTab("mainTab")
 
 	////////////////////    General GUI debugging       /////////////////////////
 	g = newTab.NewGroup("Debug")
diff --git a/main.go b/main.go
index 894c8e2..bace5ad 100644
--- a/main.go
+++ b/main.go
@@ -50,7 +50,10 @@ func main() {
 		os.Exit(0)
 	}
 
-	initGUI()
+	// myGui = gui.New().LoadToolkit("gocui")
+	myGui = gui.New().Default()
+	drawWindow()
+
 	gui.Watchdog()
 }