diff options
Diffstat (limited to 'doGui.go')
| -rw-r--r-- | doGui.go | 124 |
1 files changed, 64 insertions, 60 deletions
@@ -102,16 +102,9 @@ func doGui() { func drawWindow(win *gadgets.GenericWindow) { grid := win.Group.RawGrid() - me.goSrcPwd = gadgets.NewOneLiner(grid, "repo src home") + me.goSrcPwd = gadgets.NewOneLiner(grid, "Working Directory") grid.NewLabel("") - var howtoWin *gadgets.GenericWindow - me.demoB = grid.NewButton("Howto", func() { - if howtoWin != nil { - howtoWin.Toggle() - return - } - howtoWin = makeHowtoWin() - }) + grid.NextRow() me.goSrcPwd.SetText(me.forge.GetGoSrc()) @@ -128,59 +121,12 @@ func drawWindow(win *gadgets.GenericWindow) { me.gitAuthor.SetText(author) } - group1 := win.Stack.NewGroup("Forge Mode") - grid = group1.RawGrid() - me.forgeMode = grid.NewLabel("") - me.forgeMode.SetText(me.forge.GetMode()) - - me.newBranch = grid.NewDropdown() - me.newBranch.AddText("master") - me.newBranch.AddText("devel") - me.newBranch.AddText(me.forge.Config.GetUsername()) - me.newBranch.Custom = func() { - me.setBranchB.Disable() - // toggle global values shared by the command line and the gui for doCheckout() - switch me.newBranch.String() { - case "master": - if me.forge.Config.Mode != forgepb.ForgeMode_MASTER { - me.setBranchB.Enable() - } - case "devel": - if me.forge.Config.Mode != forgepb.ForgeMode_DEVEL { - me.setBranchB.Enable() - } - default: - if me.forge.Config.Mode != forgepb.ForgeMode_USER { - me.setBranchB.Enable() - } - } - } - - // select the branch you want to test, build and develop against - // this lets you select your user branch, but, when you are happy - // you can merge everything into the devel branch and make sure it actually - // works. Then, when that is good, merge and version everything in master - me.setBranchB = grid.NewButton("Switch mode", func() { - win.Disable() - defer win.Enable() - - switch me.newBranch.String() { - case "master": - forgeSwitchMode(forgepb.ForgeMode_MASTER) - case "devel": - forgeSwitchMode(forgepb.ForgeMode_DEVEL) - default: - forgeSwitchMode(forgepb.ForgeMode_USER) - } - - me.setBranchB.Disable() - }) - me.setBranchB.Disable() - grid.NextRow() - groupM := win.Stack.NewGroup("Mode Windows") - gridM := groupM.RawGrid() + // 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() { @@ -251,6 +197,64 @@ func drawWindow(win *gadgets.GenericWindow) { patchesWin = makePatchesWin(notdone) }) + var howtoWin *gadgets.GenericWindow + gridM.NewButton("Howto", func() { + if howtoWin != nil { + howtoWin.Toggle() + return + } + howtoWin = makeHowtoWin() + }) + + group1 := win.Stack.NewGroup("Forge Mode (deprecated)") + grid = group1.RawGrid() + me.forgeMode = grid.NewLabel("") + me.forgeMode.SetText(me.forge.GetMode()) + + me.newBranch = grid.NewDropdown() + me.newBranch.AddText("master") + me.newBranch.AddText("devel") + me.newBranch.AddText(me.forge.Config.GetUsername()) + me.newBranch.Custom = func() { + me.setBranchB.Disable() + // toggle global values shared by the command line and the gui for doCheckout() + switch me.newBranch.String() { + case "master": + if me.forge.Config.Mode != forgepb.ForgeMode_MASTER { + me.setBranchB.Enable() + } + case "devel": + if me.forge.Config.Mode != forgepb.ForgeMode_DEVEL { + me.setBranchB.Enable() + } + default: + if me.forge.Config.Mode != forgepb.ForgeMode_USER { + me.setBranchB.Enable() + } + } + } + + // select the branch you want to test, build and develop against + // this lets you select your user branch, but, when you are happy + // you can merge everything into the devel branch and make sure it actually + // works. Then, when that is good, merge and version everything in master + me.setBranchB = grid.NewButton("Switch mode", func() { + win.Disable() + defer win.Enable() + + switch me.newBranch.String() { + case "master": + forgeSwitchMode(forgepb.ForgeMode_MASTER) + case "devel": + forgeSwitchMode(forgepb.ForgeMode_DEVEL) + default: + forgeSwitchMode(forgepb.ForgeMode_USER) + } + + me.setBranchB.Disable() + }) + me.setBranchB.Disable() + // set the initial button state based on the last // forge mode the user saved in the config file switch me.forge.Config.Mode { |