status is almost done

1 files changed, 13 insertions, 13 deletions

diff --git a/draw.go b/draw.go
index e4f1fa4..ea72ea0 100644
--- a/draw.go
+++ b/draw.go
@@ -50,7 +50,7 @@ func (rs *RepoStatus) drawGitBranches() {
 	}
 	rs.masterDrop.Set(master)
 	// relabel the various gadgets with the right branch name
-	rs.masterBranch.SetLabel(master)
+	rs.masterBranchVersion.SetLabel(master)
 	rs.major.SetTitle(master)
 
 	rs.develDrop.Set("devel")
@@ -58,15 +58,15 @@ func (rs *RepoStatus) drawGitBranches() {
 
 	var count *gui.Node
 
-	newgrid.NewButton("show branches", func() {
+	rs.showBranchesButton = newgrid.NewButton("show branches", func() {
 		all := rs.getBranches()
 		i := len(all)
 		count.Set(strconv.Itoa(i) + " branches")
 	})
 	count = newgrid.NewLabel("")
 
-	newgrid.NewButton("check branches", func() {
-		if rs.checkBranches() {
+	rs.checkBranchesButton = newgrid.NewButton("check branches", func() {
+		if rs.CheckBranches() {
 			log.Warn("Branches are perfect")
 		} else {
 			log.Warn("Branches are not perfect")
@@ -77,7 +77,7 @@ func (rs *RepoStatus) drawGitBranches() {
 func (rs *RepoStatus) drawGitStatus() {
 	rs.gitStatusGroup = rs.window.Box().NewGroup("What GO Knows It Has")
 	newgrid := rs.gitStatusGroup.NewGrid("gridnuts", 2, 2)
-	newgrid.SetNext(1,1)
+	// newgrid.SetNext(1,1)
 	newgrid.Margin()
 	newgrid.Pad()
 
@@ -86,9 +86,9 @@ func (rs *RepoStatus) drawGitStatus() {
 	rs.lasttag		= gadgets.NewOneLiner(newgrid, "last tag")
 	rs.currentVersion	= gadgets.NewOneLiner(newgrid, "Version")
 	rs.tagsDrop		= gadgets.NewBasicDropdown(newgrid, "existing tags")
-	rs.masterBranch		= gadgets.NewOneLiner(newgrid, "master")
-	rs.develBranch		= gadgets.NewOneLiner(newgrid, "devel")
-	rs.jcarrBranch		= gadgets.NewOneLiner(newgrid, "jcarr")
+	rs.masterBranchVersion	= gadgets.NewOneLiner(newgrid, "master")
+	rs.develBranchVersion	= gadgets.NewOneLiner(newgrid, "devel")
+	rs.jcarrBranchVersion	= gadgets.NewOneLiner(newgrid, "jcarr")
 
 	rs.dirtyLabel	= gadgets.NewOneLiner(newgrid, "dirty")
 
@@ -247,21 +247,21 @@ func (rs *RepoStatus) recommend() {
 	log.Warn("list the known tags")
 	rs.DisableEverything()
 	rs.populateTags()
-	log.Warn("Does devel == jcarr?", rs.develBranch.Get(), rs.jcarrBranch.Get())
-	if rs.develBranch.Get() != rs.jcarrBranch.Get() {
+	log.Warn("Does devel == jcarr?", rs.develBranchVersion.Get(), rs.jcarrBranchVersion.Get())
+	if rs.develBranchVersion.Get() != rs.jcarrBranchVersion.Get() {
 		log.Warn("devel does not equal jcarr")
 		log.Warn("merge or squash?")
 		return
 	}
-	log.Warn("Does master == devel? ", rs.masterBranch.Get(), rs.develBranch.Get())
-	if rs.masterBranch.Get() != rs.develBranch.Get() {
+	log.Warn("Does master == devel? ", rs.masterBranchVersion.Get(), rs.develBranchVersion.Get())
+	if rs.masterBranchVersion.Get() != rs.develBranchVersion.Get() {
 		log.Warn("master does not equal devel. merge devel into master")
 		rs.EnableMergeDevel()
 		rs.setMergeDevelCommands()
 		return
 	}
 	rs.getLastTagVersion()
-	if rs.lasttag.Get() != rs.masterBranch.Get() {
+	if rs.lasttag.Get() != rs.masterBranchVersion.Get() {
 		log.Warn("master does not equal last tag")
 		rs.incrementVersion()
 		rs.EnableSelectTag()