Lerking/beadimager
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

0.0.10 Updated colors. /JL

Browse Source
This commit is contained in:
Lerking
2022-12-11 16:36:46 +01:00
parent 954d5676a7
commit 46377de071
2 changed files with 62 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
color.go
View File

@@ -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

120
main.go
View File

@@ -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{
Text: "Pallette:",
},
ComboBox{
AssignTo: &mw.pallette_combo,
Model: mw.brand_model,
OnCurrentIndexChanged: func() {
if !pallette_trigged {
log.Println("Pallette changed to: ", mw.pallette_combo.Text())
mw.serie_model = CreateSeriesList(mw)
mw.serie_combo.SetModel(mw.serie_model)
mw.serie_combo.SetEnabled(true)
}
pallette_trigged = true
Composite{
Layout: HBox{MarginsZero: true},
Children: []Widget{
Label{
Text: "Pallette:",
},
ComboBox{
AssignTo: &mw.pallette_combo,
Model: mw.brand_model,
OnCurrentIndexChanged: func() {
if !pallette_trigged {
log.Println("Pallette changed to: ", mw.pallette_combo.Text())
mw.serie_model = CreateSeriesList(mw)
mw.serie_combo.SetModel(mw.serie_model)
mw.serie_combo.SetEnabled(true)
}
pallette_trigged = true
},
},
},
},
HSpacer{},
},
}
DD_Serie := Composite{
Layout: HBox{MarginsZero: true},
Children: []Widget{
Label{
Text: "Serie:",
},
ComboBox{
AssignTo: &mw.serie_combo,
Enabled: false,
OnCurrentIndexChanged: func() {
if !serie_trigged {
log.Println("Serie changed to: ", mw.serie_combo.Text())
LoadBeads(mw)
log.Println("Beads loaded: ", mw.beads)
mw.pegboard_model = CreatePegboardsList(mw)
mw.pegboard_combo.SetModel(mw.pegboard_model)
mw.pegboard_combo.SetEnabled(true)
}
serie_trigged = true
Composite{
Layout: HBox{MarginsZero: true},
Children: []Widget{
Label{
Text: "Serie:",
},
ComboBox{
AssignTo: &mw.serie_combo,
Enabled: false,
OnCurrentIndexChanged: func() {
if !serie_trigged {
log.Println("Serie changed to: ", mw.serie_combo.Text())
LoadBeads(mw)
log.Println("Beads loaded: ", mw.beads)
mw.pegboard_model = CreatePegboardsList(mw)
mw.pegboard_combo.SetModel(mw.pegboard_model)
mw.pegboard_combo.SetEnabled(true)
}
serie_trigged = true
},
},
},
},
HSpacer{},
},
}
DD_Pegboard := Composite{
Layout: HBox{MarginsZero: true},
Children: []Widget{
Label{
Text: "Pegboard:",
},
ComboBox{
AssignTo: &mw.pegboard_combo,
Enabled: false,
OnCurrentIndexChanged: func() {
if !pegboard_trigged {
log.Println("Pegboard changed to: ", mw.pegboard_combo.Text())
}
pegboard_trigged = true
Composite{
Layout: HBox{MarginsZero: true},
Children: []Widget{
Label{
Text: "Pegboard:",
},
ComboBox{
AssignTo: &mw.pegboard_combo,
Enabled: false,
OnCurrentIndexChanged: func() {
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() {