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

work on fixing 'add account' 

Signed-off-by: Jeff Carr <jcarr@wit.com>
This commit is contained in:
Jeff Carr 2019-05-25 01:36:36 -07:00
parent 19e73d6678
commit 3b096d8145
4 changed files with 39 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
addAccount.go
View File

@ -20,9 +20,10 @@ func AddAccountQuestionBox(junk *ui.Box, custom func(*ButtonMap)) *ui.Box {
return newbox return newbox
} }
func AddAccountBox(custom func(*ButtonMap)) *ui.Box { func AddAccountBox(aTab *GuiTabStructure) {
vbox := ui.NewVerticalBox() vbox := ui.NewVerticalBox()
vbox.SetPadded(true) vbox.SetPadded(true)
aTab.firstBox = vbox
hboxAccount := ui.NewHorizontalBox() hboxAccount := ui.NewHorizontalBox()
hboxAccount.SetPadded(true) hboxAccount.SetPadded(true)
@ -67,13 +68,13 @@ func AddAccountBox(custom func(*ButtonMap)) *ui.Box {
vboxN.SetPadded(true) vboxN.SetPadded(true)
vboxN.Append(ui.NewLabel("Account Nickname:"), false) vboxN.Append(ui.NewLabel("Account Nickname:"), false)
entryNick := ui.NewEntry() aTab.EntryNick = ui.NewEntry()
entryNick.SetReadOnly(false) aTab.EntryNick.SetReadOnly(false)
vboxN.Append(entryNick, false) vboxN.Append(aTab.EntryNick, false)
entryNick.OnChanged(func(*ui.Entry) { aTab.EntryNick.OnChanged(func(*ui.Entry) {
log.Println("OK. nickname =", entryNick.Text()) log.Println("OK. nickname =", aTab.EntryNick.Text())
// Data.AccNick = entryNick.Text() // Data.AccNick = entryNick.Text()
}) })
hboxAccount.Append(vboxN, false) hboxAccount.Append(vboxN, false)
@ -84,13 +85,13 @@ func AddAccountBox(custom func(*ButtonMap)) *ui.Box {
vboxU.SetPadded(true) vboxU.SetPadded(true)
vboxU.Append(ui.NewLabel("Account Username:"), false) vboxU.Append(ui.NewLabel("Account Username:"), false)
entryUser := ui.NewEntry() aTab.EntryUser = ui.NewEntry()
entryUser.SetReadOnly(false) aTab.EntryUser.SetReadOnly(false)
vboxU.Append(entryUser, false) vboxU.Append(aTab.EntryUser, false)
entryUser.OnChanged(func(*ui.Entry) { aTab.EntryUser.OnChanged(func(*ui.Entry) {
log.Println("OK. username =", entryUser.Text()) log.Println("OK. username =", aTab.EntryUser.Text())
// Data.AccUser = entryUser.Text() // Data.AccUser = entryUser.Text()
}) })
hboxAccount.Append(vboxU, false) hboxAccount.Append(vboxU, false)
@ -101,13 +102,13 @@ func AddAccountBox(custom func(*ButtonMap)) *ui.Box {
vboxP.SetPadded(true) vboxP.SetPadded(true)
vboxP.Append(ui.NewLabel("Account Password:"), false) vboxP.Append(ui.NewLabel("Account Password:"), false)
entryPass := ui.NewEntry() aTab.EntryPass = ui.NewEntry()
entryPass.SetReadOnly(false) aTab.EntryPass.SetReadOnly(false)
vboxP.Append(entryPass, false) vboxP.Append(aTab.EntryPass, false)
entryPass.OnChanged(func(*ui.Entry) { aTab.EntryPass.OnChanged(func(*ui.Entry) {
log.Println("OK. password =", entryPass.Text()) log.Println("OK. password =", aTab.EntryPass.Text())
// Data.AccPass = entryPass.Text() // Data.AccPass = entryPass.Text()
}) })
hboxAccount.Append(vboxP, false) hboxAccount.Append(vboxP, false)
@ -119,11 +120,9 @@ func AddAccountBox(custom func(*ButtonMap)) *ui.Box {
hboxButtons.SetPadded(true) hboxButtons.SetPadded(true)
vbox.Append(hboxButtons, false) vbox.Append(hboxButtons, false)
okButton := CreateButton(nil, nil, "Add Account", "ADD", custom) okButton := CreateButton(nil, nil, "Add Account", "ADD", mouseClick)
hboxButtons.Append(okButton, false) hboxButtons.Append(okButton, false)
backButton := CreateButton(nil, nil, "Back", "BACK", custom) backButton := CreateButton(nil, nil, "Back", "BACK", mouseClick)
hboxButtons.Append(backButton, false) hboxButtons.Append(backButton, false)
return vbox
} }

1
gui.go
View File

@ -203,6 +203,7 @@ func CreateButton(a *pb.Config_Account, vm *pb.Event_VM,
newmap.Account = a newmap.Account = a
newmap.Action = note newmap.Action = note
newmap.custom = custom newmap.custom = custom
newmap.aTab = Data.CurrentTab
Data.AllButtons = append(Data.AllButtons, newmap) Data.AllButtons = append(Data.AllButtons, newmap)
return newB return newB

14
mainCloudBox.go
View File

@ -174,8 +174,18 @@ func ShowAccountTab() {
log.Println("Sleep(200)") log.Println("Sleep(200)")
time.Sleep(200 * time.Millisecond) time.Sleep(200 * time.Millisecond)
Data.smallBox = AddAccountBox(mouseClick) // Create the things for the Account Tab
Data.cloudTab.InsertAt("Add Account", 0, Data.smallBox) var aTab GuiTabStructure
Data.CurrentTab = &aTab
AddAccountBox(&aTab)
// Set the parents and data structure links
aTab.me = Data.cloudTab
aTab.parentWindow = Data.cloudWindow
aTab.tabOffset = 0
// Data.smallBox = aTab.firstBox
Data.cloudTab.InsertAt("Add Account", 0, aTab.firstBox)
Data.cloudTab.SetMargined(0, true) Data.cloudTab.SetMargined(0, true)
} }

5
structs.go
View File

@ -20,6 +20,10 @@ type GuiTabStructure struct {
firstBox *ui.Box firstBox *ui.Box
tabOffset int tabOffset int
EntryNick *ui.Entry
EntryUser *ui.Entry
EntryPass *ui.Entry
// this means only one table per tab // this means only one table per tab
mh *TableData mh *TableData
@ -101,6 +105,7 @@ type ButtonMap struct {
Account *pb.Config_Account Account *pb.Config_Account
VM *pb.Event_VM VM *pb.Event_VM
Action string // what type of button Action string // what type of button
aTab *GuiTabStructure
custom func (*ButtonMap) custom func (*ButtonMap)
} }