diff options
Diffstat (limited to 'windowReposFix.go')
| -rw-r--r-- | windowReposFix.go | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/windowReposFix.go b/windowReposFix.go index d7cb964..ef525c3 100644 --- a/windowReposFix.go +++ b/windowReposFix.go @@ -112,12 +112,6 @@ func makeReposWin() *stdReposTableWin { rwin.boxTB = win.Bottom.Box() - grid.NewButton("dirty on bottom", func() { - log.Info("try to show dirty repos on bottom") - found := findDirty() - rwin.doReposTable(found) - - }) grid.NextRow() found = develRemoteProblem() @@ -135,7 +129,7 @@ func makeReposWin() *stdReposTableWin { }) grid.NextRow() - makeHackModeWindow(win) + makeHackModeWindow(rwin) return rwin } @@ -175,8 +169,8 @@ func (rwin *stdReposTableWin) doReposTable(pb *gitpb.Repos) { rwin.TB = t } -func makeHackModeWindow(win *gadgets.GenericWindow) { - group := win.Top.NewGroup("This is a work in progress") +func makeHackModeWindow(stdwin *stdReposTableWin) { + group := stdwin.win.Top.NewGroup("This is a work in progress") grid := group.RawGrid() grid.NewButton("git pull", func() { log.Info("todo: run git pull on each repo") @@ -187,8 +181,8 @@ func makeHackModeWindow(win *gadgets.GenericWindow) { _, box := makeStandardReposWindow("repos to merge from user to devel", found) hbox := box.Box().Horizontal() hbox.NewButton("merge all", func() { - win.Disable() - defer win.Enable() + stdwin.win.Disable() + defer stdwin.win.Enable() all := found.SortByFullPath() for all.Scan() { repo := all.Next() @@ -221,26 +215,26 @@ func makeHackModeWindow(win *gadgets.GenericWindow) { }) grid.NextRow() - group2 := win.Top.NewGroup("Merge") + group2 := stdwin.win.Top.NewGroup("Merge") grid = group2.RawGrid() grid.NewButton("merge to devel", func() { - win.Disable() - defer win.Enable() + stdwin.win.Disable() + defer stdwin.win.Enable() mergeUserToDevel(true) }) grid.NewButton("merge to master", func() { - win.Disable() - defer win.Enable() + stdwin.win.Disable() + defer stdwin.win.Enable() mergeDevelToMaster(true) }) grid.NewButton("merge all", func() { - win.Disable() - defer win.Enable() + stdwin.win.Disable() + defer stdwin.win.Enable() me.argvCheckoutUser = false me.argvCheckoutDevel = true @@ -265,7 +259,13 @@ func makeHackModeWindow(win *gadgets.GenericWindow) { mergeDevelToMaster(true) }) - group3 := win.Top.NewGroup("work in progress") + grid.NewButton("show dirty repos on win.Bottom", func() { + log.Info("try to show dirty repos on bottom") + found := findDirty() + stdwin.doReposTable(found) + }) + + group3 := stdwin.win.Top.NewGroup("work in progress") grid = group3.RawGrid() grid.NewButton("forge ConfigSave()", func() { |