From c555147ebc7fd9430809f2434085f6c6f6d731d4 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Sun, 2 Jun 2019 11:52:29 -0700 Subject: [PATCH] more common window/box functions Signed-off-by: Jeff Carr --- gui-accountPage.go | 8 +++++--- gui-splashPage.go | 12 ++---------- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/gui-accountPage.go b/gui-accountPage.go index 2a08f64..65d973b 100644 --- a/gui-accountPage.go +++ b/gui-accountPage.go @@ -6,15 +6,17 @@ import "git.wit.com/wit/gui" func makeCloudInfoBox(gw *gui.GuiWindow) { log.Println("makeCloudInfoBox() START gw =", gw) - box := gui.AddMainTab(gw) - gw = box.Window +// box := gui.AddMainTab(gw) + + gw = gui.InitGuiWindow(gui.Data.Config, "Box23", nil, gw.UiWindow, gw.UiTab) + box := gui.AddGenericBox(gw, "makeCloudInfoBox") log.Println("makeCloudInfoBox() START GW IS NOW: gw =", gw) log.Println("makeCloudInfoBox() box =", box) gui.NewLabel(box, "Hostname:") - box = gui.HardHorizontalBox(gw) + // box = gui.HardHorizontalBox(gw) tmp := gui.Data.Hostname + " (" + gui.Data.IPv6 + ")" gui.MakeEntryHbox(box, "hostname:", tmp, true, "Hostname") diff --git a/gui-splashPage.go b/gui-splashPage.go index 8fe1c7d..da02e9a 100644 --- a/gui-splashPage.go +++ b/gui-splashPage.go @@ -70,16 +70,9 @@ func splashClick(b *gui.GuiButton) { return } // if there is not an account, then go to 'make account' - newGW := gui.InitGuiWindow(gui.Data.Config, "Box22", gw.MakeWindow, gw.UiWindow, gw.UiTab) - newGW.UiTab.Delete(0) - addSubdomainQuestionBox(newGW) + gw = gui.InitGuiWindow(gui.Data.Config, "Box22", gw.MakeWindow, gw.UiWindow, gw.UiTab) + gw.UiTab.Delete(0) - // gw.MakeWindow = addSubdomainQuestionBox - // window.MakeWindow(window) - // gui.ReplaceTab(gw, "Box22", "New Account?") -} - -func addSubdomainQuestionBox(gw *gui.GuiWindow) *gui.GuiBox { log.Println("addSubdomainQuestionBox() START") box := gui.AddGenericBox(gw, "addSubdomainQuestion") @@ -96,7 +89,6 @@ func addSubdomainQuestionBox(gw *gui.GuiWindow) *gui.GuiBox { gui.AddButtonToBox(box, button2) log.Println("addSubdomainQuestionBox() END box =", box) - return box } // curl -vv -X POST -H "X-Wit-Auth: $TOKEN" 'http://stackapi-api1.stackapi.customers.wit.com:4000/vms/toby?count=1&cpu=2&ram=512&disk=25'