From 733d821215fb0eb9d65524c358c9be02f93b2a9b Mon Sep 17 00:00:00 2001 From: Derek Smart Date: Thu, 13 Feb 2020 12:43:03 -0500 Subject: [PATCH] can edit shana and lavitz Signed-off-by: Derek Smart --- internal/app/ui/Form.go | 62 ++++++++++++++++++++++++++++++++--------- 1 file changed, 49 insertions(+), 13 deletions(-) diff --git a/internal/app/ui/Form.go b/internal/app/ui/Form.go index 834e656..5a2bccf 100644 --- a/internal/app/ui/Form.go +++ b/internal/app/ui/Form.go @@ -7,6 +7,7 @@ import ( "fmt" "fyne.io/fyne" "fyne.io/fyne/dialog" + "fyne.io/fyne/layout" "fyne.io/fyne/widget" ) @@ -18,12 +19,7 @@ func createSelect(i inventory.Inventory, a characters.Attribute, s *storage.Slot return r } -func CharacterForm(slot *storage.Slot, card *storage.Card, w fyne.Window) fyne.Widget { - dart := characters.Dart() - - name := widget.NewEntry() - name.SetPlaceHolder("Dart") - +func CharacterForm(slot *storage.Slot, card *storage.Card, w fyne.Window) *fyne.Container { form := &widget.Form{ OnCancel: func() { fmt.Println("Cancelled") @@ -33,11 +29,51 @@ func CharacterForm(slot *storage.Slot, card *storage.Card, w fyne.Window) fyne.W dialog.ShowInformation("Information", "Card Saved", w) }, } - form.Append("Name", name) - form.Append("Weapon", createSelect(inventory.Weapons(), dart.Weapon, slot)) - form.Append("Armor", createSelect(inventory.Armor(), dart.Chest, slot)) - form.Append("Headgear", createSelect(inventory.Helms(), dart.Helmet, slot)) - form.Append("Boots", createSelect(inventory.Boots(), dart.Boots, slot)) - form.Append("Accessories", createSelect(inventory.Accessories(), dart.Accessory, slot)) - return form + dart := characters.Dart() + box1 := widget.NewVBox() + box1.Append(widget.NewLabel("Dart")) + box1.Append(widget.NewLabel("Weapon")) + box1.Append(createSelect(inventory.Weapons(), dart.Weapon, slot)) + box1.Append(widget.NewLabel("Armor")) + box1.Append(createSelect(inventory.Armor(), dart.Chest, slot)) + box1.Append(widget.NewLabel("Headgear")) + box1.Append(createSelect(inventory.Helms(), dart.Helmet, slot)) + box1.Append(widget.NewLabel("Boots")) + box1.Append(createSelect(inventory.Boots(), dart.Boots, slot)) + box1.Append(widget.NewLabel("Accessories")) + box1.Append(createSelect(inventory.Accessories(), dart.Accessory, slot)) + + shana := characters.Shana() + box2 := widget.NewVBox() + box2.Append(widget.NewLabel("Shana")) + box2.Append(widget.NewLabel("Weapon")) + box2.Append(createSelect(inventory.Weapons(), shana.Weapon, slot)) + box2.Append(widget.NewLabel("Armor")) + box2.Append(createSelect(inventory.Armor(), shana.Chest, slot)) + box2.Append(widget.NewLabel("Headgear")) + box2.Append(createSelect(inventory.Helms(), shana.Helmet, slot)) + box2.Append(widget.NewLabel("Boots")) + box2.Append(createSelect(inventory.Boots(), shana.Boots, slot)) + box2.Append(widget.NewLabel("Accessories")) + box2.Append(createSelect(inventory.Accessories(), shana.Accessory, slot)) + + lavitz := characters.Lavitz() + box3 := widget.NewVBox() + box3.Append(widget.NewLabel("Lavitz")) + box3.Append(widget.NewLabel("Weapon")) + box3.Append(createSelect(inventory.Weapons(), lavitz.Weapon, slot)) + box3.Append(widget.NewLabel("Armor")) + box3.Append(createSelect(inventory.Armor(), lavitz.Chest, slot)) + box3.Append(widget.NewLabel("Headgear")) + box3.Append(createSelect(inventory.Helms(), lavitz.Helmet, slot)) + box3.Append(widget.NewLabel("Boots")) + box3.Append(createSelect(inventory.Boots(), lavitz.Boots, slot)) + box3.Append(widget.NewLabel("Accessories")) + box3.Append(createSelect(inventory.Accessories(), lavitz.Accessory, slot)) + + box4 := widget.NewVBox() + box4.Append(form) + + return fyne.NewContainerWithLayout(layout.NewGridLayout(3), + box1, box2, box3, box4) }