diff options
Diffstat (limited to 'andlabs')
| -rw-r--r-- | andlabs/addText.go | 4 | ||||
| -rw-r--r-- | andlabs/button.go | 4 | ||||
| -rw-r--r-- | andlabs/group.go | 4 | ||||
| -rw-r--r-- | andlabs/label.go | 4 | ||||
| -rw-r--r-- | andlabs/place.go | 2 | ||||
| -rw-r--r-- | andlabs/setText.go | 2 | ||||
| -rw-r--r-- | andlabs/tab.go | 4 | ||||
| -rw-r--r-- | andlabs/window.go | 3 |
8 files changed, 17 insertions, 10 deletions
diff --git a/andlabs/addText.go b/andlabs/addText.go index 75c8c7d..cbc9269 100644 --- a/andlabs/addText.go +++ b/andlabs/addText.go @@ -16,9 +16,9 @@ func (n *node) addText(a *widget.Action) { switch n.WidgetType { case widget.Dropdown: - n.addDropdownName(getString(a.Value)) + n.addDropdownName(widget.GetString(a.Value)) case widget.Combobox: - n.addComboboxName(getString(a.Value)) + n.addComboboxName(widget.GetString(a.Value)) default: log.Log(ERROR, "plugin Send() Don't know how to addText on", n.WidgetType, "yet", a.ActionType) } diff --git a/andlabs/button.go b/andlabs/button.go index 81a30c0..0cc4f52 100644 --- a/andlabs/button.go +++ b/andlabs/button.go @@ -1,6 +1,8 @@ package main import ( + "go.wit.com/gui/widget" + "go.wit.com/dev/andlabs/ui" _ "go.wit.com/dev/andlabs/ui/winmanifest" ) @@ -9,7 +11,7 @@ func (p *node) newButton(n *node) { t := p.tk newt := new(guiWidget) - b := ui.NewButton(getString(n.value)) + b := ui.NewButton(widget.GetString(n.value)) newt.uiButton = b newt.uiControl = b newt.parent = t diff --git a/andlabs/group.go b/andlabs/group.go index e67f358..8faa6a4 100644 --- a/andlabs/group.go +++ b/andlabs/group.go @@ -1,6 +1,8 @@ package main import ( + "go.wit.com/gui/widget" + "go.wit.com/dev/andlabs/ui" _ "go.wit.com/dev/andlabs/ui/winmanifest" ) @@ -8,7 +10,7 @@ import ( func (p *node) newGroup(n *node) { newt := new(guiWidget) - g := ui.NewGroup(getString(n.value)) + g := ui.NewGroup(widget.GetString(n.value)) g.SetMargined(true) newt.uiGroup = g newt.uiControl = g diff --git a/andlabs/label.go b/andlabs/label.go index 4c208c6..bcdaf7a 100644 --- a/andlabs/label.go +++ b/andlabs/label.go @@ -1,13 +1,15 @@ package main import ( + "go.wit.com/gui/widget" + "go.wit.com/dev/andlabs/ui" _ "go.wit.com/dev/andlabs/ui/winmanifest" ) func (p *node) newLabel(n *node) { newt := new(guiWidget) - c := ui.NewLabel(getString(n.value)) + c := ui.NewLabel(widget.GetString(n.value)) newt.uiLabel = c newt.uiControl = c diff --git a/andlabs/place.go b/andlabs/place.go index 1d2144c..94a16b2 100644 --- a/andlabs/place.go +++ b/andlabs/place.go @@ -75,7 +75,7 @@ func (p *node) place(n *node) bool { // log.Log(ERROR, "THIS SHOULD NEVER HAPPEN ??????? trying to place() node=", n.WidgetId, n.progname, n.Text, n.WidgetType) // log.Log(ERROR, "THIS SHOULD NEVER HAPPEN ??????? trying to place() on parent=", p.WidgetId, p.progname, p.Text, p.WidgetType) // panic("n.tk.uiControl == nil") - p.tk.uiTab.Append(getString(n.value), n.tk.uiControl) + p.tk.uiTab.Append(widget.GetString(n.value), n.tk.uiControl) p.tk.boxC += 1 return true case widget.Box: diff --git a/andlabs/setText.go b/andlabs/setText.go index 88b4df0..77beb5c 100644 --- a/andlabs/setText.go +++ b/andlabs/setText.go @@ -6,7 +6,7 @@ import ( ) func (n *node) setText(a *widget.Action) { - name := getString(a.Value) + name := widget.GetString(a.Value) log.Log(CHANGE, "setText() START with text =", name) t := n.tk diff --git a/andlabs/tab.go b/andlabs/tab.go index 07c5ce9..2bccf5b 100644 --- a/andlabs/tab.go +++ b/andlabs/tab.go @@ -37,7 +37,7 @@ func (p *node) newTab(n *node) { if (t.uiTab == nil) { // this means you have to make a new tab log.Log(TOOLKIT, "newTab() GOOD. This should be the first tab:", n.WidgetId, n.ParentId) - newt = rawTab(t.uiWindow, getString(n.value)) + newt = rawTab(t.uiWindow, widget.GetString(n.value)) t.uiTab = newt.uiTab } else { // this means you have to append a tab @@ -49,7 +49,7 @@ func (p *node) newTab(n *node) { newt.uiWindow = t.uiWindow newt.uiTab = t.uiTab } else { - newt = t.appendTab(getString(n.value)) + newt = t.appendTab(widget.GetString(n.value)) } } diff --git a/andlabs/window.go b/andlabs/window.go index 09bf6b8..d52648e 100644 --- a/andlabs/window.go +++ b/andlabs/window.go @@ -5,6 +5,7 @@ import ( _ "go.wit.com/dev/andlabs/ui/winmanifest" "go.wit.com/log" + "go.wit.com/gui/widget" ) func (t *guiWidget) MessageWindow(msg1 string, msg2 string) { @@ -37,7 +38,7 @@ func newWindow(n *node) { } func (n *node) SetWindowTitle(title string) { - log.Log(CHANGE, "toolkit NewWindow", getString(n.value), "title", title) + log.Log(CHANGE, "toolkit NewWindow", widget.GetString(n.value), "title", title) win := n.tk.uiWindow if (win == nil) { log.Log(ERROR, "Error: no window", n.WidgetId) |