From 3a12630a5d56b2f64182d16245df17b4ebe79e41 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Mon, 3 Jun 2019 17:07:04 -0700 Subject: [PATCH 1/5] always work in the devel branch Signed-off-by: Jeff Carr --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 6353f93..2b7dd82 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,6 @@ # simple sortcut to push all git changes push: + git checkout devel git pull git add --all -git commit -a -s From 9afb63999b6b604f7e8f7691d7f7f398019fb6d6 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Mon, 3 Jun 2019 17:25:07 -0700 Subject: [PATCH 2/5] spew with depth Signed-off-by: Jeff Carr --- debug.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/debug.go b/debug.go index 1a20532..3369be6 100644 --- a/debug.go +++ b/debug.go @@ -40,7 +40,13 @@ func DumpBoxes() { log.Println("gui.DumpBoxes()\tWindow.UiTab type =", reflect.TypeOf(window.UiTab)) log.Println("gui.DumpBoxes()\tWindow.UiTab =", window.UiTab) log.Println("gui.DumpBoxes()\tWindow.UiTab.NumPages() =", window.UiTab.NumPages()) - spew.Dump(window.UiTab) + // tmp := spew.NewDefaultConfig() + // tmp.MaxDepth = 2 + // tmp.Dump(window.UiTab) + if (Config.Debug) { + scs := spew.ConfigState{MaxDepth: 2} + scs.Dump(window.UiTab) + } } } for i, window := range Data.Windows { From 0af6ad0f3325254191c61fdcda0ef2178130fb2f Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Mon, 3 Jun 2019 18:53:14 -0700 Subject: [PATCH 3/5] not sure what happened Signed-off-by: Jeff Carr --- gui.go | 6 ++++ window.go | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+) create mode 100644 window.go diff --git a/gui.go b/gui.go index ef1ff49..5a09f6b 100644 --- a/gui.go +++ b/gui.go @@ -20,6 +20,7 @@ func GuiInit() { }) } +<<<<<<< Updated upstream func InitGuiWindow(name string, gw *GuiWindow) *GuiWindow { log.Println("InitGuiWindow() START") var newGuiWindow GuiWindow @@ -94,6 +95,8 @@ func InitTabWindow(gw *GuiWindow) { gw.UiWindow.Show() } +======= +>>>>>>> Stashed changes /* // string handling examples that might be helpful for normalizeInt() isAlpha := regexp.MustCompile(`^[A-Za-z]+$`).MatchString @@ -127,6 +130,7 @@ func normalizeInt(s string) string { log.Println("normalizeInt() s =", clean) return clean } +<<<<<<< Updated upstream func MessageWindow(gw *GuiWindow, msg1 string, msg2 string) { log.Println("gui.MessageWindow() msg1 =", msg1) @@ -139,3 +143,5 @@ func ErrorWindow(gw *GuiWindow, msg1 string, msg2 string) { log.Println("gui.ErrorWindow() msg2 =", msg2) ui.MsgBoxError(gw.UiWindow, msg1, msg2) } +======= +>>>>>>> Stashed changes diff --git a/window.go b/window.go new file mode 100644 index 0000000..344db65 --- /dev/null +++ b/window.go @@ -0,0 +1,83 @@ +package gui + +import "log" +import "time" +import "regexp" + +import "github.com/andlabs/ui" +import _ "github.com/andlabs/ui/winmanifest" + +func InitGuiWindow(action string, gw *GuiWindow) *GuiWindow { + log.Println("InitGuiWindow() START") + var newGuiWindow GuiWindow + newGuiWindow.Width = Config.Width + newGuiWindow.Height = Config.Height +// newGuiWindow.Action = action + newGuiWindow.MakeWindow = gw.MakeWindow + newGuiWindow.UiWindow = gw.UiWindow + newGuiWindow.UiTab = gw.UiTab + newGuiWindow.BoxMap = make(map[string]*GuiBox) + newGuiWindow.EntryMap = make(map[string]*GuiEntry) + newGuiWindow.EntryMap["test"] = nil + Data.Windows = append(Data.Windows, &newGuiWindow) + + if (Data.buttonMap == nil) { + GuiInit() + } + log.Println("InitGuiWindow() END *GuiWindow =", &newGuiWindow) + return &newGuiWindow +} + + +func StartNewWindow(bg bool, action string, callback func(*GuiWindow) *GuiBox) { + log.Println("StartNewWindow() Create a new window") + var junk GuiWindow + junk.MakeWindow = callback +// junk.Action = action + window := InitGuiWindow(action, &junk) + if (bg) { + log.Println("StartNewWindow() START NEW GOROUTINE for ui.Main()") + go ui.Main(func() { + log.Println("gui.StartNewWindow() inside ui.Main()") + go InitTabWindow(window) + }) + time.Sleep(2000 * time.Millisecond) // this might make it more stable on windows? + } else { + log.Println("StartNewWindow() WAITING for ui.Main()") + ui.Main(func() { + log.Println("gui.StartNewWindow() inside ui.Main()") + InitTabWindow(window) + }) + } +} + +func InitTabWindow(gw *GuiWindow) { + log.Println("InitTabWindow() START. THIS WINDOW IS NOT YET SHOWN") + + gw.UiWindow = ui.NewWindow("InitTabWindow()", int(gw.Width), int(gw.Height), true) + gw.UiWindow.SetBorderless(false) + + gw.UiWindow.OnClosing(func(*ui.Window) bool { + log.Println("InitTabWindow() OnClosing() THIS WINDOW IS CLOSING gw=", gw) + ui.Quit() + return true + }) + + gw.UiTab = ui.NewTab() + gw.UiWindow.SetChild(gw.UiTab) + gw.UiWindow.SetMargined(true) + + + box := gw.MakeWindow(gw) + log.Println("InitTabWindow() END box =", box) + log.Println("InitTabWindow() END gw =", gw) + gw.UiWindow.Show() +} + +func MessageWindow(gw *GuiWindow, msg1 string, msg2 string) { + ui.MsgBox(gw.UiWindow, msg1, msg2) +} + +func ErrorWindow(gw *GuiWindow, msg1 string, msg2 string) { + ui.MsgBoxError(gw.UiWindow, msg1, msg2) +} From b90e17f4e6fe093c6aec6e30b333c49b259fd205 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Mon, 3 Jun 2019 18:54:15 -0700 Subject: [PATCH 4/5] I fucked up git stash Signed-off-by: Jeff Carr --- gui.go | 92 ---------------------------------------------------------- 1 file changed, 92 deletions(-) diff --git a/gui.go b/gui.go index 5a09f6b..719a27c 100644 --- a/gui.go +++ b/gui.go @@ -20,83 +20,6 @@ func GuiInit() { }) } -<<<<<<< Updated upstream -func InitGuiWindow(name string, gw *GuiWindow) *GuiWindow { - log.Println("InitGuiWindow() START") - var newGuiWindow GuiWindow - newGuiWindow.Width = Config.Width - newGuiWindow.Height = Config.Height - newGuiWindow.Name = name - newGuiWindow.MakeWindow = gw.MakeWindow - newGuiWindow.UiWindow = gw.UiWindow - newGuiWindow.UiTab = gw.UiTab - newGuiWindow.BoxMap = make(map[string]*GuiBox) - newGuiWindow.EntryMap = make(map[string]*GuiEntry) - Data.Windows = append(Data.Windows, &newGuiWindow) - - if (Data.WindowMap == nil) { - log.Println("gui.InitGuiWindow() making the Data.WindowMap here") - Data.WindowMap = make(map[string]*GuiWindow) - } - Data.WindowMap[name] = &newGuiWindow - - // make a blank entry for testing - // newGuiWindow.EntryMap["test"] = nil - - if (Data.buttonMap == nil) { - GuiInit() - } - log.Println("InitGuiWindow() END *GuiWindow =", &newGuiWindow) - return &newGuiWindow -} - - -func StartNewWindow(bg bool, name string, callback func(*GuiWindow) *GuiBox) { - log.Println("StartNewWindow() Create a new window") - var junk GuiWindow - junk.MakeWindow = callback - window := InitGuiWindow(name, &junk) - if (bg) { - log.Println("StartNewWindow() START NEW GOROUTINE for ui.Main()") - go ui.Main(func() { - log.Println("gui.StartNewWindow() inside ui.Main()") - go InitTabWindow(window) - }) - time.Sleep(2000 * time.Millisecond) // this might make it more stable on windows? - } else { - log.Println("StartNewWindow() WAITING for ui.Main()") - ui.Main(func() { - log.Println("gui.StartNewWindow() inside ui.Main()") - InitTabWindow(window) - }) - } -} - -func InitTabWindow(gw *GuiWindow) { - log.Println("InitTabWindow() START. THIS WINDOW IS NOT YET SHOWN") - - gw.UiWindow = ui.NewWindow(gw.Name, int(gw.Width), int(gw.Height), true) - gw.UiWindow.SetBorderless(false) - - gw.UiWindow.OnClosing(func(*ui.Window) bool { - log.Println("InitTabWindow() OnClosing() THIS WINDOW IS CLOSING gw=", gw) - ui.Quit() - return true - }) - - gw.UiTab = ui.NewTab() - gw.UiWindow.SetChild(gw.UiTab) - gw.UiWindow.SetMargined(true) - - - box := gw.MakeWindow(gw) - log.Println("InitTabWindow() END box =", box) - log.Println("InitTabWindow() END gw =", gw) - gw.UiWindow.Show() -} - -======= ->>>>>>> Stashed changes /* // string handling examples that might be helpful for normalizeInt() isAlpha := regexp.MustCompile(`^[A-Za-z]+$`).MatchString @@ -130,18 +53,3 @@ func normalizeInt(s string) string { log.Println("normalizeInt() s =", clean) return clean } -<<<<<<< Updated upstream - -func MessageWindow(gw *GuiWindow, msg1 string, msg2 string) { - log.Println("gui.MessageWindow() msg1 =", msg1) - log.Println("gui.MessageWindow() msg2 =", msg2) - ui.MsgBox(gw.UiWindow, msg1, msg2) -} - -func ErrorWindow(gw *GuiWindow, msg1 string, msg2 string) { - log.Println("gui.ErrorWindow() msg1 =", msg1) - log.Println("gui.ErrorWindow() msg2 =", msg2) - ui.MsgBoxError(gw.UiWindow, msg1, msg2) -} -======= ->>>>>>> Stashed changes From 5f65b2f5ed0dadb1952481e19f40e26cc14e8288 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Mon, 3 Jun 2019 18:56:11 -0700 Subject: [PATCH 5/5] typo Signed-off-by: Jeff Carr --- gui.go | 2 +- window.go | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/gui.go b/gui.go index 719a27c..fca054e 100644 --- a/gui.go +++ b/gui.go @@ -1,7 +1,7 @@ package gui import "log" -import "time" +// import "time" import "regexp" import "github.com/andlabs/ui" diff --git a/window.go b/window.go index 344db65..0100778 100644 --- a/window.go +++ b/window.go @@ -2,7 +2,7 @@ package gui import "log" import "time" -import "regexp" +// import "regexp" import "github.com/andlabs/ui" import _ "github.com/andlabs/ui/winmanifest" @@ -12,7 +12,6 @@ func InitGuiWindow(action string, gw *GuiWindow) *GuiWindow { var newGuiWindow GuiWindow newGuiWindow.Width = Config.Width newGuiWindow.Height = Config.Height -// newGuiWindow.Action = action newGuiWindow.MakeWindow = gw.MakeWindow newGuiWindow.UiWindow = gw.UiWindow newGuiWindow.UiTab = gw.UiTab