diff --git a/Makefile b/Makefile index 82cc5e1..468c811 100644 --- a/Makefile +++ b/Makefile @@ -47,7 +47,7 @@ update: config-make-readable: cat ~/.config/cloud-control-panel.json |jq -r --tab -config-default-config: +config-default-config: config-delete echo loading the test config ./cloud-control-panel --defaultconfig diff --git a/example-multiple-windows/main.go b/example-multiple-windows/main.go index 2f90acf..f02deca 100644 --- a/example-multiple-windows/main.go +++ b/example-multiple-windows/main.go @@ -28,7 +28,7 @@ func main() { i += 1 c.Width = int32(400 + 50 * i) c.Hostname = fmt.Sprintf("splash %d", i) - StartNewWindow(c, false, "BLAH") + StartNewWindow(c, true, "BLAH") i += 1 c.Width = int32(400 + 50 * i) @@ -50,10 +50,12 @@ func main() { func StartNewWindow(c *pb.Config, bg bool, action string) *gui.GuiWindow { log.Println("InitNewWindow() Create a new window") + var newGuiWindow *gui.GuiWindow newGuiWindow = new(gui.GuiWindow) newGuiWindow.C = c + /* ui.OnShouldQuit(func() bool { // mouseClick(&newBM) diff --git a/main.go b/main.go index 2eca5e5..51cf7d4 100644 --- a/main.go +++ b/main.go @@ -177,9 +177,9 @@ func mainMouseClick(b *gui.GuiButton) { log.Println("\tmainMouseClick() setting current account = ", b.Account.Nick) } if (b.Action == "NEWTEXT") { - wm.AH.UiAttrstr = getNEWTEXT() - log.Println("AH.UiAttrstr = ", wm.AH.UiAttrstr) - wm.AH.UiArea.QueueRedrawAll() + wm.Area.UiAttrstr = getNEWTEXT() + log.Println("Area.UiAttrstr = ", wm.Area.UiAttrstr) + wm.Area.UiArea.QueueRedrawAll() } else if (b.Action == "AREA") { if (config == nil) { log.Println("gui.State = splash BUT SOMETHING HAS GONE VERY WRONG")