Merge pull request #40 from xypwn/main

 Upgrade to fyne 2.5.2

examples/demo.rye

@@ -25,18 +25,18 @@ do\in fyne {
 			separator
 			label "Icons"
 			center [ h-box [
-				icon file-icon
-				icon document-save-icon
-				icon document-create-icon
-				icon delete-icon
-				icon content-undo-icon
-				icon content-redo-icon
+				widget-icon file-icon
+				widget-icon document-save-icon
+				widget-icon document-create-icon
+				widget-icon delete-icon
+				widget-icon content-undo-icon
+				widget-icon content-redo-icon
 				;file-icon storage-uri "file:///nonexistant/path/image.png"
 			] ]
 
 			separator
 			label "Infinite progress bar"
-			progress-bar-infinite
+			progress-bar-infinite |start
 		]
 
 		tab-item "Entry" v-scroll v-box [
@@ -94,6 +94,7 @@ do\in fyne {
 				}
 			]
 		]
+
 		tab-item "Misc" v-scroll v-box [
 
 			accordion [

examples/list_gastown.rye

@@ -16,7 +16,6 @@ do\in fyne {
 	with win {
 		.set-content lst ,
 		.set-title "Gastown games players" ,
-		.resize size 200.0 180.0 ,
 		.show-and-run
 	}
 }

examples/progress-clock/data-ctx.rye

@@ -14,16 +14,14 @@ Data: context {
 		started: false
 	}
 
-	sessions: ref spreadsheet { "type" "minutes" "title" "percentage" }
+	sessions: ref spreadsheet { "type" "minutes" "title" }
 	{
-;		"work" 45 "spravi mobi na play" 70
+		"work" 45 "spravi mobi na play"
+		"work" 25 "reši bug uporabnici @popsi!!!"
 	}
 
 	work-sessions?: does { sessions |deref |where-equal "type" "work" }
-	add-current-work-session!: does { sessions .add-rows! [ "work" Work/current-minutes Work/current-title to-integer 100 * Work/current-progress? ] }
-
-	save-all: does { sessions .to-bson |write* %sessions.spr.bson }
-	load-all: does { read\bytes %sessions.spr.bson |^fix { save-all } |from-bson |ref |change! 'sessions }
+	add-sessions!: does { sessions .add-rows! { "work" 34 "this is magic" } }
 
 	Leisure: context {
 		from: 15
@@ -33,6 +31,4 @@ Data: context {
 		current-minutes: 0
 		started: false
 	}
-
-	load-all
 }

examples/progress-clock/work-tab.rye

@@ -9,27 +9,16 @@ show-add-work-form: fn { hb } { .objects! [ v-box [
 			nil
 			nil
 			label "named"
-			button "Add" closure { } {  Data/Work/start! to-integer minw .text? titlw .text? , hb .show-stop-form }
+			button "Add" closure { } {  Data/Work/start! to-integer minw .text? titlw .text? , hb .show-stop-form , Data/add-sessions! }
 			[ titlw: entry ]
 		]
 	] }
 
 
 show-stop-form: fn { hb } { .objects! [ 
-		button "Stop session" closure { } { Data/add-current-work-session! , Data/save-all , Data/Work/stop! , hbw .show-toolbar , work-list .refresh }
+		button "Stop session" closure { } { Data/Work/stop! }
 	] }
 
-show-toolbar: fn { hb } { .objects! [ 
-		button "Start session" does { hbw .show-add-work-form }
-	] }
-
-work-list: list does { length? Data/work-sessions? }
-does { h-box [ label "title" label "minutes" label "percent" ] }
-fn { i box } { set! box .objects? { title minutes percent }
-	minutes .set-text to-string 1 <- i <- Data/work-sessions?
-	title .set-text  2 <- i <- Data/work-sessions?
-	percent .set-text concat to-string 3 <- i <- Data/work-sessions? "%" }
-
 work-cont: border
 v-box [
 	label "Today [hours]"
@@ -40,10 +29,15 @@ v-box [
 ]
 nil nil nil
 [
-	work-list
+		wrk-lst: list does { length? Data/work-sessions? }
+	does { h-box [ label "title" label "minutes" ] }
+	fn { i box } { set! box .objects? { title minutes }
+		minutes .set-text to-string 1 <- i <- Data/work-sessions?
+		title .set-text  2 <- i <- Data/work-sessions? }
 ]
 
 update-work-tab: fn { Data } {
+	;			enter-console "GOGO"
 	if Data/Work/started {
 		Data/Work/current-progress? |set-value* pw
 		lw .set-text Data/Work/current-title

fyne/config.toml

@@ -3,7 +3,7 @@ out-dir = "../current"
 # Go name of package.
 package = "fyne.io/fyne/v2"
 # Go semantic version of package.
-version = "v2.4.4"
+version = "v2.5.2"
 # Auto-remove "New" part of functions (e.g. widget.NewLabel => widget-label, app.New => app).
 cut-new = true
 

go.mod

@@ -6,37 +6,36 @@ go 1.23.0
 
 // replace github.com/refaktor/rye => ../rye
 
-// replace github.com/refaktor/ryegen => ../ryegen
+replace github.com/refaktor/ryegen => ../ryegen
 
 require (
-	fyne.io/fyne/v2 v2.4.4
+	fyne.io/fyne/v2 v2.5.2
 	github.com/jwalton/go-supportscolor v1.2.0
-	github.com/refaktor/rye v0.0.32
-	github.com/refaktor/ryegen v0.1.0
+	github.com/refaktor/rye v0.0.25-0.20241008135859-3e401118b002
+	github.com/refaktor/ryegen v0.1.1-0.20241009014844-8c047bebf475
 	github.com/webview/webview_go v0.0.0-20230901181450-5a14030a9070
 )
 
 require (
 	filippo.io/edwards25519 v1.1.0 // indirect
-	fyne.io/systray v1.10.1-0.20231115130155-104f5ef7839e // indirect
+	fyne.io/systray v1.11.0 // indirect
 	github.com/BurntSushi/toml v1.4.0 // indirect
 	github.com/RoaringBitmap/roaring v1.9.3 // indirect
 	github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be // indirect
-	github.com/atotto/clipboard v0.1.4 // indirect
-	github.com/aws/aws-sdk-go-v2 v1.32.3 // indirect
-	github.com/aws/aws-sdk-go-v2/config v1.28.1 // indirect
-	github.com/aws/aws-sdk-go-v2/credentials v1.17.42 // indirect
-	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.18 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.22 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.22 // indirect
+	github.com/aws/aws-sdk-go-v2 v1.31.0 // indirect
+	github.com/aws/aws-sdk-go-v2/config v1.27.39 // indirect
+	github.com/aws/aws-sdk-go-v2/credentials v1.17.37 // indirect
+	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.14 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.18 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.18 // indirect
 	github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.0 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.3 // indirect
-	github.com/aws/aws-sdk-go-v2/service/ses v1.28.3 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sso v1.24.3 // indirect
-	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.3 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sts v1.32.3 // indirect
-	github.com/aws/smithy-go v1.22.0 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.5 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.20 // indirect
+	github.com/aws/aws-sdk-go-v2/service/ses v1.27.3 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sso v1.23.3 // indirect
+	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.27.3 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sts v1.31.3 // indirect
+	github.com/aws/smithy-go v1.21.0 // indirect
 	github.com/bitfield/script v0.23.0 // indirect
 	github.com/bits-and-blooms/bitset v1.12.0 // indirect
 	github.com/blevesearch/bleve/v2 v2.4.2 // indirect
@@ -57,23 +56,23 @@ require (
 	github.com/blevesearch/zapx/v14 v14.3.10 // indirect
 	github.com/blevesearch/zapx/v15 v15.3.13 // indirect
 	github.com/blevesearch/zapx/v16 v16.1.5 // indirect
-	github.com/cszczepaniak/keyboard v0.1.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/drewlanenga/govector v0.0.0-20220726163947-b958ac08bc93 // indirect
-	github.com/fredbi/uri v1.0.0 // indirect
-	github.com/fsnotify/fsnotify v1.8.0 // indirect
+	github.com/eiannone/keyboard v0.0.0-20220611211555-0d226195f203 // indirect
+	github.com/fredbi/uri v1.1.0 // indirect
+	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/fyne-io/gl-js v0.0.0-20220119005834-d2da28d9ccfe // indirect
-	github.com/fyne-io/glfw-js v0.0.0-20220120001248-ee7290d23504 // indirect
+	github.com/fyne-io/glfw-js v0.0.0-20240101223322-6e1efdc71b7a // indirect
 	github.com/fyne-io/image v0.0.0-20220602074514-4956b0afb3d2 // indirect
 	github.com/gliderlabs/ssh v0.3.7 // indirect
 	github.com/go-gl/gl v0.0.0-20211210172815-726fda9656d6 // indirect
-	github.com/go-gl/glfw/v3.3/glfw v0.0.0-20221017161538-93cebf72946b // indirect
+	github.com/go-gl/glfw/v3.3/glfw v0.0.0-20240506104042-037f3cc74f2a // indirect
 	github.com/go-gomail/gomail v0.0.0-20160411212932-81ebce5c23df // indirect
 	github.com/go-ole/go-ole v1.2.6 // indirect
 	github.com/go-sql-driver/mysql v1.8.1 // indirect
 	github.com/go-telegram-bot-api/telegram-bot-api v4.6.4+incompatible // indirect
-	github.com/go-text/render v0.0.0-20230619120952-35bccb6164b8 // indirect
-	github.com/go-text/typesetting v0.1.0 // indirect
+	github.com/go-text/render v0.2.0 // indirect
+	github.com/go-text/typesetting v0.2.0 // indirect
 	github.com/gobwas/httphead v0.1.0 // indirect
 	github.com/gobwas/pool v0.2.1 // indirect
 	github.com/gobwas/ws v1.4.0 // indirect
@@ -89,8 +88,8 @@ require (
 	github.com/iancoleman/strcase v0.3.0 // indirect
 	github.com/itchyny/gojq v0.12.13 // indirect
 	github.com/itchyny/timefmt-go v0.1.5 // indirect
+	github.com/jeandeaual/go-locale v0.0.0-20240223122105-ce5225dcaa49 // indirect
 	github.com/jinzhu/copier v0.4.0 // indirect
-	github.com/jlaffaye/ftp v0.2.0 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
 	github.com/json-iterator/go v1.1.11 // indirect
 	github.com/jsummers/gobmp v0.0.0-20151104160322-e2ba15ffa76e // indirect
@@ -102,54 +101,48 @@ require (
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mattn/go-runewidth v0.0.16 // indirect
-	github.com/mattn/go-sqlite3 v1.14.24 // indirect
+	github.com/mattn/go-sqlite3 v1.14.23 // indirect
 	github.com/mhale/smtpd v0.8.3 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 // indirect
 	github.com/modern-go/reflect2 v1.0.1 // indirect
-	github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
 	github.com/mrz1836/postmark v1.6.5 // indirect
 	github.com/mschoch/smat v0.2.0 // indirect
+	github.com/nicksnyder/go-i18n/v2 v2.4.0 // indirect
 	github.com/olekukonko/tablewriter v0.0.5 // indirect
 	github.com/pkg/term v1.2.0-beta.2.0.20211217091447-1a4a3b719465 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
 	github.com/refaktor/go-peg v0.0.0-20220116201714-31e3dfa8dc7d // indirect
-	github.com/richardlehane/mscfb v1.0.4 // indirect
-	github.com/richardlehane/msoleps v1.0.4 // indirect
 	github.com/rivo/uniseg v0.4.4 // indirect
-	github.com/sashabaranov/go-openai v1.32.5 // indirect
+	github.com/rymdport/portal v0.2.6 // indirect
+	github.com/sashabaranov/go-openai v1.31.0 // indirect
 	github.com/shirou/gopsutil/v3 v3.24.5 // indirect
 	github.com/shoenig/go-m1cpu v0.1.6 // indirect
 	github.com/srwiley/oksvg v0.0.0-20221011165216-be6e8873101c // indirect
 	github.com/srwiley/rasterx v0.0.0-20220730225603-2ab79fcdd4ef // indirect
 	github.com/stretchr/testify v1.9.0 // indirect
 	github.com/technoweenie/multipartstreamer v1.0.1 // indirect
-	github.com/tevino/abool v1.2.0 // indirect
 	github.com/thomasberger/parsemail v1.2.7 // indirect
 	github.com/tklauser/go-sysconf v0.3.13 // indirect
 	github.com/tklauser/numcpus v0.7.0 // indirect
 	github.com/valyala/bytebufferpool v1.0.0 // indirect
 	github.com/valyala/fasttemplate v1.2.2 // indirect
-	github.com/xuri/efp v0.0.0-20240408161823-9ad904a10d6d // indirect
-	github.com/xuri/excelize/v2 v2.9.0 // indirect
-	github.com/xuri/nfp v0.0.0-20240318013403-ab9948c2c4a7 // indirect
-	github.com/yuin/goldmark v1.5.5 // indirect
+	github.com/yuin/goldmark v1.7.1 // indirect
 	github.com/yusufpapurcu/wmi v1.2.4 // indirect
 	go.etcd.io/bbolt v1.3.7 // indirect
-	go.mongodb.org/mongo-driver v1.17.1 // indirect
-	golang.org/x/crypto v0.28.0 // indirect
+	go.mongodb.org/mongo-driver v1.17.0 // indirect
+	golang.org/x/crypto v0.27.0 // indirect
 	golang.org/x/image v0.18.0 // indirect
-	golang.org/x/mobile v0.0.0-20230922142353-e2f452493d57 // indirect
+	golang.org/x/mobile v0.0.0-20231127183840-76ac6878050a // indirect
 	golang.org/x/mod v0.21.0 // indirect
-	golang.org/x/net v0.30.0 // indirect
-	golang.org/x/sync v0.9.0 // indirect
-	golang.org/x/sys v0.27.0 // indirect
-	golang.org/x/term v0.26.0 // indirect
-	golang.org/x/text v0.20.0 // indirect
+	golang.org/x/net v0.29.0 // indirect
+	golang.org/x/sync v0.8.0 // indirect
+	golang.org/x/sys v0.25.0 // indirect
+	golang.org/x/term v0.24.0 // indirect
+	golang.org/x/text v0.18.0 // indirect
 	google.golang.org/protobuf v1.33.0 // indirect
 	gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
 	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	honnef.co/go/js/dom v0.0.0-20210725211120-f030747120f2 // indirect
 	mvdan.cc/sh/v3 v3.7.0 // indirect
 )