diff options
| -rw-r--r-- | doGui.go | 22 | ||||
| -rw-r--r-- | windowRepos.go | 24 |
2 files changed, 20 insertions, 26 deletions
@@ -14,6 +14,7 @@ import ( "go.wit.com/gui" "go.wit.com/lib/debugger" "go.wit.com/lib/gadgets" + "go.wit.com/lib/gui/repolist" "go.wit.com/lib/gui/shell" "go.wit.com/log" ) @@ -174,8 +175,25 @@ func drawWindow(win *gadgets.BasicWindow) { } return } - reposWin = makeRepoView() - reposWin.Show() + 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 diff --git a/windowRepos.go b/windowRepos.go index 4f4c9a5..1360ba8 100644 --- a/windowRepos.go +++ b/windowRepos.go @@ -75,30 +75,6 @@ func (r *repoWindow) Enable() { r.box.Enable() } -// you can only have one of these -func makeRepoView() *repoWindow { - r := new(repoWindow) - r.win = gadgets.RawBasicWindow("All git repositories in ~/go/src/") - r.win.Make() - - r.box = r.win.Box().NewBox("bw vbox", false) - // me.reposwin.Draw() - r.win.Custom = func() { - log.Warn("Repo Window close. hidden=true") - // sets the hidden flag to false so Toggle() works - r.win.Hide() - } - - r.topbox = r.repoMenu() - - r.View = repolist.InitBox(me.forge, r.box) - r.View.Enable() - - // need to update this logic - r.View.ScanRepositoriesOld() - return r -} - func (r *repoWindow) repoMenu() *gui.Node { // reposbox.SetExpand(false) group1 := r.box.NewGroup("Filter:") |