minor gui stuff

This commit is contained in:
Jeff Carr 2025-01-07 06:14:47 -06:00
parent fb945a5295
commit 1966246169
1 changed files with 31 additions and 18 deletions

View File

@ -92,18 +92,25 @@ func (r *repoWindow) repoMenu() *gui.Node {
if !r.mergeAllUserToDevel() { if !r.mergeAllUserToDevel() {
return return
} }
/* no longer do this here! yay! long live forge
if !r.mergeAllDevelToMain() {
return
}
*/
r.Enable() r.Enable()
}) })
box2.NewButton("test master merge", func() { box2.NewButton("test master merge", func() {
r.Disable() r.Disable()
if !r.mergeAllDevelToMain() { r.mergeAllDevelToMain()
return /*
me.forge = forgepb.Init()
me.found = new(gitpb.Repos)
me.repos = makeRepoView()
me.repos.Show()
*/
loop := me.forge.Repos.All()
for loop.Scan() {
repo := loop.Next()
vrepo := me.repos.View.FindByPath(repo.GetGoPath())
if vrepo != nil {
vrepo.NewScan3(repo)
}
} }
r.Enable() r.Enable()
}) })
@ -168,9 +175,15 @@ func (r *repoWindow) mergeAllDevelToMain() bool {
} }
me.found.Append(newr) me.found.Append(newr)
doCobol() doCobol()
return true
vrepo := me.repos.View.FindByPath(gopath) /*
vrepo.NewScan3(newr) loop1 := me.forge.Repos.All()
for loop1.Scan() {
repo := loop1.Next()
vrepo := me.repos.View.FindByPath(repo.GetGoPath())
vrepo.NewScan3(repo)
}
// remap the repo.pb // remap the repo.pb
loop := me.repos.View.ReposSortByName() loop := me.repos.View.ReposSortByName()
@ -179,7 +192,7 @@ func (r *repoWindow) mergeAllDevelToMain() bool {
repo = loop.Repo() repo = loop.Repo()
repo.NewScan2() repo.NewScan2()
} }
return true */
// continue // continue
} else { } else {
log.Warn("THINGS FAILED ", repo.GetFullPath()) log.Warn("THINGS FAILED ", repo.GetFullPath())