diff options
Diffstat (limited to 'doGui.go')
| -rw-r--r-- | doGui.go | 30 |
1 files changed, 10 insertions, 20 deletions
@@ -8,8 +8,6 @@ package main import ( "fmt" "os" - "os/user" - "path/filepath" "time" "go.wit.com/gui" @@ -90,8 +88,6 @@ func doGui() { } func drawWindow(win *gadgets.BasicWindow) { - var reposWin *repoWindow // this is the handle to the repo window - box := win.Box() vbox := box.NewVerticalBox("BOX2") @@ -102,19 +98,17 @@ func drawWindow(win *gadgets.BasicWindow) { // me.autoWorkingPwd = gadgets.NewOneLiner(grid, "working directory (pwd)") me.goSrcPwd = gadgets.NewOneLiner(grid, "repo src home") grid.NewLabel("") - me.demoB = grid.NewButton("Demo", func() { - log.Info("todo: put instructions here") + var howtoWin *genericWindow + me.demoB = grid.NewButton("Howto", func() { + if howtoWin != nil { + howtoWin.Toggle() + return + } + howtoWin = makeHowtoWin() }) grid.NextRow() - usr, _ := user.Current() - homeDir, err := os.UserHomeDir() - if err != nil { - log.Warn("Error getting home directory:", err) - homeDir = "/home/autotypist" - } - srcDir := filepath.Join(homeDir, "go/src") - me.goSrcPwd.SetText(srcDir) + me.goSrcPwd.SetText(me.forge.GetGoSrc()) // use ENV GIT_AUTHOR me.gitAuthor = gadgets.NewOneLiner(grid, "Git Author") @@ -135,10 +129,6 @@ func drawWindow(win *gadgets.BasicWindow) { me.setBranchB = grid.NewButton("git checkout", func() { win.Disable() defer win.Enable() - if reposWin != nil { - log.Info("reposWin == nil") - reposWin.Hide() - } if me.autoCreateBranches.Checked() { argv.Force = true @@ -170,8 +160,8 @@ func drawWindow(win *gadgets.BasicWindow) { me.newBranch = grid.NewDropdown() me.newBranch.AddText("master") me.newBranch.AddText("devel") - me.newBranch.AddText(usr.Username) - me.newBranch.SetText(usr.Username) + me.newBranch.AddText(me.forge.Config.GetUsername()) + me.newBranch.SetText(me.forge.Config.GetUsername()) me.argvCheckoutUser = true me.newBranch.Custom = func() { // toggle global values shared by the command line and the gui for doCheckout() |