button fixes

Signed-off-by: Jeff Carr <jcarr@wit.com>

globalBuildOptions.go

@@ -53,7 +53,6 @@ func globalBuildOptions(box *gui.Node) {
 	grid := group1.NewGrid("buildOptions", 2, 1)
 
 	me.mainBranch = gadgets.NewBasicCombobox(grid, "default main branch")
-	me.mainBranch.AddText("guimain")
 	me.mainBranch.AddText("gitea server default")
 	me.mainBranch.Disable()
 
@@ -63,13 +62,19 @@ func globalBuildOptions(box *gui.Node) {
 	me.userBranch = gadgets.NewBasicCombobox(grid, "default user branch")
 	me.userBranch.AddText("jcarr")
 
+	grid.NewLabel("<nil>")
+	grid.NewButton("set working branches", func() {
+		log.Warn("set working branches here")
+	})
+	// gadgets.OneLiner(grid, "default user branch")
+
 	// select the branch you want to test, build and develop against
 	// this lets you select your user branch, but, when you are happy
 	// you can merge everything into the devel branch and make sure it actually
 	// works. Then, when that is good, merge and version everything in master
 	var newBranch *gui.Node
-	grid.NewButton("set all branches to", func() {
-		log.Warn("set all branches to:", newBranch.String())
+	grid.NewButton("set current branch to:", func() {
+		log.Warn("set current branch to:", newBranch.String())
 		/*
 			me.toMoveToBranch = guiBranch.String()
 			setCurrentBranch.SetLabel("set all branches to " + me.toMoveToBranch)
@@ -78,6 +83,8 @@ func globalBuildOptions(box *gui.Node) {
 	})
 	newBranch = grid.NewCombobox()
 	newBranch.AddText("guimaster")
+	newBranch.AddText("master")
+	newBranch.AddText("main")
 	newBranch.AddText("guidevel")
 	newBranch.AddText("jcarr")
 	newBranch.SetText("jcarr")