almost complete obviewscation of the buttons

yes, I can't spell. I like it this way better anyway

Signed-off-by: Jeff Carr <[email protected]>

6 files changed, 30 insertions, 30 deletions

diff --git a/addAccount.go b/addAccount.go
index b5529dc..58e2b7e 100644
--- a/addAccount.go
+++ b/addAccount.go
@@ -5,16 +5,16 @@ import "log"
 import "github.com/andlabs/ui"
 import _ "github.com/andlabs/ui/winmanifest"
 
-func AddAccountQuestionBox(junk *ui.Box, custom func(*ButtonMap)) *ui.Box {
+func AddAccountQuestionBox() *ui.Box {
 	newbox := ui.NewVerticalBox()
 	newbox.SetPadded(true)
 
-	newButton := CreateButton(nil, nil, "Create New Account", "DONE", custom)
+	newButton := CreateButton(nil, nil, "Create New Account", "DONE", nil)
 	newbox.Append(newButton, false)
 
 	newbox.Append(ui.NewHorizontalSeparator(), false)
 
-	okButton := CreateButton(nil, nil, "I Have an Account", "DONE", custom)
+	okButton := CreateButton(nil, nil, "I Have an Account", "DONE", nil)
 	newbox.Append(okButton, false)
 
 	return newbox
@@ -120,9 +120,9 @@ func AddAccountBox(aTab *GuiTabStructure) {
 	hboxButtons.SetPadded(true)
 	vbox.Append(hboxButtons, false)
 
-	okButton := CreateButton(nil, nil, "Add Account", "ADD", mouseClick)
+	okButton := CreateButton(nil, nil, "Add Account", "ADD", nil)
 	hboxButtons.Append(okButton, false)
 
-	backButton := CreateButton(nil, nil, "Back", "BACK", mouseClick)
+	backButton := CreateButton(nil, nil, "Back", "BACK", nil)
 	hboxButtons.Append(backButton, false)
 }
diff --git a/area.go b/area.go
index 87261c0..cbf129f 100644
--- a/area.go
+++ b/area.go
@@ -10,7 +10,7 @@ import "github.com/davecgh/go-spew/spew"
 func makeSplashArea() *ui.Area {
 	// make this button just to get the default font (but don't display the button)
 	// There should be another way to do this (?)
-	Data.fontButton = CreateFontButton("SplashFont", "DONE", mouseClick)
+	Data.fontButton = CreateFontButton("SplashFont", "DONE")
 
 	makeAttributedString()
 	splashArea     := ui.NewArea(myAH)
diff --git a/debug.go b/debug.go
index 0020f95..e36e39e 100644
--- a/debug.go
+++ b/debug.go
@@ -54,12 +54,12 @@ func addTableTab() {
 	AddTableTab(Data.cloudTab, 1, "test seven", 7, parts, nil)
 }
 
-func addDebuggingButtons(vbox *ui.Box, custom func(*ButtonMap)) {
+func addDebuggingButtons(vbox *ui.Box) {
 	vbox.Append(ui.NewLabel("Debugging:"), false)
 
 	vbox.Append(ui.NewColorButton(), false)
-	vbox.Append(CreateButton(nil, nil, "Add Account", "ADD", custom), false)
-	vbox.Append(CreateButton(nil, nil, "Quit", "QUIT", custom), false)
+	vbox.Append(CreateButton(nil, nil, "Add Account", "ADD", nil), false)
+	vbox.Append(CreateButton(nil, nil, "Quit", "QUIT", nil), false)
 
 	// ATTEMPT TO ADD THE TABLE HERE
 	add2button := ui.NewButton("Add a Test Table")
@@ -70,11 +70,11 @@ func addDebuggingButtons(vbox *ui.Box, custom func(*ButtonMap)) {
 	vbox.Append(add2button, false)
 	// ATTEMPT TO ADD THE TABLE HERE END
 
-	vbox.Append(CreateButton(nil, nil, "Close GUI", "QUIT", custom), false)
-	vbox.Append(CreateButton(nil, nil, "DEBUG goroutines", "DEBUG", custom), false)
+	vbox.Append(CreateButton(nil, nil, "Close GUI", "QUIT", nil), false)
+	vbox.Append(CreateButton(nil, nil, "DEBUG goroutines", "DEBUG", nil), false)
 	// vbox.Append(CreateButton("ping", "PING", runPingClick), false)
 	vbox.Append(CreateButton(nil, nil, "xterm", "XTERM", runTestExecClick), false)
-	vbox.Append(CreateButton(nil, nil, "Load test.json config file", "CONFIG", custom), false)
+	vbox.Append(CreateButton(nil, nil, "Load test.json config file", "CONFIG", nil), false)
 }
 
 func runPingClick(b *ButtonMap) {
diff --git a/gui.go b/gui.go
index 254c585..5e24774 100644
--- a/gui.go
+++ b/gui.go
@@ -90,8 +90,8 @@ func AddTableTab(mytab *ui.Tab, mytabcount int, name string, rowcount int, parts
 	hbox := ui.NewHorizontalBox()
 	hbox.SetPadded(true)
 
-	hbox.Append(CreateButton(account, nil, "Add Virtual Machine", "createAddVmBox", mouseClick), false)
-	hbox.Append(CreateButton(account, nil, "Close", "CLOSE", mouseClick), false)
+	hbox.Append(CreateButton(account, nil, "Add Virtual Machine", "createAddVmBox", nil), false)
+	hbox.Append(CreateButton(account, nil, "Close", "CLOSE", nil), false)
 
 	vbox.Append(hbox, false)
 
@@ -214,7 +214,7 @@ func CreateButton(a *pb.Account, vm *pb.Event_VM,
 	return newB
 }
 
-func CreateFontButton(action string, note string, custom func(*ButtonMap)) *ui.FontButton {
+func CreateFontButton(action string, note string) *ui.FontButton {
 	newB := ui.NewFontButton()
 
         // create a 'fake' button entry for the mouse clicks
diff --git a/mainCloudBox.go b/mainCloudBox.go
index bba4b7c..42d8d41 100644
--- a/mainCloudBox.go
+++ b/mainCloudBox.go
@@ -21,7 +21,7 @@ func makeCloudInfoBox() *ui.Box {
 		vbox.SetPadded(true)
 		hbox.Append(vbox, false)
 
-		addDebuggingButtons(vbox, mouseClick)
+		addDebuggingButtons(vbox)
 
 		hbox.Append(ui.NewVerticalSeparator(), false)
 	}
@@ -44,7 +44,7 @@ func makeCloudInfoBox() *ui.Box {
 	hostnameEntry.SetText(tmp)
 	hostnameEntry.SetReadOnly(true)
 
-	hostnamebox.Append(CreateButton(nil, nil, "Edit", "EDIT", mouseClick), false)
+	hostnamebox.Append(CreateButton(nil, nil, "Edit", "EDIT", nil), false)
 
 	vbox.Append(ui.NewHorizontalSeparator(), false)
 
@@ -70,11 +70,11 @@ func makeCloudInfoBox() *ui.Box {
 		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", mouseClick)
+		l := CreateButton(Data.Config.Accounts[key], nil, name, "LOGIN", nil)
 		agrid.Append(l, 4, row, 1, 1, true, ui.AlignFill, false, ui.AlignFill)
 
 		name  = "Show " + Data.Config.Accounts[key].Nick
-		b := CreateButton(Data.Config.Accounts[key], nil, name, "SHOW", mouseClick)
+		b := CreateButton(Data.Config.Accounts[key], nil, name, "SHOW", nil)
 		agrid.Append(b, 5, row, 1, 1, true, ui.AlignFill, false, ui.AlignFill)
 
 		row += 1
@@ -83,9 +83,9 @@ func makeCloudInfoBox() *ui.Box {
 	row += 1
 	agrid.Append(ui.NewLabel(""),    1, row, 1, 1, true, ui.AlignFill, false, ui.AlignFill)
 	row += 1
-	a := CreateButton(nil, nil, "Add Account", "ADD", mouseClick)
+	a := CreateButton(nil, nil, "Add Account", "ADD", nil)
 	agrid.Append(a, 4, row, 1, 1, true, ui.AlignFill, false, ui.AlignFill)
-	q := CreateButton(nil, nil, "Quit", "QUIT", mouseClick)
+	q := CreateButton(nil, nil, "Quit", "QUIT", nil)
 	agrid.Append(q, 5, row, 1, 1, true, ui.AlignFill, false, ui.AlignFill)
 
 	vbox.Append(agrid, false)
@@ -165,7 +165,7 @@ func ShowAccountQuestionTab() {
 	log.Println("Sleep(200)")
 	time.Sleep(200 * time.Millisecond)
 
-	Data.smallBox = AddAccountQuestionBox(nil, mouseClick)
+	Data.smallBox = AddAccountQuestionBox()
 	Data.cloudTab.InsertAt("New Account?", 0, Data.smallBox)
 	Data.cloudTab.SetMargined(0, true)
 }
@@ -336,13 +336,13 @@ func createVmBox(tab *ui.Tab, pbVM *pb.Event_VM) {
 	vbox.Append(hboxButtons, false)
 
 	log.Println("pbVM =", pbVM)
-	hboxButtons.Append(CreateButton(nil, pbVM, "Power On",  "POWERON",  mouseClick), false)
-	hboxButtons.Append(CreateButton(nil, pbVM, "Power Off", "POWEROFF", mouseClick), false)
-	hboxButtons.Append(CreateButton(nil, pbVM, "Destroy",   "DESTROY",  mouseClick), false)
+	hboxButtons.Append(CreateButton(nil, pbVM, "Power On",  "POWERON",  nil), false)
+	hboxButtons.Append(CreateButton(nil, pbVM, "Power Off", "POWEROFF", nil), false)
+	hboxButtons.Append(CreateButton(nil, pbVM, "Destroy",   "DESTROY",  nil), false)
 	hboxButtons.Append(CreateButton(nil, pbVM, "ping",      "PING",     runPingClick), false)
 	hboxButtons.Append(CreateButton(nil, pbVM, "Console",   "XTERM",    runTestExecClick), false)
-	hboxButtons.Append(CreateButton(nil, pbVM, "Save",      "SAVE",     mouseClick), false)
-	hboxButtons.Append(CreateButton(nil, pbVM, "Done",      "DONE",     mouseClick), false)
+	hboxButtons.Append(CreateButton(nil, pbVM, "Save",      "SAVE",     nil), false)
+	hboxButtons.Append(CreateButton(nil, pbVM, "Done",      "DONE",     nil), false)
 
 	tab.Append(Data.CurrentVM.Name, vbox)
 	tab.SetMargined(0, true)
@@ -366,8 +366,8 @@ func createAddVmBox(tab *ui.Tab, name string) {
 	hboxButtons.SetPadded(true)
 	vbox.Append(hboxButtons, false)
 
-	hboxButtons.Append(CreateButton(nil, nil, "Add Virtual Machine",	"CREATE", mouseClick), false)
-	hboxButtons.Append(CreateButton(nil, nil, "Cancel",		"DONE",   mouseClick), false)
+	hboxButtons.Append(CreateButton(nil, nil, "Add Virtual Machine",	"CREATE", nil), false)
+	hboxButtons.Append(CreateButton(nil, nil, "Cancel",		"DONE",   nil), false)
 
 	tab.Append(name, vbox)
 	tab.SetMargined(0, true)
diff --git a/splash.go b/splash.go
index f131eaf..4c3170b 100644
--- a/splash.go
+++ b/splash.go
@@ -45,7 +45,7 @@ func ShowSplashBox() *ui.Box {
 		}
 	}
 
-	okButton := CreateButton(nil, nil, "OK", "DONE", mouseClick)
+	okButton := CreateButton(nil, nil, "OK", "DONE", nil)
 	newbox.Append(okButton, false)
 
 	return newbox