diff --git a/Makefile b/Makefile index baf3006..ba356f7 100644 --- a/Makefile +++ b/Makefile @@ -32,6 +32,7 @@ bad-run: # simple sortcut to push all git changes push: + git checkout devel git pull git add --all -git commit -a -s diff --git a/gui-accountPage.go b/gui-accountPage.go index 6fa488c..e6d71b5 100644 --- a/gui-accountPage.go +++ b/gui-accountPage.go @@ -40,5 +40,6 @@ func makeCloudInfoBox(gw *gui.GuiWindow) { makeButton(box, nil, nil, "Add Account", "ADD TAB", addSubdomainClick) makeButton(box, nil, nil, "Quit", "QUIT", nil) + makeButton(box, nil, nil, "Debug", "DEBUG", debugClick) log.Println("makeCloudInfoBox() END") } diff --git a/gui-debug.go b/gui-debug.go index f9c230d..c127ec8 100644 --- a/gui-debug.go +++ b/gui-debug.go @@ -22,10 +22,10 @@ func debugClick(b *gui.GuiButton) { gw := b.Box.Window // if there is not an account, then go to 'make account' - gw = gui.InitGuiWindow("debugClick() Box22", gw) + gw = gui.InitGuiWindow("debug() Box22", gw) log.Println("debugClick() AddGenericBox() START") - box := gui.HardBox(gw, gui.Yaxis, "debugClick") + box := gui.HardBox(gw, gui.Yaxis, "debugging") log.Println("debugClick() AddGenericBox() END box =", box) makeButton(box, nil, nil, "Generate", "SUBDOMAIN", nil) @@ -39,12 +39,13 @@ func debugClick(b *gui.GuiButton) { makeButton(Xbox1, nil, nil, "Generate 3", "SUBDOMAIN", nil) makeButton(Xbox1, nil, nil, "Generate 4", "SUBDOMAIN", nil) - Ybox2 := gui.NewBox(hardXbox, gui.Yaxis, "subdomain Y test") - makeButton(Ybox2, nil, nil, "List all windows & tabs", "SUBDOMAIN", func (*gui.GuiButton) { - log.Println("debugClick() Hide()") - box := gw.BoxMap["MAINBOX"] - box.Window.UiTab.Hide() + Xbox1 = gui.NewBox(Ybox1, gui.Xaxis, "subdomain Y1 test") + makeButton(Xbox1, nil, nil, "List all windows & tabs", "SUBDOMAIN", func (*gui.GuiButton) { + log.Println("gui.DumpBoxes()") + gui.DumpBoxes() }) + + Ybox2 := gui.NewBox(hardXbox, gui.Yaxis, "subdomain Y test") makeButton(Ybox2, nil, nil, "Hide all tabs", "SUBDOMAIN", func (*gui.GuiButton) { log.Println("debugClick() Hide()") box := gw.BoxMap["MAINBOX"] diff --git a/gui-splashPage.go b/gui-splashPage.go index 10300e0..92e7d33 100644 --- a/gui-splashPage.go +++ b/gui-splashPage.go @@ -13,7 +13,8 @@ import pb "git.wit.com/wit/witProtobuf" func showSplashBox(gw *gui.GuiWindow) *gui.GuiBox { log.Println("ShowSplashBox() START") text := getNEWTEXT() - box := gui.ShowTextBox(gw, text, splashClick) + // TODO: turn 'Welcome' into a i18n for translations + box := gui.ShowTextBox(gw, text, splashClick, "Welcome") if runtime.GOOS == "linux" { gui.NewLabel(box,"OS: Linux") @@ -25,13 +26,16 @@ func showSplashBox(gw *gui.GuiWindow) *gui.GuiBox { gui.NewLabel(box, "Version: " + VERSION) - if (gui.Config.Debug) { + if (config.Debug) { gui.NewLabel(box, "git rev-list: " + GITCOMMIT) gui.NewLabel(box, "go build version: " + GOVERSION) gui.NewLabel(box, "build date: " + BUILDTIME) } - makeButton(box, nil, nil, "OK", "AREA", splashClick) + button := makeButton(box, nil, nil, "OK", "AREA", splashClick) + if (config.Debug) { + debugClick(button) + } log.Println("ShowSplashBox() END box =", box) return box } @@ -81,7 +85,6 @@ func splashClick(b *gui.GuiButton) { gui.AddEntry(box, "SUBDOMAIN") gui.HorizontalBreak(box) makeButton(box, nil, nil, "Create Subdomain Account", "ADD", addSubdomainClick) - makeButton(box, nil, nil, "Debug Tab", "DEBUG", debugClick) log.Println("splashClick() END box =", box) }