diff options
| -rw-r--r-- | globalDisplayOptions.go | 20 | ||||
| -rw-r--r-- | main.go | 2 | ||||
| -rw-r--r-- | releaseWindow.go | 2 | ||||
| -rw-r--r-- | repolist.go | 27 | ||||
| -rw-r--r-- | scan.go | 4 | ||||
| -rw-r--r-- | structs.go | 6 |
6 files changed, 41 insertions, 20 deletions
diff --git a/globalDisplayOptions.go b/globalDisplayOptions.go index 866303f..b35ac29 100644 --- a/globalDisplayOptions.go +++ b/globalDisplayOptions.go @@ -76,6 +76,7 @@ func globalDisplayOptions(box *gui.Node) { me.scanEveryMinute = group1.NewCheckbox("Scan every minute").SetChecked(false) group1.NewButton("set all branches to master", func() { + me.Disable() for _, repo := range me.allrepos { if whitelist(repo.String()) { continue @@ -88,18 +89,36 @@ func globalDisplayOptions(box *gui.Node) { repo.newScan() } } + me.Enable() + }) + + var longB *gui.Node + longB = group1.NewButton("redo go.sum", func() { + longB.Disable() + me.Disable() + for _, repo := range me.allrepos { + if whitelist(repo.String()) { + continue + } + repo.status.MakeRedomod() + } + me.Enable() + longB.Enable() }) group1.NewButton("rm -f go.mod go.sum", func() { + me.Disable() for _, repo := range me.allrepos { if whitelist(repo.String()) { continue } repo.status.RunCmd([]string{"rm", "-f", "go.mod", "go.sum"}) } + me.Enable() }) group1.NewButton("git reset --hard", func() { + me.Disable() for _, repo := range me.allrepos { if whitelist(repo.String()) { log.Warn("skipping whitelist", repo.String()) @@ -108,6 +127,7 @@ func globalDisplayOptions(box *gui.Node) { log.Warn("running git reset --hard", repo.String()) repo.status.RunCmd([]string{"git", "reset", "--hard"}) } + me.Enable() }) group2 := vbox.NewGroup("Debugger") @@ -30,7 +30,7 @@ func main() { repoworld() for _, repo := range me.allrepos { - repo.status.Update() + repo.status.UpdateCurrent() repo.newScan() } log.Info("Creating the Release Window") diff --git a/releaseWindow.go b/releaseWindow.go index 25ce976..40b86f7 100644 --- a/releaseWindow.go +++ b/releaseWindow.go @@ -160,7 +160,7 @@ func createReleaseBox(box *gui.Node) { // open the status window to commit the release release.current.status.Toggle() release.current.status.SetVersion(partS[0], partS[1], partS[2], release.reason.String()) - release.current.status.Update() + release.current.status.UpdateCurrent() }) release.openrepo.Disable() diff --git a/repolist.go b/repolist.go index 069efc2..c299e49 100644 --- a/repolist.go +++ b/repolist.go @@ -52,9 +52,9 @@ func (r *repo) Hide() { r.lastTag.Hide() r.vLabel.Hide() - r.masterVersion.Hide() - r.develVersion.Hide() - r.userVersion.Hide() +// r.masterVersion.Hide() +// r.develVersion.Hide() +// r.userVersion.Hide() r.dirtyLabel.Hide() r.goSumStatus.Hide() @@ -67,9 +67,9 @@ func (r *repo) Show() { r.lastTag.Show() r.vLabel.Show() - r.masterVersion.Show() - r.develVersion.Show() - r.userVersion.Show() +// r.masterVersion.Show() +// r.develVersion.Show() +// r.userVersion.Show() r.dirtyLabel.Show() r.goSumStatus.Show() @@ -90,15 +90,15 @@ func repoworld() { } reposgroup = reposbox.NewGroup("go repositories (read from ~/.config/myrepolist)") - reposgrid = reposgroup.NewGrid("test", 9, 1) + reposgrid = reposgroup.NewGrid("test", 6, 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("master version") +// reposgrid.NewLabel("devel version") +// reposgrid.NewLabel("user version") reposgrid.NewLabel("Status") reposgrid.NewLabel("go.sum") @@ -161,9 +161,9 @@ func addRepo(grid *gui.Node, path string, master string, devel string, user stri newRepo.lastTag = grid.NewLabel("").SetProgName("lastTag") - newRepo.masterVersion = grid.NewLabel("").SetProgName("masterVersion") - newRepo.develVersion = grid.NewLabel("").SetProgName("develVersion") - newRepo.userVersion = grid.NewLabel("").SetProgName("userVersion") +// newRepo.masterVersion = grid.NewLabel("").SetProgName("masterVersion") +// newRepo.develVersion = grid.NewLabel("").SetProgName("develVersion") +// newRepo.userVersion = grid.NewLabel("").SetProgName("userVersion") newRepo.dirtyLabel = grid.NewLabel("") newRepo.goSumStatus = grid.NewLabel("?") @@ -178,7 +178,6 @@ func addRepo(grid *gui.Node, path string, master string, devel string, user stri log.Warn("status window exists. trying TestDraw() here") newRepo.status.Toggle() setCurrentRepo(newRepo, "manually chosen", "notsure") - // newRepo.status.Update() }) newRepo.status = repostatus.NewRepoStatusWindow(newRepo.path) @@ -22,6 +22,7 @@ func (r *repo) newScan() bool { log.Warn("repo does not exist", r.getPath()) return false } + /* mname := r.status.GetMasterBranchName() mver := r.status.GetMasterVersion() if mname != "guimaster" { @@ -42,6 +43,7 @@ func (r *repo) newScan() bool { uver = uver + " (" + uname + ")" } r.userVersion.SetLabel(uver) + */ cbname := r.status.GetCurrentBranchName() cbversion := r.status.GetCurrentBranchVersion() @@ -136,7 +138,7 @@ func scanGoSum() { if status == "PERFECT" { continue } else { - repo.status.Update() + repo.status.UpdateCurrent() repo.newScan() } @@ -90,11 +90,11 @@ type repo struct { goSumStatus *gui.Node // what is the state of the go.sum file // masterName *gui.Node // the master branch name - masterVersion *gui.Node // the master branch version + // masterVersion *gui.Node // the master branch version // develName *gui.Node // the devel branch name - develVersion *gui.Node // the devel branch version + // develVersion *gui.Node // the devel branch version // userName *gui.Node // the jcarr branch name - userVersion *gui.Node // the jcarr branch version + // userVersion *gui.Node // the jcarr branch version statusButton *gui.Node // opens up the status window |