From db7d9b8de75043a25639813d81ef6e5c430b4e9f Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Thu, 13 Jun 2019 15:57:27 -0700 Subject: [PATCH] delete splash works Signed-off-by: Jeff Carr --- gui-debug.go | 2 +- gui-splash.go | 2 +- main.go | 2 +- resources/tags/v0.6.32 | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 resources/tags/v0.6.32 diff --git a/gui-debug.go b/gui-debug.go index bd8d7f3..c682cf3 100644 --- a/gui-debug.go +++ b/gui-debug.go @@ -70,7 +70,7 @@ func debugClick(b *gui.GuiButton) { }) makeButton(Ybox2, nil, nil, "Destroy Splash", "SUBDOMAIN", func (*gui.GuiButton) { log.Println("debugClick() Destroy(0)") - gui.DeleteWindow("Cloud Accounts") + gui.DeleteWindow("Splash") }) makeButton(Ybox2, nil, nil, "Load the default test config file", "SUBDOMAIN", func (*gui.GuiButton) { diff --git a/gui-splash.go b/gui-splash.go index 8df6b4f..79469b8 100644 --- a/gui-splash.go +++ b/gui-splash.go @@ -17,7 +17,7 @@ func showSplashBox(box *gui.GuiBox) *gui.GuiBox { // TODO: turn 'Welcome' into a i18n for translations text := getNEWTEXT() gui.ShowTextBox(box, text, splashClick, "Welcome") - // box.Window.UiWindow.SetTitle("Splash") + box.Window.UiWindow.SetTitle("Cloud Control Panel") gui.HorizontalBreak(box) gui.NewLabel(box, "jcarr test2") diff --git a/main.go b/main.go index 2ecbff3..d0ecd93 100644 --- a/main.go +++ b/main.go @@ -155,7 +155,7 @@ func main() { // make this the main loop in an attempt to figure out the crashes // do not change this until the GUI is stable - gui.StartNewWindow(false, "Cloud Control Panel", gui.Yaxis, showSplashBox) + gui.StartNewWindow(false, "Splash", gui.Yaxis, showSplashBox) if (os.Getenv("DISPLAY") == "") { log.Println("gui.StartNewWindow() END DISPLAY =", os.Getenv("DISPLAY")) log.Println("gui.StartNewWindow() Probably this died because your DISPLAY is not set") diff --git a/resources/tags/v0.6.32 b/resources/tags/v0.6.32 new file mode 100644 index 0000000..4259cd2 --- /dev/null +++ b/resources/tags/v0.6.32 @@ -0,0 +1 @@ +b7661667d18b33fa7fddd8e95e1233185e398930