From f12d4b5c32f74452a46dc417b52949ad6e4611fc Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Sun, 2 Jun 2019 12:08:53 -0700 Subject: [PATCH] cleanups Signed-off-by: Jeff Carr --- box.go | 19 ++++++++ debug.go | 145 +++++++++++-------------------------------------------- misc.go | 30 ------------ 3 files changed, 48 insertions(+), 146 deletions(-) diff --git a/box.go b/box.go index 51e8b68..a8c2c46 100644 --- a/box.go +++ b/box.go @@ -53,6 +53,25 @@ func add(box *GuiBox, newbox *GuiBox) { log.Println("gui.add() END") } +func InitGuiBox(gw *GuiWindow, box *GuiBox, uiBox *ui.Box, name string) *GuiBox { + log.Println("InitGuiBox() START") + var newGuiBox GuiBox + newGuiBox.UiBox = uiBox + newGuiBox.Window = gw + uiBox.SetPadded(true) + + if (box != nil) { + log.Println("InitGuiBox() APPEND NEW BOX TO OLD BOX") + box.UiBox.Append(uiBox, false) + } else { + log.Println("InitGuiBox() APPEND NEW BOX TO TAB") + gw.UiTab.Append(name, uiBox) + } + gw.BoxMap[name] = &newGuiBox + log.Println("InitGuiBox() END") + return &newGuiBox +} + func HardHorizontalBox(gw *GuiWindow) *GuiBox { log.Println("HardHorizontalBreak START") var newbox *GuiBox diff --git a/debug.go b/debug.go index 049b1ba..daf3143 100644 --- a/debug.go +++ b/debug.go @@ -7,125 +7,10 @@ import "reflect" // import "github.com/andlabs/ui" // import _ "github.com/andlabs/ui/winmanifest" - // import "github.com/davecgh/go-spew/spew" - // import pb "git.wit.com/wit/witProtobuf" -// THIS IS NOT CLEAN (but probably doesn't need to be. it's debugging) - -func addTableTab() { - var parts []TableColumnData - - for key, foo := range []string{"BG", "TEXTCOLOR", "BUTTON", "TEXTCOLOR", "TEXTCOLOR", "TEXT", "BUTTON", "TEXT", "BUTTON"} { - log.Println(key, foo) - - var b TableColumnData - b.CellType = foo - b.Heading = fmt.Sprintf("heading%d", key) - parts = append(parts, b) - } - - log.Println("Sleep for 2 seconds, then try to add new tabs") - time.Sleep(1 * 1000 * 1000 * 1000) - // AddTableTab(Data.Window1.T, 1, "test seven", 7, parts, nil) -} - -/* -func addDebuggingButtons(box *GuiBox) { - vbox := ui.NewVerticalBox() - vbox.SetPadded(true) - box.UiBox.Append(vbox, false) - - vbox.Append(ui.NewLabel("Debugging:"), false) - - vbox.Append(ui.NewColorButton(), false) - a := CreateButton(box, nil, nil, "Add Account", "ADD", nil) - vbox.Append(a.B, false) - a = CreateButton(box, nil, nil, "Quit", "QUIT", nil) - vbox.Append(a.B, false) - - // ATTEMPT TO ADD THE TABLE HERE - add2button := ui.NewButton("Add a Test Table") - add2button.OnClicked(func(*ui.Button) { - log.Println("send over socket") - addTableTab() - }) - vbox.Append(add2button, false) - // ATTEMPT TO ADD THE TABLE HERE END - - a = CreateButton(box, nil, nil, "Hide & Show Box1&2", "HIDE", runTestHide) - vbox.Append(a.B, false) - - a = CreateButton(box, nil, nil, "Close GUI", "QUIT", nil) - vbox.Append(a.B, false) - a = CreateButton(box, nil, nil, "DEBUG goroutines", "DEBUG", nil) - vbox.Append(a.B, false) - a = CreateButton(box, nil, nil, "xterm", "XTERM", runTestExecClick) - vbox.Append(a.B, false) - a = CreateButton(box, nil, nil, "Load test.json config file", "CONFIG", nil) - vbox.Append(a.B, false) -} -*/ - -func runTestHide(b *GuiButton) { - /* - log.Println("runTestHide START") - Data.Window1.Box1.Hide() - Data.Window1.Box2.Hide() - // time.Sleep(2000 * time.Millisecond) - Data.State = "HIDE" - log.Println("runTestHide END") - */ -} - -/* -func runPingClick(b *GuiButton) { - log.Println("runPingClick START") - log.Println("runTestExecClick b.VM", b.VM) - hostname := "localhost" - if (b.VM != nil) { - hostname = b.VM.Hostname - } - spew.Dump(b) - var tmp []string - tmp = append(tmp, "xterm", "-geometry", "120x30", "-e", "ping " + hostname + ";sleep 3") - go runCommand(tmp) - log.Println("runPingClick END") -} - -func runTestExecClick(b *GuiButton) { - log.Println("runTestExecClick START") - if runtime.GOOS == "linux" { - go runSimpleCommand("xterm -report-fonts") - } else if runtime.GOOS == "windows" { - go runSimpleCommand("mintty.exe") - } else { - go runSimpleCommand("xterm") - } - log.Println("runTestExecClick END") -} - -func runSimpleCommand(s string) { - cmd := strings.TrimSpace(s) // this is like 'chomp' in perl - cmdArgs := strings.Fields(cmd) - runCommand(cmdArgs) -} - -func runCommand(cmdArgs []string) { - log.Println("runCommand() START", cmdArgs) - process := exec.Command(cmdArgs[0], cmdArgs[1:len(cmdArgs)]...) - // process := exec.Command("xterm", "-e", "ping localhost") - log.Println("runCommand() process.Start()") - process.Start() - log.Println("runCommand() process.Wait()") - process.Wait() - log.Println("runCommand() NEED TO CHECK THE TIME HERE TO SEE IF THIS WORKED") - log.Println("runCommand() OTHERWISE INFORM THE USER") - log.Println("runCommand() END") -} -*/ - +// THIS IS NOT CLEAN // // this watches the GUI primarily to process protobuf's // this is pointless or wrong but I use it for debugging @@ -159,3 +44,31 @@ func WatchGUI() { time.Sleep(200 * time.Millisecond) } } + +func addTableTab() { + var parts []TableColumnData + + for key, foo := range []string{"BG", "TEXTCOLOR", "BUTTON", "TEXTCOLOR", "TEXTCOLOR", "TEXT", "BUTTON", "TEXT", "BUTTON"} { + log.Println(key, foo) + + var b TableColumnData + b.CellType = foo + b.Heading = fmt.Sprintf("heading%d", key) + parts = append(parts, b) + } + + log.Println("Sleep for 2 seconds, then try to add new tabs") + time.Sleep(1 * 1000 * 1000 * 1000) + // AddTableTab(Data.Window1.T, 1, "test seven", 7, parts, nil) +} + +/* +func runTestHide(b *GuiButton) { + log.Println("runTestHide START") + Data.Window1.Box1.Hide() + Data.Window1.Box2.Hide() + // time.Sleep(2000 * time.Millisecond) + Data.State = "HIDE" + log.Println("runTestHide END") +} +*/ diff --git a/misc.go b/misc.go index 2040cda..3e86a88 100644 --- a/misc.go +++ b/misc.go @@ -25,17 +25,6 @@ func GuiInit() { }) } -/* -func AddMainTab(gw *GuiWindow) *GuiBox { - log.Println("ShowMainTab() gw =", gw) - log.Println("ShowMainTab() gw.UiTab =", gw.UiTab) - - window := InitGuiWindow(Data.Config, "MAIN", nil, gw.UiWindow, gw.UiTab) - box := InitGuiBox(window, nil, ui.NewHorizontalBox(), "MAIN") - return box -} -*/ - func ShowMainTabShowBox(gw *GuiWindow, box *GuiBox) { log.Println("gui.ShowMainTabShowBox() box =", box) // gw.UiTab.Delete(0) @@ -44,25 +33,6 @@ func ShowMainTabShowBox(gw *GuiWindow, box *GuiBox) { gw.UiTab.SetMargined(0, true) } -func InitGuiBox(gw *GuiWindow, box *GuiBox, uiBox *ui.Box, name string) *GuiBox { - log.Println("InitGuiBox() START") - var newGuiBox GuiBox - newGuiBox.UiBox = uiBox - newGuiBox.Window = gw - uiBox.SetPadded(true) - - if (box != nil) { - log.Println("InitGuiBox() APPEND NEW BOX TO OLD BOX") - box.UiBox.Append(uiBox, false) - } else { - log.Println("InitGuiBox() APPEND NEW BOX TO TAB") - gw.UiTab.Append(name, uiBox) - } - gw.BoxMap[name] = &newGuiBox - log.Println("InitGuiBox() END") - return &newGuiBox -} - func InitGuiWindow(c *pb.Config, action string, maketab func(*GuiWindow) *GuiBox, uiW *ui.Window, uiT *ui.Tab) *GuiWindow { log.Println("InitGuiWindow() START") var newGuiWindow GuiWindow