diff --git a/Cargo.lock b/Cargo.lock
index 8b61a15..4404b4f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -71,7 +71,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0f2a1bb052857d5dd49572219344a7332b31b76405648eabac5bc68978251bcd"
dependencies = [
"android-properties",
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"cc",
"jni 0.22.4",
"libc",
@@ -418,17 +418,17 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]]
name = "bitflags"
-version = "2.11.0"
+version = "2.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "843867be96c8daad0d758b57df9392b6d8d271134fce549de6ce169ff98a92af"
+checksum = "c4512299f36f043ab09a583e57bceb5a5aab7a73db1805848e8fef3c9e8c78b3"
[[package]]
name = "bitstream-io"
-version = "4.9.0"
+version = "4.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60d4bd9d1db2c6bdf285e223a7fa369d5ce98ec767dec949c6ca62863ce61757"
+checksum = "7eff00be299a18769011411c9def0d827e8f2d7bf0c3dbf53633147a8867fd1f"
dependencies = [
- "core2",
+ "no_std_io2",
]
[[package]]
@@ -528,7 +528,7 @@ version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"log",
"polling",
"rustix 0.38.44",
@@ -542,7 +542,7 @@ version = "0.14.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4dbf9978365bac10f54d1d4b04f7ce4427e51f71d61f2fe15e3fed5166474df7"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"polling",
"rustix 1.1.4",
"slab",
@@ -734,20 +734,11 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"core-foundation 0.10.1",
"libc",
]
-[[package]]
-name = "core2"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b49ba7ef1ad6107f8824dbe97de947cbaac53c44e7f9756a1fba0d37c1eec505"
-dependencies = [
- "memchr",
-]
-
[[package]]
name = "core_maths"
version = "0.1.1"
@@ -763,7 +754,7 @@ version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "173852283a9a57a3cbe365d86e74dc428a09c50421477d5ad6fe9d9509e37737"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"fontdb",
"harfrust",
"linebender_resource_handle",
@@ -835,10 +826,13 @@ dependencies = [
]
[[package]]
-name = "ctor-lite"
-version = "0.1.2"
+name = "ctor"
+version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e162d0c2e2068eb736b71e5597eff0b9944e6b973cd9f37b6a288ab9bf20e300"
+checksum = "95d0d11eb38e7642efca359c3cf6eb7b2e528182d09110165de70192b0352775"
+dependencies = [
+ "dtor",
+]
[[package]]
name = "cursor-icon"
@@ -858,7 +852,7 @@ version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e0e367e4e7da84520dedcac1901e4da967309406d1e51017ae1abfb97adbd38"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"objc2 0.6.4",
]
@@ -892,6 +886,12 @@ version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d8b14ccef22fc6f5a8f4d7d768562a182c04ce9a3b3157b91390b52ddfdf1a76"
+[[package]]
+name = "dtor"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17f72721db8027a4e96dd6fb50d2a1d32259c9d3da1b63dee612ccd981e14293"
+
[[package]]
name = "either"
version = "1.15.0"
@@ -1291,9 +1291,9 @@ dependencies = [
[[package]]
name = "gif"
-version = "0.14.1"
+version = "0.14.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5df2ba84018d80c213569363bdcd0c64e6933c67fe4c1d60ecf822971a3c35e"
+checksum = "ee8cfcc411d9adbbaba82fb72661cc1bcca13e8bba98b364e62b2dba8f960159"
dependencies = [
"color_quant",
"weezl",
@@ -1373,7 +1373,7 @@ version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"gpu-alloc-types",
]
@@ -1383,7 +1383,7 @@ version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
]
[[package]]
@@ -1404,7 +1404,7 @@ version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b89c83349105e3732062a895becfc71a8f921bb71ecbbdd8ff99263e3b53a0ca"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"gpu-descriptor-types",
"hashbrown 0.15.5",
]
@@ -1415,7 +1415,7 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fdf242682df893b86f33a73828fb09ca4b2d3bb6cc95249707fc684d27484b91"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
]
[[package]]
@@ -1446,7 +1446,7 @@ version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "92c020db12c71d8a12a3fe7607873cade3a01a6287e29d540c8723276221b9d8"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"bytemuck",
"core_maths",
"read-fonts 0.35.0",
@@ -1524,7 +1524,7 @@ version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "91ab1937d699403e7e69252ae743a902bcee9f4ab2052cc4c9a46fcf34729d85"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"bytes",
"glam",
"lilt",
@@ -1568,7 +1568,7 @@ version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "234ca1c2cec4155055f68fa5fad1b5242c496ac8238d80a259bca382fb44a102"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"bytemuck",
"cosmic-text",
"half",
@@ -1642,7 +1642,7 @@ version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ff144a999b0ca0f8a10257934500060240825c42e950ec0ebee9c8ae30561c13"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"bytemuck",
"cryoglyph",
"futures",
@@ -1926,6 +1926,7 @@ version = "0.1.0"
dependencies = [
"iced",
"rust-i18n",
+ "serde",
"toml 1.1.2+spec-1.1.0",
]
@@ -1995,7 +1996,7 @@ version = "0.1.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e02f3bb43d335493c96bf3fd3a321600bf6bd07ed34bc64118e9293bdffea46c"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"libc",
"plain",
"redox_syscall 0.7.4",
@@ -2113,7 +2114,7 @@ version = "0.32.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "00c15a6f673ff72ddcc22394663290f870fb224c1bfce55734a75c414150e605"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"block",
"core-graphics-types 0.2.0",
"foreign-types",
@@ -2181,7 +2182,7 @@ checksum = "066cf25f0e8b11ee0df221219010f213ad429855f57c494f995590c861a9a7d8"
dependencies = [
"arrayvec",
"bit-set",
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"cfg-if",
"cfg_aliases",
"codespan-reporting",
@@ -2205,7 +2206,7 @@ version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"jni-sys 0.3.1",
"log",
"ndk-sys",
@@ -2235,6 +2236,15 @@ version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086"
+[[package]]
+name = "no_std_io2"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b51ed7824b6e07d354605f4abb3d9d300350701299da96642ee084f5ce631550"
+dependencies = [
+ "memchr",
+]
+
[[package]]
name = "nom"
version = "8.0.0"
@@ -2372,7 +2382,7 @@ version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"block2 0.5.1",
"libc",
"objc2 0.5.2",
@@ -2388,7 +2398,7 @@ version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d49e936b501e5c5bf01fda3a9452ff86dc3ea98ad5f283e1455153142d97518c"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"block2 0.6.2",
"libc",
"objc2 0.6.4",
@@ -2409,7 +2419,7 @@ version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "74dd3b56391c7a0596a295029734d3c1c5e7e510a4cb30245f8221ccea96b009"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"block2 0.5.1",
"objc2 0.5.2",
"objc2-core-location",
@@ -2422,7 +2432,7 @@ version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "73ad74d880bb43877038da939b7427bba67e9dd42004a18b809ba7d87cee241c"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"objc2 0.6.4",
"objc2-foundation 0.3.2",
]
@@ -2444,7 +2454,7 @@ version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"block2 0.5.1",
"objc2 0.5.2",
"objc2-foundation 0.2.2",
@@ -2456,7 +2466,7 @@ version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0b402a653efbb5e82ce4df10683b6b28027616a2715e90009947d50b8dd298fa"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"objc2 0.6.4",
"objc2-foundation 0.3.2",
]
@@ -2467,7 +2477,7 @@ version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"dispatch2",
"objc2 0.6.4",
]
@@ -2478,7 +2488,7 @@ version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e022c9d066895efa1345f8e33e584b9f958da2fd4cd116792e15e07e4720a807"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"dispatch2",
"objc2 0.6.4",
"objc2-core-foundation",
@@ -2525,7 +2535,7 @@ version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0cde0dfb48d25d2b4862161a4d5fcc0e3c24367869ad306b0c9ec0073bfed92d"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"objc2 0.6.4",
"objc2-core-foundation",
"objc2-core-graphics",
@@ -2537,7 +2547,7 @@ version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d425caf1df73233f29fd8a5c3e5edbc30d2d4307870f802d18f00d83dc5141a6"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"objc2 0.6.4",
"objc2-core-foundation",
"objc2-core-graphics",
@@ -2556,7 +2566,7 @@ version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"block2 0.5.1",
"dispatch",
"libc",
@@ -2569,7 +2579,7 @@ version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e3e0adef53c21f888deb4fa59fc59f7eb17404926ee8a6f59f5df0fd7f9f3272"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"block2 0.6.2",
"libc",
"objc2 0.6.4",
@@ -2582,7 +2592,7 @@ version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "180788110936d59bab6bd83b6060ffdfffb3b922ba1396b312ae795e1de9d81d"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"objc2 0.6.4",
"objc2-core-foundation",
]
@@ -2605,7 +2615,7 @@ version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"block2 0.5.1",
"objc2 0.5.2",
"objc2-foundation 0.2.2",
@@ -2617,7 +2627,7 @@ version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"block2 0.5.1",
"objc2 0.5.2",
"objc2-foundation 0.2.2",
@@ -2630,7 +2640,7 @@ version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "96c1358452b371bf9f104e21ec536d37a650eb10f7ee379fff67d2e08d537f1f"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"objc2 0.6.4",
"objc2-core-foundation",
"objc2-foundation 0.3.2",
@@ -2652,7 +2662,7 @@ version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b8bb46798b20cd6b91cbd113524c490f1686f4c4e8f49502431415f3512e2b6f"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"block2 0.5.1",
"objc2 0.5.2",
"objc2-cloud-kit 0.2.2",
@@ -2684,7 +2694,7 @@ version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "76cfcbf642358e8689af64cee815d139339f3ed8ad05103ed5eaf73db8d84cb3"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"block2 0.5.1",
"objc2 0.5.2",
"objc2-core-location",
@@ -2699,9 +2709,9 @@ checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50"
[[package]]
name = "orbclient"
-version = "0.3.51"
+version = "0.3.53"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59aed3b33578edcfa1bc96a321d590d31832b6ad55a26f0313362ce687e9abd6"
+checksum = "12c6933ddbbd16539a7672e697bb8d41ac3a4e99ac43eeb40c07236bd7fcb2dd"
dependencies = [
"libc",
"libredox",
@@ -2843,7 +2853,7 @@ version = "0.18.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "60769b8b31b2a9f263dae2776c37b1b28ae246943cf719eb6946a1db05128a61"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"crc32fast",
"fdeflate",
"flate2",
@@ -2872,9 +2882,9 @@ checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49"
[[package]]
name = "portable-atomic-util"
-version = "0.2.6"
+version = "0.2.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "091397be61a01d4be58e7841595bd4bfedb15f1cd54977d79b8271e94ed799a3"
+checksum = "c2a106d1259c23fac8e543272398ae0e3c0b8d33c88ed73d0cc71b0f1d902618"
dependencies = [
"portable-atomic",
]
@@ -2943,9 +2953,9 @@ dependencies = [
[[package]]
name = "pxfm"
-version = "0.1.28"
+version = "0.1.29"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5a041e753da8b807c9255f28de81879c78c876392ff2469cde94799b2896b9d"
+checksum = "e0c5ccf5294c6ccd63a74f1565028353830a9c2f5eb0c682c355c471726a6e3f"
[[package]]
name = "qoi"
@@ -2994,9 +3004,9 @@ checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"
[[package]]
name = "rand"
-version = "0.9.2"
+version = "0.9.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
+checksum = "44c5af06bb1b7d3216d91932aed5265164bf384dc89cd6ba05cf59a35f5f76ea"
dependencies = [
"rand_chacha",
"rand_core",
@@ -3091,9 +3101,9 @@ checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539"
[[package]]
name = "rayon"
-version = "1.11.0"
+version = "1.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f"
+checksum = "fb39b166781f92d482534ef4b4b1b2568f42613b53e5b6c160e24cfbfa30926d"
dependencies = [
"either",
"rayon-core",
@@ -3145,7 +3155,7 @@ version = "0.5.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
]
[[package]]
@@ -3154,7 +3164,7 @@ version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f450ad9c3b1da563fb6948a8e0fb0fb9269711c9c73d9ea1de5058c79c8d643a"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
]
[[package]]
@@ -3285,7 +3295,7 @@ version = "0.38.44"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"errno",
"libc",
"linux-raw-sys 0.4.15",
@@ -3298,7 +3308,7 @@ version = "1.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"errno",
"libc",
"linux-raw-sys 0.12.1",
@@ -3548,7 +3558,7 @@ version = "0.19.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3457dea1f0eb631b4034d61d4d8c32074caa6cd1ab2d59f2327bd8461e2c0016"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"calloop 0.13.0",
"calloop-wayland-source 0.3.0",
"cursor-icon",
@@ -3573,7 +3583,7 @@ version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0512da38f5e2b31201a93524adb8d3136276fa4fe4aafab4e1f727a82b534cc0"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"calloop 0.14.4",
"calloop-wayland-source 0.4.1",
"cursor-icon",
@@ -3668,7 +3678,7 @@ version = "0.3.0+sdk-1.3.268.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
]
[[package]]
@@ -3829,12 +3839,12 @@ dependencies = [
[[package]]
name = "tiny-xlib"
-version = "0.2.4"
+version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0324504befd01cab6e0c994f34b2ffa257849ee019d3fb3b64fb2c858887d89e"
+checksum = "a90a0ca3ee6a69f2ad28fd11621a4c3f03b371f366be500b64df260c4ffbafb4"
dependencies = [
"as-raw-xcb-connection",
- "ctor-lite",
+ "ctor",
"libloading",
"pkg-config",
"tracing",
@@ -3879,7 +3889,7 @@ dependencies = [
"toml_datetime 1.1.1+spec-1.1.0",
"toml_parser",
"toml_writer",
- "winnow 1.0.1",
+ "winnow 1.0.2",
]
[[package]]
@@ -3923,7 +3933,7 @@ dependencies = [
"indexmap",
"toml_datetime 1.1.1+spec-1.1.0",
"toml_parser",
- "winnow 1.0.1",
+ "winnow 1.0.2",
]
[[package]]
@@ -3932,7 +3942,7 @@ version = "1.1.2+spec-1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a2abe9b86193656635d2411dc43050282ca48aa31c2451210f4202550afb7526"
dependencies = [
- "winnow 1.0.1",
+ "winnow 1.0.2",
]
[[package]]
@@ -4060,9 +4070,9 @@ checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861"
[[package]]
name = "uuid"
-version = "1.23.0"
+version = "1.23.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ac8b6f42ead25368cf5b098aeb3dc8a1a2c05a3eee8a9a1a68c640edbfc79d9"
+checksum = "ddd74a9687298c6858e9b88ec8935ec45d22e8fd5e6394fa1bd4e99a87789c76"
dependencies = [
"js-sys",
"serde_core",
@@ -4098,11 +4108,11 @@ dependencies = [
[[package]]
name = "wasip2"
-version = "1.0.2+wasi-0.2.9"
+version = "1.0.3+wasi-0.2.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9517f9239f02c069db75e65f174b3da828fe5f5b945c4dd26bd25d89c03ebcf5"
+checksum = "20064672db26d7cdc89c7798c48a0fdfac8213434a1186e5ef29fd560ae223d6"
dependencies = [
- "wit-bindgen",
+ "wit-bindgen 0.57.1",
]
[[package]]
@@ -4111,7 +4121,7 @@ version = "0.4.0+wasi-0.3.0-rc-2026-01-06"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5"
dependencies = [
- "wit-bindgen",
+ "wit-bindgen 0.51.0",
]
[[package]]
@@ -4197,7 +4207,7 @@ version = "0.244.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"hashbrown 0.15.5",
"indexmap",
"semver",
@@ -4237,7 +4247,7 @@ version = "0.31.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "645c7c96bb74690c3189b5c9cb4ca1627062bb23693a4fad9d8c3de958260144"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"rustix 1.1.4",
"wayland-backend",
"wayland-scanner",
@@ -4249,7 +4259,7 @@ version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"cursor-icon",
"wayland-backend",
]
@@ -4271,7 +4281,7 @@ version = "0.32.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "563a85523cade2429938e790815fd7319062103b9f4a2dc806e9b53b95982d8f"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"wayland-backend",
"wayland-client",
"wayland-scanner",
@@ -4283,7 +4293,7 @@ version = "20250721.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "40a1f863128dcaaec790d7b4b396cc9b9a7a079e878e18c47e6c2d2c5a8dcbb1"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"wayland-backend",
"wayland-client",
"wayland-protocols",
@@ -4296,7 +4306,7 @@ version = "0.3.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6e9567599ef23e09b8dad6e429e5738d4509dfc46b3b21f32841a304d16b29c8"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"wayland-backend",
"wayland-client",
"wayland-protocols",
@@ -4309,7 +4319,7 @@ version = "0.3.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2b6d8cf1eb2c1c31ed1f5643c88a6e53538129d4af80030c8cabd1f9fa884d91"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"wayland-backend",
"wayland-client",
"wayland-protocols",
@@ -4322,7 +4332,7 @@ version = "0.3.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eb04e52f7836d7c7976c78ca0250d61e33873c34156a2a1fc9474828ec268234"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"wayland-backend",
"wayland-client",
"wayland-protocols",
@@ -4385,7 +4395,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bfe68bac7cde125de7a731c3400723cadaaf1703795ad3f4805f187459cd7a77"
dependencies = [
"arrayvec",
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"cfg-if",
"cfg_aliases",
"document-features",
@@ -4416,7 +4426,7 @@ dependencies = [
"arrayvec",
"bit-set",
"bit-vec",
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"bytemuck",
"cfg_aliases",
"document-features",
@@ -4476,7 +4486,7 @@ dependencies = [
"arrayvec",
"ash",
"bit-set",
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"block",
"bytemuck",
"cfg-if",
@@ -4521,7 +4531,7 @@ version = "27.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "afdcf84c395990db737f2dd91628706cb31e86d72e53482320d368e52b5da5eb"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"bytemuck",
"js-sys",
"log",
@@ -4892,7 +4902,7 @@ dependencies = [
"ahash",
"android-activity",
"atomic-waker",
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"block2 0.5.1",
"bytemuck",
"calloop 0.13.0",
@@ -4946,9 +4956,9 @@ dependencies = [
[[package]]
name = "winnow"
-version = "1.0.1"
+version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09dac053f1cd375980747450bfc7250c264eaae0583872e845c0c7cd578872b5"
+checksum = "2ee1708bef14716a11bae175f579062d4554d95be2c6829f518df847b7b3fdd0"
dependencies = [
"memchr",
]
@@ -4962,6 +4972,12 @@ dependencies = [
"wit-bindgen-rust-macro",
]
+[[package]]
+name = "wit-bindgen"
+version = "0.57.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e"
+
[[package]]
name = "wit-bindgen-core"
version = "0.51.0"
@@ -5011,7 +5027,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2"
dependencies = [
"anyhow",
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"indexmap",
"log",
"serde",
@@ -5085,7 +5101,7 @@ version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"dlib",
"log",
"once_cell",
@@ -5226,9 +5242,9 @@ dependencies = [
[[package]]
name = "zune-jpeg"
-version = "0.5.13"
+version = "0.5.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec5f41c76397b7da451efd19915684f727d7e1d516384ca6bd0ec43ec94de23c"
+checksum = "27bc9d5b815bc103f142aa054f561d9187d191692ec7c2d1e2b4737f8dbd7296"
dependencies = [
"zune-core",
]
diff --git a/Cargo.toml b/Cargo.toml
index 48b347e..71e252f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -6,4 +6,11 @@ edition = "2024"
[dependencies]
iced = { version = "0.14", features = ["smol", "image"] }
rust-i18n = "3"
+serde = "1.0.228"
toml = "1"
+
+[profile.release]
+lto = true
+codegen-units = 1
+opt-level = 3
+strip = true
diff --git a/src/icon.png b/src/icon.png
new file mode 100644
index 0000000..4c06eaa
Binary files /dev/null and b/src/icon.png differ
diff --git a/src/kira_config.toml b/src/kira_config.toml
new file mode 100644
index 0000000..feb6b74
--- /dev/null
+++ b/src/kira_config.toml
@@ -0,0 +1,3 @@
+
+[network]
+reqire_network = true
diff --git a/src/locales/en.json b/src/locales/en.json
index 4ab7431..e555cf8 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -10,5 +10,6 @@
"license.license": "This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.\n\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n\nYou should have received a copy of the GNU General Public License along with this program. If not, see .",
"license.accept_text": "By pressing 'Accept' button you agreening to terms described above.",
"license.button.accept": "Accept",
- "license.button.decline": "Decline"
-}
+ "network.reuse_checkbox_caption": "Reuse settings?",
+ "network.reuse_question": "Do you want to apply current network settings to installing system?"
+}
\ No newline at end of file
diff --git a/src/main.rs b/src/main.rs
index e9fb684..766d0e0 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -27,12 +27,15 @@
use iced::widget;
use iced::Alignment;
use std::collections::{HashMap};
-
+use std::path::{PathBuf,Path};
+use std::str::FromStr;
+use std::process::ExitCode;
use iced::{Element, Task};
use crate::stage::{StageAction, KiraConfig};
use crate::stages::license;
+use crate::stages::network;
use crate::stages::welcome;
use crate::stages::welcome::WelcomeStage;
@@ -47,12 +50,15 @@ enum Views {
Start,
Welcome(welcome::WelcomeStage),
License(license::LicenseStage),
+ Network(stages::network::NetworkStage),
}
enum Message {
+ Start,
Welcome(welcome::Message),
- License(license::Message)
+ License(license::Message),
+ Network(stages::network::Message)
}
struct KiraState {
@@ -61,30 +67,70 @@ struct KiraState {
config: KiraConfig,
}
+const CONFIG_PATH_STR: &str = "kira_config.toml";
+fn load_kira_config(config_path: &str) -> Result> {
+ use std::fs;
+ use toml::Table;
+ // 1. Read the file content into a String
+ let content = fs::read_to_string(config_path)?;
+
+ // 2. Parse the string into a Table
+ let table: Table = content.parse()?;
+
+ println!("{:?}", table);
+ Ok(table)
+}
impl KiraState {
- fn new(toml_config: toml::Table) -> Self {
-
- Self {
+ fn boot() -> (Self, Task) {
+ (Self {
current_view: Views::Start,
- toml_config: toml_config,
+ toml_config: toml::Table::new(),
config: KiraConfig { config_trail: Vec::new() }
- }
+ }, Task::done(Message::Start))
}
-
}
+// impl KiraState {
+// fn new(toml_config: toml::Table) -> Self {
+
+// Self {
+// current_view: Views::Start,
+// toml_config: toml_config,
+// config: KiraConfig { config_trail: Vec::new() }
+// }
+// }
+
+// }
+
+
+
fn view(k_state: &KiraState) -> Element<'_, Message> {
match &k_state.current_view {
Views::Start => Element::new(widget::space()) ,
Views::Welcome(wellcome_stage) => wellcome_stage.view().map(Message::Welcome),
Views::License(license_stage) => license_stage.view().map(Message::License),
+ Views::Network(network_stage) => network_stage.view().map(Message::Network),
}
}
fn update(k_state: &mut KiraState, message: Message) -> Task {
match message {
+ Message::Start => {
+ match load_kira_config(CONFIG_PATH_STR) {
+ Ok(conf) => {
+ println!("Config loaded!");
+ k_state.toml_config = conf;
+ k_state.current_view = Views::Welcome(WelcomeStage::new());
+ Task::none()
+ },
+ Err(ex) => {
+ println!("Error reading config {}: {}", CONFIG_PATH_STR, ex);
+ iced::exit()
+ }
+ }
+ },
Message::Welcome(wlc_msg) => {
if let Views::Welcome(wlc_view) = &mut k_state.current_view {
let action = wlc_view.update(wlc_msg);
@@ -101,7 +147,8 @@ fn update(k_state: &mut KiraState, message: Message) -> Task {
match action {
StageAction::Next(license_res) => {
k_state.config.config_trail.push(license_res);
- iced::exit()
+ k_state.current_view = Views::Network(network::NetworkStage::new(&k_state.toml_config));
+ Task::none()
},
StageAction::Abort(_) => iced::exit(),
StageAction::Back => iced::exit(),
@@ -111,6 +158,15 @@ fn update(k_state: &mut KiraState, message: Message) -> Task {
else {
Task::none()
}
+ },
+ Message::Network(network_message) => {
+ if let Views::Network(network_view) = &mut k_state.current_view {
+ Task::none()
+ }
+ else {
+ Task::none()
+ }
+
}
}
}
@@ -119,18 +175,34 @@ fn update(k_state: &mut KiraState, message: Message) -> Task {
// pub fn main_interface() -> iced::Result {
// iced::run(WellcomeStage::update, WellcomeStage::view)
// }
-pub fn main() -> iced::Result {
- use toml;
- let app_init = || {
- let mut k_state = KiraState::new(toml::Table::new());
- k_state.current_view = Views::Welcome(WelcomeStage::new());
- k_state
- };
+pub fn main() -> ExitCode {
- iced::application(app_init, update, view)
+
+ // let app_init = || {
+ // let mut k_state = KiraState::default()
+ // k_state.current_view = Views::Welcome(WelcomeStage::new());
+ // k_stateapp_init
+ // };
+
+ let iced_result = iced::application(KiraState::boot, update, view)
+ .window(iced::window::Settings {
+ icon: Some(
+ iced::window::icon::from_file_data(
+ include_bytes!("icon.png"),
+ None,
+ )
+ .expect("icon should be a valid PNG"),
+ ),
+ ..Default::default()
+ })
.centered()
.theme(theme::main_theme())
- .run()
+ .run();
+
+ match iced_result {
+ Ok(()) => ExitCode::SUCCESS,
+ Err(_) => ExitCode::from(42), // Custom error code
+ }
}
diff --git a/src/stages/mod.rs b/src/stages/mod.rs
index cb25d8c..4c45e5e 100644
--- a/src/stages/mod.rs
+++ b/src/stages/mod.rs
@@ -16,4 +16,5 @@
pub mod welcome;
-pub mod license;
\ No newline at end of file
+pub mod license;
+pub mod network;
\ No newline at end of file
diff --git a/src/stages/network/mod.rs b/src/stages/network/mod.rs
new file mode 100644
index 0000000..d2e790e
--- /dev/null
+++ b/src/stages/network/mod.rs
@@ -0,0 +1,158 @@
+//
+// Copyright (C) <2026>
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+
+/*
+ This is Network stage. Chiking if internet is active and propose to configure it if
+ it needed for installation to process.
+*/
+
+use toml::Table;
+use iced::{Alignment, widget};
+
+use rust_i18n::t;
+use std::collections::HashMap;
+
+use crate::stage;
+use crate::stage::StageResult;
+
+
+
+#[derive(Debug, Clone)]
+pub enum State {
+ Init,
+ Cheking,
+ ConnOK,
+ ConnBad,
+ CheckFailed,
+}
+
+#[derive(Debug, Clone)]
+pub struct NetworkStage {
+ internet_active: bool,
+ state: State,
+ use_net_settings: bool,
+ reqire_network: bool,
+}
+
+#[derive(Debug, Clone)]
+pub enum Message {
+ Next,
+ Back,
+ StateChange(State),
+ UseSettingsTogle(bool)
+}
+
+
+
+impl NetworkStage {
+ pub fn new(toml_config: &Table) -> Self {
+
+ let mut reqire_network = false;
+
+ if let Some(reqire_network_conf) = toml_config.get("network")
+ .and_then(|v|v.as_table())
+ .and_then(|v| v.get("reqire_network"))
+ .and_then(|v| v.as_bool())
+ {
+ println!("Config value reqire_network read {}", reqire_network_conf);
+ reqire_network = reqire_network_conf;
+ }
+ else {
+ println!("Error parsing network config. Using default values.");
+ }
+
+ Self {
+ internet_active: false,
+ state: State::Init,
+ use_net_settings: false,
+ reqire_network: reqire_network
+ }
+ }
+
+ fn check_connected(&mut self) -> Result {
+ use std::process::Command;
+ let status = Command::new("nm-online").arg("-q").status()?;
+
+ if status.success() {
+ self.internet_active = true;
+ Ok(true)
+ } else {
+ self.internet_active = false;
+ Ok(false)
+ }
+ }
+ fn gen_result(&self) -> StageResult {
+ StageResult {
+ name: "network".into(),
+ config: Some(HashMap::from([(
+ "accepted".to_string(),
+ stage::ConfigValue::Bool(true),
+ )])),
+ resuts: None,
+ error: None,
+ }
+ }
+
+ pub fn update(&mut self, message: Message) -> stage::StageAction {
+ match message {
+ Message::Next => stage::StageAction::Next(self.gen_result()),
+ Message::Back => stage::StageAction::Back,
+ Message::StateChange(new_state) => {
+ self.state = new_state;
+ stage::StageAction::None
+ },
+ Message::UseSettingsTogle(toggle) => {
+ self.use_net_settings = toggle;
+ stage::StageAction::None
+ }
+ }
+ }
+
+ pub fn view(&self) -> iced::Element<'_, Message> {
+ let next_button =
+ widget::button(widget::text(t!("button.next"))).on_press(Message::Next);
+ let back_button = widget::button(widget::text(t!("button.back"))).on_press(Message::Back);
+
+ widget::column![
+ widget::container(
+ widget::column![
+ widget::text(t!("network.reuse_question")),
+ widget::checkbox(self.use_net_settings)
+ .label(t!("network.reuse_checkbox_caption"))
+ .on_toggle(Message::UseSettingsTogle)
+ ]
+ .align_x(Alignment::Center)
+ .padding(20)
+ .spacing(5)
+ )
+ .height(iced::Length::Fill)
+ .width(iced::Length::Fill)
+ .align_x(Alignment::Center)
+ .align_y(Alignment::Center),
+ widget::row![
+ back_button,
+ widget::space::horizontal(), // Pushes the right button to the far right
+ next_button
+ ]
+ .width(iced::Length::Fill)
+ .align_y(Alignment::End)
+ .padding(10)
+ .spacing(10),
+ ]
+ .align_x(Alignment::Center)
+ .into()
+ }
+}
diff --git a/src/stages/welcome/mod.rs b/src/stages/welcome/mod.rs
index 2be062d..f657b3b 100644
--- a/src/stages/welcome/mod.rs
+++ b/src/stages/welcome/mod.rs
@@ -111,7 +111,12 @@ impl WelcomeStage {
self.locale = Some(loc);
StageAction::None
}
- Message::Exit => StageAction::Back,
+ Message::Exit => StageAction::Abort(StageResult {
+ name: "welcome".to_string(),
+ config: None,
+ resuts: None,
+ error: None,
+ }),
Message::Next => StageAction::Next(self.gen_result()),
}
}