0.0.6 Added pallette dropdown. /JL
This commit is contained in:
@@ -37,10 +37,20 @@ func LoadBeads(mw *MyMainWindow) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func NewBeadColor(mw *MyMainWindow, name string, red byte, green byte, blue byte) *BeadColor {
|
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)
|
color := new(BeadColor)
|
||||||
|
log.Println("Bead color struct: ", color)
|
||||||
//color.SetBackgroundColor(walk.RGB(red, green, blue))
|
//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)
|
color.Checkbox.SetName(name)
|
||||||
|
log.Println("Checkbox name set")
|
||||||
//color.Checkbox.SetBackground(color.backgroundColor)
|
//color.Checkbox.SetBackground(color.backgroundColor)
|
||||||
|
|
||||||
return color
|
return color
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ type MyMainWindow struct {
|
|||||||
|
|
||||||
const (
|
const (
|
||||||
AppName string = "BeadImager"
|
AppName string = "BeadImager"
|
||||||
Version string = "0.0.5"
|
Version string = "0.0.6"
|
||||||
CopyRight string = "©2022 Jan Lerking"
|
CopyRight string = "©2022 Jan Lerking"
|
||||||
STD_MESS string = "Ready"
|
STD_MESS string = "Ready"
|
||||||
UserPath string = "C:\\Users\\janle\\BeadImager"
|
UserPath string = "C:\\Users\\janle\\BeadImager"
|
||||||
@@ -67,8 +67,10 @@ func main() {
|
|||||||
log.Println("MainWindow created")
|
log.Println("MainWindow created")
|
||||||
CreatePallette(mw)
|
CreatePallette(mw)
|
||||||
log.Println("Pallette created: ", mw.pallette)
|
log.Println("Pallette created: ", mw.pallette)
|
||||||
LoadBeads(mw)
|
//LoadBeads(mw)
|
||||||
log.Println("Beads loaded: ", mw.beads)
|
//log.Println("Beads loaded: ", mw.beads)
|
||||||
|
brand_model := CreateBrandsList(mw)
|
||||||
|
pallette_combo := new(walk.ComboBox)
|
||||||
|
|
||||||
if _, err := (MainWindow{
|
if _, err := (MainWindow{
|
||||||
AssignTo: &mw.MainWindow,
|
AssignTo: &mw.MainWindow,
|
||||||
@@ -83,6 +85,21 @@ func main() {
|
|||||||
Composite{
|
Composite{
|
||||||
Layout: VBox{MarginsZero: true},
|
Layout: VBox{MarginsZero: true},
|
||||||
Children: []Widget{
|
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{
|
PushButton{
|
||||||
Text: "Edit Animal",
|
Text: "Edit Animal",
|
||||||
OnClicked: func() {},
|
OnClicked: func() {},
|
||||||
|
|||||||
@@ -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) {
|
func CreatePallette(mw *MyMainWindow) {
|
||||||
// Open our xmlFile
|
// Open our xmlFile
|
||||||
XMLFile, err := os.Open("pallettes\\pallette.xml")
|
XMLFile, err := os.Open("pallettes\\pallette.xml")
|
||||||
|
|||||||
Reference in New Issue
Block a user