diff --git a/Cargo.lock b/Cargo.lock index 2ed8758..725dee2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -80,9 +80,9 @@ checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" [[package]] name = "android-activity" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39b801912a977c3fd52d80511fe1c0c8480c6f957f21ae2ce1b92ffe970cf4b9" +checksum = "ee91c0c2905bae44f84bfa4e044536541df26b7703fd0888deeb9060fcc44289" dependencies = [ "android-properties", "bitflags 2.4.2", @@ -136,9 +136,9 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" +checksum = "2faccea4cc4ab4a667ce676a30e8ec13922a692c99bb8f5b11f1502c72e04220" [[package]] name = "anstyle-parse" @@ -270,9 +270,9 @@ dependencies = [ [[package]] name = "async-io" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb41eb19024a91746eba0773aa5e16036045bbf45733766661099e182ea6a744" +checksum = "8f97ab0c5b00a7cdbe5a371b9a782ee7be1316095885c8a4ea1daf490eb0ef65" dependencies = [ "async-lock 3.3.0", "cfg-if", @@ -341,7 +341,7 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" dependencies = [ - "async-io 2.3.0", + "async-io 2.3.1", "async-lock 2.8.0", "atomic-waker", "cfg-if", @@ -387,9 +387,9 @@ dependencies = [ [[package]] name = "auto_enums" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1c074a5fdb14f54a9cc22ad68979588325bc6986eed6b859e03de43e4880214" +checksum = "1899bfcfd9340ceea3533ea157360ba8fa864354eccbceab58e1006ecab35393" dependencies = [ "derive_utils", "proc-macro2", @@ -576,9 +576,9 @@ checksum = "bf8dba2868114ed769a1f2590fc9ae5eb331175b44313b6c9b922f8f7ca813d0" [[package]] name = "bytemuck" -version = "1.14.0" +version = "1.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" +checksum = "ed2490600f404f2b94c167e31d3ed1d5f3c225a0f3b80230053b3e0b7b962bd9" dependencies = [ "bytemuck_derive", ] @@ -762,9 +762,9 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.32" +version = "0.4.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41daef31d7a747c5c847246f36de49ced6f7403b4cdabc807a97b5cc184cda7a" +checksum = "9f13690e35a5e4ace198e7beea2895d29f3a9cc55015fcebe6336bd2010af9eb" dependencies = [ "android-tzdata", "iana-time-zone", @@ -944,7 +944,8 @@ dependencies = [ [[package]] name = "const-field-offset" version = "0.1.3" -source = "git+https://github.com/slint-ui/slint.git#c350d787c14c24131beb3a555acc291cbc779e79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6304465f16f463cddc572b737c3df93576edd3a6b53f057bd8beeb29f4ef8dfd" dependencies = [ "const-field-offset-macro", "field-offset", @@ -953,7 +954,8 @@ dependencies = [ [[package]] name = "const-field-offset-macro" version = "0.1.3" -source = "git+https://github.com/slint-ui/slint.git#c350d787c14c24131beb3a555acc291cbc779e79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57aaaad9185d3bcb3afe63549d8ba60b2fb0ea8dc2da83f62dd56805edf56fd1" dependencies = [ "proc-macro2", "quote", @@ -1405,9 +1407,9 @@ dependencies = [ [[package]] name = "derive_utils" -version = "0.13.2" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9abcad25e9720609ccb3dcdb795d845e37d8ce34183330a9f48b03a1a71c8e21" +checksum = "61bb5a1014ce6dfc2a378578509abe775a5aa06bff584a547555d9efdb81b926" dependencies = [ "proc-macro2", "quote", @@ -1899,11 +1901,11 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fontconfig-parser" -version = "0.5.3" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "674e258f4b5d2dcd63888c01c68413c51f565e8af99d2f7701c7b81d79ef41c4" +checksum = "6a595cb550439a117696039dfc69830492058211b771a2a165379f2a1a53d84d" dependencies = [ - "roxmltree 0.18.1", + "roxmltree", ] [[package]] @@ -1914,7 +1916,7 @@ checksum = "98b88c54a38407f7352dd2c4238830115a6377741098ffd1f997c813d0e088a6" dependencies = [ "fontconfig-parser", "log", - "memmap2 0.9.3", + "memmap2 0.9.4", "slotmap", "tinyvec", "ttf-parser", @@ -2661,7 +2663,8 @@ dependencies = [ [[package]] name = "i-slint-backend-linuxkms" version = "1.4.0" -source = "git+https://github.com/slint-ui/slint.git#c350d787c14c24131beb3a555acc291cbc779e79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6cd1b3324ff9f747fcca8a2b26f6ddbea318f1df82904ead9b8f6afae24bc25" dependencies = [ "calloop", "drm 0.9.0", @@ -2681,7 +2684,8 @@ dependencies = [ [[package]] name = "i-slint-backend-selector" version = "1.4.0" -source = "git+https://github.com/slint-ui/slint.git#c350d787c14c24131beb3a555acc291cbc779e79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b0f07f619b50236543a1e0db24a479a1de8e334bf0aaca81c934e5f416dbb1b" dependencies = [ "cfg-if", "i-slint-backend-linuxkms", @@ -2694,7 +2698,8 @@ dependencies = [ [[package]] name = "i-slint-backend-winit" version = "1.4.0" -source = "git+https://github.com/slint-ui/slint.git#c350d787c14c24131beb3a555acc291cbc779e79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4a2e570357afaf8f12d1a068425b3581ac731748dfc267c6c138360777bd450" dependencies = [ "bytemuck", "cfg-if", @@ -2728,7 +2733,8 @@ dependencies = [ [[package]] name = "i-slint-common" version = "1.4.0" -source = "git+https://github.com/slint-ui/slint.git#c350d787c14c24131beb3a555acc291cbc779e79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0314c1b4834ab8b427eb4a557962647c508774b4cd395b64506243bc5ddd5696" dependencies = [ "cfg-if", "derive_more", @@ -2739,7 +2745,8 @@ dependencies = [ [[package]] name = "i-slint-compiler" version = "1.4.0" -source = "git+https://github.com/slint-ui/slint.git#c350d787c14c24131beb3a555acc291cbc779e79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3812db29a849bd6579c080d2b5507e7dd2105300a70aab6dd743974502d754f" dependencies = [ "by_address", "codemap", @@ -2749,7 +2756,7 @@ dependencies = [ "fontdue", "i-slint-common", "image", - "itertools 0.12.0", + "itertools 0.12.1", "linked_hash_set", "lyon_extra", "lyon_path", @@ -2768,7 +2775,8 @@ dependencies = [ [[package]] name = "i-slint-core" version = "1.4.0" -source = "git+https://github.com/slint-ui/slint.git#c350d787c14c24131beb3a555acc291cbc779e79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea54d9a3e3a7f6cf4d130810d287143120ff0c24a0b2d0fbd0ac0428c8fbe31f" dependencies = [ "auto_enums", "bytemuck", @@ -2811,7 +2819,8 @@ dependencies = [ [[package]] name = "i-slint-core-macros" version = "1.4.0" -source = "git+https://github.com/slint-ui/slint.git#c350d787c14c24131beb3a555acc291cbc779e79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4732fcf4e706f99b93959f4ac8f66831483d3e194a3d476b14cb78e664acfe6e" dependencies = [ "quote", "syn 2.0.48", @@ -2820,7 +2829,8 @@ dependencies = [ [[package]] name = "i-slint-renderer-femtovg" version = "1.4.0" -source = "git+https://github.com/slint-ui/slint.git#c350d787c14c24131beb3a555acc291cbc779e79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7cf902c7f989bd988077e2b517cfbb89981e220f5a07b7e8918554ec22dbc1d" dependencies = [ "cfg-if", "const-field-offset", @@ -2852,7 +2862,8 @@ dependencies = [ [[package]] name = "i-slint-renderer-skia" version = "1.4.0" -source = "git+https://github.com/slint-ui/slint.git#c350d787c14c24131beb3a555acc291cbc779e79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53a4babc3b281b491a7bc2cd48ea2643d6754eeb5c38a37d33da55366e00e197" dependencies = [ "ash", "bytemuck", @@ -2895,7 +2906,7 @@ dependencies = [ "serde", "serde_derive", "thiserror", - "toml 0.8.8", + "toml 0.8.9", "unic-langid", ] @@ -3080,9 +3091,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.1.0" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +checksum = "824b2ae422412366ba479e8111fd301f7b5faece8149317bb81925979a53f520" dependencies = [ "equivalent", "hashbrown 0.14.3", @@ -3227,9 +3238,9 @@ dependencies = [ [[package]] name = "itertools" -version = "0.12.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" dependencies = [ "either", ] @@ -3358,9 +3369,9 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" [[package]] name = "libc" -version = "0.2.152" +version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libflate" @@ -3541,9 +3552,9 @@ dependencies = [ [[package]] name = "lofty" -version = "0.18.0" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c7b592b0deed44e1633b140464af992a15c4045c83e28f2e558c3cc06f50b6" +checksum = "f75066eb1d25a7047fb2667edb410ae2592439ed81546f95c28b0a1c7d7d3818" dependencies = [ "byteorder", "data-encoding", @@ -3588,9 +3599,9 @@ dependencies = [ [[package]] name = "lru" -version = "0.12.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2994eeba8ed550fd9b47a0b38f0242bc3344e496483c6180b69139cc2fa5d1d7" +checksum = "db2c024b41519440580066ba82aab04092b333e09066a5eb86c7c4890df31f22" [[package]] name = "lyon_algorithms" @@ -3673,9 +3684,9 @@ dependencies = [ [[package]] name = "memmap2" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45fd3a57831bf88bc63f8cebc0cf956116276e97fef3966103e96416209f7c92" +checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" dependencies = [ "libc", ] @@ -3865,6 +3876,12 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + [[package]] name = "num-integer" version = "0.1.45" @@ -4167,7 +4184,7 @@ dependencies = [ "deflate", "fax", "globalcache", - "indexmap 2.1.0", + "indexmap 2.2.2", "istring", "itertools 0.10.5", "jpeg-decoder", @@ -4213,18 +4230,18 @@ checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" [[package]] name = "pin-project" -version = "1.1.3" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" +checksum = "0302c4a0442c456bd56f841aee5c3bfd17967563f6fadc9ceb9f9c23cf3807e0" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.3" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" +checksum = "266c042b60c9c76b8d53061e52b2e0d1116abc57cefc8c5cd671619a56ac3690" dependencies = [ "proc-macro2", "quote", @@ -4380,7 +4397,7 @@ version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" dependencies = [ - "toml_edit 0.21.0", + "toml_edit 0.21.1", ] [[package]] @@ -4427,9 +4444,9 @@ dependencies = [ [[package]] name = "quick-xml" -version = "0.30.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" +checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" dependencies = [ "memchr", ] @@ -4560,7 +4577,7 @@ checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.4", + "regex-automata 0.4.5", "regex-syntax 0.8.2", ] @@ -4575,9 +4592,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b7fa1134405e2ec9353fd416b17f8dacd46c473d7d3fd1cf202706a14eb792a" +checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" dependencies = [ "aho-corasick", "memchr", @@ -4675,15 +4692,6 @@ dependencies = [ "text-size", ] -[[package]] -name = "roxmltree" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "862340e351ce1b271a378ec53f304a5558f7db87f3769dc655a8f6ecbb68b302" -dependencies = [ - "xmlparser", -] - [[package]] name = "roxmltree" version = "0.19.0" @@ -4952,7 +4960,7 @@ checksum = "82b2eaf3a5b264a521b988b2e73042e742df700c4f962cde845d1541adb46550" dependencies = [ "ab_glyph", "log", - "memmap2 0.9.3", + "memmap2 0.9.4", "smithay-client-toolkit", "tiny-skia", ] @@ -4980,18 +4988,18 @@ checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" [[package]] name = "serde" -version = "1.0.195" +version = "1.0.196" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02" +checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.195" +version = "1.0.196" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c" +checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67" dependencies = [ "proc-macro2", "quote", @@ -5000,9 +5008,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.111" +version = "1.0.113" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4" +checksum = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79" dependencies = [ "itoa", "ryu", @@ -5122,7 +5130,7 @@ dependencies = [ "regex", "serde_json", "tar", - "toml 0.8.8", + "toml 0.8.9", "ureq", ] @@ -5151,7 +5159,8 @@ dependencies = [ [[package]] name = "slint" version = "1.4.0" -source = "git+https://github.com/slint-ui/slint.git#c350d787c14c24131beb3a555acc291cbc779e79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc2fbd42d7728b2a48e21b8e0a8bde32275956bd8802b779e127d8fb3b9e73b6" dependencies = [ "const-field-offset", "i-slint-backend-selector", @@ -5167,18 +5176,20 @@ dependencies = [ [[package]] name = "slint-build" version = "1.4.0" -source = "git+https://github.com/slint-ui/slint.git#c350d787c14c24131beb3a555acc291cbc779e79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b65a1ded118c4848c432f9b1877eab793fcc1ef9fd9809d6f7a3cd1eefb1bb2b" dependencies = [ "i-slint-compiler", "spin_on", "thiserror", - "toml_edit 0.21.0", + "toml_edit 0.21.1", ] [[package]] name = "slint-macros" version = "1.4.0" -source = "git+https://github.com/slint-ui/slint.git#c350d787c14c24131beb3a555acc291cbc779e79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad63c624ee686b0b1dc93b962deb9a526638d0328e89453e9554fe5e047da54a" dependencies = [ "i-slint-compiler", "proc-macro2", @@ -5213,7 +5224,7 @@ dependencies = [ "cursor-icon", "libc", "log", - "memmap2 0.9.3", + "memmap2 0.9.4", "rustix 0.38.30", "thiserror", "wayland-backend", @@ -5304,7 +5315,7 @@ dependencies = [ "foreign-types", "js-sys", "log", - "memmap2 0.9.3", + "memmap2 0.9.4", "objc", "raw-window-handle", "redox_syscall 0.4.1", @@ -5642,7 +5653,7 @@ dependencies = [ "cfg-expr", "heck", "pkg-config", - "toml 0.8.8", + "toml 0.8.9", "version-compare", ] @@ -5734,13 +5745,14 @@ dependencies = [ [[package]] name = "time" -version = "0.3.31" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e" +checksum = "fe80ced77cbfb4cb91a94bf72b378b4b6791a0d9b7f09d0be747d1bdff4e68bd" dependencies = [ "deranged", "itoa", "libc", + "num-conv", "num_threads", "powerfmt", "serde", @@ -5756,10 +5768,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f" +checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" dependencies = [ + "num-conv", "time-core", ] @@ -5853,14 +5866,14 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.8" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" +checksum = "c6a4b9e8023eb94392d3dca65d717c53abc5dad49c07cb65bb8fcd87115fa325" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.21.0", + "toml_edit 0.21.1", ] [[package]] @@ -5878,7 +5891,7 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.1.0", + "indexmap 2.2.2", "toml_datetime", "winnow", ] @@ -5889,18 +5902,18 @@ version = "0.20.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" dependencies = [ - "indexmap 2.1.0", + "indexmap 2.2.2", "toml_datetime", "winnow", ] [[package]] name = "toml_edit" -version = "0.21.0" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ - "indexmap 2.1.0", + "indexmap 2.2.2", "serde", "serde_spanned", "toml_datetime", @@ -6225,7 +6238,7 @@ dependencies = [ "imagesize", "kurbo", "log", - "roxmltree 0.19.0", + "roxmltree", "simplecss", "siphasher", "svgtypes", @@ -6318,7 +6331,8 @@ dependencies = [ [[package]] name = "vtable" version = "0.1.11" -source = "git+https://github.com/slint-ui/slint.git#c350d787c14c24131beb3a555acc291cbc779e79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f4c7506238561777a1861d3dc3c0001877c475187e7bc4392ea87ebf631fd9c" dependencies = [ "const-field-offset", "portable-atomic", @@ -6329,7 +6343,8 @@ dependencies = [ [[package]] name = "vtable-macro" version = "0.1.10" -source = "git+https://github.com/slint-ui/slint.git#c350d787c14c24131beb3a555acc291cbc779e79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b2b8eecdb8e4284adf5546fc518f048f6dc33e7203dbe36fa93a4add39b31f6" dependencies = [ "proc-macro2", "quote", @@ -6349,7 +6364,7 @@ dependencies = [ "crossbeam-queue", "half", "heck", - "indexmap 2.1.0", + "indexmap 2.2.2", "libloading 0.8.1", "objc", "once_cell", @@ -6455,13 +6470,13 @@ checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b" [[package]] name = "wayland-backend" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19152ddd73f45f024ed4534d9ca2594e0ef252c1847695255dae47f34df9fbe4" +checksum = "9d50fa61ce90d76474c87f5fc002828d81b32677340112b4ef08079a9d459a40" dependencies = [ "cc", "downcast-rs", - "nix 0.26.4", + "rustix 0.38.30", "scoped-tls", "smallvec", "wayland-sys", @@ -6469,12 +6484,12 @@ dependencies = [ [[package]] name = "wayland-client" -version = "0.31.1" +version = "0.31.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ca7d52347346f5473bf2f56705f360e8440873052e575e55890c4fa57843ed3" +checksum = "82fb96ee935c2cea6668ccb470fb7771f6215d1691746c2d896b447a00ad3f1f" dependencies = [ "bitflags 2.4.2", - "nix 0.26.4", + "rustix 0.38.30", "wayland-backend", "wayland-scanner", ] @@ -6492,20 +6507,20 @@ dependencies = [ [[package]] name = "wayland-cursor" -version = "0.31.0" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44aa20ae986659d6c77d64d808a046996a932aa763913864dc40c359ef7ad5b" +checksum = "71ce5fa868dd13d11a0d04c5e2e65726d0897be8de247c0c5a65886e283231ba" dependencies = [ - "nix 0.26.4", + "rustix 0.38.30", "wayland-client", "xcursor", ] [[package]] name = "wayland-protocols" -version = "0.31.0" +version = "0.31.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e253d7107ba913923dc253967f35e8561a3c65f914543e46843c88ddd729e21c" +checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4" dependencies = [ "bitflags 2.4.2", "wayland-backend", @@ -6541,9 +6556,9 @@ dependencies = [ [[package]] name = "wayland-scanner" -version = "0.31.0" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb8e28403665c9f9513202b7e1ed71ec56fde5c107816843fb14057910b2c09c" +checksum = "63b3a62929287001986fb58c789dce9b67604a397c15c611ad9f747300b6c283" dependencies = [ "proc-macro2", "quick-xml", @@ -6901,7 +6916,7 @@ dependencies = [ "js-sys", "libc", "log", - "memmap2 0.9.3", + "memmap2 0.9.4", "ndk", "ndk-sys", "objc2", @@ -6931,9 +6946,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.5.34" +version = "0.5.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7cf47b659b318dccbd69cc4797a39ae128f533dce7902a1096044d1967b9c16" +checksum = "818ce546a11a9986bc24f93d0cdf38a8a1a400f1473ea8c82e59f6e0ffab9249" dependencies = [ "memchr", ] @@ -7077,12 +7092,6 @@ version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" -[[package]] -name = "xmlparser" -version = "0.13.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4" - [[package]] name = "xmlwriter" version = "0.1.0" diff --git a/czkawka_gui/Cargo.toml b/czkawka_gui/Cargo.toml index 67279b7..69e0e80 100644 --- a/czkawka_gui/Cargo.toml +++ b/czkawka_gui/Cargo.toml @@ -15,7 +15,7 @@ glib = "0.18" gtk4 = { version = "0.7", default-features = false, features = ["v4_6"] } humansize = "2.1" -chrono = "0.4.32" +chrono = "0.4.33" # Used for sending stop signal across threads crossbeam-channel = "0.5" diff --git a/krokiet/Cargo.toml b/krokiet/Cargo.toml index 594bd52..df04a35 100644 --- a/krokiet/Cargo.toml +++ b/krokiet/Cargo.toml @@ -13,7 +13,7 @@ build = "build.rs" [dependencies] rand = "0.8" czkawka_core = { version = "6.1.0", path = "../czkawka_core" } -chrono = "0.4.32" +chrono = "0.4.33" open = "5.0" crossbeam-channel = "0.5" handsome_logger = "0.8" @@ -36,16 +36,16 @@ once_cell = "1.19" # Try to use only needed features from https://github.com/slint-ui/slint/blob/master/api/rs/slint/Cargo.toml#L23-L31 #slint = { path = "/home/rafal/test/slint/api/rs/slint/", default-features = false, features = ["std", -slint = { git = "https://github.com/slint-ui/slint.git", default-features = false, features = [ -# slint = { version = "1.3", default-features = false, features = [ +#slint = { git = "https://github.com/slint-ui/slint.git", default-features = false, features = [ + slint = { version = "1.4", default-features = false, features = [ "std", "backend-winit", "compat-1-2" ] } [build-dependencies] #slint-build = { path = "/home/rafal/test/slint/api/rs/build/"} -slint-build = { git = "https://github.com/slint-ui/slint.git" } -# slint-build = "1.3" +#slint-build = { git = "https://github.com/slint-ui/slint.git" } + slint-build = "1.4" [features] default = ["winit_femtovg", "winit_software"] diff --git a/krokiet/src/common.rs b/krokiet/src/common.rs index ac79eef..f15eee0 100644 --- a/krokiet/src/common.rs +++ b/krokiet/src/common.rs @@ -1,7 +1,8 @@ use std::path::PathBuf; use slint::{ModelRc, SharedString, StandardListViewItem, VecModel}; - +use crate::ExcludedDirectoriesModel; +use crate::IncludedDirectoriesModel; use crate::CurrentTab; // Remember to match updated this according to ui/main_lists.slint and connect_scan.rs files @@ -52,6 +53,33 @@ pub fn create_string_standard_list_view_from_pathbuf(items: &[PathBuf]) -> Model ModelRc::new(VecModel::from(new_folders_standard_list_view)) } +pub fn create_included_directories_model_from_pathbuf(items: &[PathBuf]) -> ModelRc { + let converted = items + .iter() + .map(|x| { + IncludedDirectoriesModel { + path: x.to_string_lossy().to_string().into(), + referenced_folder: false, + selected_row: false, + } + }) + .collect::>(); + ModelRc::new(VecModel::from(converted)) +} + +pub fn create_excluded_directories_model_from_pathbuf(items: &[PathBuf]) -> ModelRc { + let converted = items + .iter() + .map(|x| { + ExcludedDirectoriesModel { + path: x.to_string_lossy().to_string().into(), + selected_row: false, + } + }) + .collect::>(); + ModelRc::new(VecModel::from(converted)) +} + pub fn create_vec_model_from_vec_string(items: Vec) -> VecModel { VecModel::from(items.into_iter().map(SharedString::from).collect::>()) } diff --git a/krokiet/src/connect_directories_changes.rs b/krokiet/src/connect_directories_changes.rs index be8d5a7..fb7a0ed 100644 --- a/krokiet/src/connect_directories_changes.rs +++ b/krokiet/src/connect_directories_changes.rs @@ -20,27 +20,26 @@ fn connect_add_manual_directories(app: &MainWindow) { let settings = app.global::(); if included_directories { - let included_model = settings.get_included_directories(); + let included_model = settings.get_included_directories_model(); let mut included_model = included_model.iter().collect::>(); - included_model.extend(non_empty_lines.iter().map(|x| { - let mut element = slint::StandardListViewItem::default(); - element.text = (*x).into(); - element + included_model.extend(non_empty_lines.iter().map(|x| IncludedDirectoriesModel { + path: x.to_string_lossy().to_string().into(), + referenced_folder: false, + selected_row: false, })); included_model.sort_by_cached_key(|x| x.text.to_string()); included_model.dedup(); - settings.set_included_directories(ModelRc::new(VecModel::from(included_model))); + settings.set_included_directories_model(ModelRc::new(VecModel::from(included_model))); } else { - let excluded_model = settings.get_excluded_directories(); + let excluded_model = settings.get_excluded_directories_model(); let mut excluded_model = excluded_model.iter().collect::>(); - excluded_model.extend(non_empty_lines.iter().map(|x| { - let mut element = slint::StandardListViewItem::default(); - element.text = (*x).into(); - element + excluded_model.extend(non_empty_lines.iter().map(|x| ExcludedDirectoriesModel { + path: x.to_string_lossy().to_string().into(), + selected_row: false, })); - excluded_model.sort_by_cached_key(|x| x.text.to_string()); + excluded_model.sort_by_cached_key(|x| x.path.to_string()); excluded_model.dedup(); - settings.set_excluded_directories(ModelRc::new(VecModel::from(excluded_model))); + settings.set_excluded_directories_model(ModelRc::new(VecModel::from(excluded_model))); } }); } @@ -92,12 +91,12 @@ fn connect_add_directories(app: &MainWindow) { let settings = app.global::(); let old_folders = if included_directories { - settings.get_included_directories() + settings.get_included_directories_model() } else { - settings.get_excluded_directories() + settings.get_excluded_directories_model() }; - let mut new_folders = old_folders.iter().map(|x| x.text.to_string()).collect::>(); + let mut new_folders = old_folders.iter().map(|x| x.path.to_string()).collect::>(); new_folders.extend(folders.iter().map(|x| x.to_string_lossy().to_string())); new_folders.sort(); new_folders.dedup(); @@ -113,9 +112,9 @@ fn connect_add_directories(app: &MainWindow) { let new_folders_model = ModelRc::new(VecModel::from(new_folders_standard_list_view)); if included_directories { - settings.set_included_directories(new_folders_model); + settings.set_included_directories_model(new_folders_model); } else { - settings.set_excluded_directories(new_folders_model); + settings.set_excluded_directories_model(new_folders_model); } }); } diff --git a/krokiet/src/settings.rs b/krokiet/src/settings.rs index 87be6ad..7852675 100644 --- a/krokiet/src/settings.rs +++ b/krokiet/src/settings.rs @@ -12,7 +12,7 @@ use slint::{ComponentHandle, Model, ModelRc}; use czkawka_core::common::{get_available_threads, set_number_of_threads}; use czkawka_core::common_items::{DEFAULT_EXCLUDED_DIRECTORIES, DEFAULT_EXCLUDED_ITEMS}; -use crate::common::{create_string_standard_list_view_from_pathbuf, create_vec_model_from_vec_string}; +use crate::common::{create_included_directories_model_from_pathbuf, create_excluded_directories_model_from_pathbuf, create_vec_model_from_vec_string}; use crate::{Callabler, GuiState, MainWindow, Settings}; pub const DEFAULT_MINIMUM_SIZE_KB: i32 = 16; @@ -350,11 +350,11 @@ pub fn set_settings_to_gui(app: &MainWindow, custom_settings: &SettingsCustom) { let settings = app.global::(); // Included directories - let included_directories = create_string_standard_list_view_from_pathbuf(&custom_settings.included_directories); + let included_directories = create_included_directories_model_from_pathbuf(&custom_settings.included_directories); settings.set_included_directories(included_directories); // Excluded directories - let excluded_directories = create_string_standard_list_view_from_pathbuf(&custom_settings.excluded_directories); + let excluded_directories = create_excluded_directories_model_from_pathbuf(&custom_settings.excluded_directories); settings.set_excluded_directories(excluded_directories); settings.set_excluded_items(custom_settings.excluded_items.clone().into()); @@ -433,11 +433,11 @@ pub fn set_settings_to_gui(app: &MainWindow, custom_settings: &SettingsCustom) { pub fn collect_settings(app: &MainWindow) -> SettingsCustom { let settings = app.global::(); - let included_directories = settings.get_included_directories(); - let included_directories = included_directories.iter().map(|x| PathBuf::from(x.text.as_str())).collect::>(); + let included_directories = settings.get_included_directories_model(); + let included_directories = included_directories.iter().map(|model| PathBuf::from(model.path.as_str())).collect::>(); - let excluded_directories = settings.get_excluded_directories(); - let excluded_directories = excluded_directories.iter().map(|x| PathBuf::from(x.text.as_str())).collect::>(); + let excluded_directories = settings.get_excluded_directories_model(); + let excluded_directories = excluded_directories.iter().map(|model| PathBuf::from(model.path.as_str())).collect::>(); let excluded_items = settings.get_excluded_items().to_string(); let allowed_extensions = settings.get_allowed_extensions().to_string(); diff --git a/krokiet/ui/settings.slint b/krokiet/ui/settings.slint index 01d3474..fd94b58 100644 --- a/krokiet/ui/settings.slint +++ b/krokiet/ui/settings.slint @@ -4,10 +4,6 @@ import {IncludedDirectoriesModel, ExcludedDirectoriesModel} from "common.slint"; export global Settings { in-out property settings_preset_idx: 0; in-out property <[string]> settings_presets: ["Preset 1", "Preset 2"]; - - in-out property <[StandardListViewItem]> included_directories: [{text: "ABCD"}, {text: "BCDA"}]; - in-out property <[StandardListViewItem]> excluded_directories: [{text: "ABCD"}, {text: "BCDA"}, {text: "CDFFF"}]; - in-out property <[IncludedDirectoriesModel]> included_directories_model: [{path: "/home/path", referenced_folder: false, selected_row: false}]; in-out property <[ExcludedDirectoriesModel]> excluded_directories_model: [{path:"/home/path", selected_row: false}, {path:"/home/path", selected_row: false}];