jcarr
/
new-gui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add account tab working again 

Signed-off-by: Jeff Carr <jcarr@wit.com>
This commit is contained in:
Jeff Carr 2019-05-27 15:25:30 -07:00
parent 63c818217a
commit 7ada34f221
1 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
mainCloudBox.go
View File

@ -83,7 +83,7 @@ func makeCloudInfoBox() *ui.Box {
row += 1 row += 1
agrid.Append(ui.NewLabel(""), 1, row, 1, 1, true, ui.AlignFill, false, ui.AlignFill) agrid.Append(ui.NewLabel(""), 1, row, 1, 1, true, ui.AlignFill, false, ui.AlignFill)
row += 1 row += 1
a := CreateButton(nil, nil, "Add Account", "ADD", nil) a := CreateButton(nil, nil, "Add Account", "ADD TAB", nil)
agrid.Append(a, 4, row, 1, 1, true, ui.AlignFill, false, ui.AlignFill) agrid.Append(a, 4, row, 1, 1, true, ui.AlignFill, false, ui.AlignFill)
q := CreateButton(nil, nil, "Quit", "QUIT", nil) q := CreateButton(nil, nil, "Quit", "QUIT", nil)
agrid.Append(q, 5, row, 1, 1, true, ui.AlignFill, false, ui.AlignFill) agrid.Append(q, 5, row, 1, 1, true, ui.AlignFill, false, ui.AlignFill)
@ -171,7 +171,7 @@ func ShowAccountQuestionTab() {
} }
func ShowAccountTab(i int) { func ShowAccountTab(i int) {
Data.cloudTab.Delete(0) log.Println("ShowAccountTab() START")
log.Println("Sleep(200)") log.Println("Sleep(200)")
time.Sleep(200 * time.Millisecond) time.Sleep(200 * time.Millisecond)
@ -181,17 +181,19 @@ func ShowAccountTab(i int) {
// Set the parents and data structure links // Set the parents and data structure links
// aTab.me = Data.cloudTab // aTab.me = Data.cloudTab
// aTab.parentWindow = Data.cloudWindow // aTab.parentWindow = Data.cloudWindow
// aTab.tabOffset = 0 // aTab.tabOffset = 0
if (i >= 0) { if (i >= 0) {
Data.cloudTab.InsertAt("Add Account", 0, abox) log.Println("ShowAccountTab() InsertAt i=", i)
Data.cloudTab.Delete(0)
Data.cloudTab.InsertAt("Add Account", i, abox)
Data.cloudTab.SetMargined(0, true)
} else { } else {
// this is going to crash, see TODO. This means index is -1 // TODO: After append try to discover the tab index #
// TODO: Do append here and discover tab index # log.Println("ShowAccountTab() Append")
Data.cloudTab.InsertAt("Add Account", 0, abox) AddBoxToTab("Create New Account", Data.cloudTab, abox)
} }
Data.cloudTab.SetMargined(0, true)
} }
func ShowMainTab() { func ShowMainTab() {
@ -321,6 +323,11 @@ func makeEntryHbox(hbox *ui.Box, a string, b string, edit bool) {
// End 'Nickname' vertical box // End 'Nickname' vertical box
} }
func AddBoxToTab(name string, tab *ui.Tab, box *ui.Box) {
tab.Append(name, box)
tab.SetMargined(0, true)
}
func CreateVmBox(tab *ui.Tab, vm *pb.Event_VM) { func CreateVmBox(tab *ui.Tab, vm *pb.Event_VM) {
log.Println("CreateVmBox() START") log.Println("CreateVmBox() START")
log.Println("CreateVmBox() vm.Name", vm.Name) log.Println("CreateVmBox() vm.Name", vm.Name)
@ -357,8 +364,9 @@ func CreateVmBox(tab *ui.Tab, vm *pb.Event_VM) {
hboxButtons.Append(CreateButton(nil, vm, "Save", "SAVE", nil), false) hboxButtons.Append(CreateButton(nil, vm, "Save", "SAVE", nil), false)
hboxButtons.Append(CreateButton(nil, vm, "Done", "DONE", nil), false) hboxButtons.Append(CreateButton(nil, vm, "Done", "DONE", nil), false)
tab.Append(Data.CurrentVM.Name, vbox) AddBoxToTab(Data.CurrentVM.Name, tab, vbox)
tab.SetMargined(0, true) // tab.Append(Data.CurrentVM.Name, vbox)
// tab.SetMargined(0, true)
} }
func createAddVmBox(tab *ui.Tab, name string, b *ButtonMap) { func createAddVmBox(tab *ui.Tab, name string, b *ButtonMap) {
@ -383,6 +391,7 @@ func createAddVmBox(tab *ui.Tab, name string, b *ButtonMap) {
hboxButtons.Append(CreateButton(nil, nil, "Cancel", "CLOSE", nil), false) hboxButtons.Append(CreateButton(nil, nil, "Cancel", "CLOSE", nil), false)
name += " (" + b.Account.Nick + ")" name += " (" + b.Account.Nick + ")"
tab.Append(name, vbox) AddBoxToTab(name, tab, vbox)
tab.SetMargined(0, true) // tab.Append(name, vbox)
// tab.SetMargined(0, true)
} }