more button cleanups

Signed-off-by: Jeff Carr <jcarr@wit.com>
This commit is contained in:
Jeff Carr 2019-06-03 00:49:51 -07:00
parent 0316547d1d
commit a557c4a042
4 changed files with 15 additions and 16 deletions

View File

@ -9,7 +9,7 @@ func makeCloudInfoBox(gw *gui.GuiWindow) {
log.Println("makeCloudInfoBox() START gw =", gw)
gw = gui.InitGuiWindow("makeCloudInfoBox() Box23", gw)
box := gui.AddGenericBox(gw, "makeCloudInfoBox")
box := gui.HardBox(gw, gui.Yaxis, "makeCloudInfoBox")
log.Println("makeCloudInfoBox() START GW IS NOW: gw =", gw)
log.Println("makeCloudInfoBox() box =", box)
@ -19,9 +19,9 @@ func makeCloudInfoBox(gw *gui.GuiWindow) {
tmp := config.Hostname + " (" + config.IPv6 + ")"
gui.MakeEntryHbox(box, "hostname:", tmp, true, "Hostname")
box = gui.HardBox(gw, gui.Xaxis)
// box = gui.HardBox(gw, gui.Yaxis)
for key, a := range config.Accounts {
vbox := gui.VerticalBox(box, fmt.Sprintf("ACCOUNT %d", key))
vbox := gui.NewBox(box, gui.Xaxis, fmt.Sprintf("ACCOUNT %d", key))
log.Println("account = ", key, a)
log.Println("Accounts[key] = ", config.Accounts[key])
log.Println("account.Nick = ", config.Accounts[key].Nick)

View File

@ -17,15 +17,18 @@ func debugClick(b *gui.GuiButton) {
gw = gui.InitGuiWindow("debugClick() Box22", gw)
log.Println("debugClick() AddGenericBox() START")
box := gui.AddGenericBox(gw, "debugClick")
box := gui.HardBox(gw, gui.Yaxis, "debugClick")
log.Println("debugClick() AddGenericBox() END box =", box)
makeButton(box, nil, nil, "Generate", "SUBDOMAIN", nil)
gui.HorizontalBreak(box)
makeButton(box, nil, nil, "Create Subdomain Account", "ADD", addSubdomainClick)
box = gui.HardBox(gw, gui.Xaxis)
box = gui.HardBox(gw, gui.Xaxis, "subdomain test")
makeButton(box, nil, nil, "Generate 1", "SUBDOMAIN", nil)
makeButton(box, nil, nil, "Generate 2", "SUBDOMAIN", nil)
makeButton(box, nil, nil, "Generate 3", "SUBDOMAIN", func (*gui.GuiButton) {
log.Println("debugClick() Generate 3")
})
log.Println("debugClick() END box =", box)
}

View File

@ -73,14 +73,11 @@ func splashClick(b *gui.GuiButton) {
// gw.UiTab.Hide() // Hide or Delete ?
gw.UiTab.Delete(0) // does this make things more or less stable or neither?
log.Println("splashClick() AddGenericBox() START")
box := gui.AddGenericBox(gw, "addSubdomainQuestion")
log.Println("splashClick() AddGenericBox() END box =", box)
box := gui.HardBox(gw, gui.Yaxis, "addSubdomainQuestion")
// make a place for someone to enter their subdomain
gui.NewLabel(box, "Enter your Subdomain or")
makeButton(box, nil, nil, "Generate", "SUBDOMAIN", generateSubdomain)
gui.AddEntry(box, "SUBDOMAIN")
gui.HorizontalBreak(box)
makeButton(box, nil, nil, "Create Subdomain Account", "ADD", addSubdomainClick)

View File

@ -90,7 +90,8 @@ func createAddVmBox(b *gui.GuiButton) {
txt := "ADD VM " + name
gw = gui.InitGuiWindow(txt, gw)
box := gui.AddGenericBox(gw, name)
box := gui.HardBox(gw, gui.Xaxis, txt)
// box := gui.AddGenericBox(gw, name)
// Add hostname entry box
hostname := gui.MakeEntryHbox(box, "Hostname:", "testhost", true, "Hostname")
@ -113,13 +114,11 @@ func showVmMouseClick(b *gui.GuiButton) {
}
func createVmBox(gw *gui.GuiWindow, vm *pb.Event_VM) {
log.Println("CreateVmBox() START")
log.Println("CreateVmBox() vm.Name =", vm.Name)
log.Println("CreateVmBox() gw =", gw)
log.Println("CreateVmBox() START vm.Name =", vm.Name)
txt := "createVmBox() " + vm.Name
gw = gui.InitGuiWindow(txt, gw)
box := gui.AddGenericBox(gw, vm.Name)
box := gui.HardBox(gw, gui.Xaxis, txt)
// Add hostname entry box
gui.MakeEntryVbox(box, "hostname:", vm.Hostname, true, "Hostname")
@ -129,7 +128,7 @@ func createVmBox(gw *gui.GuiWindow, vm *pb.Event_VM) {
gui.MakeEntryVbox(box, "Disk (GB):", fmt.Sprintf("%d",vm.Disk), true, "Disk")
gui.MakeEntryVbox(box, "OS Image:", vm.BaseImage, true, "BaseImage")
gui.HorizontalBreak(box)
box = gui.HardBox(gw, gui.Xaxis, "VM BUTTONS")
makeButton(box, nil, vm, "Power On", "POWERON", nil)
makeButton(box, nil, vm, "Power Off", "POWEROFF", nil)