diff --git a/color.go b/color.go index 7340233..7a65fd6 100644 --- a/color.go +++ b/color.go @@ -37,10 +37,20 @@ func LoadBeads(mw *MyMainWindow) { } func NewBeadColor(mw *MyMainWindow, name string, red byte, green byte, blue byte) *BeadColor { + var err error + log.Println("Creating bead color: " + name + " ...") color := new(BeadColor) + log.Println("Bead color struct: ", color) //color.SetBackgroundColor(walk.RGB(red, green, blue)) - color.Checkbox, _ = walk.NewCheckBox(mw.colors) + log.Println("Creating checkbox") + color.Checkbox, err = walk.NewCheckBox(mw.colors) + if err != nil { + log.Panic(err) + } + log.Println("Checkbox created") + log.Println("Setting checkbox name") color.Checkbox.SetName(name) + log.Println("Checkbox name set") //color.Checkbox.SetBackground(color.backgroundColor) return color diff --git a/main.go b/main.go index 801937f..0e21351 100644 --- a/main.go +++ b/main.go @@ -20,7 +20,7 @@ type MyMainWindow struct { const ( AppName string = "BeadImager" - Version string = "0.0.5" + Version string = "0.0.6" CopyRight string = "©2022 Jan Lerking" STD_MESS string = "Ready" UserPath string = "C:\\Users\\janle\\BeadImager" @@ -67,8 +67,10 @@ func main() { log.Println("MainWindow created") CreatePallette(mw) log.Println("Pallette created: ", mw.pallette) - LoadBeads(mw) - log.Println("Beads loaded: ", mw.beads) + //LoadBeads(mw) + //log.Println("Beads loaded: ", mw.beads) + brand_model := CreateBrandsList(mw) + pallette_combo := new(walk.ComboBox) if _, err := (MainWindow{ AssignTo: &mw.MainWindow, @@ -83,6 +85,21 @@ func main() { Composite{ Layout: VBox{MarginsZero: true}, Children: []Widget{ + Composite{ + Layout: HBox{MarginsZero: true}, + Children: []Widget{ + Label{ + Text: "Pallette:", + }, + ComboBox{ + AssignTo: &pallette_combo, + Model: brand_model, + OnCurrentIndexChanged: func() { + log.Println("Pallette changed to: ", pallette_combo.Text()) + }, + }, + }, + }, PushButton{ Text: "Edit Animal", OnClicked: func() {}, diff --git a/pallette.go b/pallette.go index 6e8a118..5d6bf87 100644 --- a/pallette.go +++ b/pallette.go @@ -70,6 +70,14 @@ type ( } ) +func CreateBrandsList(mw *MyMainWindow) []string { + brands := make([]string, 0) + for _, brand := range mw.pallette.Brands.Brand { + brands = append(brands, brand.BrandName) + } + return brands +} + func CreatePallette(mw *MyMainWindow) { // Open our xmlFile XMLFile, err := os.Open("pallettes\\pallette.xml")