diff --git a/Makefile b/Makefile index c26322b..c7f66b0 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ BUILDTIME = $(shell date +%Y.%m.%d_%H%M) # make andlabs # try the andlabs gui plugin (uses GTK) default: install - forge commit --all + forge --gui gocui vet: @GO111MODULE=off go vet diff --git a/doGui.go b/doGui.go index 8d52310..cb83c43 100644 --- a/doGui.go +++ b/doGui.go @@ -167,38 +167,6 @@ func drawWindow(win *gadgets.BasicWindow) { me.autoCreateBranches = grid.NewCheckbox("auto create branches").SetChecked(true) grid.NextRow() - grid.NewButton("Repo Window", func() { - win.Disable() - defer win.Enable() - if reposWin != nil { - if reposWin.Hidden() { - reposWin.Show() - } else { - reposWin.Hide() - } - return - } - reposWin := new(repoWindow) - reposWin.win = gadgets.RawBasicWindow("All git repositories in ~/go/src/") - reposWin.win.Make() - - reposWin.box = reposWin.win.Box().NewBox("bw vbox", false) - // me.reposwin.Draw() - reposWin.win.Custom = func() { - log.Warn("Repo Window close. hidden=true") - // sets the hidden flag to false so Toggle() works - reposWin.win.Hide() - } - reposWin.topbox = reposWin.repoMenu() - - reposWin.View = repolist.InitBox(me.forge, reposWin.box) - reposWin.View.Enable() - - // need to update this logic - reposWin.View.ScanRepositoriesOld() - reposWin.win.Show() - }) - var patchWin *patchesWindow grid.NewButton("Patches Window", func() { @@ -211,36 +179,28 @@ func drawWindow(win *gadgets.BasicWindow) { patchWin.Show() }) - var foundWin *foundWindow - grid.NewButton("Search Repos", func() { - if foundWin != nil { - foundWin.Toggle() - return - } - foundWin = new(foundWindow) - foundWin.initWindow() - foundWin.Show() + group2 := vbox.NewGroup("Repos") + grid = group2.RawGrid() + + grid.NewButton("All", func() { + makeStandardReposWindow(me.forge.Repos) }) - grid.NewButton("find merge to devel", func() { - findMergeToDevel() - t := me.found.NewTable("testFind2") - t.AddStringFunc("repo", func(r *gitpb.Repo) string { - return r.GetGoPath() - }) - t.AddMasterVersion() - t.AddState() - t.ShowTable() - /* - t.AddStringFunc("zood", func(m *zoopb.Machine) string { - return findVersion(m, "zood") - }) - t.AddTimeFunc("age", func(m *zoopb.Machine) time.Time { - return m.Laststamp.AsTime() - }) - */ + grid.NewButton("dirty", func() { + me.found = new(gitpb.Repos) + findDirty() + makeStandardReposWindow(me.found) }) + grid.NewButton("needs merge to devel", func() { + findMergeToDevel() + makeStandardReposWindow(me.found) + }) + grid.NextRow() + + group3 := vbox.NewGroup("debugging stuff") + grid = group3.RawGrid() + grid.NewButton("forge ConfigSave()", func() { me.forge.ConfigSave() }) @@ -289,6 +249,77 @@ func drawWindow(win *gadgets.BasicWindow) { mergeDevelToMaster(me.autoCreateBranches.Checked()) }) + + group3 = vbox.NewGroup("old junk") + grid = group3.RawGrid() + + var foundWin *foundWindow + grid.NewButton("Search Repos", func() { + if foundWin != nil { + foundWin.Toggle() + return + } + foundWin = new(foundWindow) + foundWin.initWindow() + foundWin.Show() + }) + + grid.NewButton("Repo Window", func() { + win.Disable() + defer win.Enable() + if reposWin != nil { + if reposWin.Hidden() { + reposWin.Show() + } else { + reposWin.Hide() + } + return + } + reposWin := new(repoWindow) + reposWin.win = gadgets.RawBasicWindow("All git repositories in ~/go/src/") + reposWin.win.Make() + + reposWin.box = reposWin.win.Box().NewBox("bw vbox", false) + // me.reposwin.Draw() + reposWin.win.Custom = func() { + log.Warn("Repo Window close. hidden=true") + // sets the hidden flag to false so Toggle() works + reposWin.win.Hide() + } + reposWin.topbox = reposWin.repoMenu() + + reposWin.View = repolist.InitBox(me.forge, reposWin.box) + reposWin.View.Enable() + + // need to update this logic + reposWin.View.ScanRepositoriesOld() + reposWin.win.Show() + }) + +} + +func makeStandardReposWindow(pb *gitpb.Repos) { + t := pb.NewTable("testDirty") + sf := t.AddStringFunc("repo", func(r *gitpb.Repo) string { + return r.GetGoPath() + }) + // t.Custom = func() { + // log.Info("close grid?") + // } + sf.Custom = func(r *gitpb.Repo) { + log.Info("do button click on", r.GetGoPath()) + } + t.AddMasterVersion() + t.AddState() + t.ShowTable() + /* + t.AddStringFunc("zood", func(m *zoopb.Machine) string { + return findVersion(m, "zood") + }) + t.AddTimeFunc("age", func(m *zoopb.Machine) time.Time { + return m.Laststamp.AsTime() + }) + */ } func findMergeToDevel() {