diff --git a/color.go b/color.go index 60ae7f6..c706d39 100644 --- a/color.go +++ b/color.go @@ -41,6 +41,7 @@ func CreateBeadsGroup(mw *MyMainWindow) { }) mw.colors, _ = walk.NewScrollView(gb) mw.colors.SetLayout(walk.NewVBoxLayout()) + LoadBeads(mw) } func LoadBeads(mw *MyMainWindow) { diff --git a/main.go b/main.go index ca0928b..3ac38fc 100644 --- a/main.go +++ b/main.go @@ -30,7 +30,7 @@ type MyMainWindow struct { const ( AppName string = "BeadImager" - Version string = "0.1.2" + Version string = "0.1.3" CopyRight string = "©2022 Jan Lerking" STD_MESS string = "Ready" LogFile string = "BeadImager.log" @@ -97,8 +97,7 @@ func main() { CreatePalletteGroup(mw) CreateBeadsGroup(mw) CreateCanvasGroup(mw) - CreateSettingsGroup(mw) - LoadBeads(mw) + CreateProperties(mw) /* DD_Pallette := GroupBox{ diff --git a/pallette.go b/pallette.go index 7f49f32..5542519 100644 --- a/pallette.go +++ b/pallette.go @@ -93,13 +93,7 @@ func CreatePalletteGroup(mw *MyMainWindow) *walk.GroupBox { lbl.SetText("Brand:") mw.brand_combo, _ = walk.NewComboBox(comp) mw.brand_combo.SetModel(CreateBrandsList(mw)) - mw.brand_combo.SetCurrentIndex(0) - mw.brand_combo.CurrentIndexChanged().Attach(func() { - mw.serie_combo.SetModel(CreateSeriesList(mw)) - mw.serie_combo.SetCurrentIndex(0) - mw.pegboard_combo.SetModel(CreatePegboardsList(mw)) - mw.pegboard_combo.SetCurrentIndex(0) - }) + mw.brand_combo.SetText(ConfigBrand) comp, _ = walk.NewComposite(pallette_group) comp.SetLayout(walk.NewHBoxLayout()) comp.Layout().SetMargins(walk.Margins{0, 0, 0, 0}) @@ -107,11 +101,7 @@ func CreatePalletteGroup(mw *MyMainWindow) *walk.GroupBox { lbl.SetText("Serie:") mw.serie_combo, _ = walk.NewComboBox(comp) mw.serie_combo.SetModel(CreateSeriesList(mw)) - mw.serie_combo.SetCurrentIndex(0) - mw.serie_combo.CurrentIndexChanged().Attach(func() { - mw.pegboard_combo.SetModel(CreatePegboardsList(mw)) - mw.pegboard_combo.SetCurrentIndex(0) - }) + mw.serie_combo.SetText(ConfigSerie) comp, _ = walk.NewComposite(pallette_group) comp.SetLayout(walk.NewHBoxLayout()) comp.Layout().SetMargins(walk.Margins{0, 0, 0, 0}) @@ -119,7 +109,7 @@ func CreatePalletteGroup(mw *MyMainWindow) *walk.GroupBox { lbl.SetText("Pegboard:") mw.pegboard_combo, _ = walk.NewComboBox(comp) mw.pegboard_combo.SetModel(CreatePegboardsList(mw)) - mw.pegboard_combo.SetCurrentIndex(0) + mw.pegboard_combo.SetText(ConfigPegboard) return pallette_group } diff --git a/properties.go b/properties.go index 2045dc3..7ef4073 100644 --- a/properties.go +++ b/properties.go @@ -29,6 +29,14 @@ type ( } ) +func CreateProperties(mw *MyMainWindow) { + mw.properties = new(properties) + mw.properties.propColor = new(PropColor) + mw.properties.propScale = new(PropScale) + mw.properties.propCanvas = new(PropCanvas) + CreateSettingsGroup(mw) +} + func CreateSettingsGroup(mw *MyMainWindow) { log.Println("Setting up settings...") mw.rightPanel, _ = walk.NewComposite(mw.content) @@ -52,29 +60,29 @@ func CreateSettingsGroup(mw *MyMainWindow) { func CreateColorProperties(mw *MyMainWindow) { log.Println("Creating color properties...") - cp, _ := walk.NewComposite(mw.propScroll) - cp.SetAlignment(walk.AlignHNearVNear) + mw.properties.propColor.property, _ = walk.NewComposite(mw.propScroll) + mw.properties.propColor.property.SetAlignment(walk.AlignHNearVNear) vb := walk.NewVBoxLayout() //vb.SetMargins(walk.Margins{5, 0, 5, 0}) - cp.SetLayout(vb) + mw.properties.propColor.property.SetLayout(vb) log.Println("Creating color label...") - lbl, _ := walk.NewTextLabel(cp) + lbl, _ := walk.NewTextLabel(mw.properties.propColor.property) log.Println("Setting color label text...") lbl.SetText("Color: ") log.Println("Creating color background brush...") bg, _ := walk.NewSolidColorBrush(walk.RGB(167, 45, 234)) log.Println("Setting color background...") - cp.SetBackground(bg) + mw.properties.propColor.property.SetBackground(bg) } func CreateScaleProperties(mw *MyMainWindow) { log.Println("Creating scale properties...") - sp, _ := walk.NewComposite(mw.propScroll) - sp.SetAlignment(walk.AlignHNearVNear) + mw.properties.propScale.property, _ = walk.NewComposite(mw.propScroll) + mw.properties.propScale.property.SetAlignment(walk.AlignHNearVNear) vb := walk.NewVBoxLayout() //vb.SetMargins(walk.Margins{5, 0, 5, 0}) - sp.SetLayout(vb) - grcom, _ := walk.NewComposite(sp) + mw.properties.propScale.property.SetLayout(vb) + grcom, _ := walk.NewComposite(mw.properties.propScale.property) grcom.SetAlignment(walk.AlignHNearVNear) hb := walk.NewVBoxLayout() hb.SetMargins(walk.Margins{0, 0, 0, 0}) @@ -109,21 +117,21 @@ func CreateScaleProperties(mw *MyMainWindow) { }) log.Println("Setting background color...") bg, _ := walk.NewSolidColorBrush(walk.RGB(255, 255, 255)) - sp.SetBackground(bg) + mw.properties.propScale.property.SetBackground(bg) } func CreateCanvasProperties(mw *MyMainWindow) { log.Println("Creating canvas properties...") - cp, _ := walk.NewComposite(mw.propScroll) - cp.SetAlignment(walk.AlignHNearVNear) + mw.properties.propCanvas.property, _ = walk.NewComposite(mw.propScroll) + mw.properties.propCanvas.property.SetAlignment(walk.AlignHNearVNear) vb := walk.NewVBoxLayout() //vb.SetMargins(walk.Margins{5, 0, 5, 0}) - cp.SetLayout(vb) + mw.properties.propCanvas.property.SetLayout(vb) log.Println("Creating canvas label...") - lbl, _ := walk.NewTextLabel(cp) + lbl, _ := walk.NewTextLabel(mw.properties.propCanvas.property) log.Println("Setting canvas label text...") lbl.SetText("Canvas:") - grcom, _ := walk.NewComposite(cp) + grcom, _ := walk.NewComposite(mw.properties.propCanvas.property) grcom.SetAlignment(walk.AlignHNearVNear) hb := walk.NewHBoxLayout() hb.SetMargins(walk.Margins{0, 0, 0, 0}) @@ -146,7 +154,7 @@ func CreateCanvasProperties(mw *MyMainWindow) { grcolb.SetText("Grid color") log.Println("Grid color button created") log.Println("Creating pixels checkbox") - cb, _ = walk.NewCheckBox(cp) + cb, _ = walk.NewCheckBox(mw.properties.propCanvas.property) cb.SetAlignment(walk.AlignHNearVNear) cb.SetText("Show pixels as beads") switch ConfigShowBeads { @@ -157,10 +165,10 @@ func CreateCanvasProperties(mw *MyMainWindow) { } log.Println("Pixels checkbox created") log.Println("Creating canvas background color button") - grcolb, _ = walk.NewPushButton(cp) + grcolb, _ = walk.NewPushButton(mw.properties.propCanvas.property) grcolb.SetAlignment(walk.AlignHFarVNear) grcolb.SetText("Background color") log.Println("Background color button created") bg, _ := walk.NewSolidColorBrush(walk.RGB(255, 255, 255)) - cp.SetBackground(bg) + mw.properties.propCanvas.property.SetBackground(bg) }