more code reorg

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

3 files changed, 62 insertions, 71 deletions

diff --git a/globalDisplayOptions.go b/globalDisplayOptions.go
index f61cd50..4cb8478 100644
--- a/globalDisplayOptions.go
+++ b/globalDisplayOptions.go
@@ -88,18 +88,6 @@ func globalDisplayOptions(box *gui.Node) {
 			repo.newScan()
 		}
 	})
-	/*
-		group1.NewButton("hide all", func() {
-			for _, repo := range me.allrepos {
-				repo.Hide()
-			}
-		})
-		group1.NewButton("show all", func() {
-			for repo := range me.allrepos {
-				repo.Show()
-			}
-		})
-	*/
 
 	me.autoHideReadOnly = group1.NewCheckbox("Hide read-only repos").SetChecked(true)
 	me.autoHideReadOnly.Custom = func() {
diff --git a/main.go b/main.go
index 3e8883d..45cc32f 100644
--- a/main.go
+++ b/main.go
@@ -4,14 +4,12 @@ package main
 import (
 	"embed"
 	"fmt"
-	"os/user"
 	"strings"
 	"time"
 
 	"go.wit.com/log"
 
 	"go.wit.com/gui"
-	"go.wit.com/lib/gadgets"
 	"go.wit.com/lib/gui/repostatus"
 )
 
@@ -135,60 +133,3 @@ func autotypistWindow() {
 	// globalTestingOptions(box)
 	// globalResetOptions(box)
 }
-
-// This creates a window
-func repoworld() {
-	reposwin = gadgets.NewBasicWindow(me.myGui, "All git repositories in ~/go/src/")
-	reposwin.Make()
-
-	reposbox = reposwin.Box().NewBox("bw vbox", false)
-	reposwin.Draw()
-	reposwin.Custom = func() {
-		log.Warn("GOT HERE: main() gadgets.NewBasicWindow() close")
-		log.Warn("Should I do something special here?")
-	}
-
-	reposgroup = reposbox.NewGroup("go repositories (read from ~/.config/myrepolist)")
-	reposgrid = reposgroup.NewGrid("test", 9, 1)
-
-	reposgrid.NewLabel("") // path goes here
-
-	reposgrid.NewLabel("last tag").SetProgName("last tag")
-
-	reposgrid.NewLabel("master version")
-	reposgrid.NewLabel("devel version")
-	reposgrid.NewLabel("user version")
-
-	reposgrid.NewLabel("Status")
-	reposgrid.NewLabel("go.sum")
-
-	reposgrid.NewLabel("Current Version").SetProgName("Current Version")
-
-	reposgrid.NewLabel("Show()")
-
-	repos := myrepolist()
-	for _, line := range repos {
-		log.Verbose("repo =", line)
-		path, mbranch, dbranch, ubranch := splitLine(line)
-		if mbranch == "" {
-			mbranch = "master"
-		}
-		if dbranch == "" {
-			dbranch = "devel"
-		}
-		usr, _ := user.Current()
-		if ubranch == "" {
-			ubranch = usr.Username
-		}
-		addRepo(reposgrid, path, mbranch, dbranch, ubranch)
-	}
-
-	for i, path := range repostatus.ListGitDirectories() {
-		// log.Info("addRepo()", i, path)
-		tmp := strings.TrimPrefix(path, "/home/jcarr/go/src/")
-		log.Info("addRepo()", i, tmp)
-		addRepo(reposgrid, tmp, "master", "master", "master")
-	}
-
-	reposwin.Toggle()
-}
diff --git a/repolist.go b/repolist.go
index 8eb42ac..8a70674 100644
--- a/repolist.go
+++ b/repolist.go
@@ -3,7 +3,12 @@ package main
 
 import (
 	"io/ioutil"
+	"os/user"
 	"strings"
+
+	"go.wit.com/lib/gadgets"
+	"go.wit.com/lib/gui/repostatus"
+	"go.wit.com/log"
 )
 
 func (r *repo) String() string {
@@ -70,3 +75,60 @@ func (r *repo) Show() {
 	r.statusButton.Show()
 	r.hidden = false
 }
+
+// This creates a window
+func repoworld() {
+	reposwin = gadgets.NewBasicWindow(me.myGui, "All git repositories in ~/go/src/")
+	reposwin.Make()
+
+	reposbox = reposwin.Box().NewBox("bw vbox", false)
+	reposwin.Draw()
+	reposwin.Custom = func() {
+		log.Warn("GOT HERE: main() gadgets.NewBasicWindow() close")
+		log.Warn("Should I do something special here?")
+	}
+
+	reposgroup = reposbox.NewGroup("go repositories (read from ~/.config/myrepolist)")
+	reposgrid = reposgroup.NewGrid("test", 9, 1)
+
+	reposgrid.NewLabel("") // path goes here
+
+	reposgrid.NewLabel("last tag").SetProgName("last tag")
+
+	reposgrid.NewLabel("master version")
+	reposgrid.NewLabel("devel version")
+	reposgrid.NewLabel("user version")
+
+	reposgrid.NewLabel("Status")
+	reposgrid.NewLabel("go.sum")
+
+	reposgrid.NewLabel("Current Version").SetProgName("Current Version")
+
+	reposgrid.NewLabel("Show()")
+
+	repos := myrepolist()
+	for _, line := range repos {
+		log.Verbose("repo =", line)
+		path, mbranch, dbranch, ubranch := splitLine(line)
+		if mbranch == "" {
+			mbranch = "master"
+		}
+		if dbranch == "" {
+			dbranch = "devel"
+		}
+		usr, _ := user.Current()
+		if ubranch == "" {
+			ubranch = usr.Username
+		}
+		addRepo(reposgrid, path, mbranch, dbranch, ubranch)
+	}
+
+	for i, path := range repostatus.ListGitDirectories() {
+		// log.Info("addRepo()", i, path)
+		tmp := strings.TrimPrefix(path, "/home/jcarr/go/src/")
+		log.Info("addRepo()", i, tmp)
+		addRepo(reposgrid, tmp, "master", "master", "master")
+	}
+
+	reposwin.Toggle()
+}