more fixes on tracking the window

Signed-off-by: Jeff Carr <jcarr@wit.com>
This commit is contained in:
Jeff Carr 2019-06-13 13:09:24 -07:00
parent ebfab08357
commit d20e7cea65
4 changed files with 11 additions and 4 deletions

View File

@ -15,6 +15,7 @@ func makeCloudInfoBox(gw *gui.GuiWindow) {
log.Println("gui.InitWindow() FAILED") log.Println("gui.InitWindow() FAILED")
return return
} }
gw = box.Window
log.Println("makeCloudInfoBox() START GW IS NOW: gw =", gw) log.Println("makeCloudInfoBox() START GW IS NOW: gw =", gw)
log.Println("makeCloudInfoBox() box =", box) log.Println("makeCloudInfoBox() box =", box)
@ -24,7 +25,6 @@ func makeCloudInfoBox(gw *gui.GuiWindow) {
tmp := config.Hostname + " (" + config.IPv6 + ")" tmp := config.Hostname + " (" + config.IPv6 + ")"
gui.MakeEntryHbox(box, "hostname:", tmp, true, "Hostname") gui.MakeEntryHbox(box, "hostname:", tmp, true, "Hostname")
// box = gui.HardBox(gw, gui.Yaxis)
for key, a := range config.Accounts { for key, a := range config.Accounts {
vbox := gui.NewBox(box, gui.Xaxis, fmt.Sprintf("ACCOUNT %d", key)) vbox := gui.NewBox(box, gui.Xaxis, fmt.Sprintf("ACCOUNT %d", key))
log.Println("account = ", key, a) log.Println("account = ", key, a)
@ -47,10 +47,10 @@ func makeCloudInfoBox(gw *gui.GuiWindow) {
gui.NewLabel(vbox, name) gui.NewLabel(vbox, name)
} }
Xbox := gui.HardBox(gw, gui.Xaxis, "subdomain test") Xbox := gui.HardBox(box.Window, gui.Xaxis, "subdomain test")
makeButton(Xbox, nil, nil, "Add Account", "ADD TAB", func (*gui.GuiButton) { makeButton(Xbox, nil, nil, "Add Account", "ADD TAB", func (*gui.GuiButton) {
log.Println("makeCloudInfoBox() Add Account") log.Println("makeCloudInfoBox() Add Account")
createAccount(gw) createAccount(box.Window)
}) })
makeButton(Xbox, nil, nil, "Quit", "QUIT", nil) makeButton(Xbox, nil, nil, "Quit", "QUIT", nil)
makeButton(Xbox, nil, nil, "Debug", "DEBUG", debugClick) makeButton(Xbox, nil, nil, "Debug", "DEBUG", debugClick)
@ -60,7 +60,6 @@ func makeCloudInfoBox(gw *gui.GuiWindow) {
func createAccount(gw *gui.GuiWindow) { func createAccount(gw *gui.GuiWindow) {
box := gui.InitWindow(gw, "Create New Account", gui.Yaxis) box := gui.InitWindow(gw, "Create New Account", gui.Yaxis)
if (box == nil) { return } if (box == nil) { return }
gw = box.Window gw = box.Window
// make a place for someone to enter their subdomain // make a place for someone to enter their subdomain

View File

@ -108,6 +108,7 @@ func showAccountClick(b *gui.GuiButton) {
log.Println("gui.InitWindow() FAILED") log.Println("gui.InitWindow() FAILED")
return return
} }
gw = box.Window
event := pb.MakeGetEvent() event := pb.MakeGetEvent()
event.Account = values.Account event.Account = values.Account

View File

@ -21,6 +21,7 @@ func debugClick(b *gui.GuiButton) {
box := gui.InitWindow(gw, "Debugging", gui.Yaxis) box := gui.InitWindow(gw, "Debugging", gui.Yaxis)
if (box == nil) { return } if (box == nil) { return }
gw = box.Window
log.Println("debugClick() initWindow() END") log.Println("debugClick() initWindow() END")
makeButton(box, nil, nil, "empty", "SUBDOMAIN", nil) makeButton(box, nil, nil, "empty", "SUBDOMAIN", nil)
@ -67,6 +68,10 @@ func debugClick(b *gui.GuiButton) {
box := gw.BoxMap["MAINBOX"] box := gw.BoxMap["MAINBOX"]
box.Window.UiTab.Delete(0) box.Window.UiTab.Delete(0)
}) })
makeButton(Ybox2, nil, nil, "Destroy Splash", "SUBDOMAIN", func (*gui.GuiButton) {
log.Println("debugClick() Destroy(0)")
gui.DeleteWindow("Cloud Accounts")
})
makeButton(Ybox2, nil, nil, "Load the default test config file", "SUBDOMAIN", func (*gui.GuiButton) { makeButton(Ybox2, nil, nil, "Load the default test config file", "SUBDOMAIN", func (*gui.GuiButton) {
newConfig := loadDefaultConfig() newConfig := loadDefaultConfig()

View File

@ -94,6 +94,7 @@ func createAddVmBox(b *gui.GuiButton) {
log.Println("initWindow() FAILED") log.Println("initWindow() FAILED")
return return
} }
gw = box.Window
box = gui.HardBox(gw, gui.Xaxis, txt) box = gui.HardBox(gw, gui.Xaxis, txt)
// box := gui.AddGenericBox(gw, name) // box := gui.AddGenericBox(gw, name)
@ -128,6 +129,7 @@ func createVmBox(gw *gui.GuiWindow, vm *pb.Event_VM) {
log.Println("initWindow() FAILED") log.Println("initWindow() FAILED")
return return
} }
gw = box.Window
box = gui.HardBox(gw, gui.Xaxis, txt) box = gui.HardBox(gw, gui.Xaxis, txt)
// Add hostname entry box // Add hostname entry box