diff --git a/gui.go b/gui.go index 45a9d6c..c811bd9 100644 --- a/gui.go +++ b/gui.go @@ -41,7 +41,7 @@ func InitColumns(mh *TableData, parts []TableColumnData) { } } -func AddTableTab(mytab *ui.Tab, mytabcount int, name string, rowcount int, parts []TableColumnData, account *pb.Config_Account) *TableData { +func AddTableTab(mytab *ui.Tab, mytabcount int, name string, rowcount int, parts []TableColumnData, account *pb.Account) *TableData { mh := new(TableData) mh.RowCount = rowcount @@ -193,7 +193,7 @@ func defaultFontButtonClick(button *ui.FontButton) { } } -func CreateButton(a *pb.Config_Account, vm *pb.Event_VM, +func CreateButton(a *pb.Account, vm *pb.Event_VM, name string, note string, custom func(*ButtonMap)) *ui.Button { newB := ui.NewButton(name) newB.OnClicked(defaultButtonClick) diff --git a/mainCloudBox.go b/mainCloudBox.go index 9765900..b6f23e2 100644 --- a/mainCloudBox.go +++ b/mainCloudBox.go @@ -99,7 +99,7 @@ func makeCloudInfoBox(custom func(*ButtonMap)) *ui.Box { // which could be anything since TEXTCOLOR, TEXT, BG, etc // fields use between 1 and 3 values internally // -func AddVmsTab(name string, count int, a *pb.Config_Account) *TableData { +func AddVmsTab(name string, count int, a *pb.Account) *TableData { var parts []TableColumnData human := 0 diff --git a/structs.go b/structs.go index bf9c860..90da86f 100644 --- a/structs.go +++ b/structs.go @@ -58,7 +58,7 @@ type GuiDataStructure struct { // account entry textboxes Config *pb.Config - Current *pb.Config_Account + Current *pb.Account // A map of all buttons everywhere on all // windows, all tabs, across all goroutines @@ -102,7 +102,7 @@ type TableColumnData struct { type ButtonMap struct { B *ui.Button FB *ui.FontButton - Account *pb.Config_Account + Account *pb.Account VM *pb.Event_VM Action string // what type of button aTab *GuiTabStructure @@ -177,7 +177,7 @@ type TableData struct { Cells [20]CellData Human [20]HumanMap - Account *pb.Config_Account // what account this table is for + Account *pb.Account // what account this table is for lastRow int lastColumn int