start a merge button here

1 files changed, 9 insertions, 27 deletions

diff --git a/doGui.go b/doGui.go
index 0408f83..7531841 100644
--- a/doGui.go
+++ b/doGui.go
@@ -231,7 +231,15 @@ func drawWindow(win *gadgets.BasicWindow) {
 
 	me.repoDevelMergeB = grid.NewButton("merge", func() {
 		found := findMergeToDevel()
-		makeStandardReposWindow("repos to merge from user to devel", found)
+		_, box := makeStandardReposWindow("repos to merge from user to devel", found)
+		hbox := box.Box().Horizontal()
+		hbox.NewButton("merge all", func() {
+			all := found.SortByFullPath()
+			for all.Scan() {
+				repo := all.Next()
+				log.Info("todo: merge here on", repo.GetGoPath())
+			}
+		})
 	})
 	var problemsWin *repoProblemsWindow
 	grid.NewButton("Repo Problems", func() {
@@ -243,32 +251,6 @@ func drawWindow(win *gadgets.BasicWindow) {
 	})
 	grid.NextRow()
 
-	/*
-		group2 = vbox.NewGroup("Repos with problems")
-		grid = group2.RawGrid()
-
-		grid.NewButton("devel is behind master", func() {
-			log.Info("not done yet")
-		})
-
-		grid.NewButton("user branch is remote", func() {
-			log.Info("not done yet")
-		})
-
-		grid.NewButton("unknown branches", func() {
-			log.Info("not done yet")
-		})
-		grid.NextRow()
-
-		grid.NewButton("remote devel != local devel", func() {
-			log.Info("not done yet")
-		})
-
-		grid.NewButton("remote master != local master", func() {
-			log.Info("not done yet")
-		})
-	*/
-
 	group2 = vbox.NewGroup("Merge")
 	grid = group2.RawGrid()