From 2233089565a3c815ad17f18055035dab3c9240cc Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Mon, 3 Jun 2019 13:58:33 -0700 Subject: [PATCH] clean up button and tab names Signed-off-by: Jeff Carr --- gui-accountPage.go | 10 ++++++---- gui-splashPage.go | 15 ++++++++++----- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/gui-accountPage.go b/gui-accountPage.go index e6d71b5..5890301 100644 --- a/gui-accountPage.go +++ b/gui-accountPage.go @@ -9,7 +9,8 @@ func makeCloudInfoBox(gw *gui.GuiWindow) { log.Println("makeCloudInfoBox() START gw =", gw) gw = gui.InitGuiWindow("makeCloudInfoBox() Box23", gw) - box := gui.HardBox(gw, gui.Yaxis, "makeCloudInfoBox") + // TODO: make this text i18n + box := gui.HardBox(gw, gui.Yaxis, "Cloud Accounts") log.Println("makeCloudInfoBox() START GW IS NOW: gw =", gw) log.Println("makeCloudInfoBox() box =", box) @@ -38,8 +39,9 @@ func makeCloudInfoBox(gw *gui.GuiWindow) { makeButton(vbox, config.Accounts[key], nil, name, "SHOW", nil) } - makeButton(box, nil, nil, "Add Account", "ADD TAB", addSubdomainClick) - makeButton(box, nil, nil, "Quit", "QUIT", nil) - makeButton(box, nil, nil, "Debug", "DEBUG", debugClick) + Xbox := gui.HardBox(gw, gui.Xaxis, "subdomain test") + makeButton(Xbox, nil, nil, "Add Account", "ADD TAB", addSubdomainClick) + makeButton(Xbox, nil, nil, "Quit", "QUIT", nil) + makeButton(Xbox, nil, nil, "Debug", "DEBUG", debugClick) log.Println("makeCloudInfoBox() END") } diff --git a/gui-splashPage.go b/gui-splashPage.go index dd5fc05..3cb2bda 100644 --- a/gui-splashPage.go +++ b/gui-splashPage.go @@ -77,14 +77,19 @@ func splashClick(b *gui.GuiButton) { // gw.UiTab.Hide() // Hide or Delete ? gw.UiTab.Delete(0) // does this make things more or less stable or neither? - box := gui.HardBox(gw, gui.Yaxis, "addSubdomainQuestion") + box := gui.HardBox(gw, gui.Yaxis, "Create New Account") // make a place for someone to enter their subdomain - // gui.NewLabel(box, "Enter your Subdomain or") - makeButton(box, nil, nil, "Generate a Subdomain", "SUBDOMAIN", generateSubdomain) + hardXbox := gui.HardBox(gw, gui.Xaxis, "subdomain test") + makeButton(hardXbox, nil, nil, "Generate a Subdomain", "SUBDOMAIN", generateSubdomain) + gui.NewLabel(hardXbox, "") + gui.AddEntry(box, "SUBDOMAIN") - gui.HorizontalBreak(box) - makeButton(box, nil, nil, "Create Account", "ADD", addSubdomainClick) + // gui.HorizontalBreak(box) + + hardXbox1 := gui.HardBox(gw, gui.Xaxis, "subdomain test") + makeButton(hardXbox1, nil, nil, "Create Account", "ADD", addSubdomainClick) + gui.NewLabel(hardXbox, "") log.Println("splashClick() END box =", box) }