0.0.10 Updated colors. /JL

color.go

@@ -52,13 +52,11 @@ func NewBeadColor(mw *MyMainWindow, name string, id int, red byte, green byte, b
 	cm, _ := walk.NewComposite(mw.colors)
 	cm.SetAlignment(walk.AlignHNearVCenter)
 	hb := walk.NewHBoxLayout()
-	hb.SetMargins(walk.Margins{0, 0, 0, 0})
+	hb.SetMargins(walk.Margins{5, 0, 20, 0})
 	cm.SetLayout(hb)
 	color := new(BeadColor)
 	log.Println("Bead color struct: ", color)
 	color.SetBackgroundColor(walk.RGB(red, green, blue))
-	lbl, _ := walk.NewLabel(cm)
-	lbl.SetText(fmt.Sprint("Color ID: ", id))
 	log.Println("Creating checkbox")
 	color.Checkbox, err = walk.NewCheckBox(cm)
 	if err != nil {
@@ -69,6 +67,8 @@ func NewBeadColor(mw *MyMainWindow, name string, id int, red byte, green byte, b
 	color.Checkbox.SetText(name)
 	log.Println("Checkbox name set")
 	walk.NewHSpacer(cm)
+	lbl, _ := walk.NewLabel(cm)
+	lbl.SetText(fmt.Sprint("Color ID: ", id))
 	cm.SetBackground(color.backgroundColor)
 
 	return color

main.go

@@ -24,7 +24,7 @@ type MyMainWindow struct {
 
 const (
 	AppName   string = "BeadImager"
-	Version   string = "0.0.9"
+	Version   string = "0.0.10"
 	CopyRight string = "©2022 Jan Lerking"
 	STD_MESS  string = "Ready"
 	UserPath  string = "C:\\Users\\janle\\BeadImager"
@@ -50,70 +50,70 @@ func main() {
 	pegboard_trigged := false
 
 	DD_Pallette := Composite{
-		Layout: HBox{MarginsZero: true},
+		Layout: VBox{MarginsZero: true},
 		Children: []Widget{
-			Label{
+			Composite{
-				Text: "Pallette:",
+				Layout: HBox{MarginsZero: true},
-			},
+				Children: []Widget{
-			ComboBox{
+					Label{
-				AssignTo: &mw.pallette_combo,
+						Text: "Pallette:",
-				Model:    mw.brand_model,
+					},
-				OnCurrentIndexChanged: func() {
+					ComboBox{
-					if !pallette_trigged {
+						AssignTo: &mw.pallette_combo,
-						log.Println("Pallette changed to: ", mw.pallette_combo.Text())
+						Model:    mw.brand_model,
-						mw.serie_model = CreateSeriesList(mw)
+						OnCurrentIndexChanged: func() {
-						mw.serie_combo.SetModel(mw.serie_model)
+							if !pallette_trigged {
-						mw.serie_combo.SetEnabled(true)
+								log.Println("Pallette changed to: ", mw.pallette_combo.Text())
-					}
+								mw.serie_model = CreateSeriesList(mw)
-					pallette_trigged = true
+								mw.serie_combo.SetModel(mw.serie_model)
+								mw.serie_combo.SetEnabled(true)
+							}
+							pallette_trigged = true
+						},
+					},
 				},
 			},
-			HSpacer{},
+			Composite{
-		},
+				Layout: HBox{MarginsZero: true},
-	}
+				Children: []Widget{
-
+					Label{
-	DD_Serie := Composite{
+						Text: "Serie:",
-		Layout: HBox{MarginsZero: true},
+					},
-		Children: []Widget{
+					ComboBox{
-			Label{
+						AssignTo: &mw.serie_combo,
-				Text: "Serie:",
+						Enabled:  false,
-			},
+						OnCurrentIndexChanged: func() {
-			ComboBox{
+							if !serie_trigged {
-				AssignTo: &mw.serie_combo,
+								log.Println("Serie changed to: ", mw.serie_combo.Text())
-				Enabled:  false,
+								LoadBeads(mw)
-				OnCurrentIndexChanged: func() {
+								log.Println("Beads loaded: ", mw.beads)
-					if !serie_trigged {
+								mw.pegboard_model = CreatePegboardsList(mw)
-						log.Println("Serie changed to: ", mw.serie_combo.Text())
+								mw.pegboard_combo.SetModel(mw.pegboard_model)
-						LoadBeads(mw)
+								mw.pegboard_combo.SetEnabled(true)
-						log.Println("Beads loaded: ", mw.beads)
+							}
-						mw.pegboard_model = CreatePegboardsList(mw)
+							serie_trigged = true
-						mw.pegboard_combo.SetModel(mw.pegboard_model)
+						},
-						mw.pegboard_combo.SetEnabled(true)
+					},
-					}
-					serie_trigged = true
 				},
 			},
-			HSpacer{},
+			Composite{
-		},
+				Layout: HBox{MarginsZero: true},
-	}
+				Children: []Widget{
-
+					Label{
-	DD_Pegboard := Composite{
+						Text: "Pegboard:",
-		Layout: HBox{MarginsZero: true},
+					},
-		Children: []Widget{
+					ComboBox{
-			Label{
+						AssignTo: &mw.pegboard_combo,
-				Text: "Pegboard:",
+						Enabled:  false,
-			},
+						OnCurrentIndexChanged: func() {
-			ComboBox{
+							if !pegboard_trigged {
-				AssignTo: &mw.pegboard_combo,
+								log.Println("Pegboard changed to: ", mw.pegboard_combo.Text())
-				Enabled:  false,
+							}
-				OnCurrentIndexChanged: func() {
+							pegboard_trigged = true
-					if !pegboard_trigged {
+						},
-						log.Println("Pegboard changed to: ", mw.pegboard_combo.Text())
+					},
-					}
-					pegboard_trigged = true
 				},
 			},
-			HSpacer{},
 		},
 	}
 
@@ -125,14 +125,12 @@ func main() {
 		Layout: VBox{MarginsZero: true},
 		Children: []Widget{
 			Composite{
-				Layout: HBox{MarginsZero: true},
+				Layout: HBox{},
 				Children: []Widget{
 					Composite{
 						Layout: VBox{MarginsZero: true},
 						Children: []Widget{
 							DD_Pallette,
-							DD_Serie,
-							DD_Pegboard,
 							PushButton{
 								Text: "Select all colors",
 								OnClicked: func() {