diff --git a/Cargo.lock b/Cargo.lock index e6fafd4..defe0fe 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -136,6 +136,23 @@ dependencies = [ "libc", ] +[[package]] +name = "annotate-snippets" +version = "0.12.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74fc7650eedcb2fee505aad48491529e408f0e854c2d9f63eb86c1361b9b3f93" +dependencies = [ + "anstyle", + "memchr", + "unicode-width", +] + +[[package]] +name = "anstyle" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "940b3a0ca603d1eade50a4846a2afffd5ef57a9feac2c0e2ec2e14f9ead76000" + [[package]] name = "anyhow" version = "1.0.100" @@ -715,22 +732,6 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cbd0f76e066e64fdc5631e3bb46381254deab9ef1158292f27c8c57e3bf3fe59" -[[package]] -name = "codemap" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e769b5c8c8283982a987c6e948e540254f1058d5a74b8794914d4ef5fc2a24" - -[[package]] -name = "codemap-diagnostic" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc20770be05b566a963bf91505e60412c4a2d016d1ef95c5512823bb085a8122" -dependencies = [ - "codemap", - "termcolor", -] - [[package]] name = "color_quant" version = "1.1.0" @@ -1271,9 +1272,9 @@ dependencies = [ [[package]] name = "femtovg" -version = "0.19.3" +version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be5d925785ad33d7b0ae2b445d9f157c3ab42ff3c515fff0b46d53d4a86c43c5" +checksum = "35695993a8264f5dfa8facc135c003965cea40d83705b49e0f8c3a3b632a2171" dependencies = [ "bitflags 2.10.0", "bytemuck", @@ -1360,6 +1361,12 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" +[[package]] +name = "foldhash" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb" + [[package]] name = "font-types" version = "0.10.1" @@ -1394,12 +1401,12 @@ dependencies = [ [[package]] name = "fontique" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff3336bc0b87fe42305047263fa60d2eabd650d29cbe62fdeb2a66c7a0a595f9" +checksum = "30bbc252c93499b6d3635d692f892a637db0dbb130ce9b32bf20b28e0dcc470b" dependencies = [ "bytemuck", - "hashbrown 0.15.5", + "hashbrown 0.16.1", "icu_locale_core", "linebender_resource_handle", "memmap2", @@ -1594,6 +1601,15 @@ dependencies = [ "windows 0.48.0", ] +[[package]] +name = "getopts" +version = "0.2.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfe4fbac503b8d1f88e6676011885f34b7174f46e59956bba534ba83abded4df" +dependencies = [ + "unicode-width", +] + [[package]] name = "getrandom" version = "0.2.16" @@ -1621,16 +1637,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "gif" -version = "0.13.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ae047235e33e2829703574b54fdec96bfbad892062d97fed2f76022287de61b" -dependencies = [ - "color_quant", - "weezl", -] - [[package]] name = "gif" version = "0.14.1" @@ -1781,7 +1787,7 @@ checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" dependencies = [ "allocator-api2", "equivalent", - "foldhash", + "foldhash 0.1.5", "rayon", ] @@ -1790,6 +1796,11 @@ name = "hashbrown" version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" +dependencies = [ + "allocator-api2", + "equivalent", + "foldhash 0.2.0", +] [[package]] name = "heck" @@ -1815,6 +1826,12 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" +[[package]] +name = "htmlparser" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48ce8546b993eaf241d69ded33b1be6d205dd9857ec879d9d18bd05d3676e144" + [[package]] name = "http" version = "0.2.12" @@ -1970,9 +1987,9 @@ dependencies = [ [[package]] name = "i-slint-backend-android-activity" -version = "1.14.1" +version = "1.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38c42a78b1ace78c7fa4ba42de61ba85799342c0b8c62adca33f3132dab427c6" +checksum = "e96c2ccc34adf9194dade4093f1a191a241d33d8da06765c15cf67e0d28bbcc9" dependencies = [ "android-activity 0.5.2", "android-activity 0.6.0", @@ -1986,9 +2003,9 @@ dependencies = [ [[package]] name = "i-slint-backend-linuxkms" -version = "1.14.1" +version = "1.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8fd06c00fbdac3dd490cf5c10da7daad3820d775060a19ea277d8ab944a160b" +checksum = "6b8827952ecfbbf76c8cb5bc3388ca9124c34f2b4fe5dffcfe57800d2a484885" dependencies = [ "calloop 0.14.3", "drm", @@ -2005,9 +2022,9 @@ dependencies = [ [[package]] name = "i-slint-backend-qt" -version = "1.14.1" +version = "1.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c946891ff0bfa95a5944c7cfc18828b8e123edea1168301f1e1b5505aa82933e" +checksum = "ac9d5db3221f453439ec5ad9b6ac3bb8d2b4825b2f8734f0cde4b67d7336c3da" dependencies = [ "const-field-offset", "i-slint-common", @@ -2018,9 +2035,9 @@ dependencies = [ [[package]] name = "i-slint-backend-selector" -version = "1.14.1" +version = "1.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e138660c634d6bbdf98bb2d0cfa487cda28e032e133a2a2c974f1cc494198765" +checksum = "ce5a7e591a7257096e1f3da1bbb9ad6a140c307d0eee74f008a0b412fdb20dec" dependencies = [ "cfg-if", "i-slint-backend-android-activity", @@ -2030,14 +2047,16 @@ dependencies = [ "i-slint-common", "i-slint-core", "i-slint-core-macros", + "i-slint-renderer-femtovg", ] [[package]] name = "i-slint-backend-winit" -version = "1.14.1" +version = "1.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69bf9167fb1165942ef1f034e039645b60b07b23c0c76069cb83595f979243a4" +checksum = "bbbf4789191740f939c9563b8850379122d7b5c1ceb09f9297b50ad53e408787" dependencies = [ + "block2 0.6.2", "cfg-if", "cfg_aliases", "copypasta", @@ -2052,7 +2071,11 @@ dependencies = [ "i-slint-renderer-skia", "lyon_path", "muda", + "objc2 0.6.3", "objc2-app-kit 0.3.2", + "objc2-foundation 0.3.2", + "objc2-quartz-core 0.3.2", + "objc2-ui-kit 0.3.2", "pin-weak", "raw-window-handle", "scoped-tls-hkt", @@ -2069,9 +2092,9 @@ dependencies = [ [[package]] name = "i-slint-common" -version = "1.14.1" +version = "1.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3566194c13f8dcf6e9f41a2090c96f08cf3f59b60c91380a86c1ed72f6e7d19" +checksum = "e7659797fd28d4df3ed275ff95bf730bdf4a88d253f07e1ee8d0032d70138c3a" dependencies = [ "fontique", "ttf-parser 0.25.1", @@ -2079,13 +2102,12 @@ dependencies = [ [[package]] name = "i-slint-compiler" -version = "1.14.1" +version = "1.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a301031f6c1da6acdd483641cc44109b34990e5edd67478eb0cbca359ab7ae3f" +checksum = "2a6f358d0d5389869d67cd6ab6f5acf98fe31827264a696593e9687213cff682" dependencies = [ + "annotate-snippets", "by_address", - "codemap", - "codemap-diagnostic", "derive_more", "fontdue", "i-slint-common", @@ -2095,12 +2117,12 @@ dependencies = [ "lyon_extra", "lyon_path", "num_enum", - "polib", "proc-macro2", "quote", "rayon", "resvg", "rowan", + "rspolib", "smol_str 0.3.4", "strum", "typed-index-collections", @@ -2109,9 +2131,9 @@ dependencies = [ [[package]] name = "i-slint-core" -version = "1.14.1" +version = "1.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc140f1218cfc4451b9e8753306c42afbcaf0386cc888e53664c1a5f5330ae19" +checksum = "a95591ff85f8e2ff11c8d26ea8429768c2b77866e0c7e7fd49348f23ad108b5c" dependencies = [ "auto_enums", "bitflags 2.10.0", @@ -2121,10 +2143,10 @@ dependencies = [ "const-field-offset", "derive_more", "euclid", + "htmlparser", "i-slint-common", "i-slint-core-macros", "image", - "integer-sqrt", "lyon_algorithms", "lyon_extra", "lyon_geom", @@ -2135,14 +2157,17 @@ dependencies = [ "pin-project", "pin-weak", "portable-atomic", + "pulldown-cmark", "raw-window-handle", "resvg", "rgb", "scoped-tls-hkt", "scopeguard", + "skrifa", "slab", "strum", "sys-locale", + "thiserror 2.0.17", "unicode-linebreak", "unicode-script", "unicode-segmentation", @@ -2154,9 +2179,9 @@ dependencies = [ [[package]] name = "i-slint-core-macros" -version = "1.14.1" +version = "1.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4c6a3975ccaa66415f5524292750e631879e69178aa97e3928d2396b790d00d" +checksum = "7cc5f2f71682787dd5c6299555c0de635009eb269bbc54d6198e0d225b69fae4" dependencies = [ "quote", "serde_json", @@ -2165,9 +2190,9 @@ dependencies = [ [[package]] name = "i-slint-renderer-femtovg" -version = "1.14.1" +version = "1.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03d85d77f899ecb1f05c50c659a6d356fba44463686713f1f925c8be48de6afb" +checksum = "eb6eccda447999bc6222988500b841b64c953988986af182334e7ba9a30f0edd" dependencies = [ "cfg-if", "const-field-offset", @@ -2188,9 +2213,9 @@ dependencies = [ [[package]] name = "i-slint-renderer-skia" -version = "1.14.1" +version = "1.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e26ed0d42d66c457b7937d7f5ee07d2fbef3691c896a26212a69b30288844ddd" +checksum = "a64546232c0370f291e65fc92a4f4fc777ea78d5f48467873cb968b1de52e9ab" dependencies = [ "bytemuck", "cfg-if", @@ -2222,6 +2247,26 @@ dependencies = [ "write-fonts", ] +[[package]] +name = "i-slint-renderer-software" +version = "1.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a59be6c34935c4f8e41aa67a63518d5c59219c8eeb1d07af420bed8334fa31d7" +dependencies = [ + "bytemuck", + "clru", + "derive_more", + "euclid", + "fontdue", + "i-slint-common", + "i-slint-core", + "integer-sqrt", + "lyon_path", + "num-traits", + "skrifa", + "zeno", +] + [[package]] name = "iana-time-zone" version = "0.1.64" @@ -2359,7 +2404,7 @@ dependencies = [ "byteorder-lite", "color_quant", "exr", - "gif 0.14.1", + "gif", "image-webp", "moxcms", "num-traits", @@ -2369,8 +2414,8 @@ dependencies = [ "rayon", "rgb", "tiff", - "zune-core 0.5.0", - "zune-jpeg 0.5.7", + "zune-core 0.5.1", + "zune-jpeg 0.5.14", ] [[package]] @@ -2385,9 +2430,9 @@ dependencies = [ [[package]] name = "imagesize" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edcd27d72f2f071c64249075f42e205ff93c9a4c5f6c6da53e79ed9f9832c285" +checksum = "09e54e57b4c48b40f7aec75635392b12b3421fa26fe8b4332e63138ed278459c" [[package]] name = "imgref" @@ -2662,9 +2707,9 @@ dependencies = [ [[package]] name = "kurbo" -version = "0.11.3" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c62026ae44756f8a599ba21140f350303d4f08dcdcc71b5ad9c9bb8128c13c62" +checksum = "ce9729cc38c18d86123ab736fd2e7151763ba226ac2490ec092d1dd148825e32" dependencies = [ "arrayvec", "euclid", @@ -2673,9 +2718,9 @@ dependencies = [ [[package]] name = "kurbo" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce9729cc38c18d86123ab736fd2e7151763ba226ac2490ec092d1dd148825e32" +checksum = "7564e90fe3c0d5771e1f0bc95322b21baaeaa0d9213fa6a0b61c99f8b17b3bfb" dependencies = [ "arrayvec", "euclid", @@ -2763,15 +2808,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4a5ff6bcca6c4867b1c4fd4ef63e4db7436ef363e0ad7531d1558856bae64f4" -[[package]] -name = "linereader" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d921fea6860357575519aca014c6e22470585accdd543b370c404a8a72d0dd1d" -dependencies = [ - "memchr", -] - [[package]] name = "linked-hash-map" version = "0.5.6" @@ -2918,9 +2954,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.6" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273" +checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79" [[package]] name = "memmap2" @@ -3022,6 +3058,12 @@ dependencies = [ "version_check", ] +[[package]] +name = "natord" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "308d96db8debc727c3fd9744aac51751243420e46edf401010908da7f8d5e57c" + [[package]] name = "ndk" version = "0.8.0" @@ -3469,6 +3511,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3e0adef53c21f888deb4fa59fc59f7eb17404926ee8a6f59f5df0fd7f9f3272" dependencies = [ "bitflags 2.10.0", + "block2 0.6.2", "objc2 0.6.3", "objc2-core-foundation", ] @@ -3576,6 +3619,20 @@ dependencies = [ "objc2-user-notifications", ] +[[package]] +name = "objc2-ui-kit" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d87d638e33c06f577498cbcc50491496a3ed4246998a7fbba7ccb98b1e7eab22" +dependencies = [ + "bitflags 2.10.0", + "block2 0.6.2", + "objc2 0.6.3", + "objc2-core-foundation", + "objc2-foundation 0.3.2", + "objc2-quartz-core 0.3.2", +] + [[package]] name = "objc2-uniform-type-identifiers" version = "0.2.2" @@ -3669,13 +3726,13 @@ dependencies = [ [[package]] name = "parley" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26746861bb76dbc9bcd5ed1b0b55d2fedf291100961251702a031ab2abd2ce52" +checksum = "ada5338c3a9794af7342e6f765b6e78740db37378aced034d7bf72c96b94ed94" dependencies = [ "fontique", "harfrust", - "hashbrown 0.15.5", + "hashbrown 0.16.1", "linebender_resource_handle", "skrifa", "swash", @@ -3809,15 +3866,6 @@ dependencies = [ "miniz_oxide", ] -[[package]] -name = "polib" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b393b155cf9be86249cba1b56cc81be0e6212c66d94ac0d76d37a1761f3bb1b" -dependencies = [ - "linereader", -] - [[package]] name = "polling" version = "3.11.0" @@ -3925,6 +3973,25 @@ dependencies = [ "syn", ] +[[package]] +name = "pulldown-cmark" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14104c5a24d9bcf7eb2c24753e0f49fe14555d8bd565ea3d38e4b4303267259d" +dependencies = [ + "bitflags 2.10.0", + "getopts", + "memchr", + "pulldown-cmark-escape", + "unicase", +] + +[[package]] +name = "pulldown-cmark-escape" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "007d8adb5ddab6f8e3f491ac63566a7d5002cc7ed73901f72057943fa71ae1ae" + [[package]] name = "pxfm" version = "0.1.27" @@ -4302,11 +4369,11 @@ dependencies = [ [[package]] name = "resvg" -version = "0.45.1" +version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8928798c0a55e03c9ca6c4c6846f76377427d2c1e1f7e6de3c06ae57942df43" +checksum = "b563218631706d614e23059436526d005b50ab5f2d506b55a17eb65c5eb83419" dependencies = [ - "gif 0.13.3", + "gif", "image-webp", "log", "pico-args", @@ -4314,7 +4381,7 @@ dependencies = [ "svgtypes", "tiny-skia", "usvg", - "zune-jpeg 0.4.21", + "zune-jpeg 0.5.14", ] [[package]] @@ -4436,9 +4503,25 @@ dependencies = [ [[package]] name = "roxmltree" -version = "0.20.0" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97" +checksum = "f1964b10c76125c36f8afe190065a4bf9a87bf324842c05701330bba9f1cacbb" +dependencies = [ + "memchr", +] + +[[package]] +name = "rspolib" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fda9a7796aff63a7b1b39ccc93fffaaf65e20042984b4843041a49ca4677535" +dependencies = [ + "lazy_static", + "natord", + "snafu", + "unicode-linebreak", + "unicode-width", +] [[package]] name = "rustc-hash" @@ -4738,9 +4821,9 @@ checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" [[package]] name = "skia-bindings" -version = "0.89.1" +version = "0.90.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f06b9b01a0d1189fa756bb9aec034554d52ad53f2f33d80a96e7a4ecfbd3d989" +checksum = "8f6f96e00735f14a781aac8a6870c862b8cc831df6d8e4ad77ab78e11411b9af" dependencies = [ "bindgen", "cc", @@ -4755,9 +4838,9 @@ dependencies = [ [[package]] name = "skia-safe" -version = "0.89.1" +version = "0.90.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ced1fcc0fa7510f9339988f31d831e14f64f9aa771e5f93f4935431e6fe69d4c" +checksum = "6a71c01d325d40b1031dee67d251a5e0132e79e2a9ec272149a4f4a0d4b8b3be" dependencies = [ "bitflags 2.10.0", "skia-bindings", @@ -4782,16 +4865,18 @@ checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589" [[package]] name = "slint" -version = "1.14.1" +version = "1.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c35c4bdca2c42c69b21ceb416aa4ba76c3f54df30e9ce85dcad0742229422a6" +checksum = "d25b87d458205e79efb30545cae083aec2ccb1b192c46a55ae6d54403cdacb33" dependencies = [ "const-field-offset", "i-slint-backend-android-activity", "i-slint-backend-selector", + "i-slint-common", "i-slint-core", "i-slint-core-macros", "i-slint-renderer-femtovg", + "i-slint-renderer-software", "num-traits", "once_cell", "pin-weak", @@ -4803,21 +4888,22 @@ dependencies = [ [[package]] name = "slint-build" -version = "1.14.1" +version = "1.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6f9e30dfc58198894a4a4fe38d126a24ed4121d11cd8564643f3b7915752adc" +checksum = "064ef470cc8ab046319db94d0727f080fbd05322d07d774eb6de607d97defb8d" dependencies = [ "derive_more", + "fontique", "i-slint-compiler", "spin_on", - "toml_edit 0.23.10+spec-1.0.0", + "toml_edit 0.24.1+spec-1.1.0", ] [[package]] name = "slint-interpreter" -version = "1.14.1" +version = "1.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff6c49db734e5ef1887ae5a5de0dc91b9aa2e9eb15956dcaaa3e9aac20947f0" +checksum = "22df58eef76ecc29e0641bbd34f718b6c84ab49186f099298d6baa94f5493437" dependencies = [ "derive_more", "generativity", @@ -4839,9 +4925,9 @@ dependencies = [ [[package]] name = "slint-macros" -version = "1.14.1" +version = "1.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6b4b4bada19852716991153ddd93bf133548ac74383a05db8df399b9003bbfe" +checksum = "5ecc09bbc42c780d5b7ed7d41f7573dfd67343e11cdac27c07b88a8f933958e6" dependencies = [ "i-slint-compiler", "proc-macro2", @@ -4946,6 +5032,27 @@ dependencies = [ "serde_core", ] +[[package]] +name = "snafu" +version = "0.8.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e84b3f4eacbf3a1ce05eac6763b4d629d60cbc94d632e4092c54ade71f1e1a2" +dependencies = [ + "snafu-derive", +] + +[[package]] +name = "snafu-derive" +version = "0.8.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1c97747dbf44bb1ca44a561ece23508e99cb592e862f22222dcf42f51d1e451" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "socket2" version = "0.5.10" @@ -5105,11 +5212,11 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "svgtypes" -version = "0.15.3" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68c7541fff44b35860c1a7a47a7cadf3e4a304c457b58f9870d9706ece028afc" +checksum = "695b5790b3131dafa99b3bbfd25a216edb3d216dad9ca208d4657bfb8f2abc3d" dependencies = [ - "kurbo 0.11.3", + "kurbo 0.13.0", "siphasher", ] @@ -5161,7 +5268,10 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8eab9a99a024a169fe8a903cf9d4a3b3601109bcc13bd9e3c6fff259138626c4" dependencies = [ + "js-sys", "libc", + "wasm-bindgen", + "web-sys", ] [[package]] @@ -5188,15 +5298,6 @@ dependencies = [ "windows-sys 0.61.2", ] -[[package]] -name = "termcolor" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" -dependencies = [ - "winapi-util", -] - [[package]] name = "text-size" version = "1.1.1" @@ -5434,7 +5535,7 @@ dependencies = [ "toml_datetime 0.7.5+spec-1.1.0", "toml_parser", "toml_writer", - "winnow", + "winnow 0.7.14", ] [[package]] @@ -5466,7 +5567,7 @@ dependencies = [ "serde_spanned 0.6.9", "toml_datetime 0.6.11", "toml_write", - "winnow", + "winnow 0.7.14", ] [[package]] @@ -5474,21 +5575,33 @@ name = "toml_edit" version = "0.23.10+spec-1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "84c8b9f757e028cee9fa244aea147aab2a9ec09d5325a9b01e0a49730c2b5269" +dependencies = [ + "indexmap", + "toml_datetime 0.7.5+spec-1.1.0", + "toml_parser", + "winnow 0.7.14", +] + +[[package]] +name = "toml_edit" +version = "0.24.1+spec-1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01f2eadbbc6b377a847be05f60791ef1058d9f696ecb51d2c07fe911d8569d8e" dependencies = [ "indexmap", "toml_datetime 0.7.5+spec-1.1.0", "toml_parser", "toml_writer", - "winnow", + "winnow 0.7.14", ] [[package]] name = "toml_parser" -version = "1.0.6+spec-1.1.0" +version = "1.0.10+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3198b4b0a8e11f09dd03e133c0280504d0801269e9afa46362ffde1cbeebf44" +checksum = "7df25b4befd31c4816df190124375d5a20c6b6921e2cad937316de3fccd63420" dependencies = [ - "winnow", + "winnow 1.0.0", ] [[package]] @@ -5683,6 +5796,12 @@ dependencies = [ "version_check", ] +[[package]] +name = "unicase" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbc4bc3a9f746d862c45cb89d705aa10f187bb96c76001afab07a0d35ce60142" + [[package]] name = "unicode-bidi" version = "0.3.18" @@ -5737,6 +5856,12 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94" +[[package]] +name = "unicode-width" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254" + [[package]] name = "unicode-xid" version = "0.2.6" @@ -5769,16 +5894,16 @@ dependencies = [ [[package]] name = "usvg" -version = "0.45.1" +version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80be9b06fbae3b8b303400ab20778c80bbaf338f563afe567cf3c9eea17b47ef" +checksum = "e419dff010bb12512b0ae9e3d2f318dfbdf0167fde7eb05465134d4e8756076f" dependencies = [ "base64", "data-url", "flate2", "fontdb", "imagesize", - "kurbo 0.11.3", + "kurbo 0.13.0", "log", "pico-args", "roxmltree", @@ -6655,7 +6780,7 @@ dependencies = [ "objc2 0.5.2", "objc2-app-kit 0.2.2", "objc2-foundation 0.2.2", - "objc2-ui-kit", + "objc2-ui-kit 0.2.2", "orbclient", "pin-project", "raw-window-handle", @@ -6687,6 +6812,12 @@ dependencies = [ "memchr", ] +[[package]] +name = "winnow" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a90e88e4667264a994d34e6d1ab2d26d398dcdca8b7f52bec8668957517fc7d8" + [[package]] name = "wit-bindgen" version = "0.46.0" @@ -6859,7 +6990,7 @@ dependencies = [ "uds_windows", "uuid", "windows-sys 0.61.2", - "winnow", + "winnow 0.7.14", "zbus_macros", "zbus_names", "zvariant", @@ -6888,7 +7019,7 @@ checksum = "7be68e64bf6ce8db94f63e72f0c7eb9a60d733f7e0499e628dfab0f84d6bcb97" dependencies = [ "serde", "static_assertions", - "winnow", + "winnow 0.7.14", "zvariant", ] @@ -6993,9 +7124,9 @@ checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a" [[package]] name = "zune-core" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "111f7d9820f05fd715df3144e254d6fc02ee4088b0644c0ffd0efc9e6d9d2773" +checksum = "cb8a0807f7c01457d0379ba880ba6322660448ddebc890ce29bb64da71fb40f9" [[package]] name = "zune-inflate" @@ -7017,11 +7148,11 @@ dependencies = [ [[package]] name = "zune-jpeg" -version = "0.5.7" +version = "0.5.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51d915729b0e7d5fe35c2f294c5dc10b30207cc637920e5b59077bfa3da63f28" +checksum = "0b7a1c0af6e5d8d1363f4994b7a091ccf963d8b694f7da5b0b9cceb82da2c0a6" dependencies = [ - "zune-core 0.5.0", + "zune-core 0.5.1", ] [[package]] @@ -7033,7 +7164,7 @@ dependencies = [ "endi", "enumflags2", "serde", - "winnow", + "winnow 0.7.14", "zvariant_derive", "zvariant_utils", ] @@ -7061,5 +7192,5 @@ dependencies = [ "quote", "serde", "syn", - "winnow", + "winnow 0.7.14", ] diff --git a/gui/Cargo.toml b/gui/Cargo.toml index 9960a6f..0e43cae 100644 --- a/gui/Cargo.toml +++ b/gui/Cargo.toml @@ -3,44 +3,6 @@ name = "inkopslista" version = "0.0.0" edition = "2024" -[lib] -path = "src/lib.rs" -crate-type = ["cdylib", "lib"] - -[dependencies] -reqwest = { version = "0.12.26", features = ["json", "rustls-tls"], default-features = false } -inkopslista-lib = { path = "../lib" } -tokio = { version = "1.48.0", default-features = false, features = ["rt", "macros", "sync"] } -serde = { version = "1.0.228", features = ["derive"] } -serde_json = "1.0.148" -anyhow = "1.0.100" - -[target.'cfg(target_os = "linux")'.dependencies] -tokio = { version = "1.48.0", default-features = false, features = ["fs", "rt-multi-thread"] } -xdg = "3.0.0" - -[target.'cfg(target_os = "android")'.dependencies] -tokio = { version = "1.48.0", default-features = false, features = ["rt-multi-thread"] } - -[target.'cfg(target_arch = "wasm32")'.dependencies] -wasm-bindgen = "0.2.106" -wasm-bindgen-futures = "0.4.56" -web-sys = "0.3.83" - -[dependencies.slint] -version = "1.14.1" -default-features = false -features = [ - "live-preview", - "backend-winit-wayland", - "renderer-femtovg", - "compat-1-2", - "backend-android-activity-06", -] - -[build-dependencies] -slint-build = "1.14.1" - # See https://github.com/rust-mobile/cargo-apk?tab=readme-ov-file#manifest [package.metadata.android] package = "sh.nubo.Inkopslista" @@ -63,3 +25,42 @@ name = "android.permission.INTERNET" [[package.metadata.android.uses_permission]] name = "android.permission.ACCESS_NETWORK_STATE" + +[lib] +path = "src/lib.rs" +crate-type = ["cdylib", "lib"] + +[dependencies] +reqwest = { version = "0.12.26", features = ["json", "rustls-tls"], default-features = false } +inkopslista-lib = { path = "../lib" } +tokio = { version = "1.48.0", default-features = false, features = ["rt", "macros", "sync"] } +serde = { version = "1.0.228", features = ["derive"] } +serde_json = "1.0.148" +anyhow = "1.0.100" + +[dependencies.slint] +version = "1.15.1" +default-features = false +features = [ + "live-preview", + "backend-winit-wayland", + "renderer-femtovg", + "compat-1-2", + "backend-android-activity-06", +] + + +[target.'cfg(target_os = "linux")'.dependencies] +tokio = { version = "1.48.0", default-features = false, features = ["fs", "rt-multi-thread"] } +xdg = "3.0.0" + +[target.'cfg(target_os = "android")'.dependencies] +tokio = { version = "1.48.0", default-features = false, features = ["rt-multi-thread"] } + +[target.'cfg(target_arch = "wasm32")'.dependencies] +wasm-bindgen = "0.2.106" +wasm-bindgen-futures = "0.4.56" +web-sys = "0.3.83" + +[build-dependencies] +slint-build = "1.15.1"