more code cleanups

Signed-off-by: Jeff Carr <jcarr@wit.com>
This commit is contained in:
Jeff Carr 2019-05-26 02:19:09 -07:00
parent 458e0f7139
commit b251151328
2 changed files with 12 additions and 9 deletions

8
gui.go
View File

@ -122,10 +122,12 @@ func ErrorWindow(msg1 string, msg2 string) {
// defaultButtonClick() below when the button is found
// in the AllButtons %map
// TODO: clean up the text above
// TODO: remove this all together going only to main()
func mouseClick(b *ButtonMap) {
log.Println("gui.mouseClick() START b =", b)
if (b != nil) {
if (b == nil) {
log.Println("gui.mouseClick() START b = nil")
} else {
log.Println("gui.mouseClick() START b.Action =", b.Action)
if (b.Action == "createAddVmBox") {
log.Println("gui.mouseClick() createAddVmBox for b =", b)
createAddVmBox(Data.cloudTab, "Create New Virtual Machine", mouseClick)

View File

@ -59,14 +59,15 @@ func makeCloudInfoBox(custom func(*ButtonMap)) *ui.Box {
row := 1
for key, foo := range Data.Config.Accounts {
log.Println("account.Nick = ", Data.Config.Accounts[key].Nick)
log.Println("account = ", key, foo)
log.Println("Accounts[key] = ", Data.Config.Accounts[key])
log.Println("account.Nick = ", Data.Config.Accounts[key].Nick)
log.Println("account.Username = ", Data.Config.Accounts[key].Username)
log.Println("account.Token = ", Data.Config.Accounts[key].Token)
log.Println("account = ", key, foo)
log.Println("account.Token = ", Data.Config.Accounts[key].Token)
agrid.Append(ui.NewLabel(Data.Config.Accounts[key].Nick), 1, row, 1, 1, true, ui.AlignFill, false, ui.AlignFill)
agrid.Append(ui.NewLabel(Data.Config.Accounts[key].Username), 2, row, 1, 1, true, ui.AlignFill, false, ui.AlignFill)
agrid.Append(ui.NewLabel(Data.Config.Accounts[key].Domainname), 3, row, 1, 1, true, ui.AlignFill, false, ui.AlignFill)
agrid.Append(ui.NewLabel(Data.Config.Accounts[key].Nick), 1, row, 1, 1, true, ui.AlignFill, false, ui.AlignFill)
agrid.Append(ui.NewLabel(Data.Config.Accounts[key].Username), 2, row, 1, 1, true, ui.AlignFill, false, ui.AlignFill)
agrid.Append(ui.NewLabel(Data.Config.Accounts[key].Domain), 3, row, 1, 1, true, ui.AlignFill, false, ui.AlignFill)
name := "Login " + Data.Config.Accounts[key].Nick
l := CreateButton(Data.Config.Accounts[key], nil, name, "LOGIN", custom)