diff options
| -rw-r--r-- | globalDisplayOptions.go | 61 | ||||
| -rw-r--r-- | main.go | 17 | ||||
| -rw-r--r-- | releaseWindow.go | 30 | ||||
| -rw-r--r-- | structs.go | 2 |
4 files changed, 58 insertions, 52 deletions
diff --git a/globalDisplayOptions.go b/globalDisplayOptions.go index 4cb8478..19ae704 100644 --- a/globalDisplayOptions.go +++ b/globalDisplayOptions.go @@ -5,7 +5,6 @@ import ( "go.wit.com/gui" "go.wit.com/lib/debugger" "go.wit.com/lib/gui/logsettings" - "go.wit.com/log" // "go.wit.com/gui/gadgets" ) @@ -52,42 +51,44 @@ func globalDisplayOptions(box *gui.Node) { globalDisplaySetRepoState() reposwin.Toggle() }) - group1.NewButton("Create Release Window", func() { - if release.win == nil { - log.Info("Creating the Release Window") - createReleaseWindow() + /* + group1.NewButton("Create Release Window", func() { + if release.win == nil { + log.Info("Creating the Release Window") + createReleaseWindow() + log.Info("Toggling the Release Window") + release.win.Toggle() + } log.Info("Toggling the Release Window") - release.win.Toggle() - } - log.Info("Toggling the Release Window") - release.openrepo.Disable() - for _, repo := range me.allrepos { - repo.newScan() - } - reposwin.Toggle() - release.win.Toggle() - }) - group1.NewButton("Create Release Window (fullscan)", func() { - if release.win == nil { - log.Info("Creating the Release Window") - createReleaseWindow() + release.openrepo.Disable() for _, repo := range me.allrepos { - repo.status.Update() repo.newScan() } - globalDisplaySetRepoState() - // open the repo window reposwin.Toggle() + release.win.Toggle() + }) + group1.NewButton("Create Release Window (fullscan)", func() { + if release.win == nil { + log.Info("Creating the Release Window") + createReleaseWindow() + for _, repo := range me.allrepos { + repo.status.Update() + repo.newScan() + } + globalDisplaySetRepoState() + // open the repo window + reposwin.Toggle() + log.Info("Toggling the Release Window") + release.win.Toggle() + } log.Info("Toggling the Release Window") release.win.Toggle() - } - log.Info("Toggling the Release Window") - release.win.Toggle() - release.openrepo.Disable() - for _, repo := range me.allrepos { - repo.newScan() - } - }) + release.openrepo.Disable() + for _, repo := range me.allrepos { + repo.newScan() + } + }) + */ me.autoHideReadOnly = group1.NewCheckbox("Hide read-only repos").SetChecked(true) me.autoHideReadOnly.Custom = func() { @@ -23,7 +23,13 @@ func main() { // me.myGui.LoadToolkit("nocui") me.myGui.Default() - autotypistWindow() + // autotypistWindow() + + me.mainWindow = me.myGui.NewWindow("GUI release manager") + me.mainBox = me.mainWindow.NewBox("bw hbox", true) + + globalDisplayOptions(me.mainBox) + repoworld() for _, repo := range me.allrepos { @@ -32,7 +38,7 @@ func main() { } if release.win == nil { log.Info("Creating the Release Window") - createReleaseWindow() + createReleaseWindow(me.mainBox) globalDisplaySetRepoState() // open the repo window reposwin.Toggle() @@ -72,10 +78,3 @@ func main() { me.autoWorkingPwd.SetText(s) }) } - -func autotypistWindow() { - win := me.myGui.NewWindow("autotypist for GO & git. it types faster than you can.") - box := win.NewBox("bw hbox", true) - - globalDisplayOptions(box) -} diff --git a/releaseWindow.go b/releaseWindow.go index d168374..d25fd40 100644 --- a/releaseWindow.go +++ b/releaseWindow.go @@ -39,25 +39,29 @@ type releaseStruct struct { checkSafeB *gui.Node } -func createReleaseWindow() { - if release.win != nil { - release.win.Toggle() - return - } +func createReleaseWindow(box *gui.Node) { + /* + if release.win != nil { + release.win.Toggle() + return + } + */ versionS := "0.17.0" reasonS := "gocui" partS := strings.Split(versionS, ".") - release.win = gadgets.NewBasicWindow(me.myGui, "Make a new release") - release.win.Custom = func() { - log.Info("Release Window close") - } + /* + release.win = gadgets.NewBasicWindow(me.myGui, "Make a new release") + release.win.Custom = func() { + log.Info("Release Window close") + } - release.win.Make() - release.win.StandardClose() - release.win.Draw() - release.box = release.win.Box() + release.win.Make() + release.win.StandardClose() + release.win.Draw() + */ + release.box = box release.group = release.box.NewGroup("things") release.grid = release.group.NewGrid("buildOptions", 2, 1) @@ -20,6 +20,8 @@ type autoType struct { myGui *gui.Node autotypistWindow *gadgets.BasicWindow + mainWindow *gui.Node + mainBox *gui.Node // #### autotypist Global Display Options autoHidePerfect *gui.Node |