From 02ab32835e155a03f9898d5368c13d78526bed9c Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Thu, 30 May 2019 12:44:36 -0700 Subject: [PATCH] simplify the login process and start to clean up the vm display Signed-off-by: Jeff Carr --- mainCloudBox.go | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/mainCloudBox.go b/mainCloudBox.go index 9d11bf7..3b9cef7 100644 --- a/mainCloudBox.go +++ b/mainCloudBox.go @@ -55,9 +55,8 @@ func makeCloudInfoBox(wm *GuiWindow) *ui.Box { agrid.SetPadded(true) agrid.Append(ui.NewLabel("Accounts:"), 0, 0, 1, 1, true, ui.AlignFill, false, ui.AlignFill) - agrid.Append(ui.NewLabel("Nickname"), 1, 0, 1, 1, true, ui.AlignFill, false, ui.AlignFill) - agrid.Append(ui.NewLabel("Username"), 2, 0, 1, 1, true, ui.AlignFill, false, ui.AlignFill) - agrid.Append(ui.NewLabel("Domain Name"), 3, 0, 1, 1, true, ui.AlignFill, false, ui.AlignFill) + agrid.Append(ui.NewLabel("Domain Name"), 1, 0, 1, 1, true, ui.AlignFill, false, ui.AlignFill) + agrid.Append(ui.NewLabel("Email"), 2, 0, 1, 1, true, ui.AlignFill, false, ui.AlignFill) row := 1 @@ -68,17 +67,16 @@ func makeCloudInfoBox(wm *GuiWindow) *ui.Box { log.Println("account.Username = ", Data.Config.Accounts[key].Username) 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].Domain), 3, row, 1, 1, true, ui.AlignFill, false, ui.AlignFill) + agrid.Append(ui.NewLabel(Data.Config.Accounts[key].Domain), 1, row, 1, 1, true, ui.AlignFill, false, ui.AlignFill) + agrid.Append(ui.NewLabel(Data.Config.Accounts[key].Email), 2, row, 1, 1, true, ui.AlignFill, false, ui.AlignFill) name := "Login " + Data.Config.Accounts[key].Nick l := CreateButton(wm, Data.Config.Accounts[key], nil, name, "LOGIN", nil) - agrid.Append(l.B, 4, row, 1, 1, true, ui.AlignFill, false, ui.AlignFill) + agrid.Append(l.B, 3, row, 1, 1, true, ui.AlignFill, false, ui.AlignFill) name = "Show " + Data.Config.Accounts[key].Nick b := CreateButton(wm, Data.Config.Accounts[key], nil, name, "SHOW", nil) - agrid.Append(b.B, 5, row, 1, 1, true, ui.AlignFill, false, ui.AlignFill) + agrid.Append(b.B, 4, row, 1, 1, true, ui.AlignFill, false, ui.AlignFill) row += 1 }