jcarr
/
cloud-control-panel
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

better display and debugging 

Signed-off-by: Jeff Carr <jcarr@wit.com>
This commit is contained in:
Jeff Carr 2019-06-03 12:56:20 -07:00
parent 8b1d68fd91
commit be98e4259e
4 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -32,6 +32,7 @@ bad-run:
# simple sortcut to push all git changes # simple sortcut to push all git changes
push: push:
git checkout devel
git pull git pull
git add --all git add --all
-git commit -a -s -git commit -a -s

1
gui-accountPage.go
View File

@ -40,5 +40,6 @@ func makeCloudInfoBox(gw *gui.GuiWindow) {
makeButton(box, nil, nil, "Add Account", "ADD TAB", addSubdomainClick) makeButton(box, nil, nil, "Add Account", "ADD TAB", addSubdomainClick)
makeButton(box, nil, nil, "Quit", "QUIT", nil) makeButton(box, nil, nil, "Quit", "QUIT", nil)
makeButton(box, nil, nil, "Debug", "DEBUG", debugClick)
log.Println("makeCloudInfoBox() END") log.Println("makeCloudInfoBox() END")
} }

15
gui-debug.go
View File

@ -22,10 +22,10 @@ func debugClick(b *gui.GuiButton) {
gw := b.Box.Window gw := b.Box.Window
// if there is not an account, then go to 'make account' // 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") 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) log.Println("debugClick() AddGenericBox() END box =", box)
makeButton(box, nil, nil, "Generate", "SUBDOMAIN", nil) 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 3", "SUBDOMAIN", nil)
makeButton(Xbox1, nil, nil, "Generate 4", "SUBDOMAIN", nil) makeButton(Xbox1, nil, nil, "Generate 4", "SUBDOMAIN", nil)
Ybox2 := gui.NewBox(hardXbox, gui.Yaxis, "subdomain Y test") Xbox1 = gui.NewBox(Ybox1, gui.Xaxis, "subdomain Y1 test")
makeButton(Ybox2, nil, nil, "List all windows & tabs", "SUBDOMAIN", func (*gui.GuiButton) { makeButton(Xbox1, nil, nil, "List all windows & tabs", "SUBDOMAIN", func (*gui.GuiButton) {
log.Println("debugClick() Hide()") log.Println("gui.DumpBoxes()")
box := gw.BoxMap["MAINBOX"] gui.DumpBoxes()
box.Window.UiTab.Hide()
}) })
Ybox2 := gui.NewBox(hardXbox, gui.Yaxis, "subdomain Y test")
makeButton(Ybox2, nil, nil, "Hide all tabs", "SUBDOMAIN", func (*gui.GuiButton) { makeButton(Ybox2, nil, nil, "Hide all tabs", "SUBDOMAIN", func (*gui.GuiButton) {
log.Println("debugClick() Hide()") log.Println("debugClick() Hide()")
box := gw.BoxMap["MAINBOX"] box := gw.BoxMap["MAINBOX"]

11
gui-splashPage.go
View File

@ -13,7 +13,8 @@ import pb "git.wit.com/wit/witProtobuf"
func showSplashBox(gw *gui.GuiWindow) *gui.GuiBox { func showSplashBox(gw *gui.GuiWindow) *gui.GuiBox {
log.Println("ShowSplashBox() START") log.Println("ShowSplashBox() START")
text := getNEWTEXT() 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" { if runtime.GOOS == "linux" {
gui.NewLabel(box,"OS: Linux") gui.NewLabel(box,"OS: Linux")
@ -25,13 +26,16 @@ func showSplashBox(gw *gui.GuiWindow) *gui.GuiBox {
gui.NewLabel(box, "Version: " + VERSION) gui.NewLabel(box, "Version: " + VERSION)
if (gui.Config.Debug) { if (config.Debug) {
gui.NewLabel(box, "git rev-list: " + GITCOMMIT) gui.NewLabel(box, "git rev-list: " + GITCOMMIT)
gui.NewLabel(box, "go build version: " + GOVERSION) gui.NewLabel(box, "go build version: " + GOVERSION)
gui.NewLabel(box, "build date: " + BUILDTIME) 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) log.Println("ShowSplashBox() END box =", box)
return box return box
} }
@ -81,7 +85,6 @@ func splashClick(b *gui.GuiButton) {
gui.AddEntry(box, "SUBDOMAIN") gui.AddEntry(box, "SUBDOMAIN")
gui.HorizontalBreak(box) gui.HorizontalBreak(box)
makeButton(box, nil, nil, "Create Subdomain Account", "ADD", addSubdomainClick) makeButton(box, nil, nil, "Create Subdomain Account", "ADD", addSubdomainClick)
makeButton(box, nil, nil, "Debug Tab", "DEBUG", debugClick)
log.Println("splashClick() END box =", box) log.Println("splashClick() END box =", box)
} }