diff options
Diffstat (limited to 'main.go')
| -rw-r--r-- | main.go | 34 |
1 files changed, 21 insertions, 13 deletions
@@ -16,7 +16,7 @@ import ( var resToolkit embed.FS func main() { - me = new(repoType) + me = new(autoType) me.allrepos = make(map[*repo]string) me.myGui = gui.New() @@ -35,10 +35,15 @@ func main() { func addRepo(grid *gui.Node, path string, master string, devel string, user string) { newRepo := new(repo) + if path == "" { + log.Warn("addRepo() got empty path", path, master, devel, user) + return + } + if repostatus.VerifyLocalGoRepo(path) { - log.Warn("newRepo actually exists", newRepo.getPath()) + log.Verbose("newRepo actually exists", newRepo.getPath()) } else { - log.Warn("newRepo does not exist", newRepo.getPath()) + log.Warn("repostatus.VerifyLocalGoRepo() failed for for", path, master, devel, user) return } @@ -55,7 +60,7 @@ func addRepo(grid *gui.Node, path string, master string, devel string, user stri newRepo.vLabel = grid.NewLabel("").SetProgName("current") - newRepo.showButton = grid.NewButton("Show()", func() { + newRepo.statusButton = grid.NewButton("Configure", func() { if newRepo.status == nil { log.Warn("status window doesn't exist") return @@ -64,17 +69,19 @@ func addRepo(grid *gui.Node, path string, master string, devel string, user stri newRepo.status.Toggle() newRepo.status.Update() }) - if path == "" { - newRepo.cButton.Hide() - newRepo.pButton.Hide() - } - newRepo.status = repostatus.New(me.myGui, newRepo.path) - newRepo.status.SetMasterBranchName(master) + + // newRepo.status = repostatus.New(me.myGui, newRepo.path) + newRepo.status = repostatus.NewRepoStatusWindow(newRepo.path) + newRepo.hidden = false + newRepo.status.SetMainWorkingName(me.mainBranch.String()) + newRepo.status.SetDevelWorkingName(me.develBranch.String()) + newRepo.status.SetUserWorkingName(me.userBranch.String()) + /* newRepo.status.SetDevelBranchName(devel) newRepo.status.SetUserBranchName(user) - newRepo.hidden = false newRepo.status.Update() newRepo.newScan() + */ me.allrepos[newRepo] = path } @@ -97,7 +104,8 @@ func repoworld() { reposbox = reposwin.Box().NewBox("bw vbox", false) reposwin.Draw() reposwin.Custom = func() { - log.Warn("GOT HERE") + 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)") @@ -119,7 +127,7 @@ func repoworld() { repos := myrepolist() for _, line := range repos { - log.Warn("repo =", line) + log.Verbose("repo =", line) path, mbranch, dbranch, ubranch := splitLine(line) if mbranch == "" { mbranch = "master" |