diff --git a/Makefile b/Makefile index 70655a7..7148a01 100644 --- a/Makefile +++ b/Makefile @@ -32,7 +32,7 @@ goimports: @# // gofmt -w -r '"go.wit.com/gui/gadgets" -> "go.wit.com/lib/gadgets"' *.go gocui: install - forge --gui gocui + forge --gui gocui --do-gui redomod-all: forge --do-RedoGoMod diff --git a/structs.go b/structs.go index 3f55b3d..b5f5ee0 100644 --- a/structs.go +++ b/structs.go @@ -37,11 +37,11 @@ type mainType struct { mainbox *gui.Node // the window from the /lib/gui/gowit package - lw *gadgets.BasicWindow + // lw *gadgets.BasicWindow // #### Sorting options for the repolist - autoHidePerfect *gui.Node - autoHideReadOnly *gui.Node + // autoHidePerfect *gui.Node + // autoHideReadOnly *gui.Node // checkbox for --dry-run autoDryRun *gui.Node diff --git a/subitPatches.go b/windowPatches.go similarity index 92% rename from subitPatches.go rename to windowPatches.go index 9929909..bd14797 100644 --- a/subitPatches.go +++ b/windowPatches.go @@ -1,14 +1,11 @@ package main import ( - "os" - "path/filepath" "strconv" "go.wit.com/gui" "go.wit.com/lib/gadgets" "go.wit.com/lib/gui/repolist" - "go.wit.com/lib/gui/shell" "go.wit.com/log" ) @@ -160,18 +157,21 @@ func submitPatchesBox(box *gui.Node) *patchSummary { } } s.submitB = s.grid.NewButton("Submit", func() { - dirname := "submit-patchset.quilt" - patchdir := filepath.Join(me.userHomePwd.String(), dirname) - if shell.Exists(patchdir) { - log.Info("patchset dir already exists", patchdir) - shell.PathRun(me.userHomePwd.String(), []string{"rm", "-rf", dirname}) - } - os.MkdirAll(patchdir, os.ModeDir) - if !shell.Exists(patchdir) { - log.Info("something went wrong making", patchdir) - return - } - me.repos.View.MakePatchset(patchdir) + sendDevelDiff() + /* + dirname := "submit-patchset.quilt" + patchdir := filepath.Join(me.userHomePwd.String(), dirname) + if shell.Exists(patchdir) { + log.Info("patchset dir already exists", patchdir) + shell.PathRun(me.userHomePwd.String(), []string{"rm", "-rf", dirname}) + } + os.MkdirAll(patchdir, os.ModeDir) + if !shell.Exists(patchdir) { + log.Info("something went wrong making", patchdir) + return + } + me.repos.View.MakePatchset(patchdir) + */ }) s.grid.NewButton("Show Repos", func() { s.Update() diff --git a/repoview.go b/windowRepos.go similarity index 100% rename from repoview.go rename to windowRepos.go