summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Carr <[email protected]>2019-05-26 02:19:09 -0700
committerJeff Carr <[email protected]>2019-05-26 02:19:09 -0700
commitb251151328f04bd35208e38b1680f79ecfb29935 (patch)
tree48bae99e2f8a57479839fdb57da2c0b8df27b151
parent458e0f71397857899c295f805521bce1fb065701 (diff)
more code cleanups
Signed-off-by: Jeff Carr <[email protected]>
-rw-r--r--gui.go8
-rw-r--r--mainCloudBox.go13
2 files changed, 12 insertions, 9 deletions
diff --git a/gui.go b/gui.go
index f9744bf..2853dd6 100644
--- a/gui.go
+++ b/gui.go
@@ -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)
diff --git a/mainCloudBox.go b/mainCloudBox.go
index dd0842a..91caa4d 100644
--- a/mainCloudBox.go
+++ b/mainCloudBox.go
@@ -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)