From 38bb9d0b167b3c09ca179887d694cafc97342feb Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Fri, 31 May 2019 22:27:52 -0700 Subject: [PATCH] v0.2 Signed-off-by: Jeff Carr --- main.go | 10 +++++----- splash.go | 2 ++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/main.go b/main.go index c99bb59..459cd1c 100644 --- a/main.go +++ b/main.go @@ -120,7 +120,7 @@ func main() { ipAAAA := lookupAAAA(hostname) gui.Data.IPv6 = ipAAAA - gui.Data.Version = "v0.1a" + gui.Data.Version = "v0.2" gui.Data.GitCommit = GITCOMMIT gui.Data.GoVersion = GOVERSION gui.Data.Buildtime = BUILDTIME @@ -144,7 +144,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(config, false, "SPLASH") + gui.StartNewWindow(config, false, "SPLASH", getNEWTEXT) } // This is the handler for all mosue clicks (buttons, areas, etc)) @@ -249,12 +249,12 @@ func mainMouseClick(b *gui.GuiButton) { log.Println("\tdefaultEntryChange() Data.AllEntries =", key, entry) log.Println("\tdefaultEntryChange() Data.AllEntries[key].Action =", entry.Action) if (entry.Action == "Hostname") { - event.Vms[0].Hostname = entry.E.Text() + event.Vms[0].Hostname = entry.UiEntry.Text() } if (entry.Action == "Memory") { - event.Vms[0].Memory = pint64(entry.E.Text()) + event.Vms[0].Memory = pint64(entry.UiEntry.Text()) } - log.Println("\tdefaultEntryChange() Data.AllEntries[key].E =", entry.E.Text()) + log.Println("\tdefaultEntryChange() Data.AllEntries[key].E =", entry.UiEntry.Text()) log.Println("\tdefaultEntryChange() Data.AllEntries[key].B =", entry.B) if entry.B == b { log.Println("defaultEntryChange() FOUND. Entry assigned to Button", b) diff --git a/splash.go b/splash.go index b57e3e5..ff8efa2 100644 --- a/splash.go +++ b/splash.go @@ -5,11 +5,13 @@ import "git.wit.com/wit/gui" import "github.com/andlabs/ui" import _ "github.com/andlabs/ui/winmanifest" +/* func getSplashText() *ui.AttributedString { var aText *ui.AttributedString aText = ui.NewAttributedString("Click to continue") return aText } +*/ func getNEWTEXT() *ui.AttributedString { var aText *ui.AttributedString