diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | argvAutoshell.go | 2 | ||||
| -rw-r--r-- | doGui.go | 100 |
3 files changed, 61 insertions, 43 deletions
@@ -8,7 +8,7 @@ BUILDTIME = $(shell date +%Y.%m.%d_%H%M) default: verbose install # forge clean - #forge + forge vet: @GO111MODULE=off go vet diff --git a/argvAutoshell.go b/argvAutoshell.go index 7c1354f..8c34d68 100644 --- a/argvAutoshell.go +++ b/argvAutoshell.go @@ -32,7 +32,7 @@ func (args) doBashAuto() { // me.pp.WriteHelpForSubcommand(os.Stderr, "clean") fmt.Println("--force") case "commit": - fmt.Println("--all --more") + fmt.Println("--all") case "config": fmt.Println("add fix list debug") case "delete": @@ -123,31 +123,8 @@ func drawWindow(win *gadgets.GenericWindow) { grid.NextRow() - // groupM := hbox.NewGroup("Windows") - // gridM := groupM.RawGrid() - // hbox := win.Stack.Box().Horizontal() gridM := win.Stack.RawGrid() - var releaseWin *gadgets.GenericWindow - gridM.NewButton("Release Window", func() { - log.Info("todo: move releaser here") - log.Info("for now, run guireleaser") - if releaseWin != nil { - releaseWin.Toggle() - return - } - releaseWin = makeModeMasterWin() - }) - - var patches *stdPatchsetTableWin - gridM.NewButton("Patch Window", func() { - if patches != nil { - patches.Toggle() - return - } - patches = makePatchsetsWin() - }) - var insertWin *gadgets.GenericWindow s := fmt.Sprintf("Repos (%d)", me.forge.Repos.Len()) me.reposWinB = gridM.NewButton(s, func() { @@ -160,15 +137,8 @@ func drawWindow(win *gadgets.GenericWindow) { insertWin = makeReposWinNew() }) - // var reposWin *gadgets.GenericWindow - var reposWin *stdReposTableWin - gridM.NewButton("Fix Repos", func() { - if reposWin != nil { - reposWin.Toggle() - return - } - reposWin = makeReposWin() - }) + /* + */ var patchesWin *stdPatchTableWin gridM.NewButton("Pending patches", func() { @@ -197,18 +167,14 @@ func drawWindow(win *gadgets.GenericWindow) { patchesWin = makePatchesWin(notdone) }) - gridM.NextRow() - var howtoWin *gadgets.GenericWindow - gridM.NewButton("Tutorial", func() { - if howtoWin != nil { - howtoWin.Toggle() + var oldWin *gadgets.GenericWindow + gridM.NewButton("old", func() { + if oldWin != nil { + oldWin.Toggle() return } - howtoWin = makeHowtoWin() + oldWin = makeOldStuff() }) - - gridM.NextRow() - gridM.NewLabel("") } // this is the magic that generates a window directly from the protocol buffer @@ -413,3 +379,55 @@ func mergeUserToDevel(doit bool) { } me.forge.ConfigSave() } + +// old things before they are removed, deprecated, fixed, etc +func makeOldStuff() *gadgets.GenericWindow { + oldWin := gadgets.NewGenericWindow("old code", "old code on it's way out") + + grid := oldWin.Group.RawGrid() + + var releaseWin *gadgets.GenericWindow + grid.NewButton("Release Window", func() { + log.Info("todo: move releaser here") + log.Info("for now, run guireleaser") + if releaseWin != nil { + releaseWin.Toggle() + return + } + releaseWin = makeModeMasterWin() + }) + + var patches *stdPatchsetTableWin + grid.NewButton("Patch Window", func() { + if patches != nil { + patches.Toggle() + return + } + patches = makePatchsetsWin() + }) + grid.NextRow() + + // var reposWin *gadgets.GenericWindow + var reposWin *stdReposTableWin + grid.NewButton("Fix Repos", func() { + if reposWin != nil { + reposWin.Toggle() + return + } + reposWin = makeReposWin() + }) + + var howtoWin *gadgets.GenericWindow + grid.NewButton("Tutorial", func() { + if howtoWin != nil { + howtoWin.Toggle() + return + } + howtoWin = makeHowtoWin() + }) + + grid.NextRow() + grid.NewLabel("") + + return oldWin +} |