cleaning up default behavior

1 files changed, 4 insertions, 50 deletions

diff --git a/windowModeMaster.go b/windowModeMaster.go
index e09d991..a48875d 100644
--- a/windowModeMaster.go
+++ b/windowModeMaster.go
@@ -15,73 +15,27 @@ func makeModeMasterWin() *gadgets.GenericWindow {
 	win := gadgets.NewGenericWindow("Release", "tools")
 	grid := win.Group.RawGrid()
 
-	checkout := grid.NewButton("git checkout master", func() {
+	grid.NewButton("git checkout master", func() {
 		win.Disable()
 		defer win.Enable()
 	})
-	gitpull := grid.NewButton("git pull", func() {
+	grid.NewButton("git pull", func() {
 		win.Disable()
 		defer win.Enable()
 	})
 	grid.NextRow()
 
-	cleanUser := grid.NewButton("Clean user branches", func() {
+	grid.NewButton("Clean branches", func() {
 		win.Disable()
 		defer win.Enable()
-		if err := doCleanUser(); err != nil {
-			log.Info("Clean user branches failed", err)
-		}
+		doClean()
 	})
 
-	cleanDevel := grid.NewButton("Clean devel branches", func() {
-		win.Disable()
-		defer win.Enable()
-		if err := doCleanDevel(); err != nil {
-			log.Info("Clean devel branches failed", err)
-		}
-	})
 	grid.NextRow()
 
-	f := func() {
-		total, count, nope, err := IsEverythingOnMaster()
-		if nope == 0 {
-			checkout.Disable()
-			gitpull.Enable()
-		} else {
-			log.Printf("Master branch check. %d total repos. (%d ok) (%d not on master branch) err=%v\n", total, count, nope, err)
-			checkout.Enable()
-		}
-
-		var localuser bool  // are there still local user branches
-		var localdevel bool // are there still local devel branches
-
-		all := me.forge.Repos.SortByFullPath()
-		for all.Scan() {
-			repo := all.Next()
-			if repo.IsLocalBranch(repo.GetUserBranchName()) {
-				localuser = true
-			}
-			if repo.IsLocalBranch(repo.GetDevelBranchName()) {
-				localdevel = true
-			}
-		}
-		if localuser {
-			cleanUser.Enable()
-		} else {
-			cleanUser.Disable()
-		}
-		if localdevel {
-			cleanDevel.Enable()
-		} else {
-			cleanDevel.Disable()
-		}
-	}
-
 	grid.NewButton("check repo state", func() {
 		win.Disable()
 		defer win.Enable()
-
-		f()
 	})
 
 	grid.NewButton("reset user branches (?)", func() {