diff --git a/Makefile b/Makefile index d96c970..169014f 100644 --- a/Makefile +++ b/Makefile @@ -2,8 +2,8 @@ # and are developing so it sets export GO111MODULE=off all: build - reset - ./autotypist + # reset + # ./autotypist build: echo "build it!" diff --git a/main.go b/main.go index 9cc33c2..ce147cc 100644 --- a/main.go +++ b/main.go @@ -18,8 +18,10 @@ func main() { me = new(autoType) me.myGui = gui.New() - me.myGui.InitEmbed(resources) - me.myGui.Default() + if !myargv.GitPull { + me.myGui.InitEmbed(resources) + me.myGui.Default() + } me.autotypistWindow = me.myGui.NewWindow("autotypist: it types faster than you can.") me.mainbox = me.autotypistWindow.NewBox("bw hbox", true) diff --git a/repoview.go b/repoview.go index 09cc848..03b91b2 100644 --- a/repoview.go +++ b/repoview.go @@ -75,21 +75,21 @@ func (r *repoWindow) repoMenu() *gui.Node { box2 := hbox.Box().Vertical() /* - box2.NewButton("merge all user to devel", func() { - r.Disable() - if !r.mergeAllUserToDevel() { - return - } - r.Enable() - }) + box2.NewButton("merge all user to devel", func() { + r.Disable() + if !r.mergeAllUserToDevel() { + return + } + r.Enable() + }) - box2.NewButton("merge all devel to main", func() { - r.Disable() - if !r.mergeAllDevelToMain() { - return - } - r.Enable() - }) + box2.NewButton("merge all devel to main", func() { + r.Disable() + if !r.mergeAllDevelToMain() { + return + } + r.Enable() + }) */ box2.NewButton("merge it all", func() {