From 4df4f2bfd93f0491f81c58742ecb4f32c8005e80 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Thu, 13 Jun 2019 12:08:16 -0700 Subject: [PATCH] VM list works again Signed-off-by: Jeff Carr --- gui-accounts.go | 34 ++++++---------------------------- gui-buttonClicks.go | 16 ++++++++-------- gui-debug.go | 4 +--- gui-splash.go | 2 +- gui-vm.go | 17 +++++++++++------ resources/tags/v0.6.31 | 1 + 6 files changed, 28 insertions(+), 46 deletions(-) create mode 100644 resources/tags/v0.6.31 diff --git a/gui-accounts.go b/gui-accounts.go index bed0dd7..9408667 100644 --- a/gui-accounts.go +++ b/gui-accounts.go @@ -9,11 +9,12 @@ import pb "git.wit.com/wit/witProtobuf" func makeCloudInfoBox(gw *gui.GuiWindow) { log.Println("makeCloudInfoBox() START gw =", gw) - gw.UiTab.Delete(0) // does this make things more or less stable or neither? - gw.Name = "Cloud Accounts" - gw = gui.InitGuiWindow(gw) // TODO: make this text i18n - box := gui.HardBox(gw, gui.Yaxis, "Cloud Accounts") + box := gui.InitWindow(gw, "Cloud Accounts", gui.Yaxis) + if (box == nil) { + log.Println("gui.InitWindow() FAILED") + return + } log.Println("makeCloudInfoBox() START GW IS NOW: gw =", gw) log.Println("makeCloudInfoBox() box =", box) @@ -56,31 +57,8 @@ func makeCloudInfoBox(gw *gui.GuiWindow) { log.Println("makeCloudInfoBox() END") } -// func createAccount(gw *gui.GuiWindow) { -func initWindow(gw *gui.GuiWindow, name string, axis int) *gui.GuiBox { - window := gui.Data.WindowMap[name] - if (window != nil) { - box := window.BoxMap["MAINBOX"] - log.Println("initWindow() tab already exists name =", name) - gui.ErrorWindow(box.Window, "Create Window Error", "Window " + name + " already exists") - return nil - } - - // if there is not an account, then go to 'make account' - gw.Name = name - newWindow := gui.InitGuiWindow(gw) - - var box *gui.GuiBox - if (axis == gui.Xaxis) { - box = gui.HardBox(newWindow, gui.Xaxis, name) - } else { - box = gui.HardBox(newWindow, gui.Yaxis, name) - } - return box -} - func createAccount(gw *gui.GuiWindow) { - box := initWindow(gw, "Create New Account", gui.Yaxis) + box := gui.InitWindow(gw, "Create New Account", gui.Yaxis) if (box == nil) { return } gw = box.Window diff --git a/gui-buttonClicks.go b/gui-buttonClicks.go index b8c440d..7df467f 100644 --- a/gui-buttonClicks.go +++ b/gui-buttonClicks.go @@ -89,13 +89,13 @@ func showAccountClick(b *gui.GuiButton) { var values *myButtonInfo if tmp, ok := b.Values.(*myButtonInfo); ! ok { - log.Println("\tmainMouseClick() values.Accounts error =", ok) - log.Println("\tmainMouseClick() values.Accounts tmp =", tmp) + log.Println("\tshowAccountClick() values.Accounts error =", ok) + log.Println("\tshowAccountClick() values.Accounts tmp =", tmp) } else { values = tmp } - log.Println("\tmainMouseClick() values.Accounts =", values.Accounts) - log.Println("\tmainMouseClick() values.Name = ", values.Name) + log.Println("\tshowAccountClick() values.Accounts =", values.Accounts) + log.Println("\tshowAccountClick() values.Name = ", values.Name) gw := b.Box.Window @@ -144,13 +144,13 @@ func createVmClick(b *gui.GuiButton) { var values *myButtonInfo if tmp, ok := b.Values.(*myButtonInfo); ! ok { - log.Println("\tmainMouseClick() values.Accounts error =", ok) - log.Println("\tmainMouseClick() values.Accounts tmp =", tmp) + log.Println("\tcreateVmClick() values.Accounts error =", ok) + log.Println("\tcreateVmClick() values.Accounts tmp =", tmp) } else { values = tmp } - log.Println("\tmainMouseClick() values.Accounts =", values.Accounts) - log.Println("\tmainMouseClick() values.Name = ", values.Name) + log.Println("\tcreateVmClick() values.Accounts =", values.Accounts) + log.Println("\tcreateVmClick() values.Name = ", values.Name) log.Println("\tTRIGGER CREATE VM") State = "CREATE" diff --git a/gui-debug.go b/gui-debug.go index f5b8950..52a972b 100644 --- a/gui-debug.go +++ b/gui-debug.go @@ -19,9 +19,7 @@ func debugClick(b *gui.GuiButton) { log.Println("debugClick() START") gw := b.Box.Window - // if there is not an account, then go to 'make account' - // gw = gui.InitGuiWindow("debugClick", gw) - box := initWindow(gw, "Debugging", gui.Yaxis) + box := gui.InitWindow(gw, "Debugging", gui.Yaxis) if (box == nil) { return } log.Println("debugClick() initWindow() END") diff --git a/gui-splash.go b/gui-splash.go index eb7df0d..f4e9df1 100644 --- a/gui-splash.go +++ b/gui-splash.go @@ -78,7 +78,7 @@ func splashClick(b *gui.GuiButton) { return } - gw.UiTab.Delete(0) // does this make things more or less stable or neither? + // gw.UiTab.Delete(0) // does this make things more or less stable or neither? createAccount(gw) log.Println("splashClick() END") } diff --git a/gui-vm.go b/gui-vm.go index 5fe8fc8..49b231b 100644 --- a/gui-vm.go +++ b/gui-vm.go @@ -87,9 +87,11 @@ func createAddVmBox(b *gui.GuiButton) { // gw.BoxMap["ADD VM" + name] = box txt := "ADD VM " + name - gw.Name = txt - gw = gui.InitGuiWindow(gw) - box := gui.HardBox(gw, gui.Yaxis, txt) + box := gui.InitWindow(gw, txt, gui.Yaxis) + if (box == nil) { + log.Println("initWindow() FAILED") + return + } box = gui.HardBox(gw, gui.Xaxis, txt) // box := gui.AddGenericBox(gw, name) @@ -118,9 +120,12 @@ func createVmBox(gw *gui.GuiWindow, vm *pb.Event_VM) { log.Println("CreateVmBox() START vm.Name =", vm.Name) txt := "VM " + vm.Name - gw.Name = txt - gw = gui.InitGuiWindow(gw) - box := gui.HardBox(gw, gui.Yaxis, txt) + // TODO: make this text i18n + box := gui.InitWindow(gw, txt, gui.Yaxis) + if (box == nil) { + log.Println("initWindow() FAILED") + return + } box = gui.HardBox(gw, gui.Xaxis, txt) // Add hostname entry box diff --git a/resources/tags/v0.6.31 b/resources/tags/v0.6.31 new file mode 100644 index 0000000..8e603fe --- /dev/null +++ b/resources/tags/v0.6.31 @@ -0,0 +1 @@ +8d39c04b6af88dddcaa05df2955c390b94f77ea1