finally cleaned out all protobuf references
this effort is almost done being 'cleaned' of the code I started with. This library is not perfect and lacks features from andlabs/ui but it will work for our purposes Signed-off-by: Jeff Carr <jcarr@wit.com>
This commit is contained in:
parent
3a204732cd
commit
2af6fa52a4
|
|
@ -0,0 +1,94 @@
|
||||||
|
package gui
|
||||||
|
|
||||||
|
import "log"
|
||||||
|
|
||||||
|
import "github.com/andlabs/ui"
|
||||||
|
import _ "github.com/andlabs/ui/winmanifest"
|
||||||
|
|
||||||
|
import pb "git.wit.com/wit/witProtobuf"
|
||||||
|
|
||||||
|
// import "github.com/davecgh/go-spew/spew"
|
||||||
|
|
||||||
|
// THIS IS CLEAN
|
||||||
|
|
||||||
|
// This is the default mouse click handler
|
||||||
|
// Every mouse click that hasn't been assigned to
|
||||||
|
// something specific will fall into this routine
|
||||||
|
// By default, all it runs is the call back to
|
||||||
|
// the main program that is using this library
|
||||||
|
//
|
||||||
|
// This routine MUST be here as this is how the andlabs/ui works
|
||||||
|
// This is the raw routine passed to every button in andlabs libui / ui
|
||||||
|
//
|
||||||
|
// There is a []GuiButton which has all the buttons. We search
|
||||||
|
// for the button and then call the function below
|
||||||
|
//
|
||||||
|
func defaultButtonClick(button *ui.Button) {
|
||||||
|
log.Println("gui.defaultButtonClick() LOOK FOR BUTTON button =", button)
|
||||||
|
for key, foo := range Data.AllButtons {
|
||||||
|
if (Data.Debug) {
|
||||||
|
log.Println("gui.defaultButtonClick() Data.AllButtons =", key, foo)
|
||||||
|
// spew.Dump(foo)
|
||||||
|
}
|
||||||
|
if Data.AllButtons[key].B == button {
|
||||||
|
log.Println("\tgui.defaultButtonClick() BUTTON MATCHED")
|
||||||
|
log.Println("\tgui.defaultButtonClick() Data.AllButtons[key].Action =", Data.AllButtons[key].Action)
|
||||||
|
if Data.AllButtons[key].custom != nil {
|
||||||
|
log.Println("\tgui.defaultButtonClick() DOING CUSTOM FUNCTION")
|
||||||
|
Data.AllButtons[key].custom(Data.AllButtons[key])
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if (Data.MouseClick != nil) {
|
||||||
|
Data.MouseClick(Data.AllButtons[key])
|
||||||
|
} else {
|
||||||
|
log.Println("\tgui.defaultButtonClick() IGNORING BUTTON. MouseClick() is nil")
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
log.Println("\tgui.defaultButtonClick() BUTTON NOT FOUND")
|
||||||
|
if (Data.Debug) {
|
||||||
|
panic("gui.defaultButtonClick() SHOULD NOT HAVE UNMAPPED BUTTONS")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func CreateButton(box *GuiBox, a *pb.Account, vm *pb.Event_VM, name string, action string, custom func(*GuiButton)) *GuiButton {
|
||||||
|
newUiB := ui.NewButton(name)
|
||||||
|
newUiB.OnClicked(defaultButtonClick)
|
||||||
|
|
||||||
|
var newB *GuiButton
|
||||||
|
newB = new(GuiButton)
|
||||||
|
newB.B = newUiB
|
||||||
|
if (box.Window == nil) {
|
||||||
|
log.Println("CreateButton() box.Window == nil")
|
||||||
|
panic("crap")
|
||||||
|
}
|
||||||
|
newB.GW = box.Window
|
||||||
|
newB.Account = a
|
||||||
|
newB.VM = vm
|
||||||
|
newB.Box = box
|
||||||
|
newB.Action = action
|
||||||
|
newB.custom = custom
|
||||||
|
Data.AllButtons = append(Data.AllButtons, newB)
|
||||||
|
|
||||||
|
box.UiBox.Append(newB.B, false)
|
||||||
|
return newB
|
||||||
|
}
|
||||||
|
|
||||||
|
func CreateFontButton(box *GuiBox, action string) *GuiButton {
|
||||||
|
|
||||||
|
// create a 'fake' button entry for the mouse clicks
|
||||||
|
var newGB GuiButton
|
||||||
|
newGB.Action = action
|
||||||
|
newGB.FB = ui.NewFontButton()
|
||||||
|
newGB.Box = box
|
||||||
|
Data.AllButtons = append(Data.AllButtons, &newGB)
|
||||||
|
|
||||||
|
newGB.FB.OnChanged(func (*ui.FontButton) {
|
||||||
|
log.Println("FontButton.OnChanged() START mouseClick(&newBM)", newGB)
|
||||||
|
if (Data.MouseClick != nil) {
|
||||||
|
Data.MouseClick(&newGB)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
return &newGB
|
||||||
|
}
|
||||||
6
debug.go
6
debug.go
|
|
@ -3,7 +3,7 @@ package gui
|
||||||
import "log"
|
import "log"
|
||||||
import "time"
|
import "time"
|
||||||
import "fmt"
|
import "fmt"
|
||||||
import "reflect"
|
// import "reflect"
|
||||||
|
|
||||||
// import "github.com/andlabs/ui"
|
// import "github.com/andlabs/ui"
|
||||||
// import _ "github.com/andlabs/ui/winmanifest"
|
// import _ "github.com/andlabs/ui/winmanifest"
|
||||||
|
|
@ -24,7 +24,8 @@ func WatchGUI() {
|
||||||
for i, window := range Data.Windows {
|
for i, window := range Data.Windows {
|
||||||
log.Println("watchGUI() Data.Windows", i, "Action =", window.Action)
|
log.Println("watchGUI() Data.Windows", i, "Action =", window.Action)
|
||||||
for name, abox := range window.BoxMap {
|
for name, abox := range window.BoxMap {
|
||||||
log.Println("\twatchGUI() BOX name =", name)
|
log.Printf("\twatchGUI() BOX mapname=%-12s abox.Name=%-12s", name, abox.Name)
|
||||||
|
/*
|
||||||
if (name == "SplashArea3") {
|
if (name == "SplashArea3") {
|
||||||
log.Println("\t\twatchGUI() BOX abox =", reflect.TypeOf(abox))
|
log.Println("\t\twatchGUI() BOX abox =", reflect.TypeOf(abox))
|
||||||
win := abox.Window
|
win := abox.Window
|
||||||
|
|
@ -36,6 +37,7 @@ func WatchGUI() {
|
||||||
// time.Sleep(2000 * time.Millisecond)
|
// time.Sleep(2000 * time.Millisecond)
|
||||||
// os.Exit(0)
|
// os.Exit(0)
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
count = 0
|
count = 0
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,103 @@
|
||||||
|
package gui
|
||||||
|
|
||||||
|
import "log"
|
||||||
|
import "fmt"
|
||||||
|
|
||||||
|
import "github.com/andlabs/ui"
|
||||||
|
import _ "github.com/andlabs/ui/winmanifest"
|
||||||
|
import "github.com/davecgh/go-spew/spew"
|
||||||
|
// import pb "git.wit.com/wit/witProtobuf"
|
||||||
|
|
||||||
|
|
||||||
|
// THIS IS CLEAN
|
||||||
|
|
||||||
|
func NewLabel(box *GuiBox, text string) {
|
||||||
|
box.UiBox.Append(ui.NewLabel(text), false)
|
||||||
|
}
|
||||||
|
|
||||||
|
func GetText(box *GuiBox, name string) string {
|
||||||
|
if (box == nil) {
|
||||||
|
log.Println("gui.GetText() ERROR box == nil")
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
if (box.Window.EntryMap == nil) {
|
||||||
|
log.Println("gui.GetText() ERROR b.Box.Window.EntryMap == nil")
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
spew.Dump(box.Window.EntryMap)
|
||||||
|
if (box.Window.EntryMap[name] == nil) {
|
||||||
|
log.Println("gui.GetText() ERROR box.Window.EntryMap[", name, "] == nil ")
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
e := box.Window.EntryMap[name]
|
||||||
|
log.Println("gui.GetText() box.Window.EntryMap[", name, "] = ", e.UiEntry.Text())
|
||||||
|
log.Println("gui.GetText() END")
|
||||||
|
return e.UiEntry.Text()
|
||||||
|
}
|
||||||
|
|
||||||
|
func SetText(box *GuiBox, name string, value string) error {
|
||||||
|
if (box == nil) {
|
||||||
|
return fmt.Errorf("gui.SetText() ERROR box == nil")
|
||||||
|
}
|
||||||
|
if (box.Window.EntryMap == nil) {
|
||||||
|
return fmt.Errorf("gui.SetText() ERROR b.Box.Window.EntryMap == nil")
|
||||||
|
}
|
||||||
|
spew.Dump(box.Window.EntryMap)
|
||||||
|
if (box.Window.EntryMap[name] == nil) {
|
||||||
|
return fmt.Errorf("gui.SetText() ERROR box.Window.EntryMap[", name, "] == nil ")
|
||||||
|
}
|
||||||
|
e := box.Window.EntryMap[name]
|
||||||
|
log.Println("gui.SetText() box.Window.EntryMap[", name, "] = ", e.UiEntry.Text())
|
||||||
|
e.UiEntry.SetText(value)
|
||||||
|
log.Println("gui.SetText() box.Window.EntryMap[", name, "] = ", e.UiEntry.Text())
|
||||||
|
log.Println("gui.SetText() END")
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// makeEntryBox(box, "hostname:", "blah.foo.org") {
|
||||||
|
func MakeEntryVbox(box *GuiBox, a string, startValue string, edit bool, action string) *GuiEntry {
|
||||||
|
// Start 'Nickname' vertical box
|
||||||
|
vboxN := ui.NewVerticalBox()
|
||||||
|
vboxN.SetPadded(true)
|
||||||
|
vboxN.Append(ui.NewLabel(a), false)
|
||||||
|
|
||||||
|
e := defaultMakeEntry(startValue, edit, action)
|
||||||
|
|
||||||
|
vboxN.Append(e.UiEntry, false)
|
||||||
|
box.UiBox.Append(vboxN, false)
|
||||||
|
// End 'Nickname' vertical box
|
||||||
|
|
||||||
|
return e
|
||||||
|
}
|
||||||
|
|
||||||
|
func MakeEntryHbox(box *GuiBox, a string, startValue string, edit bool, action string) *GuiEntry {
|
||||||
|
// Start 'Nickname' vertical box
|
||||||
|
hboxN := ui.NewHorizontalBox()
|
||||||
|
hboxN.SetPadded(true)
|
||||||
|
hboxN.Append(ui.NewLabel(a), false)
|
||||||
|
|
||||||
|
e := defaultMakeEntry(startValue, edit, action)
|
||||||
|
hboxN.Append(e.UiEntry, false)
|
||||||
|
|
||||||
|
box.UiBox.Append(hboxN, false)
|
||||||
|
// End 'Nickname' vertical box
|
||||||
|
|
||||||
|
return e
|
||||||
|
}
|
||||||
|
|
||||||
|
func AddEntry(box *GuiBox, name string) *GuiEntry {
|
||||||
|
var ge *GuiEntry
|
||||||
|
ge = new(GuiEntry)
|
||||||
|
|
||||||
|
ue := ui.NewEntry()
|
||||||
|
ue.SetReadOnly(false)
|
||||||
|
ue.OnChanged(func(*ui.Entry) {
|
||||||
|
log.Println("gui.AddEntry() OK. ue.Text() =", ue.Text())
|
||||||
|
})
|
||||||
|
box.UiBox.Append(ue, false)
|
||||||
|
|
||||||
|
ge.UiEntry = ue
|
||||||
|
box.Window.EntryMap[name] = ge
|
||||||
|
|
||||||
|
return ge
|
||||||
|
}
|
||||||
300
gui.go
300
gui.go
|
|
@ -1,300 +0,0 @@
|
||||||
package gui
|
|
||||||
|
|
||||||
import "log"
|
|
||||||
import "fmt"
|
|
||||||
|
|
||||||
import "github.com/andlabs/ui"
|
|
||||||
import _ "github.com/andlabs/ui/winmanifest"
|
|
||||||
|
|
||||||
import pb "git.wit.com/wit/witProtobuf"
|
|
||||||
|
|
||||||
import "github.com/davecgh/go-spew/spew"
|
|
||||||
|
|
||||||
// THIS IS CLEAN (all that is left is the 'ADD VM')
|
|
||||||
|
|
||||||
func InitColumns(mh *TableData, parts []TableColumnData) {
|
|
||||||
tmpBTindex := 0
|
|
||||||
humanID := 0
|
|
||||||
for key, foo := range parts {
|
|
||||||
log.Println("key, foo =", key, foo)
|
|
||||||
|
|
||||||
parts[key].Index = humanID
|
|
||||||
humanID += 1
|
|
||||||
|
|
||||||
if (foo.CellType == "BG") {
|
|
||||||
mh.generatedColumnTypes = append(mh.generatedColumnTypes, ui.TableColor{})
|
|
||||||
initRowBTcolor (mh, tmpBTindex, parts[key])
|
|
||||||
tmpBTindex += 1
|
|
||||||
} else if (foo.CellType == "BUTTON") {
|
|
||||||
mh.generatedColumnTypes = append(mh.generatedColumnTypes, ui.TableString(""))
|
|
||||||
initRowButtonColumn (mh, tmpBTindex, parts[key].Heading, parts[key])
|
|
||||||
tmpBTindex += 1
|
|
||||||
} else if (foo.CellType == "TEXTCOLOR") {
|
|
||||||
mh.generatedColumnTypes = append(mh.generatedColumnTypes, ui.TableString(""))
|
|
||||||
mh.generatedColumnTypes = append(mh.generatedColumnTypes, ui.TableColor{})
|
|
||||||
initRowTextColorColumn(mh, tmpBTindex, tmpBTindex + 1, parts[key].Heading, ui.TableColor{0.0, 0, 0.9, 1}, parts[key])
|
|
||||||
tmpBTindex += 2
|
|
||||||
} else if (foo.CellType == "TEXT") {
|
|
||||||
mh.generatedColumnTypes = append(mh.generatedColumnTypes, ui.TableString(""))
|
|
||||||
initRowTextColumn (mh, tmpBTindex, parts[key].Heading, parts[key])
|
|
||||||
tmpBTindex += 1
|
|
||||||
} else {
|
|
||||||
panic("I don't know what this is in initColumnNames")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func AddTableTab(gw *GuiWindow, name string, rowcount int, parts []TableColumnData, account *pb.Account) *TableData {
|
|
||||||
mh := new(TableData)
|
|
||||||
|
|
||||||
mh.RowCount = rowcount
|
|
||||||
mh.Rows = make([]RowData, mh.RowCount)
|
|
||||||
|
|
||||||
InitColumns(mh, parts)
|
|
||||||
|
|
||||||
model := ui.NewTableModel(mh)
|
|
||||||
table := ui.NewTable(
|
|
||||||
&ui.TableParams{
|
|
||||||
Model: model,
|
|
||||||
RowBackgroundColorModelColumn: 0, // Row Background color is always index zero
|
|
||||||
})
|
|
||||||
|
|
||||||
tmpBTindex := 0
|
|
||||||
for key, foo := range parts {
|
|
||||||
log.Println(key, foo)
|
|
||||||
if (foo.CellType == "BG") {
|
|
||||||
} else if (foo.CellType == "BUTTON") {
|
|
||||||
tmpBTindex += 1
|
|
||||||
table.AppendButtonColumn(foo.Heading, tmpBTindex, ui.TableModelColumnAlwaysEditable)
|
|
||||||
} else if (foo.CellType == "TEXTCOLOR") {
|
|
||||||
tmpBTindex += 1
|
|
||||||
table.AppendTextColumn(foo.Heading, tmpBTindex, ui.TableModelColumnAlwaysEditable,
|
|
||||||
&ui.TableTextColumnOptionalParams{
|
|
||||||
ColorModelColumn: tmpBTindex + 1,
|
|
||||||
});
|
|
||||||
tmpBTindex += 1
|
|
||||||
} else if (foo.CellType == "TEXT") {
|
|
||||||
tmpBTindex += 1
|
|
||||||
table.AppendTextColumn(foo.Heading, tmpBTindex, ui.TableModelColumnAlwaysEditable, nil)
|
|
||||||
} else {
|
|
||||||
panic("I don't know what this is in initColumnNames")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
var gb *GuiBox
|
|
||||||
gb = new(GuiBox)
|
|
||||||
|
|
||||||
// gb.EntryMap = make(map[string]*GuiEntry)
|
|
||||||
// gb.EntryMap["test"] = nil
|
|
||||||
|
|
||||||
vbox := ui.NewVerticalBox()
|
|
||||||
vbox.SetPadded(true)
|
|
||||||
gb.UiBox = vbox
|
|
||||||
gb.Window = gw
|
|
||||||
gw.BoxMap[name] = gb
|
|
||||||
mh.Box = gb
|
|
||||||
|
|
||||||
vbox.Append(table, true)
|
|
||||||
gw.UiTab.Append(name, vbox)
|
|
||||||
|
|
||||||
vbox.Append(ui.NewVerticalSeparator(), false)
|
|
||||||
|
|
||||||
hbox := ui.NewHorizontalBox()
|
|
||||||
hbox.SetPadded(true)
|
|
||||||
|
|
||||||
vbox.Append(hbox, false)
|
|
||||||
|
|
||||||
return mh
|
|
||||||
}
|
|
||||||
|
|
||||||
func MessageWindow(gw *GuiWindow, msg1 string, msg2 string) {
|
|
||||||
ui.MsgBox(gw.UiWindow, msg1, msg2)
|
|
||||||
}
|
|
||||||
|
|
||||||
func ErrorWindow(gw *GuiWindow, msg1 string, msg2 string) {
|
|
||||||
ui.MsgBoxError(gw.UiWindow, msg1, msg2)
|
|
||||||
}
|
|
||||||
|
|
||||||
// This is the default mouse click handler
|
|
||||||
// Every mouse click that hasn't been assigned to
|
|
||||||
// something specific will fall into this routine
|
|
||||||
// By default, all it runs is the call back to
|
|
||||||
// the main program that is using this library
|
|
||||||
//
|
|
||||||
// This routine MUST be here as this is how the andlabs/ui works
|
|
||||||
// This is the raw routine passed to every button in andlabs libui / ui
|
|
||||||
//
|
|
||||||
// There is a []GuiButton which has all the buttons. We search
|
|
||||||
// for the button and then call the function below
|
|
||||||
//
|
|
||||||
func defaultButtonClick(button *ui.Button) {
|
|
||||||
log.Println("gui.defaultButtonClick() LOOK FOR BUTTON button =", button)
|
|
||||||
for key, foo := range Data.AllButtons {
|
|
||||||
if (Data.Debug) {
|
|
||||||
log.Println("gui.defaultButtonClick() Data.AllButtons =", key, foo)
|
|
||||||
// spew.Dump(foo)
|
|
||||||
}
|
|
||||||
if Data.AllButtons[key].B == button {
|
|
||||||
log.Println("\tgui.defaultButtonClick() BUTTON MATCHED")
|
|
||||||
log.Println("\tgui.defaultButtonClick() Data.AllButtons[key].Action =", Data.AllButtons[key].Action)
|
|
||||||
if Data.AllButtons[key].custom != nil {
|
|
||||||
log.Println("\tgui.defaultButtonClick() DOING CUSTOM FUNCTION")
|
|
||||||
Data.AllButtons[key].custom(Data.AllButtons[key])
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if (Data.MouseClick != nil) {
|
|
||||||
Data.MouseClick(Data.AllButtons[key])
|
|
||||||
} else {
|
|
||||||
log.Println("\tgui.defaultButtonClick() IGNORING BUTTON. MouseClick() is nil")
|
|
||||||
}
|
|
||||||
return
|
|
||||||
}
|
|
||||||
}
|
|
||||||
log.Println("\tgui.defaultButtonClick() BUTTON NOT FOUND")
|
|
||||||
if (Data.Debug) {
|
|
||||||
panic("gui.defaultButtonClick() SHOULD NOT HAVE UNMAPPED BUTTONS")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func AddButton(b *GuiButton, name string) *ui.Button {
|
|
||||||
newB := ui.NewButton(name)
|
|
||||||
newB.OnClicked(defaultButtonClick)
|
|
||||||
|
|
||||||
b.B = newB
|
|
||||||
Data.AllButtons = append(Data.AllButtons, b)
|
|
||||||
return newB
|
|
||||||
}
|
|
||||||
|
|
||||||
func AddButtonToBox(box *GuiBox, button *GuiButton) {
|
|
||||||
box.UiBox.Append(button.B, false)
|
|
||||||
}
|
|
||||||
|
|
||||||
func CreateButton(box *GuiBox, a *pb.Account, vm *pb.Event_VM, name string, action string, custom func(*GuiButton)) *GuiButton {
|
|
||||||
newUiB := ui.NewButton(name)
|
|
||||||
newUiB.OnClicked(defaultButtonClick)
|
|
||||||
|
|
||||||
var newB *GuiButton
|
|
||||||
newB = new(GuiButton)
|
|
||||||
newB.B = newUiB
|
|
||||||
if (box.Window == nil) {
|
|
||||||
log.Println("CreateButton() box.Window == nil")
|
|
||||||
panic("crap")
|
|
||||||
}
|
|
||||||
newB.GW = box.Window
|
|
||||||
newB.Account = a
|
|
||||||
newB.VM = vm
|
|
||||||
newB.Box = box
|
|
||||||
newB.Action = action
|
|
||||||
newB.custom = custom
|
|
||||||
Data.AllButtons = append(Data.AllButtons, newB)
|
|
||||||
return newB
|
|
||||||
}
|
|
||||||
|
|
||||||
func CreateFontButton(box *GuiBox, action string) *GuiButton {
|
|
||||||
|
|
||||||
// create a 'fake' button entry for the mouse clicks
|
|
||||||
var newGB GuiButton
|
|
||||||
newGB.Action = action
|
|
||||||
newGB.FB = ui.NewFontButton()
|
|
||||||
newGB.Box = box
|
|
||||||
Data.AllButtons = append(Data.AllButtons, &newGB)
|
|
||||||
|
|
||||||
newGB.FB.OnChanged(func (*ui.FontButton) {
|
|
||||||
log.Println("FontButton.OnChanged() START mouseClick(&newBM)", newGB)
|
|
||||||
if (Data.MouseClick != nil) {
|
|
||||||
Data.MouseClick(&newGB)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
return &newGB
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewLabel(box *GuiBox, text string) {
|
|
||||||
box.UiBox.Append(ui.NewLabel(text), false)
|
|
||||||
}
|
|
||||||
|
|
||||||
func GetText(box *GuiBox, name string) string {
|
|
||||||
if (box == nil) {
|
|
||||||
log.Println("gui.GetText() ERROR box == nil")
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
if (box.Window.EntryMap == nil) {
|
|
||||||
log.Println("gui.GetText() ERROR b.Box.Window.EntryMap == nil")
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
spew.Dump(box.Window.EntryMap)
|
|
||||||
if (box.Window.EntryMap[name] == nil) {
|
|
||||||
log.Println("gui.GetText() ERROR box.Window.EntryMap[", name, "] == nil ")
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
e := box.Window.EntryMap[name]
|
|
||||||
log.Println("gui.GetText() box.Window.EntryMap[", name, "] = ", e.UiEntry.Text())
|
|
||||||
log.Println("gui.GetText() END")
|
|
||||||
return e.UiEntry.Text()
|
|
||||||
}
|
|
||||||
|
|
||||||
func SetText(box *GuiBox, name string, value string) error {
|
|
||||||
if (box == nil) {
|
|
||||||
return fmt.Errorf("gui.SetText() ERROR box == nil")
|
|
||||||
}
|
|
||||||
if (box.Window.EntryMap == nil) {
|
|
||||||
return fmt.Errorf("gui.SetText() ERROR b.Box.Window.EntryMap == nil")
|
|
||||||
}
|
|
||||||
spew.Dump(box.Window.EntryMap)
|
|
||||||
if (box.Window.EntryMap[name] == nil) {
|
|
||||||
return fmt.Errorf("gui.SetText() ERROR box.Window.EntryMap[", name, "] == nil ")
|
|
||||||
}
|
|
||||||
e := box.Window.EntryMap[name]
|
|
||||||
log.Println("gui.SetText() box.Window.EntryMap[", name, "] = ", e.UiEntry.Text())
|
|
||||||
e.UiEntry.SetText(value)
|
|
||||||
log.Println("gui.SetText() box.Window.EntryMap[", name, "] = ", e.UiEntry.Text())
|
|
||||||
log.Println("gui.SetText() END")
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// makeEntryBox(box, "hostname:", "blah.foo.org") {
|
|
||||||
func MakeEntryVbox(box *GuiBox, a string, startValue string, edit bool, action string) *GuiEntry {
|
|
||||||
// Start 'Nickname' vertical box
|
|
||||||
vboxN := ui.NewVerticalBox()
|
|
||||||
vboxN.SetPadded(true)
|
|
||||||
vboxN.Append(ui.NewLabel(a), false)
|
|
||||||
|
|
||||||
e := defaultMakeEntry(startValue, edit, action)
|
|
||||||
|
|
||||||
vboxN.Append(e.UiEntry, false)
|
|
||||||
box.UiBox.Append(vboxN, false)
|
|
||||||
// End 'Nickname' vertical box
|
|
||||||
|
|
||||||
return e
|
|
||||||
}
|
|
||||||
|
|
||||||
func MakeEntryHbox(box *GuiBox, a string, startValue string, edit bool, action string) *GuiEntry {
|
|
||||||
// Start 'Nickname' vertical box
|
|
||||||
hboxN := ui.NewHorizontalBox()
|
|
||||||
hboxN.SetPadded(true)
|
|
||||||
hboxN.Append(ui.NewLabel(a), false)
|
|
||||||
|
|
||||||
e := defaultMakeEntry(startValue, edit, action)
|
|
||||||
hboxN.Append(e.UiEntry, false)
|
|
||||||
|
|
||||||
box.UiBox.Append(hboxN, false)
|
|
||||||
// End 'Nickname' vertical box
|
|
||||||
|
|
||||||
return e
|
|
||||||
}
|
|
||||||
|
|
||||||
func AddEntry(box *GuiBox, name string) *GuiEntry {
|
|
||||||
var ge *GuiEntry
|
|
||||||
ge = new(GuiEntry)
|
|
||||||
|
|
||||||
ue := ui.NewEntry()
|
|
||||||
ue.SetReadOnly(false)
|
|
||||||
ue.OnChanged(func(*ui.Entry) {
|
|
||||||
log.Println("gui.AddEntry() OK. ue.Text() =", ue.Text())
|
|
||||||
})
|
|
||||||
box.UiBox.Append(ue, false)
|
|
||||||
|
|
||||||
ge.UiEntry = ue
|
|
||||||
box.Window.EntryMap[name] = ge
|
|
||||||
|
|
||||||
return ge
|
|
||||||
}
|
|
||||||
18
misc.go
18
misc.go
|
|
@ -12,7 +12,7 @@ import pb "git.wit.com/wit/witProtobuf"
|
||||||
|
|
||||||
// import "github.com/davecgh/go-spew/spew"
|
// import "github.com/davecgh/go-spew/spew"
|
||||||
|
|
||||||
// THIS IS NOT CLEAN (almost?)
|
// THIS IS NOT CLEAN (except the Memory normalization example)
|
||||||
|
|
||||||
const Xaxis = 0
|
const Xaxis = 0
|
||||||
const Yaxis = 1
|
const Yaxis = 1
|
||||||
|
|
@ -25,14 +25,6 @@ func GuiInit() {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
func ShowMainTabShowBox(gw *GuiWindow, box *GuiBox) {
|
|
||||||
log.Println("gui.ShowMainTabShowBox() box =", box)
|
|
||||||
// gw.UiTab.Delete(0)
|
|
||||||
gw.BoxMap["MAIN3"] = box
|
|
||||||
// gw.UiTab.InsertAt("Main", 0, box.UiBox)
|
|
||||||
gw.UiTab.SetMargined(0, true)
|
|
||||||
}
|
|
||||||
|
|
||||||
// func InitGuiWindow(c *pb.Config, action string, maketab func(*GuiWindow) *GuiBox, uiW *ui.Window, uiT *ui.Tab) *GuiWindow {
|
// func InitGuiWindow(c *pb.Config, action string, maketab func(*GuiWindow) *GuiBox, uiW *ui.Window, uiT *ui.Tab) *GuiWindow {
|
||||||
func InitGuiWindow(c *pb.Config, action string, gw *GuiWindow) *GuiWindow {
|
func InitGuiWindow(c *pb.Config, action string, gw *GuiWindow) *GuiWindow {
|
||||||
log.Println("InitGuiWindow() START")
|
log.Println("InitGuiWindow() START")
|
||||||
|
|
@ -177,3 +169,11 @@ func defaultMakeEntry(startValue string, edit bool, action string) *GuiEntry {
|
||||||
|
|
||||||
return &newEntry
|
return &newEntry
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func MessageWindow(gw *GuiWindow, msg1 string, msg2 string) {
|
||||||
|
ui.MsgBox(gw.UiWindow, msg1, msg2)
|
||||||
|
}
|
||||||
|
|
||||||
|
func ErrorWindow(gw *GuiWindow, msg1 string, msg2 string) {
|
||||||
|
ui.MsgBoxError(gw.UiWindow, msg1, msg2)
|
||||||
|
}
|
||||||
|
|
|
||||||
93
table.go
93
table.go
|
|
@ -66,3 +66,96 @@ func initRowTextColumn(mh *TableData, stringID int, junk string, cell TableColum
|
||||||
mh.Cells[stringID].Name = "EDIT"
|
mh.Cells[stringID].Name = "EDIT"
|
||||||
mh.Cells[stringID].HumanID = humanInt
|
mh.Cells[stringID].HumanID = humanInt
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func InitColumns(mh *TableData, parts []TableColumnData) {
|
||||||
|
tmpBTindex := 0
|
||||||
|
humanID := 0
|
||||||
|
for key, foo := range parts {
|
||||||
|
log.Println("key, foo =", key, foo)
|
||||||
|
|
||||||
|
parts[key].Index = humanID
|
||||||
|
humanID += 1
|
||||||
|
|
||||||
|
if (foo.CellType == "BG") {
|
||||||
|
mh.generatedColumnTypes = append(mh.generatedColumnTypes, ui.TableColor{})
|
||||||
|
initRowBTcolor (mh, tmpBTindex, parts[key])
|
||||||
|
tmpBTindex += 1
|
||||||
|
} else if (foo.CellType == "BUTTON") {
|
||||||
|
mh.generatedColumnTypes = append(mh.generatedColumnTypes, ui.TableString(""))
|
||||||
|
initRowButtonColumn (mh, tmpBTindex, parts[key].Heading, parts[key])
|
||||||
|
tmpBTindex += 1
|
||||||
|
} else if (foo.CellType == "TEXTCOLOR") {
|
||||||
|
mh.generatedColumnTypes = append(mh.generatedColumnTypes, ui.TableString(""))
|
||||||
|
mh.generatedColumnTypes = append(mh.generatedColumnTypes, ui.TableColor{})
|
||||||
|
initRowTextColorColumn(mh, tmpBTindex, tmpBTindex + 1, parts[key].Heading, ui.TableColor{0.0, 0, 0.9, 1}, parts[key])
|
||||||
|
tmpBTindex += 2
|
||||||
|
} else if (foo.CellType == "TEXT") {
|
||||||
|
mh.generatedColumnTypes = append(mh.generatedColumnTypes, ui.TableString(""))
|
||||||
|
initRowTextColumn (mh, tmpBTindex, parts[key].Heading, parts[key])
|
||||||
|
tmpBTindex += 1
|
||||||
|
} else {
|
||||||
|
panic("I don't know what this is in initColumnNames")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// func AddTableTab(gw *GuiWindow, name string, rowcount int, parts []TableColumnData, account *pb.Account) *TableData {
|
||||||
|
func AddTableTab(gw *GuiWindow, name string, rowcount int, parts []TableColumnData) *TableData {
|
||||||
|
mh := new(TableData)
|
||||||
|
|
||||||
|
mh.RowCount = rowcount
|
||||||
|
mh.Rows = make([]RowData, mh.RowCount)
|
||||||
|
|
||||||
|
InitColumns(mh, parts)
|
||||||
|
|
||||||
|
model := ui.NewTableModel(mh)
|
||||||
|
table := ui.NewTable(
|
||||||
|
&ui.TableParams{
|
||||||
|
Model: model,
|
||||||
|
RowBackgroundColorModelColumn: 0, // Row Background color is always index zero
|
||||||
|
})
|
||||||
|
|
||||||
|
tmpBTindex := 0
|
||||||
|
for key, foo := range parts {
|
||||||
|
log.Println(key, foo)
|
||||||
|
if (foo.CellType == "BG") {
|
||||||
|
} else if (foo.CellType == "BUTTON") {
|
||||||
|
tmpBTindex += 1
|
||||||
|
table.AppendButtonColumn(foo.Heading, tmpBTindex, ui.TableModelColumnAlwaysEditable)
|
||||||
|
} else if (foo.CellType == "TEXTCOLOR") {
|
||||||
|
tmpBTindex += 1
|
||||||
|
table.AppendTextColumn(foo.Heading, tmpBTindex, ui.TableModelColumnAlwaysEditable,
|
||||||
|
&ui.TableTextColumnOptionalParams{
|
||||||
|
ColorModelColumn: tmpBTindex + 1,
|
||||||
|
});
|
||||||
|
tmpBTindex += 1
|
||||||
|
} else if (foo.CellType == "TEXT") {
|
||||||
|
tmpBTindex += 1
|
||||||
|
table.AppendTextColumn(foo.Heading, tmpBTindex, ui.TableModelColumnAlwaysEditable, nil)
|
||||||
|
} else {
|
||||||
|
panic("I don't know what this is in initColumnNames")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var gb *GuiBox
|
||||||
|
gb = new(GuiBox)
|
||||||
|
|
||||||
|
vbox := ui.NewVerticalBox()
|
||||||
|
vbox.SetPadded(true)
|
||||||
|
gb.UiBox = vbox
|
||||||
|
gb.Window = gw
|
||||||
|
gw.BoxMap[name] = gb
|
||||||
|
mh.Box = gb
|
||||||
|
|
||||||
|
vbox.Append(table, true)
|
||||||
|
gw.UiTab.Append(name, vbox)
|
||||||
|
|
||||||
|
vbox.Append(ui.NewVerticalSeparator(), false)
|
||||||
|
|
||||||
|
hbox := ui.NewHorizontalBox()
|
||||||
|
hbox.SetPadded(true)
|
||||||
|
|
||||||
|
vbox.Append(hbox, false)
|
||||||
|
|
||||||
|
return mh
|
||||||
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue