0.4.4 Added clear beads. /JL
This commit is contained in:
30
color.go
30
color.go
@@ -36,6 +36,7 @@ type (
|
||||
}
|
||||
|
||||
Retval struct {
|
||||
Clear bool
|
||||
Grams int
|
||||
Number int
|
||||
}
|
||||
@@ -154,8 +155,12 @@ func NewBeadColor(mw *MyMainWindow, name string, id int, red byte, green byte, b
|
||||
if b.ColorID == color.ColorID {
|
||||
for _, s := range b.Series {
|
||||
if s.Name == mw.serie_combo.Text() {
|
||||
s.onHand += ret.Number
|
||||
log.Println("Added ", ret.Number, " beads of ", name, " to ", mw.serie_combo.Text(), " (", s.onHand, " on hand)")
|
||||
if ret.Clear {
|
||||
s.onHand = 0
|
||||
} else {
|
||||
s.onHand += ret.Number
|
||||
log.Println("Added ", ret.Number, " beads of ", name, " to ", mw.serie_combo.Text(), " (", s.onHand, " on hand)")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -166,9 +171,16 @@ func NewBeadColor(mw *MyMainWindow, name string, id int, red byte, green byte, b
|
||||
if c.ColorIndex == color.ColorID {
|
||||
for is, s := range c.Series.Serie {
|
||||
if s.Name == mw.serie_combo.Text() {
|
||||
mw.pallette.Brand[ib].Colors[ic].Series.Serie[is].OnHand += ret.Number
|
||||
log.Println("Added ", ret.Number, " beads of ", name, " to ", mw.serie_combo.Text(), " (", s.OnHand, " on hand)")
|
||||
break
|
||||
if ret.Clear {
|
||||
mw.pallette.Brand[ib].Colors[ic].Series.Serie[is].OnHand = 0
|
||||
mw.pallette.Brand[ib].Colors[ic].Series.Serie[is].InStock = false
|
||||
break
|
||||
} else {
|
||||
mw.pallette.Brand[ib].Colors[ic].Series.Serie[is].OnHand += ret.Number
|
||||
mw.pallette.Brand[ib].Colors[ic].Series.Serie[is].InStock = true
|
||||
log.Println("Added ", ret.Number, " beads of ", name, " to ", mw.serie_combo.Text(), " (", s.OnHand, " on hand)")
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
break
|
||||
@@ -241,6 +253,14 @@ func (bc *BeadColor) GetOnHand(serie string) int {
|
||||
return 0
|
||||
}
|
||||
|
||||
func (bc *BeadColor) SetOnHand(serie string, onHand int) {
|
||||
for _, s := range bc.Series {
|
||||
if s.Name == serie {
|
||||
s.onHand = onHand
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func (bc *BeadColor) GetInStock(serie string) bool {
|
||||
for _, s := range bc.Series {
|
||||
if s.Name == serie {
|
||||
|
19
dialog.go
19
dialog.go
@@ -20,12 +20,12 @@ func delay(edit *walk.NumberEdit, val string, ret *Retval) {
|
||||
}
|
||||
}
|
||||
|
||||
func (mv *MyMainWindow) addBeads(name string, data Serie, id int, bg walk.Brush, ret *Retval) int {
|
||||
func (mw *MyMainWindow) addBeads(name string, data Serie, id int, bg walk.Brush, ret *Retval) int {
|
||||
var (
|
||||
grams_edit *walk.NumberEdit
|
||||
number_edit *walk.NumberEdit
|
||||
)
|
||||
dlg, err := walk.NewDialog(mv.MainWindow)
|
||||
dlg, err := walk.NewDialog(mw.MainWindow)
|
||||
if err != nil {
|
||||
log.Println(err)
|
||||
}
|
||||
@@ -33,15 +33,15 @@ func (mv *MyMainWindow) addBeads(name string, data Serie, id int, bg walk.Brush,
|
||||
dlg.SetLayout(walk.NewVBoxLayout())
|
||||
dlg.SetSize(walk.Size{Width: 300, Height: 200})
|
||||
dlg.SetMinMaxSize(walk.Size{Width: 300, Height: 200}, walk.Size{Width: 300, Height: 200})
|
||||
dlg.SetX(mv.MainWindow.X() + 100)
|
||||
dlg.SetY(mv.MainWindow.Y() + 100)
|
||||
dlg.SetX(mw.MainWindow.X() + 100)
|
||||
dlg.SetY(mw.MainWindow.Y() + 100)
|
||||
cmp, _ := walk.NewComposite(dlg)
|
||||
cmp.SetLayout(walk.NewHBoxLayout())
|
||||
cmp.Layout().SetMargins(walk.Margins{0, 0, 0, 0})
|
||||
cmp.SetAlignment(walk.AlignHCenterVCenter)
|
||||
walk.NewHSpacer(cmp)
|
||||
lbl, _ := walk.NewTextLabel(cmp)
|
||||
lbl.SetText(name + " - " + strconv.Itoa(id))
|
||||
lbl.SetText("#" + strconv.Itoa(id) + " " + name + " - " + " Onhand: " + strconv.Itoa(data.onHand))
|
||||
lbl.SetAlignment(walk.AlignHCenterVCenter)
|
||||
walk.NewHSpacer(cmp)
|
||||
cmp.SetBackground(bg)
|
||||
@@ -105,9 +105,18 @@ func (mv *MyMainWindow) addBeads(name string, data Serie, id int, bg walk.Brush,
|
||||
//ret.Number = int(number_edit.Value())
|
||||
log.Println("grams:", ret.Grams)
|
||||
log.Println("number:", ret.Number)
|
||||
ret.Clear = false
|
||||
dlg.Accept()
|
||||
})
|
||||
walk.NewHSpacer(bc)
|
||||
cl, _ := walk.NewPushButton(bc)
|
||||
cl.SetText("Clear")
|
||||
cl.Clicked().Attach(func() {
|
||||
grams_edit.SetValue(0)
|
||||
number_edit.SetValue(0)
|
||||
ret.Clear = true
|
||||
dlg.Accept()
|
||||
})
|
||||
cb, _ := walk.NewPushButton(bc)
|
||||
cb.SetText("Cancel")
|
||||
dlg.SetCancelButton(cb)
|
||||
|
Reference in New Issue
Block a user