diff --git a/Cargo.lock b/Cargo.lock index f39c221..92d1d9c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -21,7 +21,7 @@ checksum = "366ffbaa4442f4684d91e2cd7c5ea7c4ed8add41959a31447066e279e432b618" [[package]] name = "accesskit" version = "0.22.0" -source = "git+https://github.com/wash2/accesskit?tag=cosmic-0.14#f0599eed5f18111228266fe3f28991cc48b5964f" +source = "git+https://github.com/wash2/accesskit?rev=6c20249#6c20249d3b9fd45e7002efad9f6b6171a9257912" dependencies = [ "uuid", ] @@ -29,19 +29,19 @@ dependencies = [ [[package]] name = "accesskit_atspi_common" version = "0.15.0" -source = "git+https://github.com/wash2/accesskit?tag=cosmic-0.14#f0599eed5f18111228266fe3f28991cc48b5964f" +source = "git+https://github.com/wash2/accesskit?rev=6c20249#6c20249d3b9fd45e7002efad9f6b6171a9257912" dependencies = [ "accesskit", "accesskit_consumer", "atspi-common", "serde", - "zvariant 5.12.0", + "zvariant 5.15.0", ] [[package]] name = "accesskit_consumer" version = "0.32.0" -source = "git+https://github.com/wash2/accesskit?tag=cosmic-0.14#f0599eed5f18111228266fe3f28991cc48b5964f" +source = "git+https://github.com/wash2/accesskit?rev=6c20249#6c20249d3b9fd45e7002efad9f6b6171a9257912" dependencies = [ "accesskit", "hashbrown 0.16.1", @@ -50,7 +50,7 @@ dependencies = [ [[package]] name = "accesskit_macos" version = "0.23.0" -source = "git+https://github.com/wash2/accesskit?tag=cosmic-0.14#f0599eed5f18111228266fe3f28991cc48b5964f" +source = "git+https://github.com/wash2/accesskit?rev=6c20249#6c20249d3b9fd45e7002efad9f6b6171a9257912" dependencies = [ "accesskit", "accesskit_consumer", @@ -63,7 +63,7 @@ dependencies = [ [[package]] name = "accesskit_unix" version = "0.18.0" -source = "git+https://github.com/wash2/accesskit?tag=cosmic-0.14#f0599eed5f18111228266fe3f28991cc48b5964f" +source = "git+https://github.com/wash2/accesskit?rev=6c20249#6c20249d3b9fd45e7002efad9f6b6171a9257912" dependencies = [ "accesskit", "accesskit_atspi_common", @@ -72,13 +72,13 @@ dependencies = [ "serde", "tokio", "tokio-stream", - "zbus 5.16.0", + "zbus 5.19.0", ] [[package]] name = "accesskit_windows" version = "0.30.0" -source = "git+https://github.com/wash2/accesskit?tag=cosmic-0.14#f0599eed5f18111228266fe3f28991cc48b5964f" +source = "git+https://github.com/wash2/accesskit?rev=6c20249#6c20249d3b9fd45e7002efad9f6b6171a9257912" dependencies = [ "accesskit", "accesskit_consumer", @@ -91,7 +91,7 @@ dependencies = [ [[package]] name = "accesskit_winit" version = "0.30.0" -source = "git+https://github.com/wash2/accesskit?tag=cosmic-0.14#f0599eed5f18111228266fe3f28991cc48b5964f" +source = "git+https://github.com/wash2/accesskit?rev=6c20249#6c20249d3b9fd45e7002efad9f6b6171a9257912" dependencies = [ "accesskit", "accesskit_macos", @@ -109,13 +109,13 @@ checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" [[package]] name = "aes" -version = "0.9.1" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1fc76eaeac4c9164506c466d4ffdd8ec9d0c5bf57ee97177c4d8eceb3a0e138" +checksum = "35f0f96ce78e38c3dc6d8948aa8163d06385be74000f3c7a95bf1eef35d3ea32" dependencies = [ "cipher", "cpubits", - "cpufeatures 0.3.0", + "cpufeatures 0.3.1", ] [[package]] @@ -133,9 +133,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.1.4" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301" +checksum = "c982642fa9e8606056828ee9a8505737230110bb1099153c79efe865c59d12ba" dependencies = [ "memchr", ] @@ -198,7 +198,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f2a1bb052857d5dd49572219344a7332b31b76405648eabac5bc68978251bcd" dependencies = [ "android-properties", - "bitflags 2.13.0", + "bitflags 2.13.2", "cc", "jni", "libc", @@ -207,7 +207,7 @@ dependencies = [ "ndk-context", "ndk-sys", "num_enum", - "thiserror 2.0.18", + "thiserror 2.0.20", ] [[package]] @@ -218,9 +218,9 @@ checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04" [[package]] name = "android_system_properties" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +checksum = "ae221649c9976a6f6c56ae1facf410f3ddb33cc661c4b7b61020a912d4237fbc" dependencies = [ "libc", ] @@ -277,9 +277,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.103" +version = "1.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a4385e2e34eb35d6b3efe798b9eb88096925d87726c0798709bf56d9ed84af3" +checksum = "330a5ed07fa54e4702c9d6c4174f74427fc0ef6e214bbd677ae50a5099946470" [[package]] name = "apply" @@ -319,7 +319,7 @@ checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.119", ] [[package]] @@ -330,9 +330,9 @@ checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" [[package]] name = "arrayvec" -version = "0.7.7" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f02882884d3e1bc524fb12c79f107f6ad0e1cfd498c536ffb494301740995dfe" +checksum = "d3fb67a6e08acf24fdeccbac2cb6ac4305825bd1f117462e0e6f2f193345ad56" [[package]] name = "as-slice" @@ -361,13 +361,13 @@ dependencies = [ "enumflags2", "futures-channel", "futures-util", - "rand 0.9.4", + "rand 0.9.5", "raw-window-handle", "serde", "serde_repr", "tokio", "url", - "zbus 5.16.0", + "zbus 5.19.0", ] [[package]] @@ -379,7 +379,7 @@ dependencies = [ "enumflags2", "futures-channel", "futures-util", - "rand 0.9.4", + "rand 0.9.5", "serde", "serde_repr", "tokio", @@ -387,7 +387,7 @@ dependencies = [ "wayland-backend", "wayland-client", "wayland-protocols", - "zbus 5.16.0", + "zbus 5.19.0", ] [[package]] @@ -494,7 +494,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.119", ] [[package]] @@ -523,13 +523,13 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.89" +version = "0.1.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb" +checksum = "82f6aeea286b8eb4dd3431a1be1b59d290ace00f5bfd8e2a159bc2a05e2c1667" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 3.0.5", ] [[package]] @@ -573,11 +573,11 @@ dependencies = [ "enumflags2", "serde", "static_assertions", - "zbus 5.16.0", + "zbus 5.19.0", "zbus-lockstep", "zbus-lockstep-macros", - "zbus_names 4.3.2", - "zvariant 5.12.0", + "zbus_names 4.3.4", + "zvariant 5.15.0", ] [[package]] @@ -588,19 +588,19 @@ checksum = "2230e48787ed3eb4088996eab66a32ca20c0b67bbd4fd6cdfe79f04f1f04c9fc" dependencies = [ "atspi-common", "serde", - "zbus 5.16.0", + "zbus 5.19.0", ] [[package]] name = "auto_enums" -version = "0.8.9" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e4487600931c9a89f8db7ffbdf3fbdd45bb7bd85e26861f659a463cd0dff966" +checksum = "3091d68264354f211516b91dce6f71046e444fab1867716035f736667243affb" dependencies = [ "derive_utils", "proc-macro2", "quote", - "syn", + "syn 3.0.5", ] [[package]] @@ -624,7 +624,7 @@ dependencies = [ "num-traits", "pastey", "rayon", - "thiserror 2.0.18", + "thiserror 2.0.20", "v_frame", "y4m", ] @@ -658,6 +658,12 @@ version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" +[[package]] +name = "base64" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac07cdecf99051d9a5238b80f35af32cdeba5b336e55d957b318b50137e18da5" + [[package]] name = "basic-toml" version = "0.1.10" @@ -696,9 +702,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.13.0" +version = "2.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4388bee8683e3d04af747c73422af53102d2bd24d9eadb6cbc100baef4b43f8" +checksum = "3ded4057c258ba199e2d26386d3af3780957ecaee6c4ef4041c6b4b8b97c0b06" dependencies = [ "serde_core", ] @@ -757,9 +763,9 @@ dependencies = [ [[package]] name = "blocking" -version = "1.6.2" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e83f8d02be6967315521be875afa792a316e28d57b5a2d401897e2a7921b7f21" +checksum = "a70e4329df6cb94385eed412ec92375c3cdd8a6e502493d1229b6414e4036dfa" dependencies = [ "async-channel", "async-task", @@ -770,9 +776,9 @@ dependencies = [ [[package]] name = "borsh" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f3f6da4992df95bbcd9af42a6c7dcb994498fc9048230405f3b36ff7cd3f145" +checksum = "553c5d846a6ba5150c65e3b1b8ec073bcf1abc20f9b7220de384a4443ea4e20a" dependencies = [ "bytes", "cfg_aliases", @@ -799,9 +805,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.12.3" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cee35f73844aa3014bb606320a6c1f010249dbdf43342fe54b5a4f6a8ed4b79" +checksum = "6bb31b46c14244e20ee9984b11bf5c992b91fb6939fea616e3512c8baecdbe5f" dependencies = [ "memchr", "regex-automata", @@ -817,6 +823,13 @@ dependencies = [ "num-traits", ] +[[package]] +name = "build_helpers" +version = "0.14.0" +dependencies = [ + "cfg_aliases", +] + [[package]] name = "built" version = "0.8.1" @@ -837,22 +850,22 @@ checksum = "64fa3c856b712db6612c019f14756e64e4bcea13337a6b33b696333a9eaa2d06" [[package]] name = "bytemuck" -version = "1.25.0" +version = "1.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8efb64bd706a16a1bdde310ae86b351e4d21550d98d056f22f8a7f7a2183fec" +checksum = "95832e849adfb21180ccb6826a99da14e5d266ae5c2e668e1602cf234f153797" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.10.2" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9abbd1bc6865053c427f7198e6af43bfdedc55ab791faed4fbd361d789575ff" +checksum = "6a1f896587b6f2c069c73d2f0913e2d590c3990285cd2f0b6aa02b786b4c679c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 3.0.5", ] [[package]] @@ -869,9 +882,9 @@ checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" [[package]] name = "bytes" -version = "1.12.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ae3f5d315924270530207e2a68396c3cc547f6dca3fbdca317cfb1a51edb593" +checksum = "fc652a48c352aef3ea3aed32080501cf3ef6ed5da78602a020c991775b0aff04" [[package]] name = "bzip2" @@ -898,7 +911,7 @@ version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4dbf9978365bac10f54d1d4b04f7ce4427e51f71d61f2fe15e3fed5166474df7" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "polling", "rustix 1.1.4", "slab", @@ -919,9 +932,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.65" +version = "1.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e228eec9be7c17ccb640b59b36a5cd805ea2a564a4c5e162c2f659fea30d3b96" +checksum = "a3eb0f42d6c360dc3f8a821f6bf2fdea7f72bfd36b3076eb0e6d1e9e0752fff4" dependencies = [ "find-msvc-tools", "jobserver", @@ -942,9 +955,9 @@ dependencies = [ [[package]] name = "cfg-expr" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb693542bcafa528e198be0ebd9d3632ca5b7c93dbe7237460e199910835997c" +checksum = "fe4ece8474b5f766c63426647e7b4b316b67431ade1036a8313cee24a03ae917" dependencies = [ "smallvec", "target-lexicon", @@ -958,9 +971,9 @@ checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" [[package]] name = "cfg_aliases" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" +checksum = "f079e83a288787bcd14a6aea84cee5c87a67c5a3e660c30f557a3d24761b3527" [[package]] name = "chrono" @@ -1074,9 +1087,9 @@ checksum = "1d07550c9036bf2ae0c684c4297d503f838287c83c53686d05370d0e139ae570" [[package]] name = "combine" -version = "4.6.7" +version = "4.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" +checksum = "cfc320937d09e6de266b31b9afb480f197d7a861be86be7cb2ea7e5d1bfffc5e" dependencies = [ "bytes", "memchr", @@ -1185,7 +1198,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 2.0.119", ] [[package]] @@ -1221,9 +1234,9 @@ dependencies = [ [[package]] name = "configparser" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b46dec724fd22199ebde05033a0cbae453bc3b1ecff11eb6a6bb3eec4b90c6a4" +checksum = "031ad3d167622974ed636505ae4556267ed4aa2aea0464122fa6bc9698a32825" [[package]] name = "const-oid" @@ -1293,7 +1306,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "core-foundation 0.10.1", "libc", ] @@ -1322,7 +1335,7 @@ dependencies = [ name = "cosmic-client-toolkit" version = "0.2.0" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "cosmic-protocols 0.2.0", "libc", "smithay-client-toolkit", @@ -1333,10 +1346,10 @@ dependencies = [ [[package]] name = "cosmic-client-toolkit" version = "0.2.0" -source = "git+https://github.com/pop-os/cosmic-protocols?rev=c253ec1#c253ec1d6804afbcdf250f5cc37ae1194bba7bd2" +source = "git+https://github.com/pop-os/cosmic-protocols?rev=c0cff4d#c0cff4db14c37ed954983158e4055aa94c7741d9" dependencies = [ - "bitflags 2.13.0", - "cosmic-protocols 0.2.0 (git+https://github.com/pop-os/cosmic-protocols?rev=c253ec1)", + "bitflags 2.13.2", + "cosmic-protocols 0.2.0 (git+https://github.com/pop-os/cosmic-protocols?rev=c0cff4d)", "libc", "smithay-client-toolkit", "wayland-client", @@ -1360,7 +1373,7 @@ dependencies = [ "tokio", "tracing", "xdg", - "zbus 5.16.0", + "zbus 5.19.0", ] [[package]] @@ -1368,19 +1381,19 @@ name = "cosmic-config-derive" version = "1.0.0" dependencies = [ "quote", - "syn", + "syn 2.0.119", ] [[package]] name = "cosmic-files" -version = "1.3.0" +version = "1.9.0" dependencies = [ "anyhow", "atomic_float", "bstr", "bzip2", "compio", - "cosmic-client-toolkit 0.2.0 (git+https://github.com/pop-os/cosmic-protocols?rev=c253ec1)", + "cosmic-client-toolkit 0.2.0 (git+https://github.com/pop-os/cosmic-protocols?rev=c0cff4d)", "cosmic-mime-apps", "dirs 6.0.0", "fastrand", @@ -1416,7 +1429,7 @@ dependencies = [ "recently-used-xbel", "regex", "rust-embed", - "rustc-hash 2.1.2", + "rustc-hash 2.1.3", "serde", "sha2 0.10.9", "shlex 1.3.0", @@ -1424,7 +1437,7 @@ dependencies = [ "tar", "tempfile", "test-log", - "thiserror 2.0.18", + "thiserror 2.0.20", "tikv-jemallocator", "tokio", "tracing", @@ -1442,13 +1455,21 @@ dependencies = [ [[package]] name = "cosmic-files-applet" -version = "1.2.0" +version = "1.9.0" dependencies = [ "cosmic-files", "log", "zbus 4.4.0", ] +[[package]] +name = "cosmic-files-thumbnailer" +version = "1.9.0" +dependencies = [ + "image", + "pelite", +] + [[package]] name = "cosmic-freedesktop-icons" version = "0.4.0" @@ -1457,7 +1478,7 @@ dependencies = [ "btoi", "memchr", "memmap2 0.9.11", - "thiserror 2.0.18", + "thiserror 2.0.20", "tracing", "xdg", ] @@ -1477,7 +1498,7 @@ dependencies = [ name = "cosmic-protocols" version = "0.2.0" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "wayland-backend", "wayland-client", "wayland-protocols", @@ -1489,9 +1510,9 @@ dependencies = [ [[package]] name = "cosmic-protocols" version = "0.2.0" -source = "git+https://github.com/pop-os/cosmic-protocols?rev=c253ec1#c253ec1d6804afbcdf250f5cc37ae1194bba7bd2" +source = "git+https://github.com/pop-os/cosmic-protocols?rev=c0cff4d#c0cff4db14c37ed954983158e4055aa94c7741d9" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "wayland-backend", "wayland-client", "wayland-protocols", @@ -1502,7 +1523,7 @@ dependencies = [ [[package]] name = "cosmic-settings-config" -version = "0.1.0" +version = "1.9.0" dependencies = [ "cosmic-config", "ron 0.11.0", @@ -1516,20 +1537,20 @@ dependencies = [ name = "cosmic-settings-daemon" version = "0.1.1-yoda.1" dependencies = [ - "zbus 5.16.0", + "zbus 5.19.0", ] [[package]] name = "cosmic-text" version = "0.19.0" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "fontdb", "harfrust", "linebender_resource_handle", "log", "rangemap", - "rustc-hash 2.1.2", + "rustc-hash 2.1.3", "self_cell", "skrifa 0.40.0", "smol_str", @@ -1556,7 +1577,7 @@ dependencies = [ "ron 0.12.2", "serde", "serde_json", - "thiserror 2.0.18", + "thiserror 2.0.20", ] [[package]] @@ -1576,27 +1597,27 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b2a41393f66f16b0823bb79094d54ac5fbd34ab292ddafb9a0456ac9f87d201" +checksum = "5ca28b0ae3115b884660db4118d803791fd6756b6e88f39c0f3f7859060d7566" dependencies = [ "libc", ] [[package]] name = "crc32fast" -version = "1.5.0" +version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511" +checksum = "01a7799fd6b852db0e61728dde9a204c423b44d689dbd432522543614b490e78" dependencies = [ "cfg-if", ] [[package]] name = "crossbeam-deque" -version = "0.8.6" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51" +checksum = "622f3fc73690be383c7214310406f28a90e6edeadc3cea882f9d71e495b9711a" dependencies = [ "crossbeam-epoch", "crossbeam-utils", @@ -1604,27 +1625,27 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.18" +version = "0.9.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +checksum = "dc74980687109a3b14c72fd458107bf0baa1da1a1a805e178d15501ba9b86d9d" dependencies = [ "crossbeam-utils", ] [[package]] name = "crossbeam-queue" -version = "0.3.12" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f58bbc28f91df819d0aa2a2c00cd19754769c2fad90579b3592b1c9ba7a3115" +checksum = "03e8bd762f7479489c70ed6c768ddca99d7296857de437a68dcb2a94365b3fae" dependencies = [ "crossbeam-utils", ] [[package]] name = "crossbeam-utils" -version = "0.8.21" +version = "0.8.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" +checksum = "a31eee39dddec8330830986fcd7625edb5a24ec90ea038215273bbc3adb08ac6" [[package]] name = "crunchy" @@ -1639,7 +1660,7 @@ dependencies = [ "cosmic-text", "etagere", "lru", - "rustc-hash 2.1.2", + "rustc-hash 2.1.3", "wgpu", ] @@ -1670,12 +1691,12 @@ checksum = "42aaeae719fd78ce501d77c6cdf01f7e96f26bcd5617a4903a1c2b97e388543a" [[package]] name = "csscolorparser" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "199f851bd3cb5004c09474252c7f74e7c047441ed0979bf3688a7106a13da952" +checksum = "168dbdf4dced8f57fa4246ac9080598452b49d70bb2d0e46422142f113140dd8" dependencies = [ "num-traits", - "phf 0.13.1", + "phf", "serde", "uncased", ] @@ -1707,12 +1728,12 @@ dependencies = [ [[package]] name = "darling" -version = "0.23.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25ae13da2f202d56bd7f91c25fba009e7717a1e4a1cc98a76d844b65ae912e9d" +checksum = "ed17f5901b6630b993ca003def43f2f8ef4014fc13b047b57aad617ff32bc2ec" dependencies = [ - "darling_core 0.23.0", - "darling_macro 0.23.0", + "darling_core 0.24.1", + "darling_macro 0.24.1", ] [[package]] @@ -1726,20 +1747,20 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn", + "syn 2.0.119", ] [[package]] name = "darling_core" -version = "0.23.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9865a50f7c335f53564bb694ef660825eb8610e0a53d3e11bf1b0d3df31e03b0" +checksum = "6837e2cf7485aaae18f86181d2f0e9a7ed297a025e220aeabf63fdebd3a2ddff" dependencies = [ "ident_case", "proc-macro2", "quote", "strsim", - "syn", + "syn 3.0.5", ] [[package]] @@ -1750,18 +1771,18 @@ checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81" dependencies = [ "darling_core 0.21.3", "quote", - "syn", + "syn 2.0.119", ] [[package]] name = "darling_macro" -version = "0.23.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3984ec7bd6cfa798e62b4a642426a5be0e68f9401cfc2a01e3fa9ea2fcdb8d" +checksum = "2ac7135c3ef02b2f7833bbeb1be5ba7f966dcde8a87c6b87f65a778d71a02785" dependencies = [ - "darling_core 0.23.0", + "darling_core 0.24.1", "quote", - "syn", + "syn 3.0.5", ] [[package]] @@ -1770,6 +1791,15 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be1e0bca6c3637f992fc1cc7cbc52a78c1ef6db076dbf1059c4323d6a2048376" +[[package]] +name = "dataview" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daba87f72c730b508641c9fb6411fc9bba73939eed2cab611c399500511880d0" +dependencies = [ + "derive_pod", +] + [[package]] name = "deflate64" version = "0.1.12" @@ -1778,9 +1808,9 @@ checksum = "ac6b926516df9c60bfa16e107b21086399f8285a44ca9711344b9e553c5146e2" [[package]] name = "defmt" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6e524506490a1953d237cb87b1cfc1e46f88c18f10a22dfe0f507dc6bfc7f7f" +checksum = "e2953bfe4f93bbd20cc71198842756f77d161884c99ebbabc41d80231ded88d1" dependencies = [ "bitflags 1.3.2", "defmt-macros", @@ -1788,15 +1818,14 @@ dependencies = [ [[package]] name = "defmt-macros" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0a27770e9c8f719a79d8b638281f4d828f77d8fd61e0bd94451b9b85e576a0b" +checksum = "bad9c72e7ca2137e0dc3813245a0d282fd6daad32fd800af018306a9169b5fe8" dependencies = [ "defmt-parser", - "proc-macro-error2", "proc-macro2", "quote", - "syn", + "syn 2.0.119", ] [[package]] @@ -1805,7 +1834,7 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "10d60334b3b2e7c9d91ef8150abfb6fa4c1c39ebbcf4a81c2e346aad939fee3e" dependencies = [ - "thiserror 2.0.18", + "thiserror 2.0.20", ] [[package]] @@ -1817,6 +1846,12 @@ dependencies = [ "serde_core", ] +[[package]] +name = "derive_pod" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2ea6706d74fca54e15f1d40b5cf7fe7f764aaec61352a9fcec58fe27e042fc8" + [[package]] name = "derive_setters" version = "0.1.9" @@ -1826,18 +1861,18 @@ dependencies = [ "darling 0.21.3", "proc-macro2", "quote", - "syn", + "syn 2.0.119", ] [[package]] name = "derive_utils" -version = "0.15.1" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "362f47930db19fe7735f527e6595e4900316b893ebf6d48ad3d31be928d57dd6" +checksum = "dc05a5d33db20c784f873e84934ad94bb209a090987ac5f62fede2c178234f23" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 3.0.5", ] [[package]] @@ -1932,7 +1967,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e0e367e4e7da84520dedcac1901e4da967309406d1e51017ae1abfb97adbd38" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "block2 0.6.2", "libc", "objc2 0.6.4", @@ -1940,13 +1975,13 @@ dependencies = [ [[package]] name = "displaydoc" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ac70aa55017e108007fbaf5aa0f54b021c98f92ff8af59d42eda9da96e3dd4f" +checksum = "c6232dd377dcc64799954cbd3a9bb882e9cdc1308ccd87b1c098f1fb2eaf82a8" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 3.0.5", ] [[package]] @@ -1962,7 +1997,7 @@ dependencies = [ name = "dnd" version = "0.1.0" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "mime 0.1.0", "raw-window-handle", "smithay-client-toolkit", @@ -1996,9 +2031,9 @@ checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555" [[package]] name = "either" -version = "1.16.0" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91622ff5e7162018101f2fea40d6ebf4a78bbe5a49736a2020649edf9693679e" +checksum = "252afb9ae5eaa683babdc6a068b3f5726eb19e05070c731f9b2a23a7c3e8ed34" [[package]] name = "endi" @@ -2024,7 +2059,7 @@ checksum = "67c78a4d8fdf9953a5c9d458f9efe940fd97a0cab0941c075a813ac594733827" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.119", ] [[package]] @@ -2066,7 +2101,7 @@ checksum = "44f23cf4b44bfce11a86ace86f8a73ffdec849c9fd00a386a53d278bd9e81fb3" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.119", ] [[package]] @@ -2087,9 +2122,9 @@ dependencies = [ [[package]] name = "error-code" -version = "3.3.2" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dea2df4cf52843e0452895c455a1a2cfbb842a1e7329671acf418fdc53ed4c59" +checksum = "0b5343afd4a8365a643ac588dab4cf234a190c7f6c88c9f6dd6ffe00837661b7" [[package]] name = "etagere" @@ -2112,11 +2147,10 @@ dependencies = [ [[package]] name = "event-listener" -version = "5.4.1" +version = "5.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13b66accf52311f30a0db42147dadea9850cb48cd070028831ae5f5d4b856ab" +checksum = "5a23add41df1562121a9393cb065eab5146a1242410f23a644851e90cfd669d2" dependencies = [ - "concurrent-queue", "parking", "pin-project-lite", ] @@ -2133,30 +2167,26 @@ dependencies = [ [[package]] name = "exr" -version = "1.74.0" +version = "1.74.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4300e043a56aa2cb633c01af81ca8f699a321879a7854d3896a0ba89056363be" +checksum = "711fe42c9964295e01ee3fba3f9fe0e1d24b98886950d68efe81b1c76e21adf3" dependencies = [ "bit_field", "half", "lebe", - "miniz_oxide", + "miniz_oxide 0.8.9", + "num-complex", + "pulp", "rayon-core", "smallvec", "zune-inflate", ] -[[package]] -name = "fast-srgb8" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd2e7510819d6fbf51a5545c8f922716ecfb14df168a3242f7d33e0239efe6a1" - [[package]] name = "fastrand" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f1f227452a390804cdb637b74a86990f2a7d7ba4b7d5693aac9b4dd6defd8d6" +checksum = "da7c62ceae207dd37ea5b845da6a0696c799f85e97da1ab5b7910be3c1c80223" [[package]] name = "fax" @@ -2203,9 +2233,9 @@ dependencies = [ [[package]] name = "find-msvc-tools" -version = "0.1.9" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582" +checksum = "3e0f1c7c3a72c66fd80abe965175f7523475c0489a87d3ff9d6e8c87d87a9d2d" [[package]] name = "fixed_decimal" @@ -2220,12 +2250,12 @@ dependencies = [ [[package]] name = "flate2" -version = "1.1.9" +version = "1.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "843fba2746e448b37e26a819579957415c8cef339bf08564fe8b7ddbd959573c" +checksum = "6e634e2e0ebac1ee034020da1ca582e17ffe4e0f5e985823721e168928136dcb" dependencies = [ "crc32fast", - "miniz_oxide", + "miniz_oxide 0.9.1", "zlib-rs", ] @@ -2270,7 +2300,7 @@ dependencies = [ "fluent-syntax", "intl-memoizer", "intl_pluralrules", - "rustc-hash 2.1.2", + "rustc-hash 2.1.3", "self_cell", "smallvec", "unic-langid", @@ -2292,7 +2322,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "54f0d287c53ffd184d04d8677f590f4ac5379785529e5e08b1c8083acdd5c198" dependencies = [ "memchr", - "thiserror 2.0.18", + "thiserror 2.0.20", ] [[package]] @@ -2331,6 +2361,15 @@ dependencies = [ "bytemuck", ] +[[package]] +name = "font-types" +version = "0.12.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8eb065f3251655b3c90e22e5e363f310fc5332fb3402e37bbc94752283248f6" +dependencies = [ + "bytemuck", +] + [[package]] name = "fontconfig-parser" version = "0.5.8" @@ -2366,13 +2405,13 @@ dependencies = [ [[package]] name = "foreign-types-macros" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" +checksum = "ea5190182e6915eb873ddbc16e23b711b6eb1f9c00a0d0a3a91b5f6228475225" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 3.0.5", ] [[package]] @@ -2401,15 +2440,15 @@ dependencies = [ [[package]] name = "freedesktop-desktop-entry" -version = "0.8.1" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28273c5c6b97a5f07724f6652f064c0c7f637f9aa5e7c09c83bc3bc4ad4ea245" +checksum = "9cfa09933e03f1ced380ad639822d65cb59a1914217da6c72aa8db3563e94214" dependencies = [ "bstr", "gettext-rs", "log", "memchr", - "thiserror 2.0.18", + "thiserror 2.0.20", "unicase", "xdg", ] @@ -2420,7 +2459,7 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc6d3a3635983a889f065aa9ce760384713f23a9b4a04f696f86c39a5d7a6a5a" dependencies = [ - "indexmap 2.14.0", + "indexmap 2.14.2", "nom 8.0.0", ] @@ -2435,9 +2474,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.32" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b147ee9d1f6d097cef9ce628cd2ee62288d963e16fb287bd9286455b241382d" +checksum = "9a31d2a3fbaaeb2af2368bbdd904aa8e812d3c04a1ee10d3171f52d556e5d0a3" dependencies = [ "futures-channel", "futures-core", @@ -2450,9 +2489,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.32" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07bbe89c50d7a535e539b8c17bc0b49bdb77747034daa8087407d655f3f7cc1d" +checksum = "b1f9e3d69d39e4862ffed03ed071a76f9a13ba1d9109d355b0f0aa6b15e393c4" dependencies = [ "futures-core", "futures-sink", @@ -2460,15 +2499,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.32" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e3450815272ef58cec6d564423f6e755e25379b217b0bc688e295ba24df6b1d" +checksum = "92d699e522242e69e3003b94ecc1f960f3a5e015aa7c5d7486e65ad01dd94f5e" [[package]] name = "futures-executor" -version = "0.3.32" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf29c38818342a3b26b5b923639e7b1f4a61fc5e76102d4b1981c6dc7a7579d" +checksum = "031b47cf1a3c6cc8bc2fc76cd437f521619387907d469316e7c0bc278f1f5432" dependencies = [ "futures-core", "futures-task", @@ -2477,9 +2516,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.32" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cecba35d7ad927e23624b22ad55235f2239cfa44fd10428eecbeba6d6a717718" +checksum = "53c0fa8157de1303bfffdaa1cc2a673bfffb60102f76b0ef4441659124373fed" [[package]] name = "futures-lite" @@ -2496,32 +2535,32 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.32" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835b70203e41293343137df5c0664546da5745f82ec9b84d40be8336958447b" +checksum = "9fb9654ba8355388abeb8dcb4fc62f511300867002afc858860463bdd9fe0c44" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 3.0.5", ] [[package]] name = "futures-sink" -version = "0.3.32" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c39754e157331b013978ec91992bde1ac089843443c49cbc7f46150b0fad0893" +checksum = "1944426bf7d03f1d14f708785e4b33efd750b36d48a157b836b3efc15ede8e1d" [[package]] name = "futures-task" -version = "0.3.32" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "037711b3d59c33004d3856fbdc83b99d4ff37a24768fa1be9ce3538a1cde4393" +checksum = "cd417de3d1d015fc3bfd2b1ea46dfc7bab72ef86f1cc7cc9c78e728b34a6d1fd" [[package]] name = "futures-util" -version = "0.3.32" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "389ca41296e6190b48053de0321d02a77f32f8a5d2461dd38762c0593805c6d6" +checksum = "0d50a92467f8ba5dd6e3ee5d4bd04d73ab2e4e1c44474a0674821dfce14b79bc" dependencies = [ "futures-channel", "futures-core", @@ -2597,9 +2636,9 @@ dependencies = [ [[package]] name = "gettext-rs" -version = "0.7.7" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d5857dc1b7f0fee86961de833f434e29494d72af102ce5355738c0664222bdf" +checksum = "9df5e3fa8c077b15fdfa8ce130e2bc73d663b8aaa6d51b71421b8659980b1d80" dependencies = [ "gettext-sys", "locale_config", @@ -2607,9 +2646,9 @@ dependencies = [ [[package]] name = "gettext-sys" -version = "0.26.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea859ab0dd7e70ff823032b3e077d03d39c965d68c6c10775add60e999d8ee9" +checksum = "4caa7e4460b196107cc1bb2629488e8b6dbb7f34f6683ea6753c4ac22f590785" dependencies = [ "cc", "temp-dir", @@ -2688,7 +2727,7 @@ version = "0.21.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16de123c2e6c90ce3b573b7330de19be649080ec612033d397d72da265f1bd8b" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "futures-channel", "futures-core", "futures-executor", @@ -2713,7 +2752,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 2.0.119", ] [[package]] @@ -2728,15 +2767,15 @@ dependencies = [ [[package]] name = "glob" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280" +checksum = "e4eba85ea1d0a966a983acd07deee566e67395d2d96b6fb39e62b5a833f1eb0b" [[package]] name = "globset" -version = "0.4.18" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52dfc19153a48bde0cbd630453615c8151bce3a5adfac7a0aebfbf0a1e1f57e3" +checksum = "07c34a9410465b45bd9787443bc7370f37735bad04b0f0cd57ff1a3186c98988" dependencies = [ "aho-corasick", "bstr", @@ -2787,7 +2826,7 @@ dependencies = [ "hashbrown 0.16.1", "log", "presser", - "thiserror 2.0.18", + "thiserror 2.0.20", "windows 0.62.2", ] @@ -2797,7 +2836,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b89c83349105e3732062a895becfc71a8f921bb71ecbbdd8ff99263e3b53a0ca" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "gpu-descriptor-types", "hashbrown 0.15.5", ] @@ -2808,7 +2847,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fdf242682df893b86f33a73828fb09ca4b2d3bb6cc95249707fc684d27484b91" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", ] [[package]] @@ -2845,7 +2884,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9da2e5ae821f6e96664977bf974d6d6a2d6682f9ccee23e62ec1d134246845f9" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "bytemuck", "core_maths", "read-fonts 0.37.0", @@ -2898,9 +2937,9 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "hermit-abi" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c" +checksum = "e17592d60ebacc7d5e169f4663c5f84f9161cc90328abcfe8456f41e4dfcb284" [[package]] name = "hex" @@ -2915,7 +2954,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d37f101bf4c633f7ca2e4b5e136050314503dd198e78e325ea602c327c484ef0" dependencies = [ "arrayvec", - "rand 0.8.6", + "rand 0.8.8", "serde", ] @@ -2936,9 +2975,9 @@ dependencies = [ [[package]] name = "hybrid-array" -version = "0.4.13" +version = "0.4.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "818356c5132c1fede50f837ca96afbe78ff42413047f4abb886217845e1b6c8c" +checksum = "27f864f10dfb56725ce5ce5472bc52252c8f93a4ab86327122cebf62c5f59a17" dependencies = [ "typenum", ] @@ -2980,20 +3019,20 @@ dependencies = [ [[package]] name = "i18n-embed-fl" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e598ed73b67db92f61e04672e599eef2991a262a40e1666735b8a86d2e7e9f30" +checksum = "602e6bd30c3db2749e13e38b363a3d98d9d41de1d8de7a79c31bb69e45b47cda" dependencies = [ "find-crate", "fluent", "fluent-syntax", "i18n-config", "i18n-embed", - "proc-macro-error2", + "proc-macro-error3", "proc-macro2", "quote", "strsim", - "syn", + "syn 2.0.119", "unic-langid", ] @@ -3007,7 +3046,7 @@ dependencies = [ "i18n-config", "proc-macro2", "quote", - "syn", + "syn 2.0.119", ] [[package]] @@ -3038,6 +3077,7 @@ dependencies = [ name = "iced" version = "0.14.0" dependencies = [ + "build_helpers", "dnd", "iced_accessibility", "iced_core", @@ -3050,7 +3090,7 @@ dependencies = [ "iced_winit", "image", "mime 0.1.0", - "thiserror 2.0.18", + "thiserror 2.0.20", "window_clipboard", ] @@ -3066,7 +3106,8 @@ dependencies = [ name = "iced_core" version = "0.14.0" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", + "build_helpers", "bytes", "cosmic-client-toolkit 0.2.0", "dnd", @@ -3077,10 +3118,10 @@ dependencies = [ "num-traits", "palette", "raw-window-handle", - "rustc-hash 2.1.2", + "rustc-hash 2.1.3", "serde", "smol_str", - "thiserror 2.0.18", + "thiserror 2.0.20", "unicode-segmentation", "web-time", "window_clipboard", @@ -3102,7 +3143,7 @@ dependencies = [ "futures", "iced_core", "log", - "rustc-hash 2.1.2", + "rustc-hash 2.1.3", "tokio", "wasm-bindgen-futures", "wasmtimer", @@ -3112,7 +3153,7 @@ dependencies = [ name = "iced_graphics" version = "0.14.0" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "bytemuck", "cosmic-text", "half", @@ -3123,8 +3164,8 @@ dependencies = [ "log", "lyon_path", "raw-window-handle", - "rustc-hash 2.1.2", - "thiserror 2.0.18", + "rustc-hash 2.1.3", + "thiserror 2.0.20", "unicode-segmentation", ] @@ -3144,20 +3185,21 @@ dependencies = [ "iced_tiny_skia", "iced_wgpu", "log", - "thiserror 2.0.18", + "thiserror 2.0.20", ] [[package]] name = "iced_runtime" version = "0.14.0" dependencies = [ + "build_helpers", "bytes", "cosmic-client-toolkit 0.2.0", "dnd", "iced_core", "iced_futures", "raw-window-handle", - "thiserror 2.0.18", + "thiserror 2.0.20", "window_clipboard", ] @@ -3172,16 +3214,17 @@ dependencies = [ "kurbo 0.10.4", "log", "resvg", - "rustc-hash 2.1.2", + "rustc-hash 2.1.3", "softbuffer", - "tiny-skia", + "tiny-skia 0.11.4", ] [[package]] name = "iced_wgpu" version = "0.14.0" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", + "build_helpers", "bytemuck", "cosmic-client-toolkit 0.2.0", "cryoglyph", @@ -3194,9 +3237,9 @@ dependencies = [ "lyon", "raw-window-handle", "resvg", - "rustc-hash 2.1.2", + "rustc-hash 2.1.3", "rustix 0.38.44", - "thiserror 2.0.18", + "thiserror 2.0.20", "wayland-backend", "wayland-client", "wayland-protocols", @@ -3208,6 +3251,7 @@ dependencies = [ name = "iced_widget" version = "0.14.2" dependencies = [ + "build_helpers", "cosmic-client-toolkit 0.2.0", "dnd", "iced_renderer", @@ -3215,8 +3259,8 @@ dependencies = [ "log", "num-traits", "ouroboros", - "rustc-hash 2.1.2", - "thiserror 2.0.18", + "rustc-hash 2.1.3", + "thiserror 2.0.20", "unicode-segmentation", "window_clipboard", ] @@ -3225,6 +3269,7 @@ dependencies = [ name = "iced_winit" version = "0.14.0" dependencies = [ + "build_helpers", "cosmic-client-toolkit 0.2.0", "cursor-icon", "dnd", @@ -3235,9 +3280,9 @@ dependencies = [ "iced_runtime", "log", "raw-window-handle", - "rustc-hash 2.1.2", + "rustc-hash 2.1.3", "rustix 0.38.44", - "thiserror 2.0.18", + "thiserror 2.0.20", "wasm-bindgen-futures", "wayland-backend", "wayland-client", @@ -3254,9 +3299,9 @@ dependencies = [ [[package]] name = "icu" -version = "2.2.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00380f83691e089bcfa4aeb03a2d96a910b1c9ea406d6f822fc19dfb8b58d1ec" +checksum = "4867dd3a39b9d48632416cc7fc3dfa1913d89fd36cc02fe7bfc1dddc6fda3cde" dependencies = [ "icu_calendar", "icu_casemap", @@ -3278,15 +3323,15 @@ dependencies = [ [[package]] name = "icu_calendar" -version = "2.2.1" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2b2acc6263f494f1df50685b53ff8e57869e47d5c6fe39c23d518ae9a4f3e45" +checksum = "58655df2f728e46e4eee80bddebefacf52ec3e77cdb925014b47c5a5905eb55c" dependencies = [ "calendrical_calculations", "displaydoc", "icu_calendar_data", - "icu_locale", "icu_locale_core", + "icu_locale_fallback", "icu_provider", "ixdtf", "serde", @@ -3296,15 +3341,15 @@ dependencies = [ [[package]] name = "icu_calendar_data" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "118577bcf3a0fa7c6ac0a7d6e951814da84ee56b9b1f68fb4d8d10b08cefaf4d" +checksum = "dc00caaa3fb3201ff7a18aa458e8c3ab042b9da154cfdf948bdde3936c31c36e" [[package]] name = "icu_casemap" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "070f98b5b82798fcb93654bf96ed9f40064fc44c86f51a09ea711092cd5cc5be" +checksum = "f2edfd120d8445de853cf53a1abec916f638f933a70a6f4bf8f7e2d7b7f884e9" dependencies = [ "icu_casemap_data", "icu_collections", @@ -3318,20 +3363,20 @@ dependencies = [ [[package]] name = "icu_casemap_data" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "846b0857ca091204be3c874bc93daaf89d4777e8d2d20b0d3ffe8f671d98014b" +checksum = "059fcda0fc8d33effc6633a8cf0d8a3c17caf7d7c91918fba9918744f501e4e8" [[package]] name = "icu_collator" -version = "2.2.1" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bbdf98e5e0aa827770acee171ebb568aaab975a36b56afdb5fd0e2f525750bb" +checksum = "08984ed58ac439ebf3e13d2cf26b0c46a60afcd21721c1d14087c0b240344dda" dependencies = [ "icu_collator_data", "icu_collections", - "icu_locale", "icu_locale_core", + "icu_locale_fallback", "icu_normalizer", "icu_properties", "icu_provider", @@ -3343,15 +3388,15 @@ dependencies = [ [[package]] name = "icu_collator_data" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "038ed8e5817f2059c2f3efb0945ba78d060d3d25e8f1a1bea5139f821a21a2f0" +checksum = "f7d7e54efdddeb1208c08dd5d32b53a879ac00d2d3d051b2255fd26821d16368" [[package]] name = "icu_collections" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2984d1cd16c883d7935b9e07e44071dca8d917fd52ecc02c04d5fa0b5a3f191c" +checksum = "fa68d21081c4a05d5a901a1c62add574c77048b6a1c67be3b50ce0b60d4ca513" dependencies = [ "displaydoc", "potential_utf", @@ -3364,17 +3409,17 @@ dependencies = [ [[package]] name = "icu_datetime" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "989d56ea5bbc43ae2b4e0388874b002884eaf4ed3a76c84a6c8c5ad575e04d72" +checksum = "c44df99c4c5297b05653d1a1629f13bdc9fd4044acfbbaf30b15194a1eed4cd6" dependencies = [ "displaydoc", "fixed_decimal", "icu_calendar", "icu_datetime_data", "icu_decimal", - "icu_locale", "icu_locale_core", + "icu_locale_fallback", "icu_pattern", "icu_plurals", "icu_provider", @@ -3387,21 +3432,21 @@ dependencies = [ [[package]] name = "icu_datetime_data" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40d3cc1b690d9703202bc319692ac8a1f3a6390686f0930ff40542450fa34f0b" +checksum = "8bb5555f6e4b42233f58564351ce16d73e9e6ebfce6bdcf29875d0cfc554d6a8" [[package]] name = "icu_decimal" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "288247df2e32aa776ac54fdd64de552149ac43cb840f2761811f0e8d09719dd4" +checksum = "9eb8f655bba2d0c0459e43a5b0e6cd3cd388109898fb3d85d048165e8b0abd08" dependencies = [ "displaydoc", "fixed_decimal", "icu_decimal_data", - "icu_locale", "icu_locale_core", + "icu_locale_fallback", "icu_pattern", "icu_plurals", "icu_provider", @@ -3412,15 +3457,15 @@ dependencies = [ [[package]] name = "icu_decimal_data" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f14a5ca9e8af29eef62064f269078424283d90dbaffeac5225addf62aaabc22" +checksum = "e4c887fc7d4c297cf3f9436864af9e3dba7f8be9415a6c2a7f392f3b1636298c" [[package]] name = "icu_experimental" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a881116e620fd635f564fd9cb9bc36c256b9da2221df8b3f55643d8ef32140f" +checksum = "7c09609ad18e249b97a0afa20e19502c4d11ab039e6e35f5ecf48bebd4eedd7e" dependencies = [ "displaydoc", "either", @@ -3432,6 +3477,7 @@ dependencies = [ "icu_list", "icu_locale", "icu_locale_core", + "icu_locale_fallback", "icu_normalizer", "icu_pattern", "icu_plurals", @@ -3451,18 +3497,18 @@ dependencies = [ [[package]] name = "icu_experimental_data" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f72090d4f08a2bc94565cb02de6d5b87939424e462d9927d73a34f6f8e5d1232" +checksum = "377481a8935d6774f410424d79a6dc8a09d9bd8def9560cff17abe755a246280" [[package]] name = "icu_list" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aeeaf517689324395bed4767f7c65504f5455942ed4c14ee54c2087ca00b816e" +checksum = "5a5c625125085fac4bf9ad111888a90c6ab9dc7bcaec392ca79cab417f46e3fb" dependencies = [ "icu_list_data", - "icu_locale", + "icu_locale_fallback", "icu_provider", "regex-automata", "serde", @@ -3472,30 +3518,30 @@ dependencies = [ [[package]] name = "icu_list_data" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed62dbf114db9a4163481ed071509c4cd52cbcef9cb85979eba08a95549d73f3" +checksum = "4ffef91ee351bd195a803115615a034dfb9f02bb48850980548c31cb78568a91" [[package]] name = "icu_locale" -version = "2.2.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5a396343c7208121dc86e35623d3dfe19814a7613cfd14964994cdc9c9a2e26" +checksum = "785f595c61ef57169a467eeed7b4b6936a66f6cacbb116a96ee86da983251bf4" dependencies = [ "icu_collections", "icu_locale_core", "icu_locale_data", + "icu_locale_fallback", "icu_provider", - "potential_utf", "tinystr", "zerovec", ] [[package]] name = "icu_locale_core" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92219b62b3e2b4d88ac5119f8904c10f8f61bf7e95b640d25ba3075e6cac2c29" +checksum = "d56e28588da92eee5c3201a6eff33fabdd49b62269c8938d4ff050ce4d900deb" dependencies = [ "displaydoc", "litemap", @@ -3507,15 +3553,35 @@ dependencies = [ [[package]] name = "icu_locale_data" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5fdcc9ac77c6d74ff5cf6e65ef3181d6af32003b16fce3a77fb451d2f695993" +checksum = "d37d91460e362a5cf58907cd7ce871411775ee6294e49a5cc8e6cec16dfa75ea" + +[[package]] +name = "icu_locale_fallback" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "251af8e57c9400e3eb58242fe5b8b1152b2a64fdf4cf632f923c38ccee6f2fa9" +dependencies = [ + "icu_locale_core", + "icu_locale_fallback_data", + "icu_provider", + "potential_utf", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_locale_fallback_data" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "decf2a22ec8fa68f1a0c1129a3f8583f8f8bc24e8b9ccbe98ead99f62a4dc3a8" [[package]] name = "icu_normalizer" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c56e5ee99d6e3d33bd91c5d85458b6005a22140021cc324cea84dd0e72cff3b4" +checksum = "12f9cf5f235641ed274641dd81c3f28d870e276763d0797aeeab72317b1c646f" dependencies = [ "icu_collections", "icu_normalizer_data", @@ -3530,15 +3596,15 @@ dependencies = [ [[package]] name = "icu_normalizer_data" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da3be0ae77ea334f4da67c12f149704f19f81d1adf7c51cf482943e84a2bad38" +checksum = "1563da1ed3e0b3bf3d74c9b85917ac9c56464d2f57242270c09c9e752f8021a0" [[package]] name = "icu_pattern" -version = "0.4.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c4c568054ffe735398a9f4c55aec37ad7c768844553cc0978f09cc9b933a1fb" +checksum = "2b3db611446bd92c246b03e4aa0bafa71ddb194af431ddbb42b9d70e4bfce1a0" dependencies = [ "displaydoc", "either", @@ -3550,12 +3616,12 @@ dependencies = [ [[package]] name = "icu_plurals" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a50023f1d49ad5c4333380328a0d4a19e4b9d6d842ec06639affd5ba47c8103" +checksum = "e475e6766ef87b1d3c1f97be6363995b0bfaeddbc789671615df598a97ff0593" dependencies = [ "fixed_decimal", - "icu_locale", + "icu_locale_fallback", "icu_plurals_data", "icu_provider", "zerovec", @@ -3563,16 +3629,17 @@ dependencies = [ [[package]] name = "icu_plurals_data" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8485497155dc865f901decb93ecc20d3e467df67bfeceb91e3ba34e2b11e8e1d" +checksum = "1251aa39a95e1333888e499b1263e1c196447a28948acf5bdabd82c046f153bf" [[package]] name = "icu_properties" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bee3b67d0ea5c2cca5003417989af8996f8604e34fb9ddf96208a033901e70de" +checksum = "7e7ca276ad3145661a65914e6daf131ca5120cd3dcee8f8f3214b8875184a148" dependencies = [ + "displaydoc", "icu_collections", "icu_locale_core", "icu_properties_data", @@ -3584,15 +3651,15 @@ dependencies = [ [[package]] name = "icu_properties_data" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e2bbb201e0c04f7b4b3e14382af113e17ba4f63e2c9d2ee626b720cbce54a14" +checksum = "e590f038c1464a96894fd6d10127e90a8be4509f56ff7ecef851b15cee0b7caa" [[package]] name = "icu_provider" -version = "2.2.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "139c4cf31c8b5f33d7e199446eff9c1e02decfc2f0eec2c8d71f65befa45b421" +checksum = "d27bbb9d3abbefac45d55f647c9de1d44aafcd1186eb91879afef17c396c3e73" dependencies = [ "displaydoc", "icu_locale_core", @@ -3607,31 +3674,32 @@ dependencies = [ [[package]] name = "icu_segmenter" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c0794db0b1a86193ac9c48768d0e6c52c54448e0870ad87907d456ee0dac964" +checksum = "82d07aafccd67af15d02512a6adf5896fbc5ed00f2e99b471d2efa14016db3db" dependencies = [ "core_maths", "icu_collections", - "icu_locale", + "icu_locale_fallback", "icu_provider", "icu_segmenter_data", "potential_utf", + "smallvec", "utf8_iter", "zerovec", ] [[package]] name = "icu_segmenter_data" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4a2c462a4d927d512f5f882a033ddd62f33a05bb9f230d98f736ac3dc85938f" +checksum = "ae293c039020f9ec10710af98d29ce6aa2051486638b49c9a6409f3b4a9e98ad" [[package]] name = "icu_time" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec3af0c141da0a61d4f6970cd1d5f4b388b17ea22f8124f8f6049d3d5147586a" +checksum = "af37e1c3b9f3ab564b619fdf4b22de169f6381eb0f7048e3ca454290c438126b" dependencies = [ "calendrical_calculations", "displaydoc", @@ -3647,9 +3715,9 @@ dependencies = [ [[package]] name = "icu_time_data" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f2f8aeca682d874a5247084aa4fb7d1cef9ba45d889c21209a8818dcaaa0ec9" +checksum = "005ff86fa5851a77fc0a977b72d717f777bd9230415a247219d7898aefb1517a" [[package]] name = "ident_case" @@ -3680,9 +3748,9 @@ dependencies = [ [[package]] name = "ignore" -version = "0.4.26" +version = "0.4.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b915661dd01db3f05050265b2477bcc6527b3792388e2749b41623cc592be67d" +checksum = "00b69833ed729dc5aa7d19541d96d6cf8e9137194207a04916d658e43168402f" dependencies = [ "crossbeam-deque", "globset", @@ -3714,7 +3782,7 @@ dependencies = [ "rayon", "rgb", "tiff", - "zune-core 0.5.1", + "zune-core 0.5.3", "zune-jpeg 0.5.15", ] @@ -3745,9 +3813,9 @@ checksum = "edcd27d72f2f071c64249075f42e205ff93c9a4c5f6c6da53e79ed9f9832c285" [[package]] name = "imgref" -version = "1.12.2" +version = "1.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89194689a993ab15268672e99e7b0e19da2da3268ac682e8f02d29d4d1434cd7" +checksum = "6e44b0a4eaa4c82f441d50a963f2d5f05a787240aeee097597033e72accfd22f" [[package]] name = "indexmap" @@ -3762,9 +3830,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.14.0" +version = "2.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9" +checksum = "cc4e190f5d26ca7051642629da2c52fc03bde85a03197c99408dcd291734c855" dependencies = [ "equivalent", "hashbrown 0.17.1", @@ -3783,20 +3851,20 @@ dependencies = [ [[package]] name = "inotify" -version = "0.11.2" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "533e68a5842e734946fe159fb03fc9bbbb254f590dd0d8ad321ae5ff7beca2c1" +checksum = "4cc00ea907cab49550b7da656f80ebb97be1b997d931fbcd28d39734e17ce592" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "inotify-sys", "libc", ] [[package]] name = "inotify-sys" -version = "0.1.5" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" +checksum = "c033f80b2c113cdf91ab7a33faa9cbc014726dcad99880c8609af2a370edf37d" dependencies = [ "libc", ] @@ -3818,7 +3886,7 @@ checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.119", ] [[package]] @@ -3842,11 +3910,11 @@ dependencies = [ [[package]] name = "io-uring" -version = "0.7.13" +version = "0.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9080b15e63775b9a2ac7dca720f7050a8b955e092ea0f6020a4a80f69998cdc0" +checksum = "ed3bd0ecfbb87805f538bb7b32e5239ca0763890c623e349860ecba69469f2bb" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "cfg-if", "libc", ] @@ -3904,17 +3972,18 @@ checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682" [[package]] name = "ixdtf" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ceaf4c6c48465bead8cb6a0b7c4ee0c86ecbb31239032b9c66ab9a08d2f3ee1" +checksum = "4d3667095d64c3ecffc96463a21157b04bf3e252f6e8d5750b20c02e33c194e3" [[package]] name = "jiff" -version = "0.2.31" +version = "0.2.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccfe6121cbe750cf81efa362d85c0bde7ea298ec43092d3a193baca59cdbd634" +checksum = "0ab1baf72f08796de0260609515130699b890ac25f30e610ad894bc5856cafdb" dependencies = [ "defmt", + "jiff-core", "jiff-static", "jiff-tzdb-platform", "log", @@ -3924,6 +3993,16 @@ dependencies = [ "windows-link 0.2.1", ] +[[package]] +name = "jiff-core" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e52fe76043ccecc9005d2305ebaadf7d7fc0cc89ca6baa10a94d6bc68c7128c" +dependencies = [ + "defmt", + "log", +] + [[package]] name = "jiff-icu" version = "0.2.2" @@ -3937,20 +4016,21 @@ dependencies = [ [[package]] name = "jiff-static" -version = "0.2.31" +version = "0.2.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e165e897f662d428f3cd3828a919dbe067c2d42bb1031eede74ef9d27ecdedd2" +checksum = "378268a1116ad67ae6228701118ac9f491d78fda38a40a1f1a9e1348de6f7212" dependencies = [ + "jiff-core", "proc-macro2", "quote", - "syn", + "syn 2.0.119", ] [[package]] name = "jiff-tzdb" -version = "0.1.6" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c900ef84826f1338a557697dc8fc601df9ca9af4ac137c7fb61d4c6f2dfd3076" +checksum = "142bd39932ad231f10513df9ab62661fead8719872150b7ad02a2df79f4e141e" [[package]] name = "jiff-tzdb-platform" @@ -3973,7 +4053,7 @@ dependencies = [ "jni-sys 0.4.1", "log", "simd_cesu8", - "thiserror 2.0.18", + "thiserror 2.0.20", "walkdir", "windows-link 0.2.1", ] @@ -3988,7 +4068,7 @@ dependencies = [ "quote", "rustc_version", "simd_cesu8", - "syn", + "syn 2.0.119", ] [[package]] @@ -4016,24 +4096,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38c0b942f458fe50cdac086d2f946512305e5631e720728f2a61aabcd47a6264" dependencies = [ "quote", - "syn", + "syn 2.0.119", ] [[package]] name = "jobserver" -version = "0.1.34" +version = "0.1.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33" +checksum = "1c00acbd29eabad4a2392fa0e921c874934dbbf4194312ad20f04a0ed67a3cb3" dependencies = [ - "getrandom 0.3.4", + "getrandom 0.4.3", "libc", ] [[package]] name = "js-sys" -version = "0.3.103" +version = "0.3.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53b44bfcdb3f8d5837a46dae1ca9660a837176eee74a28b229bc626816589102" +checksum = "ce57d20d1ea864ce2ac172ab472d409214f4fd359f0b2a2775abdf522e2af99e" dependencies = [ "cfg-if", "futures-util", @@ -4235,7 +4315,7 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fbe853b403ae61a04233030ae8a79d94975281ed9770a1f9e246732b534b28d" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "serde", ] @@ -4267,9 +4347,9 @@ dependencies = [ [[package]] name = "kqueue" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "273c0752728918e0ac4976f2b275b6fefb9ecd400585dec929419f3844cd87b5" +checksum = "8d763e5b24120b4ddf50de6c92308156765aabfbbccebf401da7cff2d70a41ea" dependencies = [ "kqueue-sys", "libc", @@ -4281,7 +4361,7 @@ version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07293a4e297ac234359b510362495713f75ea345d5307140414f20c69ffeb087" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "libc", ] @@ -4326,9 +4406,9 @@ checksum = "34b357333733e8260735ba5894eb928c02ecc69c78715f01a8019e7fa7f2db4c" [[package]] name = "libc" -version = "0.2.186" +version = "0.2.189" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66" +checksum = "3eaf3ede3fee6db1a4c2ee091bf8a8b4dccdc6d17f656fb07896ee72867612f2" [[package]] name = "libcosmic-yoda" @@ -4337,6 +4417,7 @@ dependencies = [ "apply", "ashpd 0.12.3", "auto_enums", + "build_helpers", "cosmic-client-toolkit 0.2.0", "cosmic-config", "cosmic-freedesktop-icons", @@ -4367,20 +4448,21 @@ dependencies = [ "log", "mime 0.3.17", "palette", - "phf 0.13.1", + "phf", "rfd", + "roxmltree", "rust-embed", "rustix 1.1.4", "serde", "shlex 1.3.0", "slotmap", "taffy", - "thiserror 2.0.18", + "thiserror 2.0.20", "tokio", "tracing", "unicode-segmentation", "url", - "zbus 5.16.0", + "zbus 5.19.0", ] [[package]] @@ -4411,21 +4493,21 @@ checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981" [[package]] name = "libredox" -version = "0.1.17" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f02ab6bace2054fb888a3c16f990117b579d14a3088e472d63c6011fa185c9d3" +checksum = "6480ccc157a1389bb2e4891b24751b0f798ba640d22386f23143fbcc89da195a" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "libc", "plain", - "redox_syscall 0.8.1", + "redox_syscall 0.9.4", ] [[package]] name = "lilt" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f67562e5eff6b20553fa9be1c503356768420994e28f67e3eafe6f41910e57ad" +checksum = "337d4c256f7d9f2dbd633891d48ace853efa5b1554122d9220b172ad9c03c3a9" dependencies = [ "web-time", ] @@ -4450,9 +4532,9 @@ checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53" [[package]] name = "litemap" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92daf443525c4cce67b150400bc2316076100ce0b3686209eb8cf3c31612e6f0" +checksum = "47d9d19d1d6efa0109d2f65ff4c85cddd50bd572e5a00127ab10987290bcefae" [[package]] name = "litrs" @@ -4484,9 +4566,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.33" +version = "0.4.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ceec5bc11778974d1bcb055b18002eba7f4b3518b6a0081b3af5f21666da9ad" +checksum = "f9f8bd3e56ce4dfc153cf470fffbfa98c7620958b312ca5c3a4b8d5181fd13c6" [[package]] name = "loom" @@ -4529,9 +4611,9 @@ dependencies = [ [[package]] name = "lyon_algorithms" -version = "1.0.20" +version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8575c0d003ae459399623c4def180c63b77f343b1a7fee64f249b349e7699a31" +checksum = "cdfa8785f95e57914ddb35e3b59994aeba6f5e79e9cfd03da1c269f010f36009" dependencies = [ "lyon_path", "num-traits", @@ -4560,9 +4642,9 @@ dependencies = [ [[package]] name = "lyon_tessellation" -version = "1.0.20" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e43b7e44161571868f5c931d12583592c223c5583eef86b08aa02b7048a3552" +checksum = "43b8dcf906637ecef61b3c0740c7a4e7f27caeb31257cfac0cc579ce15be6005" dependencies = [ "float_next_after", "lyon_path", @@ -4571,9 +4653,9 @@ dependencies = [ [[package]] name = "lzma-rust2" -version = "0.16.4" +version = "0.16.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce716bf1a316f47a280fc76295f6495b5bea4752bca01c3b3885e101b1c23c02" +checksum = "ca93e534d1142d1d0dcca6d25fe302508a5dfb40b302802904577725ea0b695b" dependencies = [ "sha2 0.11.0", ] @@ -4632,9 +4714,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.8.2" +version = "2.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88904434abc2901f197fe8cc55f0445e7ded921dba5911dad2e2b39b48e663c4" +checksum = "cf8baf1c55e62ffcace7a9f06f4bd9cd3f0c4beb022d3b367256b91b87513d98" [[package]] name = "memmap2" @@ -4669,7 +4751,7 @@ version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c7047791b5bc903b8cd963014b355f71dc9864a9a0b727057676c1dcae5cbc15" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "block", "core-graphics-types 0.2.0", "foreign-types", @@ -4718,10 +4800,20 @@ dependencies = [ ] [[package]] -name = "mio" -version = "1.2.1" +name = "miniz_oxide" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02bd0af71c67b473010cbbc60715ee815645a4dc942899111f494b4b737d6fda" +checksum = "b63fbc4a50860e98e7b2aa7804ded1db5cbc3aff9193adaff57a6931bf7c4b4c" +dependencies = [ + "adler2", + "simd-adler32", +] + +[[package]] +name = "mio" +version = "1.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b18443e9c262bfe8fa82f51666e2642c53393f7e5c27b3e1aeab922cff5b9d8" dependencies = [ "libc", "log", @@ -4753,21 +4845,21 @@ checksum = "618f667225063219ddfc61251087db8a9aec3c3f0950c916b614e403486f1135" dependencies = [ "arrayvec", "bit-set", - "bitflags 2.13.0", + "bitflags 2.13.2", "cfg-if", "cfg_aliases", "codespan-reporting", "half", "hashbrown 0.16.1", "hexf-parse", - "indexmap 2.14.0", + "indexmap 2.14.2", "libm", "log", "num-traits", "once_cell", "rustc-hash 1.1.0", "spirv", - "thiserror 2.0.18", + "thiserror 2.0.20", "unicode-ident", ] @@ -4777,7 +4869,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "jni-sys 0.3.1", "log", "ndk-sys", @@ -4813,13 +4905,19 @@ version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "cfg-if", "cfg_aliases", "libc", "memoffset", ] +[[package]] +name = "no-std-compat" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c" + [[package]] name = "no_std_io2" version = "0.9.4" @@ -4860,7 +4958,7 @@ version = "8.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4d3d07927151ff8575b7087f245456e549fea62edf0ec4e565a5ee50c8402bc3" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "fsevent-sys", "inotify", "kqueue", @@ -4896,7 +4994,7 @@ dependencies = [ "mac-notification-sys", "serde", "tauri-winrt-notification", - "zbus 5.16.0", + "zbus 5.19.0", ] [[package]] @@ -4905,7 +5003,7 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42b8cfee0e339a0337359f3c88165702ac6e600dc01c0cc9579a92d62b08477a" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", ] [[package]] @@ -4919,14 +5017,24 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.6" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" +checksum = "c89e69e7e0f03bea5ef08013795c25018e101932225a656383bd384495ecc367" dependencies = [ "num-integer", "num-traits", ] +[[package]] +name = "num-complex" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" +dependencies = [ + "bytemuck", + "num-traits", +] + [[package]] name = "num-conv" version = "0.2.2" @@ -4941,14 +5049,14 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.119", ] [[package]] name = "num-integer" -version = "0.1.46" +version = "0.1.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +checksum = "7ce2d95d4b3734dc35aa2f45e1aa22cd416814592a4f9d9205e11affd5b8e10b" dependencies = [ "num-traits", ] @@ -5003,7 +5111,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 2.0.119", ] [[package]] @@ -5057,7 +5165,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "block2 0.5.1", "libc", "objc2 0.5.2", @@ -5073,7 +5181,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d49e936b501e5c5bf01fda3a9452ff86dc3ea98ad5f283e1455153142d97518c" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "block2 0.6.2", "objc2 0.6.4", "objc2-core-foundation", @@ -5086,7 +5194,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "block2 0.5.1", "objc2 0.5.2", "objc2-foundation 0.2.2", @@ -5098,7 +5206,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "block2 0.6.2", "dispatch2", "objc2 0.6.4", @@ -5110,7 +5218,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e022c9d066895efa1345f8e33e584b9f958da2fd4cd116792e15e07e4720a807" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "libc", "objc2-core-foundation", ] @@ -5133,7 +5241,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d425caf1df73233f29fd8a5c3e5edbc30d2d4307870f802d18f00d83dc5141a6" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "objc2-core-foundation", "objc2-core-graphics", ] @@ -5150,7 +5258,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "block2 0.5.1", "libc", "objc2 0.5.2", @@ -5162,7 +5270,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3e0adef53c21f888deb4fa59fc59f7eb17404926ee8a6f59f5df0fd7f9f3272" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "block2 0.6.2", "libc", "objc2 0.6.4", @@ -5175,7 +5283,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "block2 0.5.1", "objc2 0.5.2", "objc2-foundation 0.2.2", @@ -5187,7 +5295,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "block2 0.5.1", "objc2 0.5.2", "objc2-foundation 0.2.2", @@ -5200,7 +5308,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d87d638e33c06f577498cbcc50491496a3ed4246998a7fbba7ccb98b1e7eab22" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "objc2 0.6.4", "objc2-core-foundation", "objc2-foundation 0.3.2", @@ -5229,9 +5337,9 @@ checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe" [[package]] name = "open" -version = "5.3.6" +version = "5.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd8d3b65c44123a56e0133d2cd06ce4361bd3ca99d41198b2f25e3c3db9b8b4a" +checksum = "aa576c76302b7b808eecc68061e67336c47833ef9d22caa74dda10fa9675eebc" dependencies = [ "is-wsl", "libc", @@ -5255,9 +5363,9 @@ dependencies = [ [[package]] name = "ordered-float" -version = "5.3.0" +version = "5.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7d950ca161dc355eaf28f82b11345ed76c6e1f6eb1f4f4479e0323b9e2fbd0e" +checksum = "8c7c9e0d9b23589f26070720bac724174bfec1083e82f7854cdd0267518343c0" dependencies = [ "num-traits", ] @@ -5274,11 +5382,11 @@ dependencies = [ [[package]] name = "ordermap" -version = "1.2.0" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f7476a5b122ff1fce7208e7ee9dccd0a516e835f5b8b19b8f3c98a34cf757c1" +checksum = "16a756ddcdeb6c0efc8927bdf0ed112885815a35ba350472a467be5104f01ca1" dependencies = [ - "indexmap 2.14.0", + "indexmap 2.14.2", "serde", "serde_core", ] @@ -5314,7 +5422,7 @@ dependencies = [ "proc-macro2", "proc-macro2-diagnostics", "quote", - "syn", + "syn 2.0.119", ] [[package]] @@ -5328,29 +5436,35 @@ dependencies = [ [[package]] name = "palette" -version = "0.7.6" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cbf71184cc5ecc2e4e1baccdb21026c20e5fc3dcf63028a086131b3ab00b6e6" +checksum = "ddeed8580d347d2abf3dcf06a5f0b3dc020258338526b277847cd4248a70fc64" dependencies = [ "approx", - "fast-srgb8", "palette_derive", - "phf 0.11.3", + "palette_math", + "phf", "serde", ] [[package]] name = "palette_derive" -version = "0.7.6" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5030daf005bface118c096f510ffb781fc28f9ab6a32ab224d8631be6851d30" +checksum = "88537020289b719d81be994ccf1bbf4990f477e2f69ee52fe3e45f43a02e56be" dependencies = [ "by_address", "proc-macro2", "quote", - "syn", + "syn 2.0.119", ] +[[package]] +name = "palette_math" +version = "0.7.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e6eb142958d64335fb0e345c5b9ead2ecd6fc438c307e9d7d3c4fd428dbaf12" + [[package]] name = "parking" version = "2.2.1" @@ -5402,43 +5516,42 @@ dependencies = [ "hmac", ] +[[package]] +name = "pelite" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88dccf4bd32294364aeb7bd55d749604450e9db54605887551f21baea7617685" +dependencies = [ + "dataview", + "libc", + "no-std-compat", + "pelite-macros", + "winapi", +] + +[[package]] +name = "pelite-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a7cf3f8ecebb0f4895f4892a8be0a0dc81b498f9d56735cb769dc31bf00815b" + [[package]] name = "percent-encoding" version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" -[[package]] -name = "phf" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078" -dependencies = [ - "phf_macros 0.11.3", - "phf_shared 0.11.3", -] - [[package]] name = "phf" version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1562dc717473dbaa4c1f85a36410e03c047b2e7df7f45ee938fbef64ae7fadf" dependencies = [ - "phf_macros 0.13.1", - "phf_shared 0.13.1", + "phf_macros", + "phf_shared", "serde", ] -[[package]] -name = "phf_generator" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d" -dependencies = [ - "phf_shared 0.11.3", - "rand 0.8.6", -] - [[package]] name = "phf_generator" version = "0.13.1" @@ -5446,20 +5559,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "135ace3a761e564ec88c03a77317a7c6b80bb7f7135ef2544dbe054243b89737" dependencies = [ "fastrand", - "phf_shared 0.13.1", -] - -[[package]] -name = "phf_macros" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f84ac04429c13a7ff43785d75ad27569f2951ce0ffd30a3321230db2fc727216" -dependencies = [ - "phf_generator 0.11.3", - "phf_shared 0.11.3", - "proc-macro2", - "quote", - "syn", + "phf_shared", ] [[package]] @@ -5468,23 +5568,14 @@ version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "812f032b54b1e759ccd5f8b6677695d5268c588701effba24601f6932f8269ef" dependencies = [ - "phf_generator 0.13.1", - "phf_shared 0.13.1", + "phf_generator", + "phf_shared", "proc-macro2", "quote", - "syn", + "syn 2.0.119", "uncased", ] -[[package]] -name = "phf_shared" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5" -dependencies = [ - "siphasher", -] - [[package]] name = "phf_shared" version = "0.13.1" @@ -5518,7 +5609,7 @@ checksum = "c96395f0a926bc13b1c17622aaddda1ecb55d49c8f1bf9777e4d877800a43f8b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.119", ] [[package]] @@ -5546,9 +5637,9 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.33" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19f132c84eca552bf34cab8ec81f1c1dcc229b811638f9d283dceabe58c5569e" +checksum = "f6b464fbc74e149a392436b17d523f769e057cb6877f6a5c4618bc6f11800548" [[package]] name = "plain" @@ -5566,7 +5657,7 @@ dependencies = [ "crc32fast", "fdeflate", "flate2", - "miniz_oxide", + "miniz_oxide 0.8.9", ] [[package]] @@ -5575,11 +5666,11 @@ version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "60769b8b31b2a9f263dae2776c37b1b28ae246943cf719eb6946a1db05128a61" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "crc32fast", "fdeflate", "flate2", - "miniz_oxide", + "miniz_oxide 0.8.9", ] [[package]] @@ -5604,24 +5695,24 @@ checksum = "2f3a9f18d041e6d0e102a0a46750538147e5e8992d3b4873aaafee2520b00ce3" [[package]] name = "portable-atomic" -version = "1.13.1" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49" +checksum = "05c8b63e8d9609db387f0324918f81d68fe27748f084ef092fb35954d0539a85" [[package]] name = "portable-atomic-util" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2a106d1259c23fac8e543272398ae0e3c0b8d33c88ed73d0cc71b0f1d902618" +checksum = "10ab3eb7f3becc3a1cbc4f2c6f20267996cfc1a6467a873763411b136a122715" dependencies = [ "portable-atomic", ] [[package]] name = "potential_utf" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0103b1cef7ec0cf76490e969665504990193874ea05c85ff9bab8b911d0a0564" +checksum = "d83eb9bc6d8e5cf568e7a1101d60ee05e81ed50ea106026f3d18deeb046d7661" dependencies = [ "serde_core", "writeable", @@ -5636,9 +5727,9 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppmd-rust" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efca4c95a19a79d1c98f791f10aebd5c1363b473244630bb7dbde1dc98455a24" +checksum = "196a7c80b9a7652aba7cc070827516c2abe4ccdf53d128e1944003cf5726cff1" [[package]] name = "ppv-lite86" @@ -5665,32 +5756,32 @@ dependencies = [ ] [[package]] -name = "proc-macro-error-attr2" -version = "2.0.0" +name = "proc-macro-error-attr3" +version = "3.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5" +checksum = "9e564d14133360e1ae169ffde5da25881b5fa47261665b8e5713c212c27799da" dependencies = [ "proc-macro2", "quote", ] [[package]] -name = "proc-macro-error2" -version = "2.0.1" +name = "proc-macro-error3" +version = "3.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802" +checksum = "8f0d4471b3436c22106b21913b1dda531558918ae9b7ec55d58aa84b43552233" dependencies = [ - "proc-macro-error-attr2", + "proc-macro-error-attr3", "proc-macro2", "quote", - "syn", + "syn 3.0.5", ] [[package]] name = "proc-macro2" -version = "1.0.106" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934" +checksum = "985e7ec9bb745e6ce6535b544d84d6cd6f7ad8bd711c398938ae983b91a766d9" dependencies = [ "unicode-ident", ] @@ -5703,7 +5794,7 @@ checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.119", "version_check", "yansi", ] @@ -5714,7 +5805,7 @@ version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25485360a54d6861439d60facef26de713b1e126bf015ec8f98239467a2b82f7" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "chrono", "flate2", "procfs-core", @@ -5727,7 +5818,7 @@ version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6401bf7b6af22f78b563665d15a22e9aef27775b79b149a66ca022468a4e405" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "chrono", "hex", ] @@ -5748,14 +5839,37 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4488a4a36b9a4ba6b9334a32a39971f77c1436ec82c38707bce707699cc3bbcb" dependencies = [ "quote", - "syn", + "syn 2.0.119", ] [[package]] -name = "pxfm" -version = "0.1.29" +name = "pulp" +version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0c5ccf5294c6ccd63a74f1565028353830a9c2f5eb0c682c355c471726a6e3f" +checksum = "046aa45b989642ec2e4717c8e72d677b13edd831a4d3b6cf37d9a3e54912496a" +dependencies = [ + "bytemuck", + "cfg-if", + "libm", + "num-complex", + "paste", + "pulp-wasm-simd-flag", + "raw-cpuid", + "reborrow", + "version_check", +] + +[[package]] +name = "pulp-wasm-simd-flag" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d8f70e07b9c3962945a74e59ca1c511bba65b6419468acc217c457d93f3c740" + +[[package]] +name = "pxfm" +version = "0.1.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d55d956fa96f5ec02be2e13af0e20391a5aa83d6a074e3ad368959d0fab299ea" [[package]] name = "qoi" @@ -5782,15 +5896,6 @@ dependencies = [ "serde", ] -[[package]] -name = "quick-xml" -version = "0.37.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "331e97a1af0bf59823e6eadffe373d7b27f485be8748f71471c662c1f269b7fb" -dependencies = [ - "memchr", -] - [[package]] name = "quick-xml" version = "0.38.4" @@ -5802,19 +5907,18 @@ dependencies = [ [[package]] name = "quick-xml" -version = "0.39.4" +version = "0.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdcc8dd4e2f670d309a5f0e83fe36dfdc05af317008fea29144da1a2ac858e5e" +checksum = "e660451e55124f798a69a5af3f49ccfbefbd41910eefd25caf2393e1f3473ec1" dependencies = [ "memchr", - "serde", ] [[package]] name = "quote" -version = "1.0.46" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfbc457d0c7a0759a614551b11a6409e5951f6c7537be1f1b7682b9ae9230368" +checksum = "1fbf4db142a473a8d80c26bbf18454ed458bf8d26c8219c331daecfdbd079001" dependencies = [ "proc-macro2", ] @@ -5833,9 +5937,9 @@ checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf" [[package]] name = "rand" -version = "0.8.6" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca0ecfa931c29007047d1bc58e623ab12e5590e8c7cc53200d5202b69266d8a" +checksum = "e058c7de0b26af77780c769414d6257830bb240f3c38477dbc2c16e5f54d6d4c" dependencies = [ "libc", "rand_chacha 0.3.1", @@ -5844,9 +5948,9 @@ dependencies = [ [[package]] name = "rand" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c5af06bb1b7d3216d91932aed5265164bf384dc89cd6ba05cf59a35f5f76ea" +checksum = "b9ef1d0d795eb7d84685bca4f72f3649f064e6641543d3a8c415898726a57b41" dependencies = [ "rand_chacha 0.9.0", "rand_core 0.9.5", @@ -5898,9 +6002,9 @@ checksum = "ca45419789ae5a7899559e9512e58ca889e41f04f1f2445e9f4b290ceccd1d08" [[package]] name = "rangemap" -version = "1.7.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "973443cf09a9c8656b574a866ab68dfa19f0867d0340648c7d2f6a71b8a8ea68" +checksum = "a611d15b50743feb4c76b7d03edcb0e64f399c26961e4efe6975bc398be6aa3d" [[package]] name = "rav1e" @@ -5929,10 +6033,10 @@ dependencies = [ "num-traits", "paste", "profiling", - "rand 0.9.4", + "rand 0.9.5", "rand_chacha 0.9.0", "simd_helpers", - "thiserror 2.0.18", + "thiserror 2.0.20", "v_frame", "wasm-bindgen", ] @@ -5952,6 +6056,15 @@ dependencies = [ "rgb", ] +[[package]] +name = "raw-cpuid" +version = "11.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "498cd0dc59d73224351ee52a95fee0f1a617a2eae0e7d9d720cc622c73a54186" +dependencies = [ + "bitflags 2.13.2", +] + [[package]] name = "raw-window-handle" version = "0.6.2" @@ -5986,19 +6099,26 @@ checksum = "7b634fabf032fab15307ffd272149b622260f55974d9fad689292a5d33df02e5" dependencies = [ "bytemuck", "core_maths", - "font-types", + "font-types 0.11.3", ] [[package]] name = "read-fonts" -version = "0.39.2" +version = "0.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4ed38b89c2c77ff968c524145ad65fb010f38af5c7a224b53b81d47ac2daa81" +checksum = "046a7d674daf459825b32f5062056d6882db0d2f5a479fbd76ccfc870ac18709" dependencies = [ "bytemuck", - "font-types", + "font-types 0.12.5", + "once_cell", ] +[[package]] +name = "reborrow" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03251193000f4bd3b042892be858ee50e8b3719f2b08e5833ac4353724632430" + [[package]] name = "recently-used-xbel" version = "1.2.0" @@ -6017,11 +6137,11 @@ dependencies = [ [[package]] name = "redox_event" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c07d0d6d291e3a951bd847b1cd4af32fc6243d64116cf7702838c02797688b7" +checksum = "c5018d583d6d2f5499352aea8d177e9067d1eb03ab17c78169d5ba7a30001b15" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "libredox", ] @@ -6031,16 +6151,16 @@ version = "0.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", ] [[package]] name = "redox_syscall" -version = "0.8.1" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b44b894f2a6e36457d665d1e08c3866add6ed5e70050c1b4ba8a8ddedb02ce7" +checksum = "737970939a87c6fa31e7acad13307bccbb017a073b695b6089a2c484f929e20e" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", ] [[package]] @@ -6062,34 +6182,34 @@ checksum = "a4e608c6638b9c18977b00b475ac1f28d14e84b27d8d42f70e0bf1e3dec127ac" dependencies = [ "getrandom 0.2.17", "libredox", - "thiserror 2.0.18", + "thiserror 2.0.20", ] [[package]] name = "ref-cast" -version = "1.0.25" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f354300ae66f76f1c85c5f84693f0ce81d747e2c3f21a45fef496d89c960bf7d" +checksum = "7e440fb4e4b4147295338efb76001ab9e4efc0e5839df2c47fc5ac2381d365c3" dependencies = [ "ref-cast-impl", ] [[package]] name = "ref-cast-impl" -version = "1.0.25" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da" +checksum = "92ecd8964f8453721699a1ed72037b0db49ce2f5a5138486ee89bed6f67cdf3a" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 3.0.5", ] [[package]] name = "regex" -version = "1.12.4" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1292b7759ae1cb9ec195452d1390a074f0cd8541ab7a5a8c31cd6db45d4a6ba" +checksum = "f020237b6c8eed93db2e2cb53c00c60a8e1bc73da7d073199a1180401450218d" dependencies = [ "aho-corasick", "memchr", @@ -6099,9 +6219,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.14" +version = "0.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e1dd4122fc1595e8162618945476892eefca7b88c52820e74af6262213cae8f" +checksum = "ad8553b9b26413251cbf30e620595c7a41b3887f03da04579c0e6b0d6a06b4b2" dependencies = [ "aho-corasick", "memchr", @@ -6132,7 +6252,7 @@ dependencies = [ "pico-args", "rgb", "svgtypes", - "tiny-skia", + "tiny-skia 0.11.4", "usvg", "zune-jpeg 0.4.21", ] @@ -6176,8 +6296,8 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "db09040cc89e461f1a265139777a2bde7f8d8c67c4936f700c63ce3e2904d468" dependencies = [ - "base64", - "bitflags 2.13.0", + "base64 0.22.1", + "bitflags 2.13.2", "serde", "serde_derive", "unicode-ident", @@ -6189,7 +6309,7 @@ version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81116b9531d61eabc41aeb228e4b6b2435bcca3233b98cf3b3077d4e6e9debb3" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "once_cell", "serde", "serde_derive", @@ -6205,9 +6325,9 @@ checksum = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97" [[package]] name = "rust-embed" -version = "8.11.0" +version = "8.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04113cb9355a377d83f06ef1f0a45b8ab8cd7d8b1288160717d66df5c7988d27" +checksum = "e9e7760e252aaba7b09f4be00e36476cf585bdb68a53552ac954cdf504ab4bc9" dependencies = [ "rust-embed-impl", "rust-embed-utils", @@ -6216,24 +6336,25 @@ dependencies = [ [[package]] name = "rust-embed-impl" -version = "8.11.0" +version = "8.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0902e4c7c8e997159ab384e6d0fc91c221375f6894346ae107f47dd0f3ccaa" +checksum = "3bcfc4d6f53af43755f7a723e4b6b8794fcce052a178dd8c6c1dadc5f5343097" dependencies = [ + "mime_guess", "proc-macro2", "quote", "rust-embed-utils", - "syn", + "syn 2.0.119", "walkdir", ] [[package]] name = "rust-embed-utils" -version = "8.11.0" +version = "8.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bcdef0be6fe7f6fa333b1073c949729274b05f123a0ad7efcb8efd878e5c3b1" +checksum = "42ffa149f6aa81b58a5b3011d01a857c4ed12c7a732d2c51947a4c7c692185f0" dependencies = [ - "sha2 0.10.9", + "sha2 0.11.0", "walkdir", ] @@ -6245,9 +6366,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustc-hash" -version = "2.1.2" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94300abf3f1ae2e2b8ffb7b58043de3d399c73fa6f4b73826402a5c457614dbe" +checksum = "6b1e7f9a428571be2dc5bc0505c13fb6bf936822b894ec87abf8a08a4e51742d" [[package]] name = "rustc_version" @@ -6264,7 +6385,7 @@ version = "0.38.44" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "errno", "libc", "linux-raw-sys 0.4.15", @@ -6277,7 +6398,7 @@ version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "errno", "libc", "linux-raw-sys 0.12.1", @@ -6286,9 +6407,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" +checksum = "cf54715a573b99ac80df0bc206da022bcd442c974952c7b9720069370852e21f" [[package]] name = "rustybuzz" @@ -6296,7 +6417,7 @@ version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd3c7c96f8a08ee34eff8857b11b49b07d71d1c3f4e88f8a88d4c9e9f90b1702" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "bytemuck", "core_maths", "log", @@ -6331,9 +6452,9 @@ dependencies = [ [[package]] name = "schemars" -version = "1.2.1" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2b42f36aa1cd011945615b92222f6bf73c599a102a300334cd7f8dbeec726cc" +checksum = "687274d293b6cdc6e73e0fee520bf2049650090d7164f87672d212a3c530cf4a" dependencies = [ "dyn-clone", "ref-cast", @@ -6355,22 +6476,22 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sctk-adwaita" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd3accc0f3f4bbaf2c9e1957a030dc582028130c67660d44c0a0345a22ca69b" +checksum = "ea2a4360b9abcdcee43809e6fc11d6d61ca5d25734026a8fc46c2883eea3f13f" dependencies = [ "ab_glyph", "log", "memmap2 0.9.11", "smithay-client-toolkit", - "tiny-skia", + "tiny-skia 0.12.0", ] [[package]] name = "self_cell" -version = "1.2.2" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b12e76d157a900eb52e81bc6e9f3069344290341720e9178cde2407113ac8d89" +checksum = "2ab42ca02749e120097e328d91d415325bdf43b1c72c4c8badf37375fe40a813" [[package]] name = "semver" @@ -6380,9 +6501,9 @@ checksum = "8a7852d02fc848982e0c167ef163aaff9cd91dc640ba85e263cb1ce46fae51cd" [[package]] name = "serde" -version = "1.0.228" +version = "1.0.229" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" +checksum = "4148590afebada386688f18773da617792bf2ef03ffc1e4cbd2b1d45b023e0ba" dependencies = [ "serde_core", "serde_derive", @@ -6390,31 +6511,31 @@ dependencies = [ [[package]] name = "serde_core" -version = "1.0.228" +version = "1.0.229" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" +checksum = "67dca2c9c51e58a4791a4b1ed58308b39c64224d349a935ab5039aa360942a48" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.228" +version = "1.0.229" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" +checksum = "e7a5d71263a5a7d47b41f6b3f06ba276f10cc18b0931f1799f710578e2309348" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 3.0.5", ] [[package]] name = "serde_json" -version = "1.0.150" +version = "1.0.151" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8014e44b4736ed0538adeecded0fce2a272f22dc9578a7eb6b2d9993c74cfb9" +checksum = "c841b55ecdae098c80dcae9cf767f6f8a0c2cdb3416bbef72181df4d0fe73f14" dependencies = [ - "indexmap 2.14.0", + "indexmap 2.14.2", "itoa", "memchr", "serde", @@ -6424,13 +6545,13 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.20" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "175ee3e80ae9982737ca543e96133087cbd9a485eecc3bc4de9c1a37b47ea59c" +checksum = "8d3b1629de253c70a0508c3899572da79ca359fdab27c7920ff00406df418906" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 3.0.5", ] [[package]] @@ -6444,18 +6565,19 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.21.0" +version = "3.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76a5c54c7310e7b8b9577c286d7e399ddd876c3e12b3ed917a8aabc4b96e9e8c" +checksum = "935177bb8c0cd8ca1a4e6d1a2ac8988bea69cab4f9d3a31311e012ad27868ea4" dependencies = [ - "base64", + "base64 0.23.1", "bs58", "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.14.0", + "indexmap 2.14.2", + "jiff", "schemars 0.9.0", - "schemars 1.2.1", + "schemars 1.2.2", "serde_core", "serde_json", "serde_with_macros", @@ -6464,21 +6586,21 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.21.0" +version = "3.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84d57bc0c8b9a17920c178daa6bb924850d54a9c97ab45194bb8c17ad66bb660" +checksum = "1d607aa01a3cb0ad757d6fd216136910db3c97b102fe686585689615a02dbcdc" dependencies = [ - "darling 0.23.0", + "darling 0.24.1", "proc-macro2", "quote", - "syn", + "syn 3.0.5", ] [[package]] name = "sha1" -version = "0.10.6" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +checksum = "a978451301f4db1d02937a4ab3ccce137717b81826e79b7d49ffe3244a13c3b8" dependencies = [ "cfg-if", "cpufeatures 0.2.17", @@ -6492,7 +6614,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aacc4cc499359472b4abe1bf11d0b12e688af9a805fa5e3016f9a386dc2d0214" dependencies = [ "cfg-if", - "cpufeatures 0.3.0", + "cpufeatures 0.3.1", "digest 0.11.3", ] @@ -6514,7 +6636,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "446ba717509524cb3f22f17ecc096f10f4822d76ab5c0b9822c5f9c284e825f4" dependencies = [ "cfg-if", - "cpufeatures 0.3.0", + "cpufeatures 0.3.1", "digest 0.11.3", ] @@ -6551,15 +6673,15 @@ dependencies = [ [[package]] name = "simd-adler32" -version = "0.3.9" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "703d5c7ef118737c72f1af64ad2f6f8c5e1921f818cdcb97b8fe6fc69bf66214" +checksum = "3a219298ac11a56ea9a6d2120044824d6f01aeb034955e7af7bc16858527deea" [[package]] name = "simd_cesu8" -version = "1.1.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94f90157bb87cddf702797c5dadfa0be7d266cdf49e22da2fcaa32eff75b2c33" +checksum = "11031e251abf8611c80f460e19dbdeb54a66db918e49c65a7065b46ac7aec520" dependencies = [ "rustc_version", "simdutf8", @@ -6607,12 +6729,12 @@ dependencies = [ [[package]] name = "skrifa" -version = "0.42.1" +version = "0.44.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c34617370ae968efb7161bb2beb517d9084659aae19e24b89e3db25b46e4564" +checksum = "819ab7d62b1d3e72d9d9dea5650bac30424f9111364bb94928dbf5ecad1baa68" dependencies = [ "bytemuck", - "read-fonts 0.39.2", + "read-fonts 0.41.0", ] [[package]] @@ -6632,9 +6754,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.15.2" +version = "1.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ed6a63f02c8539c91a8685a86f4099661ba3da017932f6ebbea6de3f0fa7c90" +checksum = "ba467056f1b547ed52077911161fc86985becbc60e8e1857c8a144dab0def891" [[package]] name = "smithay-client-toolkit" @@ -6642,7 +6764,7 @@ version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0512da38f5e2b31201a93524adb8d3136276fa4fe4aafab4e1f727a82b534cc0" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "bytemuck", "calloop", "calloop-wayland-source", @@ -6652,7 +6774,7 @@ dependencies = [ "memmap2 0.9.11", "pkg-config", "rustix 1.1.4", - "thiserror 2.0.18", + "thiserror 2.0.20", "wayland-backend", "wayland-client", "wayland-csd-frame", @@ -6688,9 +6810,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52d1cfed4120b4d927bf7c0f86d2087a4a7d6027c906d9f9d525a80573b9be51" +checksum = "c3d1e2c7f27f8d4cb10542a02c49005dbd6e93095799d6f3be745fae9f8fedd4" dependencies = [ "libc", "windows-sys 0.61.2", @@ -6707,11 +6829,11 @@ dependencies = [ "fastrand", "foreign-types", "js-sys", + "libredox", "log", "memmap2 0.9.11", "objc", "raw-window-handle", - "redox_syscall 0.5.18", "rustix 0.38.44", "wasm-bindgen", "wayland-backend", @@ -6723,9 +6845,9 @@ dependencies = [ [[package]] name = "spin" -version = "0.9.8" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +checksum = "3763264f6b73151db08c50ff20d7d8a0b8796e021cdea7ceedad07b80155fa0e" dependencies = [ "lock_api", ] @@ -6736,7 +6858,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.13.0", + "bitflags 2.13.2", ] [[package]] @@ -6784,20 +6906,31 @@ dependencies = [ [[package]] name = "swash" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0811b01ca2c4e8718760713911feaf4675c24f94e50530a015ec646cfb622f7c" +checksum = "6c2499c2d826531388872b2268718aed907a39bd785ab0dcfe57fab26283f92e" dependencies = [ - "skrifa 0.42.1", + "skrifa 0.44.0", "yazi", "zeno", ] [[package]] name = "syn" -version = "2.0.118" +version = "2.0.119" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9ae57f904213ebb649ce6895b8a66c66f0203b9319718f69a5612a065b1422" +checksum = "872831b642d1a07999a962a351ed35b955ea2cfc8f3862091e2a240a84f17297" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "3.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12df2e0110f65b775f769bb17ef989067a1d931b2eb822bd4346631eeada89f9" dependencies = [ "proc-macro2", "quote", @@ -6806,9 +6939,9 @@ dependencies = [ [[package]] name = "synchrony" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "416090a4d8f6358526df5f9f65dfe28750b8b7bfd1fd8a5620f483fc4a75722c" +checksum = "f9d6d5fbc4583cf3e5eee953506f13853a42ee6b4a21a983dffffb10c765cb80" dependencies = [ "futures-util", "loom", @@ -6822,7 +6955,7 @@ checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.119", ] [[package]] @@ -6843,7 +6976,7 @@ dependencies = [ "cfg-expr", "heck 0.5.0", "pkg-config", - "toml 1.1.2+spec-1.1.0", + "toml 1.1.6+spec-1.1.0", "version-compare", ] @@ -6878,12 +7011,11 @@ checksum = "adb6935a6f5c20170eeceb1a3835a49e12e19d792f6dd344ccc76a985ca5a6ca" [[package]] name = "tauri-winrt-notification" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b1e66e07de489fe43a46678dd0b8df65e0c973909df1b60ba33874e297ba9b9" +checksum = "9ed071c670382e85fc2f48ae706492d8c338f4f89bf72520d32f8abfe880aade" dependencies = [ - "quick-xml 0.37.5", - "thiserror 2.0.18", + "thiserror 2.0.20", "windows 0.61.3", "windows-version", ] @@ -6935,7 +7067,7 @@ checksum = "c26ef8b00e4d382e59f6a8ddb3cd790b3a5bb29f21a358a9a69ea2f29f13f27b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.119", ] [[package]] @@ -6944,7 +7076,7 @@ version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "944ad38adcbb71eaa682c56bceeb079e4ca82b4b3edc2a0fde5cb297b77dac8d" dependencies = [ - "syn", + "syn 2.0.119", "test-log-core", ] @@ -6965,11 +7097,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.18" +version = "2.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4288b5bcbc7920c07a1149a35cf9590a2aa808e0bc1eafaade0b80947865fbc4" +checksum = "ec86235f5fcc2a73650310756d2ac5b138a5780bbbdfae3eeccec992c435ba4f" dependencies = [ - "thiserror-impl 2.0.18", + "thiserror-impl 2.0.20", ] [[package]] @@ -6980,25 +7112,25 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.119", ] [[package]] name = "thiserror-impl" -version = "2.0.18" +version = "2.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5" +checksum = "bc04cd3e1236dd4a98afca4569f2deb3f120e5422a4023be2cb683f8486292af" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 3.0.5", ] [[package]] name = "thread_local" -version = "1.1.9" +version = "1.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f60246a4944f24f6e018aa17cdeffb7818b76356965d03b07d6a9886e8962185" +checksum = "1ad99c4c6d32803332c548b1af0540b357b3f5fc0be8f6c6bfe8b2e6ae784070" dependencies = [ "cfg-if", ] @@ -7039,9 +7171,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.52" +version = "0.3.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e48db7b415311b615f910b3dcaa4557bcd4bf1982379c95c223fd8c2a20e210" +checksum = "cdb87b95ec50ddfa440816d227a17b2ccbdda963a316a727fda0fc4334f7d134" dependencies = [ "deranged", "js-sys", @@ -7060,9 +7192,9 @@ checksum = "9e1c906769ad99c88eaa54e728060edef082f8e358ff32030cb7c7d315e81109" [[package]] name = "time-macros" -version = "0.2.31" +version = "0.2.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c431b87111666e491a90baa837f914fb45cd5dc3c268591b0220ff5057f2085f" +checksum = "7e689342a48d2ea927c87ea50cabf8594854bf940e9310208848d680d668ed85" dependencies = [ "num-conv", "time-core", @@ -7080,7 +7212,21 @@ dependencies = [ "cfg-if", "log", "png 0.17.16", - "tiny-skia-path", + "tiny-skia-path 0.11.4", +] + +[[package]] +name = "tiny-skia" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47ffee5eaaf5527f630fb0e356b90ebdec84d5d18d937c5e440350f88c5a91ea" +dependencies = [ + "arrayref", + "arrayvec", + "bytemuck", + "cfg-if", + "log", + "tiny-skia-path 0.12.0", ] [[package]] @@ -7095,10 +7241,21 @@ dependencies = [ ] [[package]] -name = "tinystr" -version = "0.8.3" +name = "tiny-skia-path" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8323304221c2a851516f22236c5722a72eaa19749016521d6dff0824447d96d" +checksum = "edca365c3faccca67d06593c5980fa6c57687de727a03131735bb85f01fdeeb9" +dependencies = [ + "arrayref", + "bytemuck", + "strict-num", +] + +[[package]] +name = "tinystr" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1e27c91459209c2986af3dcf603a5a74a4368754ce37414f59acc971167f643" dependencies = [ "displaydoc", "serde_core", @@ -7107,24 +7264,15 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.11.0" +version = "1.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e61e67053d25a4e82c844e8424039d9745781b3fc4f32b8d55ed50f5f667ef3" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" +checksum = "fd3ca314f692efd6c868f8408f53fe444634a845f96c028b97d35f6a1f79f0ee" [[package]] name = "tokio" -version = "1.52.3" +version = "1.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc7f01b389ac15039e4dc9531aa973a135d7a4135281b12d7c1bc79fd57fffe" +checksum = "202caea871b69668250d242070849eb495be178ed697a3e98aebce5bc81a0bed" dependencies = [ "bytes", "libc", @@ -7139,20 +7287,20 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.7.0" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "385a6cb71ab9ab790c5fe8d67f1645e6c450a7ce006a33de03daa956cf70a496" +checksum = "78773a2a397f451582ce068015985c33193cf6dea8b74d2a639fe457b2f07b0e" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 3.0.5", ] [[package]] name = "tokio-stream" -version = "0.1.18" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32da49809aab5c3bc678af03902d4ccddea2a87d028d86392a4b1560c6906c70" +checksum = "a3d06f0b082ba57c26b79407372e57cf2a1e28124f78e9479fe80322cf53420b" dependencies = [ "futures-core", "pin-project-lite", @@ -7170,11 +7318,11 @@ dependencies = [ [[package]] name = "toml" -version = "1.1.2+spec-1.1.0" +version = "1.1.6+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81f3d15e84cbcd896376e6730314d59fb5a87f31e4b038454184435cd57defee" +checksum = "920602543f0911ab71da12c50d59701da54c196d1a2bf5cb4b75667f137a406a" dependencies = [ - "indexmap 2.14.0", + "indexmap 2.14.2", "serde_core", "serde_spanned", "toml_datetime", @@ -7194,11 +7342,11 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.25.12+spec-1.1.0" +version = "0.25.15+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2153edc6955a6c354fad8f5efd38b6a8769bdccf9fe50f8e1329f81b0baa5d7" +checksum = "1340ea94a5856333492c9064b02c778b191dd2c853778d9609debdcdfea3a614" dependencies = [ - "indexmap 2.14.0", + "indexmap 2.14.2", "toml_datetime", "toml_parser", "winnow", @@ -7206,18 +7354,18 @@ dependencies = [ [[package]] name = "toml_parser" -version = "1.1.2+spec-1.1.0" +version = "1.1.3+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2abe9b86193656635d2411dc43050282ca48aa31c2451210f4202550afb7526" +checksum = "1d38ac1cf9b95face32296c0a3ede1fdc270627c9d9c02a7274dd6d960dc4d56" dependencies = [ "winnow", ] [[package]] name = "toml_writer" -version = "1.1.1+spec-1.1.0" +version = "1.1.2+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "756daf9b1013ebe47a8776667b466417e2d4c5679d441c26230efd9ef78692db" +checksum = "7d56353a2a665ad0f41a421187180aab746c8c325620617ad883a99a1cbe66d2" [[package]] name = "tracing" @@ -7239,7 +7387,7 @@ checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.119", ] [[package]] @@ -7283,9 +7431,9 @@ dependencies = [ [[package]] name = "trash" -version = "5.2.6" +version = "5.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7602e0c7d66ec2d92a8c917219fbc7894039efa2063b9064260110828a356f46" +checksum = "be89b3fe156965d29ac4f8522f3a640c655affdd9f21cb4f36857f0c92c00317" dependencies = [ "chrono", "libc", @@ -7296,7 +7444,7 @@ dependencies = [ "percent-encoding", "scopeguard", "urlencoding", - "windows 0.56.0", + "windows 0.62.2", ] [[package]] @@ -7314,7 +7462,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb30dbbd9036155e74adad6812e9898d03ec374946234fbcebd5dfc7b9187b90" dependencies = [ - "rustc-hash 2.1.2", + "rustc-hash 2.1.3", ] [[package]] @@ -7465,7 +7613,7 @@ version = "0.45.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "80be9b06fbae3b8b303400ab20778c80bbaf338f563afe567cf3c9eea17b47ef" dependencies = [ - "base64", + "base64 0.22.1", "data-url", "flate2", "fontdb", @@ -7479,7 +7627,7 @@ dependencies = [ "siphasher", "strict-num", "svgtypes", - "tiny-skia-path", + "tiny-skia-path 0.11.4", "unicode-bidi", "unicode-script", "unicode-vo", @@ -7506,9 +7654,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.23.4" +version = "1.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf80a72845275afea99e7f2b434723d3bc7e38470fcd1c7ed39a599c73319a53" +checksum = "2ef6dac1e96601b4fb3acccccff2139741fcb757cb9a36089bf5be91cfb285ce" dependencies = [ "getrandom 0.4.3", "js-sys", @@ -7582,9 +7730,9 @@ dependencies = [ [[package]] name = "wasm-bindgen" -version = "0.2.126" +version = "0.2.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b067c0c11094aef6b7a801c1e34a26affafdf3d051dba08456b868789aaf9a4" +checksum = "aecb87a33d3b0c5e3b7aa46336eaf486cffafbd281b195e4c8b80d50df2351bf" dependencies = [ "cfg-if", "once_cell", @@ -7595,9 +7743,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.76" +version = "0.4.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c62df1340f32221cb9c54d6a27b030e3dba64361d4a95bed55f9aacb44da291d" +checksum = "6ef4c5d3d2cdf5c54f4231181768f5510842e350db025faf1f7163b1030ed928" dependencies = [ "js-sys", "wasm-bindgen", @@ -7605,9 +7753,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.126" +version = "0.2.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "167ce5e579f6bcf889c4f7175a8a5a585de84e8ff93976ce393efa5f2837aab1" +checksum = "a690d511e3c1a8b3a55e33511e3c2c00c78415cd23650f32b808627f5696b9ed" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -7615,22 +7763,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.126" +version = "0.2.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3997c7839262f4ef12cf90b818d6340c18e80f263f1a94bf157d0ec4420380e" +checksum = "411e4887f0071ef2d2164a9d5fdf2d20efbef78fccd3a78b0c10a1dc5295e48a" dependencies = [ "bumpalo", "proc-macro2", "quote", - "syn", + "syn 3.0.5", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.126" +version = "0.2.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc1b4cb0cc549fcf58d7dfc081778139b3d283a081644e833e84682ad71cea24" +checksum = "81941cd78d0c92026c33e5e01312845a4cb1e9af3407f9134b100dd03144103e" dependencies = [ "unicode-ident", ] @@ -7651,9 +7799,9 @@ dependencies = [ [[package]] name = "wayland-backend" -version = "0.3.15" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2857dd20b54e916ec7253b3d6b4d5c4d7d4ca2c33c2e11c6c76a99bd8744755d" +checksum = "38a91b4eaddff87b1cd1074985e3713da4af2c49742d1b356b2c01670a67a078" dependencies = [ "cc", "downcast-rs", @@ -7665,11 +7813,11 @@ dependencies = [ [[package]] name = "wayland-client" -version = "0.31.14" +version = "0.31.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645c7c96bb74690c3189b5c9cb4ca1627062bb23693a4fad9d8c3de958260144" +checksum = "e3c36a0f861ad76d0901f2800b46321410d9f73f2ea88aac0650d86c32688073" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "rustix 1.1.4", "wayland-backend", "wayland-scanner", @@ -7681,7 +7829,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "cursor-icon", "wayland-backend", ] @@ -7703,7 +7851,7 @@ version = "0.32.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23d0c813de3daa2ed6520af85a3bd49b0e722a3078506899aa9686fea58dc4b6" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "wayland-backend", "wayland-client", "wayland-scanner", @@ -7716,7 +7864,7 @@ version = "20250721.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40a1f863128dcaaec790d7b4b396cc9b9a7a079e878e18c47e6c2d2c5a8dcbb1" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "wayland-backend", "wayland-client", "wayland-protocols", @@ -7729,7 +7877,7 @@ version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e9567599ef23e09b8dad6e429e5738d4509dfc46b3b21f32841a304d16b29c8" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "wayland-backend", "wayland-client", "wayland-protocols", @@ -7742,7 +7890,7 @@ version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b6d8cf1eb2c1c31ed1f5643c88a6e53538129d4af80030c8cabd1f9fa884d91" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "wayland-backend", "wayland-client", "wayland-protocols", @@ -7755,7 +7903,7 @@ version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eb04e52f7836d7c7976c78ca0250d61e33873c34156a2a1fc9474828ec268234" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "wayland-backend", "wayland-client", "wayland-protocols", @@ -7765,22 +7913,22 @@ dependencies = [ [[package]] name = "wayland-scanner" -version = "0.31.10" +version = "0.31.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c324a910fd86ebdc364a3e61ec1f11737d3b1d6c273c0239ee8ff4bc0d24b4a" +checksum = "338e30461b3a2b67d70eb30a6d89f8e0c93a833e07d2ae89085cd070c4a00ac0" dependencies = [ "proc-macro2", - "quick-xml 0.39.4", + "quick-xml 0.41.0", "quote", ] [[package]] name = "wayland-server" -version = "0.31.13" +version = "0.31.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc1846eb04c49182e04f4a099e2a830a2b745610bbc1d61246e206f29c7000a0" +checksum = "0dde9c29be0f723a573977de51ee455bf3dfa03652730a74f9dd3b337e374d75" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "downcast-rs", "rustix 1.1.4", "wayland-backend", @@ -7801,9 +7949,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.103" +version = "0.3.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8622dcb61c0bcc9fffa6938bed81210af2da9a7e4a1a834b2e37a59b6dfb6141" +checksum = "9fbddc4a036f00ec4f18c83445bd3115cb306a91da554919a099d9222fe4a7f8" dependencies = [ "js-sys", "wasm-bindgen", @@ -7832,7 +7980,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9cb534d5ffd109c7d1135f34cdae29e60eab94855a625dcfe1705f8bc7ad79f" dependencies = [ "arrayvec", - "bitflags 2.13.0", + "bitflags 2.13.2", "bytemuck", "cfg-if", "cfg_aliases", @@ -7864,12 +8012,12 @@ dependencies = [ "arrayvec", "bit-set", "bit-vec", - "bitflags 2.13.0", + "bitflags 2.13.2", "bytemuck", "cfg_aliases", "document-features", "hashbrown 0.16.1", - "indexmap 2.14.0", + "indexmap 2.14.2", "log", "naga", "once_cell", @@ -7879,7 +8027,7 @@ dependencies = [ "raw-window-handle", "rustc-hash 1.1.0", "smallvec", - "thiserror 2.0.18", + "thiserror 2.0.20", "wgpu-core-deps-apple", "wgpu-core-deps-emscripten", "wgpu-core-deps-windows-linux-android", @@ -7924,7 +8072,7 @@ dependencies = [ "arrayvec", "ash", "bit-set", - "bitflags 2.13.0", + "bitflags 2.13.2", "block", "bytemuck", "cfg-if", @@ -7954,7 +8102,7 @@ dependencies = [ "raw-window-handle", "renderdoc-sys", "smallvec", - "thiserror 2.0.18", + "thiserror 2.0.20", "wasm-bindgen", "web-sys", "wgpu-types", @@ -7968,7 +8116,7 @@ version = "28.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e18308757e594ed2cd27dddbb16a139c42a683819d32a2e0b1b0167552f5840c" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "bytemuck", "js-sys", "log", @@ -8025,16 +8173,6 @@ dependencies = [ "thiserror 1.0.69", ] -[[package]] -name = "windows" -version = "0.56.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1de69df01bdf1ead2f4ac895dc77c9351aefff65b2f3db429a343f9cbf05e132" -dependencies = [ - "windows-core 0.56.0", - "windows-targets 0.52.6", -] - [[package]] name = "windows" version = "0.61.3" @@ -8078,26 +8216,14 @@ dependencies = [ "windows-core 0.62.2", ] -[[package]] -name = "windows-core" -version = "0.56.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4698e52ed2d08f8658ab0c39512a7c00ee5fe2688c65f8c0a4f06750d729f2a6" -dependencies = [ - "windows-implement 0.56.0", - "windows-interface 0.56.0", - "windows-result 0.1.2", - "windows-targets 0.52.6", -] - [[package]] name = "windows-core" version = "0.61.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3" dependencies = [ - "windows-implement 0.60.2", - "windows-interface 0.59.3", + "windows-implement", + "windows-interface", "windows-link 0.1.3", "windows-result 0.3.4", "windows-strings 0.4.2", @@ -8109,8 +8235,8 @@ version = "0.62.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb" dependencies = [ - "windows-implement 0.60.2", - "windows-interface 0.59.3", + "windows-implement", + "windows-interface", "windows-link 0.2.1", "windows-result 0.4.1", "windows-strings 0.5.1", @@ -8138,17 +8264,6 @@ dependencies = [ "windows-threading 0.2.1", ] -[[package]] -name = "windows-implement" -version = "0.56.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "windows-implement" version = "0.60.2" @@ -8157,18 +8272,7 @@ checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf" dependencies = [ "proc-macro2", "quote", - "syn", -] - -[[package]] -name = "windows-interface" -version = "0.56.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc" -dependencies = [ - "proc-macro2", - "quote", - "syn", + "syn 2.0.119", ] [[package]] @@ -8179,7 +8283,7 @@ checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.119", ] [[package]] @@ -8214,15 +8318,6 @@ dependencies = [ "windows-link 0.2.1", ] -[[package]] -name = "windows-result" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" -dependencies = [ - "windows-targets 0.52.6", -] - [[package]] name = "windows-result" version = "0.3.4" @@ -8521,7 +8616,7 @@ checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" name = "winit" version = "0.31.0-beta.2" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "cfg_aliases", "cursor-icon", "dpi", @@ -8546,7 +8641,7 @@ name = "winit-android" version = "0.31.0-beta.2" dependencies = [ "android-activity", - "bitflags 2.13.0", + "bitflags 2.13.2", "dpi", "ndk", "raw-window-handle", @@ -8559,7 +8654,7 @@ dependencies = [ name = "winit-appkit" version = "0.31.0-beta.2" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "block2 0.6.2", "dispatch2", "dpi", @@ -8593,7 +8688,7 @@ dependencies = [ name = "winit-core" version = "0.31.0-beta.2" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "cursor-icon", "dpi", "keyboard-types", @@ -8606,7 +8701,7 @@ dependencies = [ name = "winit-orbital" version = "0.31.0-beta.2" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "dpi", "libredox", "orbclient", @@ -8621,7 +8716,7 @@ dependencies = [ name = "winit-uikit" version = "0.31.0-beta.2" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "block2 0.6.2", "dispatch2", "dpi", @@ -8641,7 +8736,7 @@ name = "winit-wayland" version = "0.31.0-beta.2" dependencies = [ "ahash", - "bitflags 2.13.0", + "bitflags 2.13.2", "calloop", "cursor-icon", "dpi", @@ -8666,7 +8761,7 @@ name = "winit-web" version = "0.31.0-beta.2" dependencies = [ "atomic-waker", - "bitflags 2.13.0", + "bitflags 2.13.2", "concurrent-queue", "cursor-icon", "dpi", @@ -8686,7 +8781,7 @@ dependencies = [ name = "winit-win32" version = "0.31.0-beta.2" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "cursor-icon", "dpi", "raw-window-handle", @@ -8699,9 +8794,9 @@ dependencies = [ [[package]] name = "winnow" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0592e1c9d151f854e6fd382574c3a0855250e1d9b2f99d9281c6e6391af352f1" +checksum = "23b97319f7b8343df12cc98938e5c3eb436064524c8d2b4e30a1d3a36eecdf81" dependencies = [ "memchr", ] @@ -8720,9 +8815,9 @@ checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" [[package]] name = "writeable" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ffae5123b2d3fc086436f8834ae3ab053a283cfac8fe0a0b8eaae044768a4c4" +checksum = "3ad82d2a33cdc9674dc7465672f271e096168fcdbe0f799d9e6db8c5892679dc" dependencies = [ "either", ] @@ -8739,9 +8834,9 @@ dependencies = [ [[package]] name = "xcursor" -version = "0.3.10" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec9e4a500ca8864c5b47b8b482a73d62e4237670e5b5f1d6b9e3cae50f28f2b" +checksum = "163b33ed8786455e2fa5d72f554057ce3f3182425434f756cd39c99839d88e23" [[package]] name = "xdg" @@ -8822,7 +8917,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "dlib", "log", "once_cell", @@ -8840,15 +8935,15 @@ dependencies = [ [[package]] name = "xml" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "636f85e5ca6488e96401b61eb7de54f4e44755c988af0f52cf90230c312a1a89" +checksum = "2f45bb2c13fec6a6cb4c0f76a7e94839e110a14ec803ec2940777a94c347bc52" [[package]] name = "xml-rs" -version = "0.8.28" +version = "0.8.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ae8337f8a065cfc972643663ea4279e04e7256de865aa66fe25cec5fb912d3f" +checksum = "e450f9b2ed1dff33c94c12589a87338689467b9c4f5d8a5710bd09a847d2c8a7" [[package]] name = "xmltree" @@ -8902,7 +8997,7 @@ checksum = "de844c262c8848816172cef550288e7dc6c7b7814b4ee56b3e1553f275f1858e" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.119", "synstructure", ] @@ -8930,10 +9025,10 @@ dependencies = [ "hex", "nix", "ordered-stream", - "rand 0.8.6", + "rand 0.8.8", "serde", "serde_repr", - "sha1 0.10.6", + "sha1 0.10.7", "static_assertions", "tracing", "uds_windows", @@ -8946,9 +9041,9 @@ dependencies = [ [[package]] name = "zbus" -version = "5.16.0" +version = "5.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eee682d202a77e4a9f3b2c2bdf48a7b28af5c08c34ddf66f98c93e5e39464285" +checksum = "5db4be7c075cb421e4b7ee645541604239bd243ba7c357511f4ff3a74b555907" dependencies = [ "async-broadcast", "async-executor", @@ -8975,9 +9070,9 @@ dependencies = [ "uuid", "windows-sys 0.61.2", "winnow", - "zbus_macros 5.16.0", - "zbus_names 4.3.2", - "zvariant 5.12.0", + "zbus_macros 5.19.0", + "zbus_names 4.3.4", + "zvariant 5.15.0", ] [[package]] @@ -8987,7 +9082,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6998de05217a084b7578728a9443d04ea4cd80f2a0839b8d78770b76ccd45863" dependencies = [ "zbus_xml", - "zvariant 5.12.0", + "zvariant 5.15.0", ] [[package]] @@ -8998,10 +9093,10 @@ checksum = "10da05367f3a7b7553c8cdf8fa91aee6b64afebe32b51c95177957efc47ca3a0" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.119", "zbus-lockstep", "zbus_xml", - "zvariant 5.12.0", + "zvariant 5.15.0", ] [[package]] @@ -9013,23 +9108,23 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 2.0.119", "zvariant_utils 2.1.0", ] [[package]] name = "zbus_macros" -version = "5.16.0" +version = "5.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adf1bd45a81a103745b1757754762a26e8cd01e4532e4d6c8ec431624b80d1d6" +checksum = "2990635d09ade6df1868f72f8cac69a876a90981e8bd3c40b1be413f8dc88f40" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn", - "zbus_names 4.3.2", - "zvariant 5.12.0", - "zvariant_utils 3.4.0", + "syn 3.0.5", + "zbus_names 4.3.4", + "zvariant 5.15.0", + "zvariant_utils 4.2.0", ] [[package]] @@ -9045,25 +9140,34 @@ dependencies = [ [[package]] name = "zbus_names" -version = "4.3.2" +version = "4.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7074f3e50b894eac91750142016d30d0a89be8e67dbfd9704fb875825760e52d" +checksum = "d8bf88b4a3ff53e883001e0e0115b297a9d53c31b9c1edd2bfdd853e3428624e" dependencies = [ "serde", "winnow", - "zvariant 5.12.0", + "zvariant 5.15.0", ] [[package]] name = "zbus_xml" -version = "5.1.1" +version = "5.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8067892e940ed1727dea64690378601603b31d62dfde019a5335fbb7c0e0ed9" +checksum = "d1586c021a01ca0a9216dcd874e546382e156a5cbab5fab6cb5f10087e22682a" +dependencies = [ + "serde", + "winnow", + "zbus_names 4.3.4", + "zvariant 5.15.0", +] + +[[package]] +name = "zcheapstr" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1afec51604565183aeb5c54c20aeab286120d4e4460f7f76e3e8bb8c0d99473" dependencies = [ - "quick-xml 0.39.4", "serde", - "zbus_names 4.3.2", - "zvariant 5.12.0", ] [[package]] @@ -9074,22 +9178,22 @@ checksum = "6df3dc4292935e51816d896edcd52aa30bc297907c26167fec31e2b0c6a32524" [[package]] name = "zerocopy" -version = "0.8.52" +version = "0.8.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce1022995ff5ff5d841ad7d994facc23098cd40152f2c1d11cd607c6f530653f" +checksum = "d35102a9f36d089ccae9e4c6802bc118be4487b80aaffc0ab4e0cf5ce92d2873" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.8.52" +version = "0.8.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ae7f38b72ec2a254e2b87ef277cf2cd4fb97cbebf944faa6f33354da0867930" +checksum = "146c01f5ab44258da43cf276c74a2763db2ff3969c9c652c3f2de07041d0b2bc" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.119", ] [[package]] @@ -9109,7 +9213,7 @@ checksum = "11532158c46691caf0f2593ea8358fed6bbf68a0315e80aae9bd41fbade684a1" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.119", "synstructure", ] @@ -9121,9 +9225,9 @@ checksum = "e13c156562582aa81c60cb29407084cdb54c4164760106ab78e6c5b0858cf64e" [[package]] name = "zerotrie" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f9152d31db0792fa83f70fb2f83148effb5c1f5b8c7686c3459e361d9bc20bf" +checksum = "4ea269c3bd32f0a32c321907a2ae912ba6f4649bb0fc764a15627e99a7095a3f" dependencies = [ "displaydoc", "yoke", @@ -9133,9 +9237,9 @@ dependencies = [ [[package]] name = "zerovec" -version = "0.11.6" +version = "0.11.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90f911cbc359ab6af17377d242225f4d75119aec87ea711a880987b18cd7b239" +checksum = "bb0464e17806c1d976d5cba29399c7f08e516e279e2ba493f63123b5fca67dd8" dependencies = [ "serde", "yoke", @@ -9145,13 +9249,13 @@ dependencies = [ [[package]] name = "zerovec-derive" -version = "0.11.3" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "625dc425cab0dca6dc3c3319506e6593dcb08a9f387ea3b284dbd52a92c40555" +checksum = "34df6fc39dbd26ddc9c10e6a2984476e13acce22e64e4487636ef494369225da" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 3.0.5", ] [[package]] @@ -9168,7 +9272,7 @@ dependencies = [ "flate2", "getrandom 0.4.3", "hmac", - "indexmap 2.14.0", + "indexmap 2.14.2", "lzma-rust2", "memchr", "pbkdf2", @@ -9183,15 +9287,15 @@ dependencies = [ [[package]] name = "zlib-rs" -version = "0.6.4" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "977347db8caa080403f6b6b7c1cda9479a8e869316f7e13a59b19076a40f94e3" +checksum = "b268e58e7c693d7c271f93ffc4ba3b380412554231c85bf61ca7af91042a4112" [[package]] name = "zmij" -version = "1.0.21" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa" +checksum = "29666d0abbfad1e3dc4dcf6144730dd3a3ab225bbbdac83319345b1b44ccfc1b" [[package]] name = "zopfli" @@ -9216,18 +9320,18 @@ dependencies = [ [[package]] name = "zstd-safe" -version = "7.2.4" +version = "7.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f49c4d5f0abb602a93fb8736af2a4f4dd9512e36f7f570d66e65ff867ed3b9d" +checksum = "64d80649ab6db9d9f6f9c80a40becd948eda4714a0a5ac8c4d157a32231c7882" dependencies = [ "zstd-sys", ] [[package]] name = "zstd-sys" -version = "2.0.16+zstd.1.5.7" +version = "2.1.0+zstd.1.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e19ebc2adc8f83e43039e79776e3fda8ca919132d68a1fed6a5faca2683748" +checksum = "0ef0a8027ec3ee71300ab3bcbcd0393f434aa72b91ca6d635a39941deae8eea0" dependencies = [ "cc", "pkg-config", @@ -9241,9 +9345,9 @@ checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a" [[package]] name = "zune-core" -version = "0.5.1" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb8a0807f7c01457d0379ba880ba6322660448ddebc890ce29bb64da71fb40f9" +checksum = "d56377fd46368984a170bc5aac5567e52ca5da874caa60bea39fcbca78fb658b" [[package]] name = "zune-inflate" @@ -9269,7 +9373,7 @@ version = "0.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "27bc9d5b815bc103f142aa054f561d9187d191692ec7c2d1e2b4737f8dbd7296" dependencies = [ - "zune-core 0.5.1", + "zune-core 0.5.3", ] [[package]] @@ -9287,17 +9391,18 @@ dependencies = [ [[package]] name = "zvariant" -version = "5.12.0" +version = "5.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a192a0bde63360d77a7523c833d4b4ce6070a927e2c53246e4c540b1a3e27be0" +checksum = "c1d34c27cc6cdd1f458427519dd6b8612f7b7e3f7b9a0b2355d041dda9869147" dependencies = [ "endi", "enumflags2", "serde", "url", "winnow", - "zvariant_derive 5.12.0", - "zvariant_utils 3.4.0", + "zcheapstr", + "zvariant_derive 5.15.0", + "zvariant_utils 4.2.0", ] [[package]] @@ -9309,21 +9414,21 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 2.0.119", "zvariant_utils 2.1.0", ] [[package]] name = "zvariant_derive" -version = "5.12.0" +version = "5.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bc6cde9c01c511074be97f7ccb6c19d0da89e3f8662e812e999dcfd4638737" +checksum = "864155e69b4352db0c7f374917bf45d1e0c8d17659c8b3dbf9795f3673f8c497" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn", - "zvariant_utils 3.4.0", + "syn 3.0.5", + "zvariant_utils 4.2.0", ] [[package]] @@ -9334,19 +9439,19 @@ checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.119", ] [[package]] name = "zvariant_utils" -version = "3.4.0" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e8535915cfa75547e559d8c68e8139909a4aeee076831e4ef7fc59d8172c4d6" +checksum = "bad0294361a320b694a328460dc73add56c306150f5cb6bfafc44446120008a3" dependencies = [ "proc-macro2", "quote", "serde", - "syn", + "syn 3.0.5", "winnow", ] diff --git a/Cargo.toml b/Cargo.toml index eae37a1..d366d84 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cosmic-files" -version = "1.3.0" +version = "1.9.0" authors = ["Jeremy Soller "] edition = "2024" license = "GPL-3.0-only" @@ -11,16 +11,16 @@ anyhow = "1" jiff = "0.2" jiff-icu = "0.2" icu = { version = "2.2.0", features = ["compiled_data"] } -cctk = { git = "https://github.com/pop-os/cosmic-protocols", package = "cosmic-client-toolkit", rev = "c253ec1", optional = true } +cctk = { git = "https://github.com/pop-os/cosmic-protocols", package = "cosmic-client-toolkit", rev = "c0cff4d", optional = true } cosmic-mime-apps = { git = "https://github.com/pop-os/cosmic-mime-apps.git", optional = true } dirs = "6.0.0" gio = { version = "0.21", optional = true } glib = { version = "0.21", optional = true } glob = "0.3" ignore = "0.4" -image = "0.25" +image.workspace = true libc = "0.2" -log = "0.4" +log.workspace = true mime_guess = "2" notify-debouncer-full = "0.7" notify-rust = { version = "4", optional = true } @@ -166,4 +166,8 @@ mime = { git = "https://forge.aditua.com/leyoda/window_clipboard.git", branch = cosmic-text = { path = "../cosmic-text" } [workspace] -members = ["cosmic-files-applet"] +members = ["cosmic-files-applet", "cosmic-files-thumbnailer"] + +[workspace.dependencies] +image = "0.25" +log = "0.4" diff --git a/cosmic-files-applet/Cargo.toml b/cosmic-files-applet/Cargo.toml index b4f5bcc..3cf3264 100644 --- a/cosmic-files-applet/Cargo.toml +++ b/cosmic-files-applet/Cargo.toml @@ -1,10 +1,10 @@ [package] name = "cosmic-files-applet" -version = "1.2.0" +version = "1.9.0" edition = "2024" [dependencies] -log = "0.4" +log.workspace = true zbus = "4" # Blocking connection in zbus 5 hangs [dependencies.cosmic-files] diff --git a/cosmic-files-thumbnailer/Cargo.toml b/cosmic-files-thumbnailer/Cargo.toml new file mode 100644 index 0000000..53cf47b --- /dev/null +++ b/cosmic-files-thumbnailer/Cargo.toml @@ -0,0 +1,8 @@ +[package] +name = "cosmic-files-thumbnailer" +version = "1.9.0" +edition = "2024" + +[dependencies] +image.workspace = true +pelite = "0.10" diff --git a/cosmic-files-thumbnailer/src/main.rs b/cosmic-files-thumbnailer/src/main.rs new file mode 100644 index 0000000..2463849 --- /dev/null +++ b/cosmic-files-thumbnailer/src/main.rs @@ -0,0 +1,254 @@ +// SPDX-License-Identifier: GPL-3.0-only + +use image::{DynamicImage, ImageFormat, RgbaImage}; +use std::error::Error; +use std::ffi::{OsStr, OsString}; +use std::io; +use std::path::Path; + +fn main() -> Result<(), Box> { + thumbnail_from_args(std::env::args_os().skip(1)) +} + +#[allow(dead_code)] +pub fn thumbnail_from_args(mut args: impl Iterator) -> Result<(), Box> { + let usage = || { + io::Error::new( + io::ErrorKind::InvalidInput, + "usage: cosmic-files-thumbnailer OUTPUT --size SIZE INPUT", + ) + }; + let output = args.next().ok_or_else(usage)?; + if args.next().as_deref() != Some(OsStr::new("--size")) { + return Err(usage().into()); + } + let size = args + .next() + .and_then(|arg| arg.into_string().ok()) + .and_then(|arg| arg.parse::().ok()) + .filter(|size| *size > 0) + .ok_or_else(usage)?; + let input = args.next().ok_or_else(usage)?; + if args.next().is_some() { + return Err(usage().into()); + } + + thumbnail(Path::new(&input), Path::new(&output), size) +} + +#[allow(dead_code)] +pub fn thumbnail(input: &Path, output: &Path, size: u32) -> Result<(), Box> { + let icon = thumbnail_image(input, size)?; + DynamicImage::ImageRgba8(icon).save_with_format(output, ImageFormat::Png)?; + + Ok(()) +} + +pub fn thumbnail_image(input: &Path, size: u32) -> Result> { + if size == 0 { + return Err(io::Error::new( + io::ErrorKind::InvalidInput, + "thumbnail size must be positive", + ) + .into()); + } + + // Map the PE so only the headers and resource pages touched by pelite are read. + let data = pelite::FileMap::open(input)?; + let bytes = data.as_ref(); + if bytes.len() < 64 || !bytes.starts_with(b"MZ") { + return Err(io::Error::new(io::ErrorKind::InvalidData, "input is not a PE file").into()); + } + + let file = pelite::PeFile::from_bytes(bytes).map_err(invalid_data)?; + let resources = file.resources().map_err(invalid_data)?; + let (_name, group) = resources + .icons() + .next() + .ok_or_else(|| io::Error::new(io::ErrorKind::InvalidData, "PE file has no icon group"))? + .map_err(invalid_data)?; + + let mut ico = Vec::new(); + group.write(&mut ico).map_err(invalid_data)?; + + Ok( + DynamicImage::ImageRgba8(largest_icon(&ico).map_err(invalid_data)?) + .thumbnail(size, size) + .into_rgba8(), + ) +} + +fn invalid_data(error: impl std::fmt::Display) -> io::Error { + io::Error::new(io::ErrorKind::InvalidData, error.to_string()) +} + +fn largest_icon(ico: &[u8]) -> Result { + if ico.len() < 6 { + return Err("ICO header is truncated".to_string()); + } + let count = usize::from(u16::from_le_bytes([ico[4], ico[5]])); + let mut best: Option<(u64, RgbaImage)> = None; + let mut errors = Vec::new(); + + for i in 0..count.min(32) { + let entry = 6 + i * 16; + if ico.len() < entry + 16 { + break; + } + let size = u32::from_le_bytes([ + ico[entry + 8], + ico[entry + 9], + ico[entry + 10], + ico[entry + 11], + ]) as usize; + let offset = u32::from_le_bytes([ + ico[entry + 12], + ico[entry + 13], + ico[entry + 14], + ico[entry + 15], + ]) as usize; + let Some(end) = offset.checked_add(size) else { + continue; + }; + let Some(data) = ico.get(offset..end) else { + continue; + }; + + match decode_icon(&ico[entry..entry + 16], data) { + Ok(image) => { + let pixels = u64::from(image.width()) * u64::from(image.height()); + if best + .as_ref() + .is_none_or(|(best_pixels, _)| pixels > *best_pixels) + { + best = Some((pixels, image)); + } + } + Err(err) => errors.push(format!("frame {i}: {err}")), + } + } + + best.map(|(_, image)| image).ok_or_else(|| { + if errors.is_empty() { + "PE icon contains no complete frames".to_string() + } else { + format!("PE icon could not be decoded ({})", errors.join("; ")) + } + }) +} + +fn decode_icon(entry: &[u8], data: &[u8]) -> Result { + if data.starts_with(b"\x89PNG\r\n\x1a\n") { + return image::ImageReader::with_format(io::Cursor::new(data), ImageFormat::Png) + .decode() + .map(DynamicImage::into_rgba8) + .map_err(|err| err.to_string()); + } + + let capacity = 22usize + .checked_add(data.len()) + .ok_or_else(|| "frame is too large".to_string())?; + let data_len = u32::try_from(data.len()).map_err(|_| "frame is too large".to_string())?; + let mut ico = Vec::with_capacity(capacity); + ico.extend_from_slice(&[0, 0, 1, 0, 1, 0]); + ico.extend_from_slice(entry); + ico[14..18].copy_from_slice(&data_len.to_le_bytes()); + ico[18..22].copy_from_slice(&22u32.to_le_bytes()); + ico.extend_from_slice(data); + + image::ImageReader::with_format(io::Cursor::new(ico), ImageFormat::Ico) + .decode() + .map(DynamicImage::into_rgba8) + .map_err(|err| err.to_string()) +} + +#[cfg(test)] +mod tests { + use super::{largest_icon, thumbnail_from_args}; + use image::{DynamicImage, ImageFormat, Rgb, RgbImage, Rgba, RgbaImage}; + use std::ffi::OsString; + use std::io::Cursor; + + #[test] + fn malformed_thumbnail_request_returns_an_error() { + let args = [OsString::from("output.png")]; + assert!(thumbnail_from_args(args.into_iter()).is_err()); + } + + #[test] + fn largest_icon_skips_invalid_entries() { + let image = RgbaImage::from_pixel(2, 2, Rgba([1, 2, 3, 255])); + let mut png = Cursor::new(Vec::new()); + DynamicImage::ImageRgba8(image) + .write_to(&mut png, ImageFormat::Png) + .unwrap(); + let png = png.into_inner(); + + let mut ico = vec![0, 0, 1, 0, 2, 0]; + let mut invalid_entry = [0; 16]; + invalid_entry[8..12].copy_from_slice(&4u32.to_le_bytes()); + invalid_entry[12..16].copy_from_slice(&u32::MAX.to_le_bytes()); + ico.extend_from_slice(&invalid_entry); + + let mut valid_entry = [0; 16]; + valid_entry[..8].copy_from_slice(&[2, 2, 0, 0, 1, 0, 32, 0]); + valid_entry[8..12].copy_from_slice(&u32::try_from(png.len()).unwrap().to_le_bytes()); + valid_entry[12..16].copy_from_slice(&38u32.to_le_bytes()); + ico.extend_from_slice(&valid_entry); + ico.extend_from_slice(&png); + + let decoded = largest_icon(&ico).expect("valid icon after malformed entry"); + assert_eq!(decoded.dimensions(), (2, 2)); + assert_eq!(decoded.get_pixel(0, 0), &Rgba([1, 2, 3, 255])); + } + + #[test] + fn dib_and_mask_is_applied() { + let mut dib = vec![0; 40]; + dib[0..4].copy_from_slice(&40u32.to_le_bytes()); + dib[4..8].copy_from_slice(&2i32.to_le_bytes()); + dib[8..12].copy_from_slice(&4i32.to_le_bytes()); + dib[12..14].copy_from_slice(&1u16.to_le_bytes()); + dib[14..16].copy_from_slice(&24u16.to_le_bytes()); + + // Two bottom-up BGR rows, padded to four-byte boundaries. + dib.extend_from_slice(&[0, 0, 255, 0, 0, 255, 0, 0]); + dib.extend_from_slice(&[0, 0, 255, 0, 0, 255, 0, 0]); + // The first mask row is the bottom image row; its first pixel is transparent. + dib.extend_from_slice(&[0b1000_0000, 0, 0, 0]); + dib.extend_from_slice(&[0, 0, 0, 0]); + + let mut ico = vec![0, 0, 1, 0, 1, 0]; + let mut entry = [0; 16]; + entry[..8].copy_from_slice(&[2, 2, 0, 0, 1, 0, 24, 0]); + entry[8..12].copy_from_slice(&u32::try_from(dib.len()).unwrap().to_le_bytes()); + entry[12..16].copy_from_slice(&22u32.to_le_bytes()); + ico.extend_from_slice(&entry); + ico.extend_from_slice(&dib); + + let decoded = largest_icon(&ico).expect("valid DIB icon"); + assert_eq!(decoded.get_pixel(0, 0), &Rgba([255, 0, 0, 255])); + assert_eq!(decoded.get_pixel(0, 1), &Rgba([255, 0, 0, 0])); + } + + #[test] + fn rgb_png_icon_is_decoded() { + let image = RgbImage::from_pixel(2, 2, Rgb([1, 2, 3])); + let mut png = Cursor::new(Vec::new()); + DynamicImage::ImageRgb8(image) + .write_to(&mut png, ImageFormat::Png) + .unwrap(); + let png = png.into_inner(); + + let mut ico = vec![0, 0, 1, 0, 1, 0]; + let mut entry = [0; 16]; + entry[..8].copy_from_slice(&[2, 2, 0, 0, 1, 0, 24, 0]); + entry[8..12].copy_from_slice(&u32::try_from(png.len()).unwrap().to_le_bytes()); + entry[12..16].copy_from_slice(&22u32.to_le_bytes()); + ico.extend_from_slice(&entry); + ico.extend_from_slice(&png); + + let decoded = largest_icon(&ico).expect("valid RGB PNG icon"); + assert_eq!(decoded.get_pixel(0, 0), &Rgba([1, 2, 3, 255])); + } +} diff --git a/debian/changelog b/debian/changelog index 0dbce82..48a34d7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,45 @@ +cosmic-files (1.9.0) noble; urgency=medium + + * Epoch 1.9.0 version update + + -- Michael Murphy Mon, 14 Sep 2026 20:35:19 +0200 + +cosmic-files (1.8.0) noble; urgency=medium + + * Epoch 1.8.0 version update + + -- Jeremy Soller Wed, 02 Sep 2026 08:14:53 -0600 + +cosmic-files (1.7.0) noble; urgency=medium + + * Epoch 1.7.0 version update + + -- Jeremy Soller Tue, 25 Aug 2026 09:20:22 -0600 + +cosmic-files (1.6.0) noble; urgency=medium + + * Epoch 1.6.0 version update + + -- Jeremy Soller Tue, 18 Aug 2026 07:13:48 -0600 + +cosmic-files (1.5.0) noble; urgency=medium + + * Epoch 1.5.0 version update + + -- Jeremy Soller Tue, 28 Jul 2026 09:14:09 -0600 + +cosmic-files (1.4.0) noble; urgency=medium + + * Epoch 1.4.0 version update + + -- Jeremy Soller Mon, 20 Jul 2026 14:36:06 -0600 + +cosmic-files (1.3.0) noble; urgency=medium + + * Epoch 1.3.0 version update + + -- Jeremy Soller Sun, 12 Jul 2026 13:21:18 -0600 + cosmic-files (1.2.0) noble; urgency=medium * Epoch 1.2.0 version update diff --git a/debian/source/options b/debian/source/options index 5d4ff73..2f8c4a1 100644 --- a/debian/source/options +++ b/debian/source/options @@ -1,4 +1,6 @@ tar-ignore=.github -tar-ignore=.vscode +tar-ignore=target/.rustc_info.json +tar-ignore=target/CACHEDIR.TAG +tar-ignore=target/debug +tar-ignore=target/release tar-ignore=vendor -tar-ignore=target \ No newline at end of file diff --git a/i18n/ar/cosmic_files.ftl b/i18n/ar/cosmic_files.ftl index c4e3292..479555b 100644 --- a/i18n/ar/cosmic_files.ftl +++ b/i18n/ar/cosmic_files.ftl @@ -84,7 +84,7 @@ settings = الإعدادات ### Appearance appearance = المظهر -theme = النسق +theme = السمة match-desktop = طابق سطح المكتب dark = داكن light = فاتح @@ -110,7 +110,7 @@ new-tab = لسان جديد new-window = نافذة جديدة rename = غيِّر الاسم... close-tab = أغلق اللسان -quit = أنهِ +quit = إنهِ ## Edit @@ -147,7 +147,7 @@ icon-size-and-spacing = حجم الأيقونة والتباعد icon-size = حجم الأيقونة grid-spacing = تباعد شبكي trashed-on = مهمل -details = التفاصيل +details = تفاصيل pause = ألبث resume = استئناف create-archive = أنشئ أرشيف @@ -383,3 +383,7 @@ context-action-confirm-warning = *[other] عنصر }. run = شغِّل +checksum = تدقيق المجموع { $kind } +calculate = احسب +error = خطأ +rename-confirm = أعد التسمية diff --git a/i18n/ca/cosmic_files.ftl b/i18n/ca/cosmic_files.ftl index f37cc18..71b5aa8 100644 --- a/i18n/ca/cosmic_files.ftl +++ b/i18n/ca/cosmic_files.ftl @@ -77,7 +77,7 @@ name-no-slashes = El nom no pot contenir barres. cancel = Cancel·lar create = Crea open = Obre -open-file = Obre el fixer +open-file = Obre el fitxer open-folder = Obre la carpeta open-in-new-tab = Obre en una pestanya nova open-in-new-window = Obre en una finestra nova diff --git a/i18n/cs/cosmic_files.ftl b/i18n/cs/cosmic_files.ftl index fac1794..d544dc8 100644 --- a/i18n/cs/cosmic_files.ftl +++ b/i18n/cs/cosmic_files.ftl @@ -428,3 +428,9 @@ context-action-confirm-warning = }. run = Spustit rename-confirm = Přejmenovat +checksum = Kontrolní součet { $kind } +calculate = Vypočítat +error = Chyba +search-application = Hledat podle názvu aplikace +sidebar-label = Popisek v postranním panelu +change-sidebar-label = Změnit popisek diff --git a/i18n/da/cosmic_files.ftl b/i18n/da/cosmic_files.ftl index 82e7f27..5666fdb 100644 --- a/i18n/da/cosmic_files.ftl +++ b/i18n/da/cosmic_files.ftl @@ -1,35 +1,43 @@ -cosmic-files = COSMIC Filer +cosmic-files = COSMIC Filhåndtering empty-folder = Tom mappe -empty-folder-hidden = Tom mappe (har skjulte filer) -no-results = Ingen resultater +empty-folder-hidden = Tom mappe (har skjulte emner) +no-results = Fandt ingen resultater filesystem = Filsystem home = Hjem networks = Netværk -notification-in-progress = Filoperationer er igangværende. -trash = Skraldespand +notification-in-progress = Fil-operationer er igang +trash = Papirkurv recents = Seneste undo = Fortryd today = I dag # Desktop view options -desktop-view-options = Indstillinger for skrivebordsudseende... -show-on-desktop = Vis på Skrivebordet -desktop-folder-content = Indhold på Skrivebordet +desktop-view-options = Valgmuligheder for skrivebordsvisning... +show-on-desktop = Vis på Skrivebord +desktop-folder-content = Skrivebords-mappeindhold mounted-drives = Monterede drev -trash-folder-icon = Skraldespandsikon -icon-size-and-spacing = Ikonstørrelse og afstand +trash-folder-icon = Papirkurv-ikon +icon-size-and-spacing = Ikonstørrelse og -afstand icon-size = Ikonstørrelse # List view name = Navn modified = Ændret -trashed-on = Smidt ud +trashed-on = Kasseret size = Størrelse # Progress footer details = Detaljer -dismiss = Afvis besked -operations-running = { $running } operationer er i gang ({ $percent }%)... -operations-running-finished = { $running } operationer er i gang ({ $percent }%), { $finished } færdiggjort... +dismiss = Luk meddelelse +operations-running = + { $running } { $running -> + [one] operation + *[other] operationer + } kører ({ $percent }%)... +operations-running-finished = + { $running } { $running -> + [one] operation + *[other] operationer + } kører ({ $percent }%), { $finished } færdig... pause = Pause -resume = Fortsæt +resume = Genoptag # Dialogs @@ -40,12 +48,12 @@ create-archive = Opret arkiv ## Empty Trash Dialog -empty-trash = Tøm skraldespand -empty-trash-warning = Er du sikker på du vil slette alle objekter i Skraldespanden permanent? +empty-trash = Tøm papirkurv +empty-trash-warning = Emner i Papirkurv-mappen vil blive slettet permanent ## Mount Error Dialog -mount-error = Kan ikke tilgå drev +mount-error = Ude af stand til at tilgå drev ## New File/Folder Dialog @@ -53,22 +61,22 @@ create-new-file = Opret ny fil create-new-folder = Opret ny mappe file-name = Filnavn folder-name = Mappenavn -file-already-exists = En fil med det navn eksisterer allerede. -folder-already-exists = En mappe med det navn eksisterer allerede. -name-hidden = Navne begyndende med "." vil blive skjult. -name-invalid = Navn kan ikke være "{ $filename }". -name-no-slashes = Navn kan ikke indeholde skråstreg. +file-already-exists = En fil med det navn eksisterer allerede +folder-already-exists = En mappe med det navn eksisterer allerede +name-hidden = Navne begyndende med "." vil være skjulte +name-invalid = Navn må ikke være "{ $filename }" +name-no-slashes = Navn må ikke indeholde skråstreger ## Open/Save Dialog -cancel = Annullér +cancel = Afbryd create = Opret open = Åbn open-file = Åbn fil open-folder = Åbn mappe -open-in-new-tab = Åbn i ny fane +open-in-new-tab = Åbn i nyt faneblad open-in-new-window = Åbn i nyt vindue -open-item-location = Åbn placering for objekt +open-item-location = Åbn emne-placering open-multiple-files = Åbn flere filer open-multiple-folders = Åbn flere mapper save = Gem @@ -87,20 +95,20 @@ rename-folder = Omdøb mappe ## Replace Dialog replace = Erstat -replace-title = "{ $filename }" eksisterer allerede på denne placering. -replace-warning = Vil du erstatte den med den du er ved at gemme? Hvis du erstatter den, overskriver du dens indhold. -replace-warning-operation = Vil du erstatte den? Hvis du erstatter den, overskriver du dens indhold. +replace-title = "{ $filename }" eksisterer allerede i denne placering +replace-warning = Ønsker du at erstatte den med den, du er ved at gemme? Erstatning af den vil overskrive dens indhold. +replace-warning-operation = Ønsker du at erstatte den? Erstatning af den vil overskrive dens indhold. original-file = Original fil replace-with = Erstat med -apply-to-all = Anvend for alle +apply-to-all = Anvend på alle keep-both = Behold begge skip = Spring over ## Set as Executable and Launch Dialog -set-executable-and-launch = Indstil som eksekverbar fil og start -set-executable-and-launch-description = Vil du indstille "{ $name }" som en eksekverbar fil og starte den? -set-and-launch = Indstil og start +set-executable-and-launch = Angiv som eksekverbar og start +set-executable-and-launch-description = Vil du angive "{ $name }" som eksekverbar og starte den? +set-and-launch = Angiv og start ## Metadata Dialog @@ -239,13 +247,13 @@ settings = Indstillinger appearance = Udseende theme = Tema -match-desktop = Match skrivebord -dark = Mørk -light = Lys +match-desktop = Følg skrivebordets indstillinger +dark = Mørkt +light = Lyst # Context menu add-to-sidebar = Tilføj til sidebjælke -compress = Komprimér -extract-here = Extract +compress = Komprimer… +extract-here = Uddrag new-file = Ny fil... new-folder = Ny mappe... open-in-terminal = Åbn i terminal @@ -280,15 +288,15 @@ quit = Afslut edit = Redigér cut = Klip copy = Kopiér -paste = Sæt ind -select-all = Vælg alt +paste = Indsæt +select-all = Vælg alle ## View zoom-in = Zoom ind default-size = Standardstørrelse zoom-out = Zoom ud -view = Visning +view = Vis grid-view = Gitter-visning list-view = Liste-visning show-hidden-files = Vis skjulte filer @@ -306,3 +314,102 @@ sort-newest-first = Nyeste først sort-oldest-first = Ældste først sort-smallest-to-largest = Mindste til største sort-largest-to-smallest = Største til mindste +delete = Slet +run = Kør +repository = Pakkearkiv +grid-spacing = Gitter-afstand +extract-password-required = Adgangskode påkrævet +extract-to = Udpak Til... +extract-to-title = Udpak til mappe +empty-trash-title = Tøm papirkurv? +keywords = Mappe;Håndtering; +comment = Filhåndteringsprogram til COSMIC-skrivebordet +copy-to-title = Vælg kopi destination +copy-to-button-label = Kopier +move-to-title = Vælg flytte destination +move-to-button-label = Flyt +deleted = + Slettede { $items } { $items -> + [one] element + *[other] elementer + } fra { trash } +removing-from-recents = + Fjerner { $items } { $items -> + [one] element + *[other] elementer + } fra { recents } +type-to-search-enter-path = Indtast stien til mappen eller filen +permanently-deleting = + Sletter permanent { $items } { $items -> + [one] element + *[other] elementer + } +execute-only = Kun kørsel +removed-from-recents = + Fjernede { $items } { $items -> + [one] element + *[other] elementer + } fra { recents } +permanently-deleted = + Slettede permanent { $items } { $items -> + [one] element + *[other] elementer + } +write-only = Kun skrivning +remove = Fjern +context-action = Konteksthandling +context-action-confirm-title = Kør “{ $name }”? +context-action-confirm-warning = + Dette vil køre på { $items } { $items -> + [one] item + *[other] items + }. +selected-items = De { $items } valgte elementer +mixed = Blandet +none = Ingen +write-execute = Skriv og kør +read-only = Kun læsning +read-execute = Læs og kør +read-write = Læs og skriv +read-write-execute = Læs, skriv og kør +keep = Behold +support = Support +progress-failed = { $percent } %, mislykkedes +pasted-image = Indsat billede +pasted-text = Indsat tekst +pasted-video = Indsat video +deleting = + Sletter { $items } { $items -> + [one] element + *[other] elementer + } fra { trash } ({ $progress })... +setting-permissions = Indstiller tilladelser for “{ $name }” til { $mode } +set-permissions = Sæt tilladelser for “{ $name }” til { $mode } +show-recents = Seneste-mappe i sidepanelet +type-to-search = Skriv for at søge +type-to-search-recursive = Søger i den aktuelle mappe og alle undermapper +type-to-search-select = Vælger den første matchende fil eller mappe +clear-recents-history = Ryd seneste historik +copy-to = Kopiér til… +delete-permanently = Slet permanent +eject = Skub ud +move-to = Flyt til… +remove-from-recents = Fjern fra seneste +reload-folder = Genindlæs mappe +copy-path = Kopiér sti +rename-confirm = Omdøb +calculate = Udregn +error = Fejl +checksum = { $kind }-kontrolsum +other-apps = Andre applikationer +related-apps = Relaterede applikationer +permanently-delete-question = Slet permanent? +permanently-delete-warning = { $target } vil blive slettet permanent. Denne handling kan ikke fortrydes. +open-with = Åbn med +favorite-path-error = Fejl ved åbning af sti +favorite-path-error-description = + Ude af stand til at åbne "{ $path }" + "{ $path }" Eksisterer muligvis ikke, eller du har måske ikketilladelse til at åbne den + + Ønsker du at fjerne den fra sidebjælken? +single-click = Enkelt klik for at åbne diff --git a/i18n/de/cosmic_files.ftl b/i18n/de/cosmic_files.ftl index 65a5ebf..87ba8b8 100644 --- a/i18n/de/cosmic_files.ftl +++ b/i18n/de/cosmic_files.ftl @@ -11,7 +11,7 @@ recents = Zuletzt verwendet undo = Rückgängig today = Heute # Optionen für die Desktop-Ansicht -desktop-view-options = Optionen für die Desktop-Ansicht… +desktop-view-options = Optionen für die Desktop-Ansicht ... show-on-desktop = Auf Desktop anzeigen desktop-folder-content = Inhalt des Desktop-Ordners mounted-drives = Eingehängte Laufwerke @@ -31,12 +31,12 @@ operations-running = { $running } { $running -> [one] laufender Vorgang *[other] laufende Vorgänge - } ({ $percent } %)... + } ({ $percent } %) ... operations-running-finished = { $running } { $running -> [one] laufender Vorgang *[other] laufende Vorgänge - } ({ $percent } %), { $finished } abgeschlossen... + } ({ $percent } %), { $finished } abgeschlossen ... pause = Pause resume = Fortsetzen @@ -50,7 +50,7 @@ create-archive = Archiv erstellen ## Entpacken-Dialog extract-password-required = Passwort erforderlich -extract-to = Entpacken nach... +extract-to = Entpacken nach ... extract-to-title = In Ordner entpacken ## Dialog zum Leeren des Papierkorbs @@ -179,7 +179,7 @@ keep = Behalten add-network-drive = Netzlaufwerk hinzufügen connect = Verbinden connect-anonymously = Anonym verbinden -connecting = Wird verbunden... +connecting = Wird verbunden ... domain = Domain enter-server-address = Serveradresse eingeben network-drive-description = @@ -218,7 +218,7 @@ compressing = { $items } { $items -> [one] Element wird *[other] Elemente werden - } von „{ $from }“ nach „{ $to }“ komprimiert ({ $progress })... + } von „{ $from }“ nach „{ $to }“ komprimiert ({ $progress }) ... compressed = { $items } { $items -> [one] Element wurde @@ -231,7 +231,7 @@ copying = { $items } { $items -> [one] Element wird *[other] Elemente werden - } von „{ $from }“ nach „{ $to }“ kopiert ({ $progress })... + } von „{ $from }“ nach „{ $to }“ kopiert ({ $progress }) ... copied = { $items } { $items -> [one] Element wurde @@ -241,19 +241,19 @@ deleting = { $items } { $items -> [one] Element wird *[other] Elemente werden - } aus dem { trash } gelöscht ({ $progress })... + } aus dem { trash } gelöscht ({ $progress }) ... deleted = { $items } { $items -> [one] Element wurde *[other] Elemente wurden } aus dem { trash } gelöscht -emptying-trash = { trash } wird geleert ({ $progress })... +emptying-trash = { trash } wird geleert ({ $progress }) ... emptied-trash = { trash } geleert extracting = { $items } { $items -> [one] Element wird *[other] Elemente werden - } von „{ $from }“ nach „{ $to }“ entpackt ({ $progress })... + } von „{ $from }“ nach „{ $to }“ entpackt ({ $progress }) ... extracted = { $items } { $items -> [one] Element wurde @@ -267,7 +267,7 @@ moving = { $items } { $items -> [one] Element wird *[other] Elemente werden - } von „{ $from }“ nach „{ $to }“ verschoben ({ $progress })... + } von „{ $from }“ nach „{ $to }“ verschoben ({ $progress }) ... moved = { $items } { $items -> [one] Element wurde @@ -289,7 +289,7 @@ restoring = { $items } { $items -> [one] Element wird *[other] Elemente werden - } aus dem { trash } wiederhergestellt ({ $progress })... + } aus dem { trash } wiederhergestellt ({ $progress }) ... restored = { $items } { $items -> [one] Element wurde @@ -299,7 +299,7 @@ unknown-folder = unbekannter Ordner ## Öffnen mit -menu-open-with = Öffnen mit... +menu-open-with = Öffnen mit ... default-app = { $name } (Standard) ## Details anzeigen @@ -311,7 +311,7 @@ item-size = Größe: { $size } item-created = Erstellt: { $created } item-modified = Geändert: { $modified } item-accessed = Zugegriffen: { $accessed } -calculating = Wird berechnet... +calculating = Wird berechnet ... ## Einstellungen @@ -333,15 +333,15 @@ type-to-search-recursive = Durchsucht den aktuellen Ordner und alle Unterordner type-to-search-enter-path = Gib den Pfad zum Verzeichnis oder zur Datei ein # Kontextmenü add-to-sidebar = Zur Seitenleiste hinzufügen -compress = Komprimieren... +compress = Komprimieren ... delete-permanently = Endgültig löschen extract-here = Entpacken -new-file = Neue Datei... -new-folder = Neuer Ordner... +new-file = Neue Datei ... +new-folder = Neuer Ordner ... open-in-terminal = Im Terminal öffnen move-to-trash = In den Papierkorb verschieben restore-from-trash = Aus dem Papierkorb wiederherstellen -remove-from-sidebar = Von der Seitenleiste entfernen +remove-from-sidebar = Aus der Seitenleiste entfernen sort-by-name = Nach Name sortieren sort-by-modified = Nach Änderung sortieren sort-by-size = Nach Größe sortieren @@ -349,9 +349,9 @@ sort-by-trashed = Nach Löschzeitpunkt sortieren ## Desktop -change-wallpaper = Hintergrundbild ändern... -desktop-appearance = Desktop-Aussehen... -display-settings = Anzeigeeinstellungen... +change-wallpaper = Hintergrundbild ändern ... +desktop-appearance = Desktop-Aussehen ... +display-settings = Anzeigeeinstellungen ... # Menü @@ -362,7 +362,7 @@ file = Datei new-tab = Neuer Tab new-window = Neues Fenster reload-folder = Ordner neu laden -rename = Umbenennen... +rename = Umbenennen ... close-tab = Tab schließen quit = Beenden @@ -385,8 +385,8 @@ list-view = Listenansicht show-hidden-files = Versteckte Dateien anzeigen list-directories-first = Verzeichnisse zuerst auflisten gallery-preview = Galerie-Vorschau -menu-settings = Einstellungen... -menu-about = Über COSMIC Dateien... +menu-settings = Einstellungen ... +menu-about = Über COSMIC Dateien ... ## Sortieren @@ -397,7 +397,7 @@ sort-newest-first = Neueste zuerst sort-oldest-first = Älteste zuerst sort-smallest-to-largest = Von klein nach groß sort-largest-to-smallest = Von groß nach klein -repository = Repository +repository = Repositorium empty-trash-title = Papierkorb leeren? copy-to-title = Kopierziel auswählen copy-to-button-label = Kopieren @@ -418,7 +418,7 @@ type-to-search-select = Wählt die erste übereinstimmende Datei oder den ersten pasted-image = Eingefügtes Bild pasted-text = Eingefügter Text pasted-video = Eingefügtes Video -copy-to = Kopieren nach... +copy-to = Kopieren nach ... show-recents = Ordner zuletzt verwendeter Elemente in der Seitenleiste clear-recents-history = Verlauf zuletzt verwendeter Elemente leeren comment = Dateimanager für den COSMIC Desktop @@ -426,7 +426,7 @@ keywords = Ordner;Manager; move-to-button-label = Verschieben move-to-title = Verschiebeziel auswählen remove-from-recents = Aus den zuletzt verwendeten Elementen entfernen -move-to = Verschieben nach... +move-to = Verschieben nach ... copy-path = Pfad kopieren mixed = Gemischt context-action = Kontextaktion @@ -438,3 +438,8 @@ context-action-confirm-warning = }. run = Ausführen rename-confirm = Umbenennen +checksum = { $kind } Prüfsumme +calculate = Berechnen +error = Fehler +sidebar-label = Bezeichnung in der Seitenleiste +search-application = Nach App-Name suchen diff --git a/i18n/el/cosmic_files.ftl b/i18n/el/cosmic_files.ftl index c75e419..6443d4b 100644 --- a/i18n/el/cosmic_files.ftl +++ b/i18n/el/cosmic_files.ftl @@ -22,7 +22,7 @@ password = Κωδικός πρόσβασης remove = Αφαίρεση create = Δημιουργία pause = Παύση -quit = Έξοδος +quit = Τερματισμός calculating = Υπολογισμός... keep = Διατήρηση edit = Επεξεργασία @@ -328,3 +328,9 @@ context-action-confirm-warning = *[other] στοιχεία }. rename-confirm = Μετονομασία +checksum = Άθροισμα ελέγχου { $kind } +calculate = Υπολογισμός +error = Σφάλμα +sidebar-label = Ετικέτα πλαϊνής στήλης +search-application = Αναζήτηση με όνομα εφαρμογής +change-sidebar-label = Αλλαγή ετικέτας πλαϊνής στήλης diff --git a/i18n/en-GB/cosmic_files.ftl b/i18n/en-GB/cosmic_files.ftl index e69de29..62d9b75 100644 --- a/i18n/en-GB/cosmic_files.ftl +++ b/i18n/en-GB/cosmic_files.ftl @@ -0,0 +1,100 @@ +save = Save +quit = Quit +name = Name +delete = Delete +cancel = Cancel +run = Run +new-window = New window +theme = Theme +appearance = Appearance +light = Light +repository = Repository +support = Support +dark = Dark +match-desktop = Match desktop +settings = Settings +replace = Replace +file = File +zoom-in = Zoom in +select-all = Select all +zoom-out = Zoom out +default-size = Default size +edit = Edit +copy = Copy +paste = Paste +view = View +undo = Undo +cut = Cut +icon-size-and-spacing = Icon size and spacing +cosmic-files = COSMIC Files +trash = Rubbish +empty-folder-hidden = Empty folder (has hidden items) +no-results = No results found +empty-folder = Empty folder +menu-settings = Settings... +recents = Recents +mounted-drives = Mounted drives +filesystem = Filesystem +home = Home +desktop-view-options = Desktop view options... +show-on-desktop = Show on Desktop +trash-folder-icon = Bin folder icon +desktop-folder-content = Desktop folder content +networks = Networks +today = Today +notification-in-progress = File operations are in progress +comment = File manager for the COSMIC desktop +keywords = Folder;Manager; +size = Size +dismiss = Dismiss message +trashed-on = Binned +create-archive = Create archive +pause = Pause +resume = Resume +grid-spacing = Grid spacing +details = Details +operations-running-finished = + { $running } { $running -> + [one] operation + *[other] operations + } running ({ $percent }%), { $finished } finished... +icon-size = Icon size +modified = Modified +operations-running = + { $running } { $running -> + [one] operation + *[other] operations + } running ({ $percent }%)... +copy-to-title = Select copy destination +open-file = Open file +open-multiple-files = Open multiple files +create-new-folder = Create new folder +create = Create +other-apps = Other applications +open-multiple-folders = Open multiple folders +extract-to = Extract To... +create-new-file = Create new file +open-in-new-window = Open in new window +folder-name = Folder name +browse-store = Browse { $store } +open-item-location = Open item location +mount-error = Unable to access drive +open = Open +extract-to-title = Extract to folder +open-with-title = How do you want to open "{ $name }"? +extract-password-required = Password required +open-folder = Open folder +open-in-new-tab = Open in new tab +file-name = File name +save-file = Save file +file-already-exists = A file with that name already exists +name-hidden = Names starting with "." will be hidden +folder-already-exists = A folder with that name already exists +empty-trash = Empty bin +empty-trash-title = Empty bin? +name-no-slashes = Name cannot contain slashes +name-invalid = Name cannot be "{ $filename }" +copy-to-button-label = Copy +move-to-title = Select move destination +move-to-button-label = Move +context-action = Context action diff --git a/i18n/en/cosmic_files.ftl b/i18n/en/cosmic_files.ftl index 2a1938a..b97ff88 100644 --- a/i18n/en/cosmic_files.ftl +++ b/i18n/en/cosmic_files.ftl @@ -119,6 +119,9 @@ rename-file = Rename file rename-folder = Rename folder rename-confirm = Rename +## Change Sidebar Label Dialog +sidebar-label = Sidebar label + ## Replace Dialog replace = Replace replace-title = "{$filename}" already exists in this location @@ -299,6 +302,7 @@ unknown-folder = unknown folder ## Open with menu-open-with = Open with... default-app = {$name} (default) +search-application = Search by app name ## Show details show-details = Show details @@ -347,6 +351,7 @@ move-to = Move to... move-to-trash = Move to trash restore-from-trash = Restore from trash remove-from-sidebar = Remove from sidebar +change-sidebar-label = Change sidebar label sort-by-name = Sort by name sort-by-modified = Sort by modified sort-by-size = Sort by size diff --git a/i18n/fa/cosmic_files.ftl b/i18n/fa/cosmic_files.ftl index 972e3c9..5f5eaee 100644 --- a/i18n/fa/cosmic_files.ftl +++ b/i18n/fa/cosmic_files.ftl @@ -345,3 +345,4 @@ sort-newest-first = جدیدترین در ابتدا sort-oldest-first = قدیمی‌ترین در ابتدا sort-smallest-to-largest = کوچک‌ترین به بزرگ‌ترین sort-largest-to-smallest = بزرگ‌ترین به کوچک‌ترین +run = اجرا diff --git a/i18n/fi/cosmic_files.ftl b/i18n/fi/cosmic_files.ftl index 6000bc7..ce1f7ff 100644 --- a/i18n/fi/cosmic_files.ftl +++ b/i18n/fi/cosmic_files.ftl @@ -225,7 +225,7 @@ settings = Asetukset appearance = Ulkoasu theme = Teema -match-desktop = Sovita työpöytään +match-desktop = Sama kuin työpöytä dark = Tumma light = Vaalea @@ -415,3 +415,9 @@ context-action-confirm-warning = }. run = Suorita rename-confirm = Nimeä uudelleen +checksum = { $kind }-tarkistussumma +calculate = Laske +error = Virhe +search-application = Hae sovelluksen nimellä +sidebar-label = Sivupalkin nimike +change-sidebar-label = Muuta sivupalkin nimikettä diff --git a/i18n/fil/cosmic_files.ftl b/i18n/fil/cosmic_files.ftl new file mode 100644 index 0000000..e69de29 diff --git a/i18n/fr/cosmic_files.ftl b/i18n/fr/cosmic_files.ftl index 0d40341..cdcfe35 100644 --- a/i18n/fr/cosmic_files.ftl +++ b/i18n/fr/cosmic_files.ftl @@ -80,14 +80,14 @@ cancel = Annuler create = Créer open = Ouvrir open-file = Ouvrir le fichier -open-folder = Ouvrir dossier +open-folder = Ouvrir le dossier open-in-new-tab = Ouvrir dans un nouvel onglet open-in-new-window = Ouvrir dans une nouvelle fenêtre open-item-location = Ouvrir l'emplacement de l'élément open-multiple-files = Ouvrir plusieurs fichiers open-multiple-folders = Ouvrir plusieurs dossiers save = Enregistrer -save-file = Enregistrer fichier +save-file = Enregistrer le fichier ## Open With Dialog @@ -189,7 +189,7 @@ keep = Conserver ## Add Network Drive add-network-drive = Ajouter un lecteur réseau -connect = Connecter +connect = Se connecter connect-anonymously = Se connecter anonymement connecting = Connexion... domain = Domaine @@ -206,8 +206,8 @@ network-drive-schemes = File Transfer Protocol,ftp:// or ftps:// Network File System,nfs:// Server Message Block,smb:// - SSH File Transfer Protocol,sftp:// or ssh:// - WebDav,dav:// or davs:// + SSH File Transfer Protocol,sftp:// ou ssh:// + WebDAV,dav:// ou davs:// network-drive-error = Impossible d'accéder au lecteur réseau password = Mot de passe remember-password = Se souvenir du mot de passe @@ -222,7 +222,7 @@ history = Historique no-history = Aucun élément dans l'historique. pending = En attente progress = { $percent }% -progress-cancelled = { $percent }%, annulation +progress-cancelled = { $percent }%, annulé progress-paused = { $percent }%, en pause failed = Échoué complete = Terminé @@ -259,7 +259,7 @@ deleted = [one] élément supprimé *[other] éléments supprimés } depuis { trash } -emptying-trash = { trash } en cours de nettoyage ({ $progress })... +emptying-trash = Nettoyage en cours de { trash } ({ $progress })... emptied-trash = { trash } vidée extracting = Extraction de { $items } { $items -> @@ -271,7 +271,7 @@ extracted = [one] élément extrait *[other] éléments extraits } depuis "{ $from }" vers "{ $to }" -setting-executable-and-launching = Paramétrage de "{ $name }" comme exécutable et prêt à être lancé +setting-executable-and-launching = Définition de "{ $name }" comme exécutable et lancement en cours set-executable-and-launched = Défini "{ $name }" comme exécutable et lancé moving = Déplacement de { $items } { $items -> @@ -282,7 +282,7 @@ moved = { $items } { $items -> [one] élément déplacé *[other] éléments déplacés - } de "{ $from }" à "{ $to }" + } de "{ $from }" vers "{ $to }" permanently-deleting = Suppression définitive de { $items } { $items -> [one] élément @@ -310,7 +310,7 @@ unknown-folder = Dossier inconnu ## Open with menu-open-with = Ouvrir avec... -default-app = { $name } (défaut) +default-app = { $name } (par défaut) ## Show details @@ -352,7 +352,7 @@ open-in-terminal = Ouvrir dans le terminal edit-desktop-entry = Modifier le fichier .desktop move-to-trash = Déplacer vers la corbeille restore-from-trash = Restaurer depuis la corbeille -remove-from-sidebar = Supprimer de la barre latérale +remove-from-sidebar = Retirer de la barre latérale sort-by-name = Trier par nom sort-by-modified = Trier par date de modification sort-by-size = Trier par taille @@ -415,11 +415,11 @@ removing-from-recents = *[other] éléments } de { recents } other-apps = Autres applications -set-permissions = Définir les permissions pour "{ $name }" à { $mode } +set-permissions = Permissions définies pour "{ $name }" à { $mode } repository = Dépôt support = Support eject = Éjecter -remove-from-recents = Supprimer des récents +remove-from-recents = Retirer des récents empty-trash-title = Vider la corbeille ? setting-permissions = Définition des permissions pour "{ $name }" à { $mode } removed-from-recents = @@ -428,9 +428,9 @@ removed-from-recents = *[other] éléments supprimés } de { recents } progress-failed = { $percent }%, échec -type-to-search-select = Sélectionne le premier fichier ou dossier qui convient +type-to-search-select = Sélectionne le premier fichier ou dossier correspondant pasted-image = Image collée -pasted-text = Text collé +pasted-text = Texte collé pasted-video = Vidéo collée copy-to-title = Sélectionner la destination de la copie copy-to-button-label = Copier @@ -453,3 +453,9 @@ context-action-confirm-warning = run = Exécuter context-action = Action contextuelle rename-confirm = Renommer +calculate = Calculer +error = Erreur +checksum = Somme de contrôle { $kind } +sidebar-label = Libellé de la barre latérale +search-application = Chercher par nom d'appli +change-sidebar-label = Changer le libellé de la barre latérale diff --git a/i18n/ga/cosmic_files.ftl b/i18n/ga/cosmic_files.ftl index 773c2fa..24b203b 100644 --- a/i18n/ga/cosmic_files.ftl +++ b/i18n/ga/cosmic_files.ftl @@ -307,7 +307,7 @@ single-click = Cliceáil amháin le hoscailt ### Appearance -appearance = Cuma +appearance = Dealramh theme = Téama match-desktop = Meaitseáil deasc dark = Dorcha @@ -443,3 +443,6 @@ context-action-confirm-warning = }. run = Rith rename-confirm = Athainmnigh +checksum = { $kind } suim sheiceála +calculate = Ríomh +error = Earráid diff --git a/i18n/gl/cosmic_files.ftl b/i18n/gl/cosmic_files.ftl new file mode 100644 index 0000000..77a5757 --- /dev/null +++ b/i18n/gl/cosmic_files.ftl @@ -0,0 +1,333 @@ +name = Nome +save = Gardar +cancel = Cancelar +run = Executar +delete = Eliminar +repository = Repositorio +support = Soporte +settings = Axustes +appearance = Apariencia +theme = Tema +match-desktop = Axustar ao escritorio +dark = Escuro +light = Claro +replace = Remplazar +file = Ficheiro +new-window = Nova xanela +quit = Pechar +edit = Editar +undo = Desfacer +cut = Cortar +copy = Copiar +paste = Pegar +select-all = Seleccionar todo +view = Ver +zoom-in = Aumentar Zoom +default-size = Tamaño por defecto +zoom-out = Afastar Zoom +menu-settings = Axustes... +cosmic-files = Ficheiros COSMIC +comment = Xestor de ficheiros para o escritorio COSMIC +keywords = Cartafol;Xestor; +empty-folder = Cartafol baleiro +empty-folder-hidden = Cartafol baleiro (contén elementos agochados) +no-results = Non se atoparon resultados +filesystem = Sistema de ficheiros +home = Inicio +networks = Redes +notification-in-progress = Operacións de ficheiros en progreso +trash = Lixo +recents = Recentes +today = Hoxe +desktop-view-options = Axustes da vista do escritorio… +show-on-desktop = Amosar no Escritorio +desktop-folder-content = Contido do cartafol Escritorio +mounted-drives = Unidades montadas +trash-folder-icon = Icona do cartafol do Lixo +icon-size-and-spacing = Tamaño e espazado das iconas +icon-size = Tamaño de icona +grid-spacing = Espazado da grella +modified = Modificado +trashed-on = No lixo +size = Tamaño +details = Detalles +dismiss = Descartar a mensaxe +operations-running = + { $running } { $executandose -> + [unha] operacion + *[outra] operacions + } executandose ({ $percent }%)... +operations-running-finished = + { $running } { $executandose -> + [unha] operacion + *[outra] operacions + } executandose ({ $percent }%), { $finished } rematadas... +pause = Pausa +resume = Retomar +create-archive = Crear arquivo comprimido +copy-to-title = Seleccionar o destino da copia +copy-to-button-label = Copiar +extract-password-required = Contrasinal necesario +extract-to = Extraer en… +extract-to-title = Extraer a cartafol +empty-trash = Baleirar Lixo +empty-trash-title = Baleirar o lixo? +empty-trash-warning = Os elementos do cartafol do lixo eliminaranse de forma permanente +mount-error = Non é posible acceder a unidade +move-to-title = Seleccionar o destino do movemento +move-to-button-label = Mover +create-new-file = Crear un novo ficheiro +create-new-folder = Crear novo cartafol +file-name = Nome do ficheiro +folder-name = Nome do cartafol +file-already-exists = Existe un ficheiro co mesmo nome +folder-already-exists = Existe un cartafol co mesmo nome +name-hidden = Os nomes que comecen por "." agocharanse +name-invalid = O nome non pode ser "{ $filename }" +name-no-slashes = O nome non pode conter barras +create = Crear +open = Abrir +open-file = Abrir ficheiro +open-folder = Abrir cartafol +open-in-new-tab = Abrir nunha nova lapela +open-in-new-window = Abrir nunha nova xanela +open-item-location = Abrir ubicación do ítem +open-multiple-files = Abrir multiples ficheiros +open-multiple-folders = Abrir multiples cartafoles +save-file = Gardar ficheiro +open-with-title = Como queres abrir «{ $name }»? +browse-store = Atopar { $store } +other-apps = Outras aplicacións +related-apps = Aplicacións relacionadas +context-action = Acción contextual +context-action-confirm-title = Executar "{ $name }"? +context-action-confirm-warning = + Esto vaise executar en { $items } { $items -> + [un] item + *[outro] items + }. +selected-items = Os { $items } elementos seleccionados +permanently-delete-question = Eliminar permanentemente? +permanently-delete-warning = { $target } será eliminado permanentemente. Esta acción non se poderá desfacer. +rename-file = Renomear ficheiro +rename-folder = Renomear cartafol +rename-confirm = Renomear +replace-title = "{ $filename }" xa existe nesta ubicación +replace-warning = Queres substituílo polo que estás a gardar? Ao substituílo sobrescribirase o seu contido. +replace-warning-operation = Queres substituílo? Ao substituílo sobrescribirase o seu contido. +original-file = Ficheiro orixinal +replace-with = Remplazar con +apply-to-all = Aplicar a todo +keep-both = Manter ambos +skip = Saltar +set-executable-and-launch = Marcar como executable e lanzalo +set-executable-and-launch-description = Queres marcar «{ $name }» como executábel e lanzalo? +set-and-launch = Marcar e executar +open-with = Abrir con +owner = Propietario +group = Grupo +other = Outro +mixed = Mesturar +none = Ningún +execute-only = Só execución +write-only = Só escritura +write-execute = Escritura e execución +read-only = Só lectura +read-execute = Lectura e execución +read-write = Lectura e escritura +read-write-execute = Lectura, escritura e execución +favorite-path-error = Erro abrindo o directorio +favorite-path-error-description = + Non foi posíbel abrir «{ $path }». + É posíbel que «{ $path }» non exista ou que non teñas permisos para abrilo. + + Queres retiralo da barra lateral? +remove = Eliminar +keep = Manter +add-network-drive = Engadir unidade de rede +connect = Conectar +connect-anonymously = Conectar de xeito anonimo +connecting = Conectando... +domain = Dominio +enter-server-address = Introducir a dirección do servidor +network-drive-description = + Os enderezos dos servidores inclúen un prefixo de protocolo e un enderezo. + Exemplos: ssh://192.168.0.1, ftp://[2001:db8::1] +network-drive-schemes = + Protocolos dispoñíbeis,Prefixo + AppleTalk,afp:// + Protocolo de transferencia de ficheiros,ftp:// ou ftps:// + Sistema de ficheiros en rede,nfs:// + Server Message Block,smb:// + Protocolo de transferencia de ficheiros por SSH,sftp:// ou ssh:// + WebDAV,dav:// ou davs:// +network-drive-error = Non foi posible acceder a unidade de rede +password = Contrasinal +remember-password = Recordar o contrasinal +try-again = Voltar a intentar +username = Nome de usuario +cancelled = Cancelado +edit-history = Editar historial +history = Historial +no-history = Non hai elementos no historial. +pending = Pendente +progress = { $percent }% +progress-cancelled = { $percent }%, cancelado +progress-failed = { $percent }%, fallou +progress-paused = { $percent }%, pausado +failed = Fallou +complete = Completado +compressing = + Comprimindo { $items } { $items -> + [one] elemento + *[other] elementos + } de «{ $from }» a «{ $to }» ({ $progress })... +compressed = + Comprimidos { $items } { $items -> + [one] elemento + *[other] elementos + } de «{ $from }» a «{ $to }» +copy_noun = Copiar +pasted-image = Imaxe pegada +pasted-text = Texto Pegado +pasted-video = Video pegado +creating = Creando "{ $name }" en "{ $parent }" +created = Creado "{ $name }" en "{ $parent }" +copying = + Copiando { $items } { $items -> + [one] elemento + *[other] elementos + } de «{ $from }» a «{ $to }» ({ $progress })... +copied = + Copiados { $items } { $items -> + [one] elemento + *[other] elementos + } de «{ $from }» a «{ $to }» +deleted = + Eliminando { $items } { $items -> + [one] elemento + *[other] elementos + } do lixo ({ $progress }) +emptying-trash = Baleirando { trash } ({ $progress })... +emptied-trash = Baleirado o { trash } +extracting = + Extraendo { $items } { $items -> + [one] elemento + *[other] elementos + } de «{ $from }» a «{ $to }» ({ $progress })... +extracted = + Extraídos { $items } { $items -> + [one] elemento + *[other] elementos + } de «{ $from }» a «{ $to }» +setting-executable-and-launching = Marcando «{ $name }» como executábel e executándoo +set-executable-and-launched = «{ $name }» marcouse como executábel e executouse +setting-permissions = Establecendo os permisos de «{ $name }» en { $mode } +set-permissions = Establecéronse os permisos de «{ $name }» en { $mode } +moving = + Movendo { $items } { $items -> + [one] elemento + *[other] elementos + } de «{ $from }» a «{ $to }» ({ $progress })... +moved = + Movidos { $items } { $items -> + [one] elemento + *[other] elementos + } de «{ $from }» a «{ $to }» +permanently-deleting = + Eliminando permanentemente { $items } { $items -> + [one] elemento + *[other] elementos + } +permanently-deleted = + Eliminados permanentemente { $items } { $items -> + [one] elemento + *[other] elementos + } +removing-from-recents = + Retirando { $items } { $items -> + [one] elemento + *[other] elementos + } dos { recents } +removed-from-recents = + Retirado { $items } { $items -> + [one] elemento + *[other] elementos + } de { recents } +renaming = Renomeando "{ $from }" a "{ $to }" +renamed = Renomeado "{ $from }" a "{ $to }" +restoring = + Restaurando { $items } { $items -> + [one] elemento + *[other] elementos + } de { trash } ({ $progress })... +restored = + Restaurado { $items } { $items -> + [one] elemento + *[other] elementos + } de { trash } +unknown-folder = cartafol descoñecido +menu-open-with = Abrir con... +default-app = { $name } (por defecto) +show-details = Amosar detalles +type = Tipo: { $mime } +items = Elementos: { $items } +item-size = Tamaño: { $size } +item-created = Creado: { $created } +item-modified = Modificado: { $modified } +item-accessed = Accedido: { $accessed } +calculating = Calculando... +checksum = { $kind } checksum +calculate = Calculado +error = Erro +single-click = Clic único para abrir +show-recents = Cartafol de recentes no panel lateral +type-to-search = Escribe para atopar +type-to-search-recursive = Busca no cartafol actual e en todos os subcartafoles +type-to-search-enter-path = Introduce a ruta do cartafol ou ficheiro +type-to-search-select = Selecciona o primeiro ficheiro ou cartafol coincidente +add-to-sidebar = Engadir o panel lateral +clear-recents-history = Limpar historial de recentes +compress = Comprimir... +copy-to = Copiar a... +delete-permanently = Eliminar permanentemente +eject = Expulsar +extract-here = Extraer +new-file = Novo ficheiro... +new-folder = Novo cartafol... +open-in-terminal = Abrir no terminal +move-to = Mover a... +move-to-trash = Mover ao lixo +restore-from-trash = Recuperar do lixo +remove-from-sidebar = Eliminar do panel lateral +sort-by-name = Ordenar por nome +sort-by-modified = Ordenar por modificación +sort-by-size = Ordenar por tamaño +sort-by-trashed = Ordenar pola data de eliminación +remove-from-recents = Eliminar de recentes +change-wallpaper = Cambiar fondo de pantalla... +desktop-appearance = Apariencia do Escritorio... +display-settings = Axustes de pantalla... +new-tab = Nova lapela +reload-folder = Recargar cartafol +rename = Renomear... +close-tab = Pechar lapela +copy-path = Copiar ruta +grid-view = Vista de grella +list-view = Vista de lista +show-hidden-files = Amosar ficheiros ocultos +list-directories-first = Listar primeiro os directorios +gallery-preview = Vista previa da galería +menu-about = Sobre Ficheiros COSMIC... +sort = Ordenar +sort-a-z = A-Z +sort-z-a = Z-A +sort-newest-first = Novos primeiro +sort-oldest-first = Antigos primeiro +sort-smallest-to-largest = Do máis pequeno ao máis grande +sort-largest-to-smallest = Do máis grande ao máis pequeno +deleting = + Eliminando { $items } { $items -> + [one] elemento + *[other] elementos + } da { trash } ({ $progress })... diff --git a/i18n/hi/cosmic_files.ftl b/i18n/hi/cosmic_files.ftl index 03e0db4..8b5d8f8 100644 --- a/i18n/hi/cosmic_files.ftl +++ b/i18n/hi/cosmic_files.ftl @@ -5,7 +5,7 @@ no-results = कोई परिणाम नहीं filesystem = फाइल सिस्टम home = होम networks = नेटवर्क्स -notification-in-progress = फाइल संचालन प्रगति पर है। +notification-in-progress = फ़ाइल संचालन प्रगति पर हैं trash = कचरा recents = हाल के undo = पूर्ववत करें @@ -33,8 +33,8 @@ create-archive = संग्रह बनाएँ ## Empty Trash Dialog -empty-trash = कचरा खाली करें -empty-trash-warning = क्या आप वाकई कचरे में सभी आइटमों को स्थायी रूप से हटाना चाहते हैं? +empty-trash = रद्दी साफ़ करें +empty-trash-warning = रद्दी फ़ोल्डर में मौजूद आइटम स्थायी रूप से हटा दिए जाएंगे ## New File/Folder Dialog @@ -42,11 +42,11 @@ create-new-file = नई फाइल बनाएँ create-new-folder = नया फ़ोल्डर बनाएँ file-name = फाइल का नाम folder-name = फ़ोल्डर का नाम -file-already-exists = इसी नाम की फाइल पहले से मौजूद है। -folder-already-exists = इसी नाम का फ़ोल्डर पहले से मौजूद है। -name-hidden = "." से शुरू होने वाले नाम छिपे रहेंगे। -name-invalid = नाम "{ $filename }" मान्य नहीं है। -name-no-slashes = नाम में स्लैश का उपयोग नहीं किया जा सकता है। +file-already-exists = उस नाम की फ़ाइल पहले से मौजूद है +folder-already-exists = उस नाम का फ़ोल्डर पहले से मौजूद है +name-hidden = "." से शुरू होने वाले नाम छिपे होंगे +name-invalid = नाम "{ $filename }" नहीं हो सकता +name-no-slashes = नाम में स्लैश नहीं हो सकते ## Open/Save Dialog @@ -75,8 +75,8 @@ rename-folder = फ़ोल्डर का नाम बदलें ## Replace Dialog -replace = प्रतिस्थापित करें -replace-title = { $filename } पहले से इस स्थान पर मौजूद है। +replace = बदलें +replace-title = { $filename } पहले से इस स्थान पर मौजूद है replace-warning = क्या आप इसे प्रतिस्थापित करना चाहते हैं? यदि प्रतिस्थापित किया गया, तो मौजूदा फ़ाइल को ओवरराइट किया जाएगा। replace-warning-operation = क्या आप इसे बदलना चाहते हैं? प्रतिस्थापित करने पर मौजूदा फ़ाइल ओवरराइट हो जाएगी। original-file = मूल फ़ाइल @@ -211,13 +211,13 @@ show-details = विवरण दिखाएँ ## Settings -settings = सेटिंग +settings = सेटिंग्स ### Appearance -appearance = रूप -theme = थीम -match-desktop = सिस्टम सेटिंग्स से मेल खाएँ +appearance = रुप-रंग +theme = प्रसंग +match-desktop = डेस्कटॉप से मेल खाएँ dark = डार्क light = लाइट # Context menu @@ -251,27 +251,27 @@ new-tab = नया टैब new-window = नई विंडो rename = नाम बदलें... close-tab = टैब बंद करें -quit = बंद करें +quit = बाहर जाएँ ## Edit -edit = संपादित करें -cut = कट करें -copy = नकल करें +edit = संपादन +cut = काटें +copy = कॉपी करें paste = चिपकाएँ select-all = सभी चुनें ## View -zoom-in = ज़ूम इन करें -default-size = डिफ़ॉल्ट आकार -zoom-out = ज़ूम आउट करें +zoom-in = बड़ा करें +default-size = मूल आकार +zoom-out = छोटा करें view = दृश्य grid-view = ग्रिड दृश्य list-view = सूची दृश्य show-hidden-files = छिपी हुई फाइलें दिखाएँ list-directories-first = सबसे पहले डाइरेक्ट्री दिखाएँ -menu-settings = सेटिंग्स... +menu-settings = सेटिंग्स..। menu-about = कॉस्मिक फाइल्स के बारे में... ## Sort @@ -284,4 +284,98 @@ sort-oldest-first = पुराने से नए sort-smallest-to-largest = छोटे से बड़े sort-largest-to-smallest = बड़े से छोटे repository = रिपॉजिटरी -support = सहायता +support = समर्थन +read-execute = पढ़ें और निष्पादित करें +deleted = + { trash } से { $items } { $items -> + [one] आइटम मिटाया गया + *[other] आइटम मिटाए गए + } +dismiss = संदेश खारिज करें +favorite-path-error = निर्देशिका खोलने में त्रुटि +progress = { $percent }% +related-apps = संबंधित ऐप्स +removing-from-recents = + { recents } से { $items } { $items -> + [one] आइटम हटाया जा रहा है + *[other] आइटम हटाए जा रहे हैं + } +remove = हटाएँ +read-write-execute = पढ़ें, लिखें और निष्पादित करें +other-apps = अन्य ऐप्स +pause = विराम +keep = रखें +permanently-deleting = + { $items } { $items -> + [one] आइटम स्थायी रूप से मिटाया जा रहा है + *[other] आइटम स्थायी रूप से मिटाए जा रहे हैं + } +read-write = पढ़ें और लिखें +none = कोई नहीं +resume = फिर से शुरू करें +grid-spacing = ग्रिड स्पेसिंग +extract-to = इस रूप में निकालें..। +delete = हटाएं +read-only = केवल पढ़ने के लिए +deleting = + { trash } से { $items } { $items -> + [one] आइटम मिटाया जा रहा है + *[other] आइटम मिटाए जा रहे हैं + } ({ $progress })..। +execute-only = केवल निष्पादित करें +details = विवरण +mount-error = ड्राइव तक पहुँचने में असमर्थ +removed-from-recents = + { recents } से { $items } { $items -> + [one] आइटम हटाया गया + *[other] आइटम हटाए गए + } +progress-paused = { $percent }%, रुका हुआ +cancelled = रद्द किया गया +operations-running-finished = + { $running } { $running -> + [one] ऑपरेशन + *[other] ऑपरेशन + } चल रहा है ({ $percent }%), { $finished } समाप्त..। +progress-failed = { $percent }%, विफल +extract-to-title = फ़ोल्डर में निकालें +open-with = इससे खोलें +permanently-deleted = + { $items } { $items -> + [one] आइटम स्थायी रूप से मिटाया गया + *[other] आइटम स्थायी रूप से मिटाए गए + } +write-execute = लिखें और निष्पादित करें +extract-password-required = पासवर्ड आवश्यक है +progress-cancelled = { $percent }%, रद्द किया गया +write-only = केवल लिखने के लिए +permanently-delete-warning = { $target } को स्थाई रूप से हटा दिया जाएगा। इस कार्रवाई को पूर्ववत नहीं किया जा सकता है। +favorite-path-error-description = + "{ $path }" को खोला नहीं जा सकता + "{ $path }" मौजूद नहीं हो सकता है या आपके पास इसे खोलने की अनुमति नहीं हो सकती है + + क्या आप इसे साइडबार से हटाना चाहते हैं? +empty-trash-title = रद्दी साफ़ करें? +permanently-delete-question = स्थाई रूप से हटाएं? +operations-running = + { $running } { $running -> + [one] ऑपरेशन + *[other] ऑपरेशन + } चल रहा है ({ $percent }%)..। +copy-to-title = कॉपी गंतव्य चुनें +copy-to-button-label = कॉपी +move-to-title = मूव गंतव्य चुनें +move-to-button-label = मूव +context-action = संदर्भ क्रिया +context-action-confirm-title = "{ $name }" चलाएँ? +context-action-confirm-warning = + यह { $items } { $items -> + [one] आइटम + *[other] आइटम + } पर चलेगा। +run = चलाएँ +rename-confirm = नाम बदलें +mixed = मिश्रित +pasted-image = चिपकाई गई छवि +pasted-text = चिपकाया गया पाठ +pasted-video = चिपकाया गया वीडियो diff --git a/i18n/hu/cosmic_files.ftl b/i18n/hu/cosmic_files.ftl index dfdbf44..fa15499 100644 --- a/i18n/hu/cosmic_files.ftl +++ b/i18n/hu/cosmic_files.ftl @@ -326,7 +326,7 @@ default-app = { $name } (alapértelmezett) show-details = Részletek megjelenítése type = Típus: { $mime } -items = Elemek: { $items } +items = Elemek száma: { $items } item-size = Méret: { $size } item-created = Létrehozva: { $created } item-modified = Módosítva: { $modified } @@ -446,3 +446,9 @@ context-action-confirm-warning = } fog lefutni. run = Futtatás rename-confirm = Átnevezés +checksum = { $kind }-ellenőrzőösszeg +calculate = Számítás +error = Hiba +sidebar-label = Oldalsávcímke +search-application = Keresés alkalmazásnév alapján +change-sidebar-label = Oldalsávcímke módosítása diff --git a/i18n/id/cosmic_files.ftl b/i18n/id/cosmic_files.ftl index 3300d25..f1203e7 100644 --- a/i18n/id/cosmic_files.ftl +++ b/i18n/id/cosmic_files.ftl @@ -249,7 +249,7 @@ settings = Pengaturan single-click = Klik sekali untuk membuka appearance = Tampilan theme = Tema -match-desktop = Cocokkan desktop +match-desktop = Cocok desktop dark = Gelap light = Terang type-to-search = Ketik untuk mencari @@ -328,3 +328,9 @@ context-action-confirm-warning = *[other] item }. rename-confirm = Ganti nama +checksum = { $kind } checksum +calculate = Hitung +error = Galat +sidebar-label = Label bilah sisi +search-application = Cari berdasarkan nama aplikasi +change-sidebar-label = Ubah label bilah sisi diff --git a/i18n/it/cosmic_files.ftl b/i18n/it/cosmic_files.ftl index e3766e5..17abad0 100644 --- a/i18n/it/cosmic_files.ftl +++ b/i18n/it/cosmic_files.ftl @@ -1,5 +1,5 @@ cosmic-files = COSMIC Files -comment = File manager di COSMIC +comment = File manager per il desktop COSMIC keywords = File;Archivi;Cartelle;Explorer; empty-folder = Cartella vuota empty-folder-hidden = Cartella vuota (con elementi nascosti) @@ -7,7 +7,7 @@ no-results = Nessun risultato trovato filesystem = Filesystem home = Home networks = Reti -notification-in-progress = Operazioni sui file in corso. +notification-in-progress = Operazioni sui file in corso trash = Cestino recents = Recenti undo = Annulla @@ -322,7 +322,7 @@ single-click = Click singolo per aprire appearance = Aspetto theme = Tema -match-desktop = Sistema +match-desktop = Abbina al desktop dark = Scuro light = Chiaro @@ -422,3 +422,4 @@ removed-from-recents = [one] elemento *[other] elementi } da { recents } +run = Esegui diff --git a/i18n/kab/cosmic_files.ftl b/i18n/kab/cosmic_files.ftl index 233c47d..f0f776e 100644 --- a/i18n/kab/cosmic_files.ftl +++ b/i18n/kab/cosmic_files.ftl @@ -20,7 +20,7 @@ name = Isem modified = Ittusnifel trashed-on = Yettwakkes ɣer tqecwalt n yiḍumman size = Tiddi -details = Talqayt +details = Ifatusen pause = Serǧu resume = Kemmel create-archive = Snulfu-d aɣbaṛ @@ -40,7 +40,7 @@ file-already-exists = Afaylu s yisem-agi yella yakan folder-already-exists = Akaram s yisem-agi yella yakan name-hidden = Ismawen ibeddun s "." ad ttwaffren name-invalid = Isem ur yezmir ara ad yili "{ $filename }" -cancel = Sefsex +cancel = Semmet create = Snulfu-d open = Ldi open-file = Ldi afaylu @@ -72,7 +72,7 @@ comment = Amsefrak n yifuyla i tnarit COSMIC keywords = Akaram;Amsefrak; delete = kkes replace = Semselsi -support = Tallalt +support = Tallelt settings = Iɣewwaṛen appearance = Timeẓri theme = Asentel @@ -86,10 +86,10 @@ zoom-out = Asemẓi view = Wali menu-settings = Iɣewwaṛen… save = Sekles -match-desktop = Amṣada d tnarit +match-desktop = Semṣada akked tnarit file = Afaylu new-window = Asfaylu amaynut -quit = Tuffɣa +quit = Ffeɣ edit = Ẓreg cut = Gzem copy = Nɣel diff --git a/i18n/kk/cosmic_files.ftl b/i18n/kk/cosmic_files.ftl index 0ee3ffe..c2b4cb1 100644 --- a/i18n/kk/cosmic_files.ftl +++ b/i18n/kk/cosmic_files.ftl @@ -22,7 +22,7 @@ name = Аты modified = Өзгертілген trashed-on = Қоқыс шелегіне тасталған size = Өлшемі -details = Ақпараты +details = Толық ақпарат dismiss = Хабарламаны елемеу operations-running = { $running } { $running -> @@ -246,10 +246,10 @@ item-accessed = Қол жеткізілген: { $accessed } calculating = Есептеу... settings = Баптаулар single-click = Ашу үшін бір рет шерту -appearance = Сыртқы түрі -theme = Тақырып -match-desktop = Жұмыс үстеліне сәйкес келу -dark = Күңгірт +appearance = Сыртқы көрініс +theme = Тема +match-desktop = Жұмыс үстеліне сәйкес болу +dark = Қою light = Ашық type-to-search = Іздеу үшін теру type-to-search-recursive = Ағымдағы бума мен барлық ішкі бумаларды іздейді @@ -328,3 +328,6 @@ context-action-confirm-warning = }. run = Орындау rename-confirm = Атын өзгерту +checksum = { $kind } бақылау сомасы +calculate = Есептеу +error = Қате diff --git a/i18n/kmr/cosmic_files.ftl b/i18n/kmr/cosmic_files.ftl index 6c08bd0..b15e92d 100644 --- a/i18n/kmr/cosmic_files.ftl +++ b/i18n/kmr/cosmic_files.ftl @@ -30,10 +30,10 @@ new-window = Çarçoveya nû remove = Rake zoom-out = Dûr bike compressing = - { $items } tê guvaştin { $items -> + { $items } { $items -> [one] hêman *[other] hêman - } ji "{ $from }" bo "{ $to }" ({ $progress })... + } tê guvaştin ji "{ $from }" bo "{ $to }" ({ $progress })... move-to-trash = Bilivîne bo jêbirdankê menu-about = Derbarê Pelên COSMIC... file-already-exists = Pelek bi heman navî jixwe heye @@ -42,10 +42,10 @@ open-multiple-files = Gelek pelan veke default-size = Mezinahiya berdest name-hidden = Navên ku bi "." tê destpêkirin wê werin veşartin extracted = - { $items } hate derxistin { $items -> + { $items } { $items -> [one] hêman *[other] hêman - } ji "{ $from }" bo "{ $to }" + } hate derxistin ji "{ $from }" bo "{ $to }" create-new-folder = Peldanka nû biafrîne folder-already-exists = Peldankek bi heman navî jixwe heye create-archive = Erşîvê biafrîne @@ -79,10 +79,10 @@ none = Ne yek no-results = Tu encam nehatin dîtin theme = Rûkar compressed = - { $items } hate guvaştin{ $items -> + { $items } { $items -> [one] hêman *[other] hêman - } ji "{ $from }" bo "{ $to }" + } hate guvaştin ji "{ $from }" bo "{ $to }" appearance = Xuyang rename-folder = Navê peldankê biguherîne new-file = Pela nû... @@ -95,20 +95,20 @@ light = Ronî extract-to = Derxîne bo... add-network-drive = Ajokarê torê tevlî bike copying = - { $items } tê jêgirtin{ $items -> + { $items } { $items -> [one] hêman *[other] hêman - } ji "{ $from }" bo "{ $to }" ({ $progress })... + } tê jêgirtin ji "{ $from }" bo "{ $to }" ({ $progress })... create-new-file = Pelê nû biafrîne sort-by-trashed = Li gorî demê rêz bike support = Piştgirî try-again = Dîsa hewl bide eject = Biavêje copied = - { $items } hate jêgirtin { $items -> + { $items } { $items -> [one] hêman *[other] hêman - } ji "{ $from }" bo "{ $to }" + } hate jêgirtin ji "{ $from }" bo "{ $to }" open-in-new-window = Di çarçoveyeke nû de veke empty-folder = Peldanka vala empty-trash = Jêbirdankê vala bike @@ -117,14 +117,14 @@ list-directories-first = Pêşî rêgehan lîste bike folder-name = Navê peldankê browse-store = { $store } bigere remove-from-recents = Ji dawiyê rake -paste = Pêve bike +paste = Pê ve bike empty-trash-title = Jêbirdankê vala bike? menu-settings = Sazkarî... moving = - { $items } tê livandin{ $items -> + { $items } { $items -> [one] hêman *[other] hêman - } ji "{ $from }" bo "{ $to }" ({ $progress })... + } tê livandin ji "{ $from }" bo "{ $to }" ({ $progress })... change-wallpaper = Wêneyê dîwêr biguhêrîne... network-drive-description = Di nav navnîşanên rajekarê de pêşgira protokolekê û navnîşanek heye. @@ -158,8 +158,8 @@ progress-paused = { $percent }%, hate rawestandin desktop-view-options = Vebijêrkên dîtina sermaseyê... show-on-desktop = Li ser sermaseyê nîşan bide cancelled = Têkbirî -new-folder = Peldankan nû... -match-desktop = Li gorî sermaseyê +new-folder = Peldanka nû... +match-desktop = Bi sermaseyê re li hev bîne name-no-slashes = Nav nabe ku "/" tê de hebe operations-running-finished = { $running } { $running -> @@ -175,10 +175,10 @@ extract-to-title = Derxîne bo peldankê icon-size = Mezinahiya îkonê open-with-title = Tu çawa dixwazî "{ $name }" vekî? extracting = - { $items } tê derxistin { $items -> + { $items } { $items -> [one] hêman *[other] hêman - } ji "{ $from }" bo"{ $to }" ({ $progress })... + } tê derxistin ji "{ $from }" bo"{ $to }" ({ $progress })... settings = Sazkarî complete = Qediya permanently-delete-question = Bi mayînde jê bibe? @@ -193,10 +193,10 @@ sort-largest-to-smallest = Mezintir bo biçûktir restore-from-trash = Ji jêbirdankê vegerîne cut = Jê bike moved = - { $items } hate livandin { $items -> + { $items } { $items -> [one] hêman *[other] hêman - } ji "{ $from }" bo "{ $to }" + } hate livandin ji "{ $from }" bo "{ $to }" progress-cancelled = { $percent }%, hat têkbirin open-in-new-tab = Di rûgerê nû de veke file = Pel @@ -220,7 +220,7 @@ trash = Jêbirdank undo = Vegerîne today = Îro name = Nav -modified = Guhertî +modified = Guhertin size = Mezinahî details = Hûrgilî pause = Rawestîne @@ -229,7 +229,7 @@ copy-to-title = Rêgeha jêgirtinê hilbijêre copy-to-button-label = Jê bigire move-to-title = Rêgeha livandinê hilbijêre move-to-button-label = Bilivîne -create = Biafrîne +create = Afirandin save = Tomar bike context-action = Çalakiya naverokê context-action-confirm-title = "{ $name }" bixebtîne? @@ -263,7 +263,7 @@ restoring = } ji { trash } ({ $progress })... icon-size-and-spacing = Mezinahiya îkonan û valahiya di navbera wan de type-to-search-enter-path = Riya rêgehê yan jî pelê têdixîne -menu-open-with = Veke bi... +menu-open-with = Veke bi riya... original-file = Pelê resen read-write-execute = Xwendin, nivîsandin û xebitandin calculating = Tê jimartin... @@ -311,7 +311,7 @@ restored = domain = Navper sort = Rêz bike item-accessed = Gihîştin: { $accessed } -open-with = Veke bi +open-with = Veke bi riya keep-both = Herduyan bihêle permanently-deleted = { $items } bi mayînde hate jêbirin{ $items -> @@ -325,6 +325,12 @@ replace = Biguhêrîne replace-title = "{ $filename }" jixwe di vê cihê de heye unknown-folder = Peldanka nenas write-only = Tenê nivîsandin -trashed-on = Li Jêbirdankê hatiye avêtin +trashed-on = Jêbirî mixed = Tevlihev type-to-search-select = Pel an peldanka yekem a lihevhatî hildibijêre +calculate = Bijmêre +error = Şaşetî +checksum = Tevahiya { $kind } kontrol bike +sidebar-label = Nîşanka benda kêlekê +search-application = Li gorî navê sepanê bigere +change-sidebar-label = Nîşanka benda kêlekê biguhêrîne diff --git a/i18n/ko/cosmic_files.ftl b/i18n/ko/cosmic_files.ftl index 5683c39..0441da5 100644 --- a/i18n/ko/cosmic_files.ftl +++ b/i18n/ko/cosmic_files.ftl @@ -278,3 +278,12 @@ move-to-button-label = 이동 clear-recents-history = 최근 기록 비우기 copy-path = 복사 경로 move-to-title = 이동 위치 선택 +copy-to-title = 복사 경로 선택 +run = 실행 +rename-confirm = 이름 변경 +mixed = 혼합됨 +pasted-image = 붙여넣은 이미지 +pasted-text = 붙여넣은 텍스트 +pasted-video = 붙여넣은 영상 +copy-to = 복사하기... +move-to = 이동하기... diff --git a/i18n/lt/cosmic_files.ftl b/i18n/lt/cosmic_files.ftl index 2a8e36f..96b6ee1 100644 --- a/i18n/lt/cosmic_files.ftl +++ b/i18n/lt/cosmic_files.ftl @@ -244,7 +244,7 @@ item-created = Sukurtas: { $created } item-modified = Modifikuota: { $modified } item-accessed = Paskutinė prieiga: { $accessed } calculating = Skaičiuojama... -settings = Nuostatos +settings = Nuostatai single-click = Vieno paspaudimo atidarymas appearance = Išvaizda match-desktop = Pagal darbalaukio temą @@ -276,7 +276,7 @@ new-window = Naujas langas reload-folder = Perkrauti aplanką rename = Pervadinti... close-tab = Uždaryti skirtuką -quit = Išeiti +quit = Išjungti edit = Redaguoti cut = Iškirpti copy = Kopijuoti @@ -291,7 +291,7 @@ list-view = Sąrašo išdėstymas show-hidden-files = Rodyti paslėptus failus list-directories-first = Pirmiau pateikti aplankus gallery-preview = Galerijos peržiūra -menu-settings = Nuostatos... +menu-settings = Nuostatai... menu-about = Apie COSMIC Files... sort = Rikiuoti sort-a-z = A-Ž @@ -318,3 +318,9 @@ copy-to = Kopijuoti į... move-to = Perkeltiį į... copy-path = Kopijuoti kelią theme = Stilius +context-action = Konteksto veiksmas +context-action-confirm-title = Paleisti „{ $name }“? +run = Paleisti +rename-confirm = Pervadinti +calculate = Skaičiuoti +error = Klaida diff --git a/i18n/nl/cosmic_files.ftl b/i18n/nl/cosmic_files.ftl index 2be219f..aa4ef5a 100644 --- a/i18n/nl/cosmic_files.ftl +++ b/i18n/nl/cosmic_files.ftl @@ -425,7 +425,7 @@ removed-from-recents = } uit { recents } verwijderd remove-from-recents = Uit recente verwijderen type-to-search-select = Dit selecteert het eerst overeenkomende bestand of map -comment = Bestandsbeheerder voor COSMIC desktop +comment = Bestandsbeheerder voor COSMIC copy-to-title = Kopieerbestemming aanwijzen copy-to-button-label = Kopiëren move-to-button-label = Verplaatsen diff --git a/i18n/oc/cosmic_files.ftl b/i18n/oc/cosmic_files.ftl index e69de29..71afc45 100644 --- a/i18n/oc/cosmic_files.ftl +++ b/i18n/oc/cosmic_files.ftl @@ -0,0 +1,33 @@ +appearance = Aparéncia +theme = Tèma +match-desktop = Assortir al burèu +dark = Escur +light = Clar +file = Fichièr +details = Detalhs +name = Nom +cancel = Anullar +repository = Depaus +settings = Configuracion +menu-settings = Configuracion... +quit = Quitar +cosmic-files = Fichièrs de COSMIC +comment = Gestionari de fichièrs pel burèu COSMIC +save-file = Enregistrar lo fichièr +open-with-title = Cossí volètz dobrir « { $name } » ? +other-apps = Autras aplicacions +context-action-confirm-title = Executar « { $name } » ? +run = Executar +delete = Suprimir +replace = Remplaçar +owner = Propietari +group = Grop +write-execute = Escritura e execucion +read-only = Lectura sola +read-execute = Lectura e execucion +read-write = Lectura e execucion +read-write-execute = Lectura, escritura e execucion +remove = Suprimir +connecting = Connexion... +domain = Domeni +password = Senhal diff --git a/i18n/pa/cosmic_files.ftl b/i18n/pa/cosmic_files.ftl index be7163e..aae4541 100644 --- a/i18n/pa/cosmic_files.ftl +++ b/i18n/pa/cosmic_files.ftl @@ -146,7 +146,7 @@ new-tab = ਨਵੀਂ ਟੈਬ new-window = ਨਵੀਂ ਵਿੰਡੋ rename = ਨਾਂ ਨੂੰ ਬਦਲੋ... close-tab = ਟੈਬ ਨੂੰ ਬੰਦ ਕਰੋ -quit = ਬਾਹਰ +quit = ਸਮਾਪਤ edit = ਸੋਧੋ cut = ਕੱਟੋ copy = ਕਾਪੀ ਕਰੋ @@ -188,9 +188,9 @@ item-accessed = ਪਹੁੰਚ: { $accessed } calculating = ਗਿਣਤੀ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ... single-click = ਇੱਕ ਵਾਰ ਕਲਿੱਕ ਕਰਕੇ ਖੋਲ੍ਹੋ show-recents = ਬਾਹੀ ਵਿੱਚ ਸੱਜਰੇ ਫੋਲਡਰ -match-desktop = ਡੈਸਕਟਾਪ ਨਾਲ ਮਿਲਦਾ +match-desktop = ਡੈਸਕਟਾਪ ਨਾਲ ਮਿਲਾਓ dark = ਗੂੜ੍ਹਾ -light = ਹਲਕਾ +light = ਫਿੱਕਾ type-to-search = ਖੋਜਣ ਲਈ ਲਿਖੋ type-to-search-recursive = ਮੌਜੂਦਾ ਫੋਲਡਰ ਅਤੇ ਸਭ ਅਧੀਨ-ਫੋਲਡਰਾਂ ਵਿੱਚ ਖੋਜੋ add-to-sidebar = ਬਾਹੀ ਵਿੱਚ ਜੋੜੋ diff --git a/i18n/pl/cosmic_files.ftl b/i18n/pl/cosmic_files.ftl index 2f58d64..e8d6ab2 100644 --- a/i18n/pl/cosmic_files.ftl +++ b/i18n/pl/cosmic_files.ftl @@ -1,5 +1,5 @@ cosmic-files = Pliki COSMIC -comment = Menedżer plików pulpitu COSMIC +comment = Menedżer plików dla środowiska COSMIC keywords = Katalogi;Pliki;Menedżer; empty-folder = Pusty katalog empty-folder-hidden = Pusty katalog (z ukrytymi plikami) @@ -27,7 +27,7 @@ modified = Zmodyfikowano trashed-on = Wyrzucono do kosza size = Rozmiar # Progress footer -details = Detale +details = Szczegóły dismiss = Odrzuć wiadomość operations-running = { $running } bieżące { $running -> @@ -390,7 +390,7 @@ new-window = Nowe okno reload-folder = Odśwież katalog rename = Zmień nazwę… close-tab = Zamknij kartę -quit = Zamknij +quit = Zakończ ## Edit @@ -447,3 +447,9 @@ context-action-confirm-warning = }. run = Uruchom rename-confirm = Zmień nazwę +checksum = { $kind } suma kontrolna +calculate = Oblicz +error = Błąd +sidebar-label = Etykieta panelu bocznego +search-application = Wyszukaj po nazwie aplikacji +change-sidebar-label = Zmień etykietę panelu bocznego diff --git a/i18n/pt-BR/cosmic_files.ftl b/i18n/pt-BR/cosmic_files.ftl index 6309e46..fd10ac3 100644 --- a/i18n/pt-BR/cosmic_files.ftl +++ b/i18n/pt-BR/cosmic_files.ftl @@ -109,6 +109,10 @@ permanently-delete-warning = Deseja realmente excluir permanentemente { $target rename-file = Renomear arquivo rename-folder = Renomear pasta +## Change Sidebar Label Dialog + +sidebar-label = Legenda da barra lateral + ## Replace Dialog replace = Substituir @@ -350,7 +354,7 @@ light = Estilo claro ### Type to Search -type-to-search = Digite para pesquisar +type-to-search = Digitar para pesquisar type-to-search-recursive = Pesquisa na pasta atual e em todas as subpastas type-to-search-enter-path = Insere o caminho do diretório ou arquivo # Context menu @@ -365,6 +369,7 @@ open-in-terminal = Abrir no terminal move-to-trash = Mover para a lixeira restore-from-trash = Restaurar da lixeira remove-from-sidebar = Remover da barra lateral +change-sidebar-label = Alterar legenda da barra lateral sort-by-name = Ordenar por nome sort-by-modified = Ordenar por data de modificação sort-by-size = Ordenar por tamanho @@ -388,7 +393,7 @@ new-window = Nova janela reload-folder = Recarregar pasta rename = Renomear... close-tab = Fechar aba -quit = Sair +quit = Encerrar ## Edit @@ -446,3 +451,7 @@ context-action-confirm-warning = }. run = Executar rename-confirm = Renomear +checksum = Soma de verificação { $kind } +calculate = Calcular +error = Erro +search-application = Pesquisar por nome de aplicativo diff --git a/i18n/ru/cosmic_files.ftl b/i18n/ru/cosmic_files.ftl index f34a377..185421f 100644 --- a/i18n/ru/cosmic_files.ftl +++ b/i18n/ru/cosmic_files.ftl @@ -174,6 +174,7 @@ unknown-folder = неизвестная папка menu-open-with = Открыть с помощью… default-app = { $name } (по умолчанию) +search-application = Поиск по названию приложения ## Show details @@ -188,7 +189,7 @@ settings = Параметры ### Appearance -appearance = Оформление +appearance = Внешний вид theme = Тема match-desktop = Как в системе dark = Тёмная @@ -218,7 +219,7 @@ new-tab = Новая вкладка new-window = Новое окно rename = Переименовать… close-tab = Закрыть вкладку -quit = Выйти +quit = Завершить ## Edit @@ -271,8 +272,8 @@ extract-to = Распаковать в… extract-to-title = Распаковать в папку mount-error = Не удалось получить доступ к диску create = Создать -open-with-title = Как вы хотите открыть «{ $name }»? -browse-store = Искать в { $store } +open-with-title = Как хотите открыть «{ $name }»? +browse-store = Перейти в { $store } other-apps = Другие приложения related-apps = Связанные приложения selected-items = { $items } выделенных элем. @@ -320,7 +321,7 @@ type-to-search-enter-path = Ввод пути к каталогу или фай delete-permanently = Удалить навсегда eject = Извлечь remove-from-recents = Убрать из недавних -change-wallpaper = Изменить обои… +change-wallpaper = Изменить фон... desktop-appearance = Параметры оформления… display-settings = Параметры экрана… reload-folder = Обновить папку @@ -382,11 +383,16 @@ clear-recents-history = Очистить историю недавних copy-path = Копировать путь mixed = Смешанные context-action = Контекстная команда -context-action-confirm-title = Выполнить «{ $name }»? +context-action-confirm-title = Запустить «{ $name }»? context-action-confirm-warning = Команда затронет { $items } { $items -> [one] элемент *[other] элем. }. -run = Выполнить +run = Запустить rename-confirm = Переименовать +checksum = Хеш-сумма { $kind } +calculate = Вычислить +error = Ошибка +sidebar-label = Подпись в боковой панели +change-sidebar-label = Изменить подпись diff --git a/i18n/sat/cosmic_files.ftl b/i18n/sat/cosmic_files.ftl new file mode 100644 index 0000000..61dcbc2 --- /dev/null +++ b/i18n/sat/cosmic_files.ftl @@ -0,0 +1,3 @@ +cancel = ᱵᱟᱹᱛᱤᱞ +name = ᱧᱩᱛᱩᱢ +save = ᱥᱟᱧᱪᱟᱣ diff --git a/i18n/sv/cosmic_files.ftl b/i18n/sv/cosmic_files.ftl index 506be0b..4714773 100644 --- a/i18n/sv/cosmic_files.ftl +++ b/i18n/sv/cosmic_files.ftl @@ -319,7 +319,7 @@ list-view = Listvy show-hidden-files = Visa dolda filer list-directories-first = Lista mappar först gallery-preview = Galleri förhandsvisning -menu-settings = Inställningar… +menu-settings = Inställningar... menu-about = Om COSMIC Filer... ## Sortera @@ -419,3 +419,9 @@ context-action-confirm-warning = }. run = Kör rename-confirm = Byt namn +checksum = { $kind }-kontrollsumma +calculate = Beräkna +error = Fel +sidebar-label = Sidofältsetikett +search-application = Sök på programnamn +change-sidebar-label = Ändra sidofältsetikett diff --git a/i18n/th/cosmic_files.ftl b/i18n/th/cosmic_files.ftl index c0da7bc..86a20b3 100644 --- a/i18n/th/cosmic_files.ftl +++ b/i18n/th/cosmic_files.ftl @@ -202,17 +202,9 @@ moved = *[other] ไฟล์ } จาก "{ $from }" สู่ "{ $to }" renaming = กำลังเปลี่ยนชื่อจาก "{ $from }" เป็น "{ $to }" -renamed = Renamed "{ $from }" to "{ $to }" -restoring = - Restoring { $items } { $items -> - [one] item - *[other] items - } from { trash } ({ $progress })... -restored = - Restored { $items } { $items -> - [one] item - *[other] items - } from { trash } +renamed = เปลี่ยนชื่อจาก "{ $from }" เป็น "{ $to }" แล้ว +restoring = กำลังกู้คืน { $items } รายการจาก { trash } ({ $progress })... +restored = กู้คืน { $items } รายการจาก { trash } แล้ว unknown-folder = แฟ้มที่ไม่รู้จัก ## Open with @@ -240,8 +232,8 @@ settings = การตั้งค่า appearance = ลักษณะ theme = ธีม match-desktop = ใช้ตามธีมหน้าจอหลัก -dark = ธีมมืด -light = ธีมสว่าง +dark = มืด +light = สว่าง # Context menu add-to-sidebar = เพิ่มเข้าแถบด้านข้าง compress = บีบอัด @@ -306,3 +298,4 @@ sort-newest-first = ไฟล์ใหม่ก่อน sort-oldest-first = ไฟล์เก่าก่อน sort-smallest-to-largest = ขนาดเล็กก่อน sort-largest-to-smallest = ขนาดใหญ่ก่อน +remove = ลบ diff --git a/i18n/uk/cosmic_files.ftl b/i18n/uk/cosmic_files.ftl index 31b4103..8a9c9d6 100644 --- a/i18n/uk/cosmic_files.ftl +++ b/i18n/uk/cosmic_files.ftl @@ -158,7 +158,7 @@ new-tab = Нова вкладка new-window = Нове вікно rename = Перейменувати... close-tab = Закрити вкладку -quit = Вийти +quit = Завершити ## Edit @@ -182,7 +182,7 @@ menu-settings = Налаштування... menu-about = Про Файли COSMIC... repository = Сховище support = Підтримка -details = Деталі +details = Подробиці dismiss = Закрити повідомлення remove = Вилучити cancelled = Скасовані @@ -389,3 +389,9 @@ context-action-confirm-warning = context-action = Контекстна дія rename-confirm = Перейменувати mixed = Змішано +checksum = контрольна сума { $kind } +calculate = Вирахувати +error = Помилка +sidebar-label = Назва бічної панелі +search-application = Пошук за назвою застосунку +change-sidebar-label = Змінити назву бічної панелі diff --git a/i18n/zh-CN/cosmic_files.ftl b/i18n/zh-CN/cosmic_files.ftl index 4807c4a..cc674a3 100644 --- a/i18n/zh-CN/cosmic_files.ftl +++ b/i18n/zh-CN/cosmic_files.ftl @@ -25,7 +25,7 @@ modified = 修改时间 trashed-on = 删除时间 size = 大小 # Progress footer -details = 详细信息 +details = 详情 dismiss = 清除消息 operations-running = 正在进行 { $running } { $running -> @@ -169,8 +169,8 @@ read-write-execute = 读取、写入和执行 favorite-path-error = 打开目录时出错 favorite-path-error-description = - 无法打开 "{ $path }" 。 - "{ $path }" 可能不存在或您没有权限打开它。 + 无法打开“{ $path }” 。 + “{ $path }”可能不存在或您没有权限打开它。 您想要从侧边栏中移除它吗? remove = 移除 @@ -267,10 +267,10 @@ extracted = [one] 项目 *[other] 项目 }到“{ $to }” -setting-executable-and-launching = 设置 "{ $name }" 为可执行文件并启动 -set-executable-and-launched = 已设 "{ $name }" 为可执行文件并且启动 -setting-permissions = 正在设置 "{ $name }" 的权限为 { $mode } -set-permissions = 设置 "{ $name }" 的权限为 { $mode } +setting-executable-and-launching = 设置 “{ $name }” 为可执行文件并启动 +set-executable-and-launched = 已设 “{ $name }” 为可执行文件并且启动 +setting-permissions = 正在设置 “{ $name }” 的权限为 { $mode } +set-permissions = 设置 “{ $name }” 的权限为 { $mode } moving = 正在从“{ $from }”移动 { $items } { $items -> [one] 项目 @@ -302,7 +302,7 @@ removed-from-recents = *[other] 项目 } renaming = 正在将“{ $from }”重命名为“{ $to }” -renamed = 已重命名"{ $from }"为"{ $to }" +renamed = 已重命名 “{ $from }” 为 “{ $to }” restoring = 正在从{ trash }中还原 { $items } { $items -> [one] 项目 @@ -446,3 +446,9 @@ context-action-confirm-warning = } 上运行。 context-action = 环境行动 rename-confirm = 重命名 +calculate = 计算 +error = 错误 +checksum = { $kind } 校验和 +sidebar-label = 侧边栏标签 +search-application = 使用应用名称搜索 +change-sidebar-label = 更改侧边栏标签 diff --git a/i18n/zh-TW/cosmic_files.ftl b/i18n/zh-TW/cosmic_files.ftl index 294ed2a..36badae 100644 --- a/i18n/zh-TW/cosmic_files.ftl +++ b/i18n/zh-TW/cosmic_files.ftl @@ -12,7 +12,7 @@ undo = 復原 today = 今天 # List view name = 名稱 -modified = 修改日期 +modified = 修改時間 size = 大小 # Dialogs @@ -42,7 +42,7 @@ name-no-slashes = 名稱不能包含斜線 ## Open/Save Dialog cancel = 取消 -create = 建立 +create = 創作 open = 開啟 open-file = 開啟檔案 open-folder = 開啟資料夾 @@ -161,8 +161,8 @@ moved = [one] 項目 *[other] 項目 } 從「{ $from }」至「{ $to }」 -renaming = 正在重新命名「{ $from }」至「{ $to }」 -renamed = 已經重新命名「{ $from }」至「{ $to }」 +renaming = 正在將「{ $from }」重新命名為「{ $to }」 +renamed = 已將「{ $from }」重新命名為「{ $to }」 restoring = 正在還原 { $items } 項目 { $items -> [one] 項目 @@ -182,7 +182,7 @@ default-app = { $name } (預設) ## Show details -show-details = 顯示詳細資料 +show-details = 顯示詳細資訊 ## Settings @@ -196,13 +196,13 @@ match-desktop = 符合桌面 dark = 深色 light = 淺色 # Context menu -add-to-sidebar = 添加至側邊欄 +add-to-sidebar = 加入側邊欄 compress = 壓縮… extract-here = 解壓縮 -new-file = 新建檔案... -new-folder = 新建資料夾... +new-file = 新增檔案... +new-folder = 新增資料夾... open-in-terminal = 在終端機中開啟 -move-to-trash = 移動至垃圾桶 +move-to-trash = 丟入垃圾桶 restore-from-trash = 從垃圾桶還原 remove-from-sidebar = 從側邊欄移除 sort-by-name = 依名稱排序 @@ -215,11 +215,11 @@ sort-by-size = 依大小排序 ## File file = 檔案 -new-tab = 新建分頁 -new-window = 新建視窗 +new-tab = 新增分頁 +new-window = 新增視窗 rename = 重新命名... close-tab = 關閉分頁 -quit = 退出 +quit = 結束 ## Edit @@ -258,18 +258,18 @@ deleted = }從 { trash } permanently-deleting = 正在永久刪除 { $items } { $items -> - [one] 项目 - *[other] 项目 + [one] 項目 + *[other] 項目 } permanently-deleted = 已經永久刪除 { $items } { $items -> - [one] 项目 - *[other] 项目 + [one] 項目 + *[other] 項目 } removing-from-recents = 正在從 { recents } 中移除 { $items } { $items -> - [one] 项目 - *[other] 项目 + [one] 項目 + *[other] 項目 } deleting = 正在刪除 { $items } { $items -> @@ -278,21 +278,21 @@ deleting = }從 { trash }({ $progress })… removed-from-recents = 已經從 { recents } 中移除 { $items } { $items -> - [one] 项目 - *[other] 项目 + [one] 項目 + *[other] 項目 } -repository = 軟體庫源 +repository = 軟體庫 desktop-view-options = 桌面檢視選項... show-on-desktop = 顯示在桌面 desktop-folder-content = 桌面資料夾內容 mounted-drives = 已經掛載的磁碟機 trash-folder-icon = 垃圾桶圖示 -trashed-on = 遺棄時間 +trashed-on = 丟入時間 icon-size-and-spacing = 圖示大小與間距 icon-size = 圖示大小 grid-spacing = 網格間距 -details = 詳情 -dismiss = 撤停訊息 +details = 詳細資訊 +dismiss = 關閉訊息 delete = 刪除 remove = 移除 support = 支援 @@ -393,3 +393,9 @@ context-action-confirm-warning = } 上執行。 run = 執行 rename-confirm = 重新命名 +checksum = { $kind } 核對和 +calculate = 計算 +error = 錯誤 +sidebar-label = 側邊欄標籤 +search-application = 依應用程式名稱搜尋 +change-sidebar-label = 變更側邊欄標籤 diff --git a/justfile b/justfile index 5e8d024..004854d 100644 --- a/justfile +++ b/justfile @@ -12,6 +12,10 @@ cargo-target-dir := env('CARGO_TARGET_DIR', 'target') bin-src := cargo-target-dir / 'release' / name bin-dst := base-dir / 'bin' / name +thumbnailer-bin-name := name + '-thumbnailer' +thumbnailer-bin-src := cargo-target-dir / 'release' / thumbnailer-bin-name +thumbnailer-bin-dst := base-dir / 'bin' / thumbnailer-bin-name + applet-name := name + '-applet' applet-src := cargo-target-dir / 'release' / applet-name applet-dst := base-dir / 'bin' / applet-name @@ -24,6 +28,10 @@ metainfo := APPID + '.metainfo.xml' metainfo-src := 'target/xdgen' / metainfo metainfo-dst := clean(rootdir / prefix) / 'share' / 'metainfo' / metainfo +thumbnailer := APPID + '.thumbnailer' +thumbnailer-src := 'res' / thumbnailer +thumbnailer-dst := clean(rootdir / prefix) / 'share' / 'thumbnailers' / thumbnailer + icons-src := 'res' / 'icons' / 'hicolor' icons-dst := clean(rootdir / prefix) / 'share' / 'icons' / 'hicolor' @@ -45,14 +53,11 @@ clean-dist: clean clean-vendor build-debug *args: cargo build {{args}} cargo build --package {{applet-name}} {{args}} + cargo build --package {{thumbnailer-bin-name}} {{args}} # Compiles with release profile build-release *args: (build-debug '--release' args) -# Compiles applet with release profile -build-release-applet *args: - cargo build --package {{applet-name}} --release {{args}} - # Compiles release profile with vendored dependencies build-vendored *args: vendor-extract (build-release '--frozen --offline' args) @@ -92,9 +97,11 @@ heaptrack *args: # Installs files install: install -Dm0755 {{bin-src}} {{bin-dst}} + install -Dm0755 {{thumbnailer-bin-src}} {{thumbnailer-bin-dst}} install -Dm0755 {{applet-src}} {{applet-dst}} install -Dm0644 {{desktop-src}} {{desktop-dst}} install -Dm0644 {{metainfo-src}} {{metainfo-dst}} + install -Dm0644 {{thumbnailer-src}} {{thumbnailer-dst}} for size in `ls {{icons-src}}`; do \ install -Dm0644 "{{icons-src}}/$size/apps/{{APPID}}.svg" "{{icons-dst}}/$size/apps/{{APPID}}.svg"; \ done @@ -105,7 +112,7 @@ install-applet: # Uninstalls installed files uninstall: - rm -f {{bin-dst}} {{applet-dst}} + rm -f {{bin-dst}} {{thumbnailer-bin-dst}} {{applet-dst}} {{thumbnailer-dst}} # Vendor dependencies locally vendor: diff --git a/res/com.system76.CosmicFiles.thumbnailer b/res/com.system76.CosmicFiles.thumbnailer new file mode 100644 index 0000000..4c936cc --- /dev/null +++ b/res/com.system76.CosmicFiles.thumbnailer @@ -0,0 +1,4 @@ +[Thumbnailer Entry] +TryExec=cosmic-files-thumbnailer +Exec=cosmic-files-thumbnailer %o --size %s %i +MimeType=application/vnd.microsoft.portable-executable;application/x-msdownload; diff --git a/src/app.rs b/src/app.rs index b197005..22459c6 100644 --- a/src/app.rs +++ b/src/app.rs @@ -2,6 +2,7 @@ // SPDX-License-Identifier: GPL-3.0-only use cosmic::app::{self, Core, Task, context_drawer}; +use cosmic::core::Auto; use cosmic::cosmic_config::{self, ConfigSet}; use cosmic::iced::clipboard::dnd::DndAction; use cosmic::iced::core::SmolStr; @@ -16,18 +17,16 @@ use cosmic::iced::widget::button::focus; use cosmic::iced::widget::scrollable; use cosmic::iced::widget::scrollable::AbsoluteOffset; use cosmic::iced::window::{self, Event as WindowEvent, Id as WindowId}; -use cosmic::iced::{ - self, Alignment, Event, Length, Rectangle, Size, Subscription, event, mouse, stream, -}; +use cosmic::iced::{self, Alignment, Event, Length, Size, Subscription, event, mouse, stream}; #[cfg(all(feature = "wayland", feature = "desktop-applet"))] use cosmic::iced::{ - Limits, Point, + Limits, Point, Rectangle, event::wayland::{Event as WaylandEvent, OutputEvent, OverlapNotifyEvent}, platform_specific::runtime::wayland::layer_surface::{ IcedMargin, IcedOutput, SctkLayerSurfaceSettings, }, platform_specific::shell::wayland::commands::layer_surface::{ - Anchor, KeyboardInteractivity, Layer, destroy_layer_surface, get_layer_surface, + Anchor, KeyboardInteractivity, Layer, destroy_layer_surface, }, }; use cosmic::widget::about::About; @@ -36,7 +35,7 @@ use cosmic::widget::menu::action::MenuAction; use cosmic::widget::menu::key_bind::KeyBind; use cosmic::widget::segmented_button::{self, Entity, ReorderEvent}; use cosmic::widget::{self, icon, settings, space}; -use cosmic::{Application, ApplicationExt, Element, cosmic_theme, executor, style, surface, theme}; +use cosmic::{Application, ApplicationExt, Element, cosmic_theme, executor, surface, theme}; use mime_guess::Mime; use notify_debouncer_full::notify::{self, RecommendedWatcher}; use notify_debouncer_full::{DebouncedEvent, Debouncer, RecommendedCache, new_debouncer}; @@ -427,6 +426,7 @@ pub enum NavMenuAction { Preview(segmented_button::Entity), RunContextAction(segmented_button::Entity, usize), RemoveFromSidebar(segmented_button::Entity), + ChangeSidebarLabel(segmented_button::Entity), } impl MenuAction for NavMenuAction { @@ -502,6 +502,7 @@ pub enum Message { OpenWithBrowse, OpenWithDialog(Option), OpenWithSelection(usize), + OpenWithSearchClear, OpenWithToggleDefault(bool), #[cfg(all(feature = "wayland", feature = "desktop-applet"))] Overlap(window::Id, OverlapNotifyEvent), @@ -605,7 +606,7 @@ pub enum Message { OutputEvent(OutputEvent, WlOutput), Cosmic(app::Action), None, - Surface(surface::Action), + Surface(surface::Action), CutPaths(Vec), } @@ -690,6 +691,7 @@ pub enum DialogPage { mime: mime_guess::Mime, selected: usize, store_opt: Option>, + search_app_name: String, /// When true, the chosen app is written to mimeapps.list as the /// default handler for `mime` after it spawns. set_default: bool, @@ -700,6 +702,10 @@ pub enum DialogPage { DeleteTrash { items: Vec, }, + ChangeSidebarLabel { + entity: Entity, + label: String, + }, RenameItem { from: PathBuf, parent: PathBuf, @@ -792,7 +798,6 @@ pub struct MounterData(MounterKey, MounterItem); #[derive(Clone, Debug)] pub enum WindowKind { - ContextMenu(Entity, widget::Id), Desktop(Entity), DesktopViewOptions, Dialogs(widget::Id), @@ -1585,12 +1590,6 @@ impl App { fn remove_window(&mut self, id: &window::Id) { if let Some(window) = self.windows.remove(id) { match window.kind { - WindowKind::ContextMenu(entity, _) => { - // Close context menu - if let Some(tab) = self.tab_model.data_mut::(entity) { - tab.context_menu = None; - } - } WindowKind::Desktop(entity) => { // Remove the tab from the tab model self.tab_model.remove(entity); @@ -1927,21 +1926,6 @@ impl App { } } - fn close_context_menus(&mut self) -> Task { - let active = self.tab_model.active(); - if let Some(tab) = self.tab_model.data_mut::(active) { - tab.location_context_menu_index = None; - if tab.context_menu.is_some() { - return self.update(Message::TabMessage( - Some(active), - tab::Message::ContextMenu(None, None), - )); - } - } - - Task::none() - } - fn update_nav_model(&mut self) { let mut nav_model = segmented_button::ModelBuilder::default(); @@ -1955,15 +1939,7 @@ impl App { for (favorite_i, favorite) in self.config.favorites.iter().enumerate() { if let Some(path) = favorite.path_opt() { - let name = if matches!(favorite, Favorite::Home) { - fl!("home") - } else if let Favorite::Network { name, .. } = favorite { - name.clone() - } else if let Some(file_name) = path.file_name().and_then(|x| x.to_str()) { - file_name.to_string() - } else { - fl!("filesystem") - }; + let name = favorite.display_name().unwrap_or_else(|| fl!("filesystem")); nav_model = nav_model.insert(move |b| { b.text(name.clone()) .icon( @@ -2600,15 +2576,33 @@ impl App { .favorites .iter() .map(|favorite| { - if let Favorite::Path(path) = favorite { - for (from, to) in path_changes.iter().map(|(f, t)| (f.as_ref(), t.as_ref())) { - if path.starts_with(from) - && let Ok(relative) = path.strip_prefix(from) + match favorite { + Favorite::Path(path) => { + for (from, to) in path_changes.iter().map(|(f, t)| (f.as_ref(), t.as_ref())) { - favorites_changed = true; - return Favorite::from_path(to.join(relative)); + if path.starts_with(from) + && let Ok(relative) = path.strip_prefix(from) + { + favorites_changed = true; + return Favorite::from_path(to.join(relative)); + } } } + Favorite::Named { path, name } => { + for (from, to) in path_changes.iter().map(|(f, t)| (f.as_ref(), t.as_ref())) + { + if path.starts_with(from) + && let Ok(relative) = path.strip_prefix(from) + { + favorites_changed = true; + return Favorite::Named { + path: to.join(relative), + name: name.clone(), + }; + } + } + } + _ => {} } favorite.clone() }) @@ -2718,6 +2712,9 @@ impl Application for App { ), ]); + if matches!(flags.mode, Mode::Desktop) { + core.set_auto_blur(Auto::Window | Auto::Popup); + } let mut app = Self { core, about, @@ -2836,8 +2833,16 @@ impl Application for App { cosmic::Action::App(Message::NavMenuAction(NavMenuAction::OpenInNewTab(entity))) }) .context_menu(self.nav_context_menu()) - .close_icon(icon::from_name("media-eject-symbolic").size(16).icon()) - .into_container(); + .close_icon(icon::from_name("media-eject-symbolic").size(16).icon()); + + #[cfg(feature = "wayland")] + { + nav = nav + .window_id_maybe(self.core().main_window_id()) + .on_surface_action(|action| cosmic::Action::Surface(action.flatten())) + } + + let mut nav = nav.into_container(); if !self.core.is_condensed() { nav = nav.max_width(280); @@ -2848,14 +2853,12 @@ impl Application for App { )) } - fn nav_context_menu( - &self, - ) -> Option>>> { + fn nav_context_menu(&self) -> Option>>> { let items = self.nav_model.iter().map(|entity| { let favorite_index_opt = self.nav_model.data::(entity); let location_opt = self.nav_model.data::(entity); - let mut items = Vec::with_capacity(7); + let mut items: Vec> = Vec::with_capacity(7); if location_opt .and_then(Location::path_opt) @@ -2915,6 +2918,11 @@ impl Application for App { } items.push(cosmic::widget::menu::Item::Divider); if favorite_index_opt.is_some() { + items.push(cosmic::widget::menu::Item::Button( + fl!("change-sidebar-label"), + None, + NavMenuAction::ChangeSidebarLabel(entity), + )); items.push(cosmic::widget::menu::Item::Button( fl!("remove-from-sidebar"), None, @@ -2982,10 +2990,14 @@ impl Application for App { }) && let Some(mounter) = MOUNTERS.get(&key) { - return mounter.network_drive(uri.clone()).map(move |()| { - cosmic::Action::App(Message::NetworkDriveOpenEntityAfterMount { - entity, - }) + return mounter.network_drive(uri.clone()).map(move |mounted| { + if mounted { + cosmic::Action::App(Message::NetworkDriveOpenEntityAfterMount { + entity, + }) + } else { + cosmic::action::none() + } }); } @@ -3095,18 +3107,6 @@ impl Application for App { return cosmic::task::message(cosmic::action::app(Message::SetShowDetails(false))); } if let Some(tab) = self.tab_model.data_mut::(entity) { - if tab.location_context_menu_index.is_some() { - tab.location_context_menu_index = None; - return Task::none(); - } - - if tab.context_menu.is_some() { - return self.update(Message::TabMessage( - Some(entity), - tab::Message::ContextMenu(None, None), - )); - } - if tab.edit_location.is_some() { tab.edit_location = None; return Task::none(); @@ -3202,7 +3202,8 @@ impl Application for App { } else { Favorite::from_path(path) }; - if !favorites.contains(&favorite) { + let favorite_path = favorite.path_opt(); + if !favorites.iter().any(|f| f.path_opt() == favorite_path) { favorites.push(favorite); } } @@ -3509,10 +3510,18 @@ impl Application for App { path, mime, selected, + search_app_name, set_default, .. } => { - let available_apps = self.mime_app_cache.get_apps_for_mime(&mime, true); + let mut available_apps = + self.mime_app_cache.get_apps_for_mime(&mime, true); + available_apps.retain(|(app, _)| { + app.name + .to_lowercase() + .trim() + .contains(search_app_name.to_lowercase().as_str().trim()) + }); if let Some((app, _)) = available_apps.get(selected) { if let Some(mut command) = @@ -3558,6 +3567,18 @@ impl Application for App { DialogPage::DeleteTrash { items } => { tasks.push(self.operation(Operation::DeleteTrash { items })); } + DialogPage::ChangeSidebarLabel { entity, label } => { + if let Some(FavoriteIndex(favorite_i)) = + self.nav_model.data::(entity) + { + let mut favorites = self.config.favorites.clone(); + if let Some(favorite) = favorites.get_mut(*favorite_i) { + *favorite = favorite.with_label(label.trim()); + config_set!(favorites, favorites); + tasks.push(self.update_config()); + } + } + } DialogPage::RenameItem { from, parent, name, .. } => { @@ -3843,7 +3864,7 @@ impl Application for App { Message::Mouse(window_id, _button) => { // Close context menu when clicking outside. if self.core.main_window_id() == Some(window_id) { - return self.close_context_menus(); + return Task::none(); } } Message::MoveTo(entity_opt) => { @@ -3896,7 +3917,7 @@ impl Application for App { Some((*mounter_key, self.network_drive_input.clone())); return mounter .network_drive(self.network_drive_input.clone()) - .map(|()| cosmic::action::none()); + .map(|_| cosmic::action::none()); } log::warn!( "no mounter found for connecting to {:?}", @@ -4159,21 +4180,25 @@ impl Application for App { let Some(path) = item.path_opt() else { continue; }; - return self.push_dialog( - DialogPage::OpenWith { - path: path.clone(), - mime: item.mime.clone(), - selected: 0, - store_opt: "x-scheme-handler/mime" - .parse::() - .ok() - .and_then(|mime| { - self.mime_app_cache.get(&mime).first().cloned() - }), - set_default: false, - }, - Some(CONFIRM_OPEN_WITH_BUTTON_ID.clone()), - ); + return Task::batch([ + self.push_dialog( + DialogPage::OpenWith { + path: path.clone(), + mime: item.mime.clone(), + selected: 0, + store_opt: "x-scheme-handler/mime" + .parse::() + .ok() + .and_then(|mime| { + self.mime_app_cache.get(&mime).first().cloned() + }), + search_app_name: String::new(), + set_default: false, + }, + Some(CONFIRM_OPEN_WITH_BUTTON_ID.clone()), + ), + widget::text_input::focus(self.dialog_text_input.clone()), + ]); } } } @@ -4189,6 +4214,14 @@ impl Application for App { *set_default = enabled; } } + Message::OpenWithSearchClear => { + if let Some(DialogPage::OpenWith { + search_app_name, .. + }) = self.dialog_pages.front_mut() + { + *search_app_name = String::new(); + } + } Message::Paste(entity_opt) => { let entity = entity_opt.unwrap_or_else(|| self.tab_model.active()); if let Some(tab) = self.tab_model.data_mut::(entity) @@ -4644,7 +4677,7 @@ impl Application for App { )); } Message::SearchActivate => { - let mut tasks = vec![self.close_context_menus()]; + let mut tasks = vec![]; if self.search_get().is_none() { tasks.push(self.search_set_active(Some(String::new()))); @@ -4655,7 +4688,7 @@ impl Application for App { return Task::batch(tasks); } Message::SearchClear => { - return Task::batch([self.close_context_menus(), self.search_set_active(None)]); + return self.search_set_active(None); } Message::SearchInput(input) => { return self.search_set_active(Some(input)); @@ -4756,7 +4789,7 @@ impl Application for App { return self.update_config(); } Message::TabActivate(entity) => { - let mut tasks = vec![self.close_context_menus()]; + let mut tasks = vec![]; // Activate new tab self.tab_model.activate(entity); @@ -4818,7 +4851,9 @@ impl Application for App { tasks.push(Task::future(async move { cosmic::action::app(Message::WindowClose) })); - } else if let Some(position) = self.tab_model.position(entity) { + } else if entity == self.tab_model.active() + && let Some(position) = self.tab_model.position(entity) + { let new_position = if position > 0 { position - 1 } else { @@ -4855,6 +4890,8 @@ impl Application for App { } Message::TabMessage(entity_opt, tab_message) => { let entity = entity_opt.unwrap_or_else(|| self.tab_model.active()); + // The context menu opens on right-button release, so refresh paste availability now + let right_click = matches!(tab_message, tab::Message::RightClick(..)); let tab_commands = match self.tab_model.data_mut::(entity) { Some(tab) => tab.update(tab_message, self.modifiers), @@ -4862,6 +4899,9 @@ impl Application for App { }; let mut commands = Vec::new(); + if right_click { + commands.push(self.update(Message::CheckClipboard)); + } for tab_command in tab_commands { match tab_command { tab::Command::Action(action) => { @@ -4874,7 +4914,8 @@ impl Application for App { tab::Command::AddToSidebar(path) => { let mut favorites = self.config.favorites.clone(); let favorite = Favorite::from_path(path); - if !favorites.contains(&favorite) { + let favorite_path = favorite.path_opt(); + if !favorites.iter().any(|f| f.path_opt() == favorite_path) { favorites.push(favorite); } config_set!(favorites, favorites); @@ -4901,78 +4942,11 @@ impl Application for App { self.update_tab(entity, tab_path, selection_paths), ])); } - tab::Command::ContextMenu(point_opt, parent_id) => { - #[cfg(feature = "wayland")] - if let Some(point) = point_opt { - if crate::is_wayland() { - // Open context menu - use cctk::wayland_protocols::xdg::shell::client::xdg_positioner::{ - Anchor, Gravity, - }; - use cosmic::iced::runtime::platform_specific::wayland::popup::{ - SctkPopupSettings, SctkPositioner, - }; - let window_id = WindowId::unique(); - self.windows.insert( - window_id, - Window::new(WindowKind::ContextMenu( - entity, - widget::Id::unique(), - )), - ); - commands.push(self.update(Message::CheckClipboard)); - commands.push(self.update(Message::Surface( - cosmic::surface::action::app_popup( - |_: &Self| cosmic::surface::action::LiveSettings::default(), - move |app: &mut Self| -> SctkPopupSettings { - let anchor_rect = Rectangle { - x: point.x as i32, - y: point.y as i32, - width: 1, - height: 1, - }; - let positioner = SctkPositioner { - size: None, - anchor_rect, - anchor: Anchor::None, - gravity: Gravity::BottomRight, - reactive: true, - ..Default::default() - }; - SctkPopupSettings { - parent: parent_id.unwrap_or( - app.core - .main_window_id() - .unwrap_or(WindowId::NONE), - ), - id: window_id, - positioner, - parent_size: None, - grab: true, - close_with_children: false, - input_zone: None, - } - }, - None, - ), - ))); - } - } else { - // Destroy previous popup - let mut window_ids = Vec::new(); - for (window_id, window) in &self.windows { - if let WindowKind::ContextMenu(e, _) = &window.kind - && *e == entity - { - window_ids.push(*window_id); - } - } - for window_id in window_ids { - commands.push(self.update(Message::Surface( - cosmic::surface::action::destroy_popup(window_id), - ))); - } - } + tab::Command::Surface(action) => { + // re-type the tab's surface action the way its messages are re-typed + let action = action + .map(move |message| Message::TabMessage(Some(entity), message)); + commands.push(self.update(Message::Surface(action))); } tab::Command::Delete(paths) => commands.push(self.delete(paths)), tab::Command::DropFiles(to, from) => { @@ -5022,7 +4996,6 @@ impl Application for App { } tab::Command::OpenFile(paths) => commands.push(self.open_file(&paths)), tab::Command::OpenInNewTab(path) => { - commands.push(self.close_context_menus()); commands.push(self.open_tab(Location::Path(path), false, None)); } tab::Command::OpenInNewWindow(path) => match env::current_exe() { @@ -5459,12 +5432,6 @@ impl Application for App { if let Some(tab) = self.tab_model.data_mut::(tab_entity) { // Close location editing if enabled tab.edit_location = None; - // Close other context menus. - tab.location_context_menu_index = None; - return Task::done(cosmic::Action::App(Message::TabMessage( - Some(tab_entity), - tab::Message::ContextMenu(None, None), - ))); } } Message::NavMenuAction(action) => match action { @@ -5508,6 +5475,7 @@ impl Application for App { .and_then(|mime| { self.mime_app_cache.get(&mime).first().cloned() }), + search_app_name: String::new(), set_default: false, }, None, @@ -5562,7 +5530,7 @@ impl Application for App { _ => Task::none(), }; - return Task::batch([self.close_context_menus(), open_task]); + return open_task; } // Open the selected path in a new cosmic-files window. @@ -5643,6 +5611,20 @@ impl Application for App { return self.update_config(); } } + + NavMenuAction::ChangeSidebarLabel(entity) => { + if let Some(favorite) = self.nav_model.data::(entity).and_then( + |FavoriteIndex(favorite_i)| self.config.favorites.get(*favorite_i), + ) { + let label = favorite.display_name().unwrap_or_else(|| fl!("filesystem")); + return Task::batch([ + self.dialog_pages + .push_back(DialogPage::ChangeSidebarLabel { entity, label }), + widget::text_input::focus(self.dialog_text_input.clone()), + widget::text_input::select_all(self.dialog_text_input.clone()), + ]); + } + } }, Message::Recents => { if self.config.show_recents { @@ -5694,24 +5676,33 @@ impl Application for App { .insert(surface_id, Window::new(WindowKind::Desktop(entity))); return Task::batch([ command, - get_layer_surface(SctkLayerSurfaceSettings { - id: surface_id, - layer: Layer::Bottom, - keyboard_interactivity: KeyboardInteractivity::OnDemand, - input_zone: None, - anchor: Anchor::TOP | Anchor::BOTTOM | Anchor::LEFT | Anchor::RIGHT, - output: IcedOutput::Output(output), - namespace: "cosmic-files-applet".into(), - size: Some((None, None)), - margin: IcedMargin { - top: 0, - bottom: 0, - left: 0, - right: 0, - }, - exclusive_zone: 0, - size_limits: Limits::NONE.min_width(1.0).min_height(1.0), - }), + cosmic::task::message(cosmic::Action::Surface( + cosmic::surface::action::app_layer_shell( + |_| Default::default(), + move |_: &mut App| SctkLayerSurfaceSettings { + id: surface_id, + layer: Layer::Bottom, + keyboard_interactivity: KeyboardInteractivity::OnDemand, + input_zone: None, + anchor: Anchor::TOP + | Anchor::BOTTOM + | Anchor::LEFT + | Anchor::RIGHT, + output: IcedOutput::Output(output.clone()), + namespace: "cosmic-files-applet".into(), + size: Some((None, None)), + margin: IcedMargin { + top: 0, + bottom: 0, + left: 0, + right: 0, + }, + exclusive_zone: 0, + size_limits: Limits::NONE.min_width(1.0).min_height(1.0), + }, + None, + ), + )), #[cfg(all(feature = "wayland", feature = "desktop-applet"))] overlap_notify(surface_id, true), ]); @@ -5804,9 +5795,7 @@ impl Application for App { }); } Message::Surface(action) => { - return cosmic::task::message(cosmic::Action::Cosmic( - cosmic::app::Action::Surface(action), - )); + return cosmic::task::message(cosmic::Action::Surface(action)); } Message::SaveSortNames => { self.must_save_sort_names = false; @@ -6352,7 +6341,9 @@ impl Application for App { mime, selected, store_opt, + search_app_name, set_default, + .. } => { let name = match path.file_name() { Some(file_name) => file_name.to_str(), @@ -6360,7 +6351,13 @@ impl Application for App { }; let mut column = widget::list_column(); - let available_apps = self.mime_app_cache.get_apps_for_mime(mime, true); + let mut available_apps = self.mime_app_cache.get_apps_for_mime(mime, true); + available_apps.retain(|(app, _)| { + app.name + .to_lowercase() + .trim() + .contains(search_app_name.to_lowercase().as_str().trim()) + }); let item_height = 32.0; let mut displayed_default = false; let mut last_kind = MimeAppMatch::Exact; @@ -6424,6 +6421,25 @@ impl Application for App { .secondary_action( widget::button::standard(fl!("cancel")).on_press(Message::DialogCancel), ) + .control( + widget::text_input::search_input( + fl!("search-application"), + search_app_name, + ) + .id(self.dialog_text_input.clone()) + .on_clear(Message::OpenWithSearchClear) + .on_input(move |search_app_name| { + Message::DialogUpdate(DialogPage::OpenWith { + path: path.clone(), + mime: mime.clone(), + selected: *selected, + store_opt: store_opt.clone(), + search_app_name, + set_default: *set_default, + }) + }) + .on_submit(|_| Message::DialogComplete), + ) .control(widget::scrollable(column).height({ let max_size = self .size @@ -6512,6 +6528,40 @@ impl Application for App { target = target ))) } + DialogPage::ChangeSidebarLabel { entity, label } => { + let entity = *entity; + let complete_maybe = if label.trim().is_empty() { + None + } else { + Some(Message::DialogComplete) + }; + + widget::dialog() + .title(fl!("change-sidebar-label")) + .primary_action( + widget::button::suggested(fl!("save")) + .on_press_maybe(complete_maybe.clone()), + ) + .secondary_action( + widget::button::standard(fl!("cancel")).on_press(Message::DialogCancel), + ) + .control( + widget::column::with_children([ + widget::text::body(fl!("sidebar-label")).into(), + widget::text_input("", label.as_str()) + .id(self.dialog_text_input.clone()) + .on_input(move |label| { + Message::DialogUpdate(DialogPage::ChangeSidebarLabel { + entity, + label, + }) + }) + .on_submit_maybe(complete_maybe.map(|maybe| move |_| maybe.clone())) + .into(), + ]) + .spacing(space_xxs), + ) + } DialogPage::RenameItem { from, parent, @@ -6898,7 +6948,6 @@ impl Application for App { }) .drag_id(self.tab_drag_id), ) - .class(style::Container::Background) .width(Length::Fill) .padding([0, space_s]), ); @@ -6962,23 +7011,6 @@ impl Application for App { fn view_window(&self, id: WindowId) -> Element<'_, Self::Message> { let content = match self.windows.get(&id) { Some(window) => match &window.kind { - WindowKind::ContextMenu(entity, id) => match self.tab_model.data::(*entity) { - Some(tab) => { - return widget::autosize::autosize( - menu::context_menu( - tab, - &self.key_binds, - &window.modifiers, - self.clipboard_has_content(), - &self.config.context_actions, - ) - .map(|x| Message::TabMessage(Some(*entity), x)), - id.clone(), - ) - .into(); - } - None => widget::text("Unknown tab ID").into(), - }, WindowKind::Desktop(entity) => { let mut tab_column = widget::column::with_capacity(3); @@ -7038,6 +7070,7 @@ impl Application for App { return self.view_main().map(|message| match message { cosmic::Action::App(app) => app, cosmic::Action::Cosmic(cosmic) => Message::Cosmic(cosmic), + cosmic::Action::Surface(action) => Message::Surface(action), cosmic::Action::None => Message::None, }); } diff --git a/src/config.rs b/src/config.rs index 8f493c0..3855b56 100644 --- a/src/config.rs +++ b/src/config.rs @@ -70,6 +70,11 @@ pub enum Favorite { name: String, path: PathBuf, }, + /// A path with a custom name chosen by the user + Named { + path: PathBuf, + name: String, + }, } impl Favorite { @@ -98,6 +103,38 @@ impl Favorite { Self::Videos => dirs::video_dir(), Self::Path(path) => Some(path.clone()), Self::Network { path, .. } => Some(path.clone()), + Self::Named { path, .. } => Some(path.clone()), + } + } + + /// Name shown in the sidebar, or `None` if the path has no usable file name + pub fn display_name(&self) -> Option { + match self { + Self::Home => Some(crate::fl!("home")), + Self::Named { name, .. } | Self::Network { name, .. } => Some(name.clone()), + _ => self + .path_opt()? + .file_name() + .and_then(|x| x.to_str()) + .map(ToString::to_string), + } + } + + /// Return this favorite with a custom sidebar label chosen by the user + pub fn with_label(&self, name: &str) -> Self { + match self { + Self::Network { uri, path, .. } => Self::Network { + uri: uri.clone(), + name: name.to_string(), + path: path.clone(), + }, + other => match other.path_opt() { + Some(path) => Self::Named { + path, + name: name.to_string(), + }, + None => other.clone(), + }, } } } @@ -113,6 +150,7 @@ pub enum TypeToSearch { #[serde(default)] pub struct State { pub sort_names: FxOrderMap, + pub dialog_sort_name: (HeadingOptions, bool), } impl Default for State { @@ -124,6 +162,7 @@ impl Default for State { (HeadingOptions::Modified, false), ) })), + dialog_sort_name: (HeadingOptions::Modified, false), } } } @@ -476,3 +515,66 @@ pub const TIME_CONFIG_ID: &str = "com.system76.CosmicAppletTime"; pub struct TimeConfig { pub military_time: bool, } + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn favorite_with_label_converts_path_to_named() { + let favorite = Favorite::Path(PathBuf::from("/some/dir")); + assert_eq!( + favorite.with_label("Custom"), + Favorite::Named { + path: PathBuf::from("/some/dir"), + name: "Custom".to_string(), + } + ); + } + + #[test] + fn favorite_with_label_updates_network_in_place() { + let favorite = Favorite::Network { + uri: "sftp://example.com/".to_string(), + name: "example.com".to_string(), + path: PathBuf::from("/run/mount/example"), + }; + assert_eq!( + favorite.with_label("Custom"), + Favorite::Network { + uri: "sftp://example.com/".to_string(), + name: "Custom".to_string(), + path: PathBuf::from("/run/mount/example"), + } + ); + } + + #[test] + fn favorite_with_label_converts_special_folder_to_named() { + let home = dirs::home_dir().unwrap(); + assert_eq!( + Favorite::Home.with_label("Custom"), + Favorite::Named { + path: home, + name: "Custom".to_string(), + } + ); + } + + #[test] + fn favorite_display_name() { + assert_eq!( + Favorite::Path(PathBuf::from("/some/dir")).display_name(), + Some("dir".to_string()) + ); + assert_eq!(Favorite::Path(PathBuf::from("/")).display_name(), None); + assert_eq!( + Favorite::Named { + path: PathBuf::from("/some/dir"), + name: "Custom".to_string(), + } + .display_name(), + Some("Custom".to_string()) + ); + } +} diff --git a/src/dialog.rs b/src/dialog.rs index c760472..ba2fd15 100644 --- a/src/dialog.rs +++ b/src/dialog.rs @@ -3,6 +3,7 @@ use cosmic::app::cosmic::Cosmic; use cosmic::app::{Core, Task, context_drawer}; +use cosmic::cosmic_config::ConfigSet; use cosmic::iced::core::SmolStr; use cosmic::iced::core::widget::operation; use cosmic::iced::futures::{self, SinkExt}; @@ -33,12 +34,12 @@ use crate::app::{ Action, ContextPage, Message as AppMessage, PreviewItem, PreviewKind, REPLACE_BUTTON_ID, }; use crate::config::{ - Config, DialogConfig, Favorite, TIME_CONFIG_ID, ThumbCfg, TimeConfig, TypeToSearch, + Config, DialogConfig, State, TIME_CONFIG_ID, ThumbCfg, TimeConfig, TypeToSearch, }; use crate::key_bind::key_binds; use crate::localize::LANGUAGE_SORTER; use crate::mounter::{MOUNTERS, MounterItem, MounterItems, MounterKey, MounterMessage}; -use crate::tab::{self, ItemMetadata, Location, SearchLocation, Tab}; +use crate::tab::{self, HeadingOptions, ItemMetadata, Location, SearchLocation, Tab}; use crate::zoom::{zoom_in_view, zoom_out_view, zoom_to_default}; use crate::{fl, home_dir, menu, mime_icon}; @@ -253,6 +254,7 @@ impl Dialog { crate::localize::localize(); let (config_handler, config) = Config::load(); + let (state_handler, state) = State::load(); let mut settings = window::Settings { decorations: false, @@ -287,6 +289,8 @@ impl Dialog { window_id, config_handler, config, + state_handler, + state, }; let (cosmic, cosmic_command) = Cosmic::::init((core, flags)); @@ -441,6 +445,8 @@ struct Flags { #[allow(dead_code)] config_handler: Option, config: Config, + state_handler: Option, + state: State, } /// Messages that are used specifically by our [`App`]. @@ -470,7 +476,7 @@ enum Message { SearchActivate, SearchClear, SearchInput(String), - Surface(cosmic::surface::Action), + Surface(cosmic::surface::Action), #[allow(clippy::enum_variant_names)] TabMessage(tab::Message), TabRescan( @@ -503,7 +509,7 @@ impl From for Message { AppMessage::ZoomIn(_entity_opt) => Self::ZoomIn, AppMessage::ZoomOut(_entity_opt) => Self::ZoomOut, AppMessage::NewItem(_entity_opt, true) => Self::NewFolder, - AppMessage::Surface(action) => Self::Surface(action), + AppMessage::Surface(action) => Self::Surface(action.map(Self::from)), unsupported => { log::warn!("{unsupported:?} not supported in dialog mode"); Self::None @@ -543,7 +549,6 @@ struct App { title: String, accept_label: DialogLabel, choices: Vec, - context_menu_window: Option, context_page: ContextPage, dialog_pages: VecDeque, dialog_text_input: widget::Id, @@ -873,15 +878,6 @@ impl App { } } - fn close_context_menus(&mut self) -> Task { - self.tab.location_context_menu_index = None; - if self.tab.context_menu.is_some() { - return self.update(Message::TabMessage(tab::Message::ContextMenu(None, None))); - } - - Task::none() - } - fn update_nav_model(&mut self) { let mut nav_model = segmented_button::ModelBuilder::default(); @@ -895,13 +891,7 @@ impl App { for favorite in &self.flags.config.favorites { if let Some(path) = favorite.path_opt() { - let name = if matches!(favorite, Favorite::Home) { - fl!("home") - } else if let Favorite::Network { name, .. } = favorite { - name.clone() - } else if let Some(file_name) = path.file_name().and_then(|x| x.to_str()) { - file_name.to_string() - } else { + let Some(name) = favorite.display_name() else { continue; }; nav_model = nav_model.insert(move |b| { @@ -1051,8 +1041,7 @@ impl Application for App { None, ); tab.mode = tab::Mode::Dialog(flags.kind.clone()); - tab.sort_name = tab::HeadingOptions::Modified; - tab.sort_direction = false; + (tab.sort_name, tab.sort_direction) = flags.state.dialog_sort_name; let key_binds = key_binds(&tab.mode); @@ -1062,7 +1051,6 @@ impl Application for App { title, accept_label: DialogLabel::from(accept_label), choices: Vec::new(), - context_menu_window: None, context_page: ContextPage::Preview(None, PreviewKind::Selected), dialog_pages: VecDeque::new(), dialog_text_input: widget::Id::new("Dialog Text Input"), @@ -1333,15 +1321,6 @@ impl Application for App { return Task::none(); } - if self.tab.location_context_menu_index.is_some() { - self.tab.location_context_menu_index = None; - return Task::none(); - } - - if self.tab.context_menu.is_some() { - return self.update(Message::TabMessage(tab::Message::ContextMenu(None, None))); - } - if self.tab.edit_location.is_some() { // Close location editing if enabled self.tab.edit_location = None; @@ -1576,7 +1555,7 @@ impl Application for App { Message::Mouse(window_id, _button) => { // Close context menu when clicking outside. if self.core.main_window_id() == Some(window_id) { - return self.close_context_menus(); + return Task::none(); } } Message::NewFolder => { @@ -1736,7 +1715,7 @@ impl Application for App { ))); } Message::SearchActivate => { - let mut tasks = vec![self.close_context_menus()]; + let mut tasks = vec![]; if self.search_get().is_none() { tasks.push(self.search_set(Some(String::new()))); @@ -1747,7 +1726,7 @@ impl Application for App { return Task::batch(tasks); } Message::SearchClear => { - return Task::batch([self.close_context_menus(), self.search_set(None)]); + return self.search_set(None); } Message::SearchInput(input) => { return self.search_set(Some(input)); @@ -1783,78 +1762,9 @@ impl Application for App { self.rescan_tab(selection_paths), ])); } - tab::Command::ContextMenu(point_opt, parent_id) => { - #[cfg(feature = "wayland")] - match point_opt { - Some(point) => { - if crate::is_wayland() { - // Open context menu - use cctk::wayland_protocols::xdg::shell::client::xdg_positioner::{ - Anchor, Gravity, - }; - use cosmic::iced::runtime::platform_specific::wayland::popup::{ - SctkPopupSettings, SctkPositioner, - }; - use cosmic::iced::Rectangle; - let window_id = window::Id::unique(); - self.context_menu_window = Some(window_id); - let autosize_id = widget::Id::unique(); - commands.push(self.update(Message::Surface( - cosmic::surface::action::app_popup( - |_: &Self| cosmic::surface::action::LiveSettings::default(), - move |app: &mut Self| -> SctkPopupSettings { - let anchor_rect = Rectangle { - x: point.x as i32, - y: point.y as i32, - width: 1, - height: 1, - }; - let positioner = SctkPositioner { - size: None, - anchor_rect, - anchor: Anchor::None, - gravity: Gravity::BottomRight, - reactive: true, - ..Default::default() - }; - SctkPopupSettings { - parent: parent_id - .unwrap_or(app.flags.window_id), - id: window_id, - positioner, - parent_size: None, - grab: true, - close_with_children: false, - input_zone: None, - } - }, - Some(Box::new(move |app: &Self| { - widget::autosize::autosize( - menu::context_menu( - &app.tab, - &app.key_binds, - &app.modifiers, - false, // Paste not used in dialogs - &app.flags.config.context_actions, - ) - .map(Message::TabMessage) - .map(cosmic::Action::App), - autosize_id.clone(), - ) - .into() - })), - ), - ))); - } - } - None => { - if let Some(window_id) = self.context_menu_window.take() { - commands.push(self.update(Message::Surface( - cosmic::surface::action::destroy_popup(window_id), - ))); - } - } - } + tab::Command::Surface(action) => { + let action = action.map(Message::TabMessage); + commands.push(self.update(Message::Surface(action))); } tab::Command::Iced(iced_command) => { commands.push(iced_command.0.map(|tab_message| { @@ -1889,6 +1799,17 @@ impl Application for App { self.auto_scroll_speed = None; } } + tab::Command::SetSort(_, heading_options, direction) => { + self.flags.state.dialog_sort_name = (heading_options, direction); + if let Some(state_handler) = self.flags.state_handler.as_ref() + && let Err(err) = state_handler.set::<&(HeadingOptions, bool)>( + "dialog_sort_name", + &self.flags.state.dialog_sort_name, + ) + { + log::warn!("Failed to save dialog sort name: {err:?}"); + } + } unsupported => { log::warn!("{unsupported:?} not supported in dialog mode"); } @@ -2009,9 +1930,7 @@ impl Application for App { }); } Message::Surface(action) => { - return cosmic::task::message(cosmic::Action::Cosmic( - cosmic::app::Action::Surface(action), - )); + return cosmic::task::message(cosmic::Action::Surface(action)); } } diff --git a/src/menu.rs b/src/menu.rs index dd31819..05998a4 100644 --- a/src/menu.rs +++ b/src/menu.rs @@ -1,16 +1,12 @@ // SPDX-License-Identifier: GPL-3.0-only +use cosmic::{Element, theme}; use cosmic::app::Core; -use cosmic::iced::advanced::widget::text::Style as TextStyle; use cosmic::iced::keyboard::Modifiers; -use cosmic::iced::{Alignment, Background, Border, Length}; +use cosmic::widget::menu::action::MenuAction; use cosmic::widget::menu::key_bind::KeyBind; use cosmic::widget::menu::{self, ItemHeight, ItemWidth, MenuBar}; -use cosmic::widget::{ - self, Row, button, column, container, divider, responsive_menu_bar, space, text, -}; -use cosmic::{Element, theme}; -#[cfg(feature = "desktop")] +use cosmic::widget::{self, responsive_menu_bar}; use i18n_embed::LanguageLoader; use mime_guess::Mime; use std::collections::HashMap; @@ -27,21 +23,6 @@ use crate::trash::{Trash, TrashExt}; static MENU_ID: LazyLock = LazyLock::new(|| cosmic::widget::Id::new("responsive-menu")); -macro_rules! menu_button { - ($($x:expr),+ $(,)?) => ( - button::custom( - Row::with_children( - [$(Element::from($x)),+] - ) - .height(Length::Fixed(24.0)) - .align_y(Alignment::Center) - ) - .padding([theme::spacing().space_xxs, 16]) - .width(Length::Fill) - .class(theme::Button::MenuItem) - ); -} - const fn menu_button_optional( label: String, action: Action, @@ -54,82 +35,46 @@ const fn menu_button_optional( } } +/// A menu action dispatched to the tab the menu was opened on. +#[derive(Clone, Copy, Debug, Eq, PartialEq)] +pub struct TabAction(pub Action); + +impl MenuAction for TabAction { + type Message = tab::Message; + + fn message(&self) -> tab::Message { + tab::Message::ContextAction(self.0) + } +} + pub fn context_menu<'a>( tab: &Tab, key_binds: &HashMap, modifiers: &Modifiers, clipboard_paste_available: bool, context_actions: &[ContextActionPreset], -) -> Element<'a, tab::Message> { - let find_key = |action: &Action| -> String { - for (key_bind, key_action) in key_binds { - if action == key_action { - return key_bind.to_string(); - } - } - String::new() - }; - fn key_style(theme: &cosmic::Theme) -> TextStyle { - let mut color = theme.cosmic().background(false).component.on; - color.alpha *= 0.75; - TextStyle { - color: Some(color.into()), - ..Default::default() - } - } - fn disabled_style(theme: &cosmic::Theme) -> TextStyle { - let mut color = theme.cosmic().background(false).component.on; - color.alpha *= 0.5; - TextStyle { - color: Some(color.into()), - ..Default::default() - } - } - - let menu_item = |label, action| { - let key = find_key(&action); - menu_button!( - text::body(label), - space::horizontal(), - text::body(key).class(theme::Text::Custom(key_style)) - ) - .on_press(tab::Message::ContextAction(action)) - }; - - let menu_item_disabled = |label, action: Action| { - let key = find_key(&action); - menu_button!( - text::body(label).class(theme::Text::Custom(disabled_style)), - space::horizontal(), - text::body(key).class(theme::Text::Custom(disabled_style)) - ) - }; +) -> Vec> { + let menu_item = + |label: String, action: Action| menu::Item::Button(label, None, TabAction(action)); + let menu_item_disabled = + |label: String, action: Action| menu::Item::ButtonDisabled(label, None, TabAction(action)); // Allow paste when clipboard has data and we're in a location that supports it let can_paste = clipboard_paste_available && tab.location.supports_paste(); let (sort_name, sort_direction, _) = tab.sort_options(); - let sort_item = |label, variant| { - let key = find_key(&Action::ToggleSort(variant)); - let leading: Element<'a, tab::Message> = if sort_name == variant { + let sort_item = |label: String, variant| { + let entry = menu::Entry::new(label, TabAction(Action::ToggleSort(variant))); + menu::Item::Entry(if sort_name == variant { let icon_name = if sort_direction { "view-sort-ascending-symbolic" } else { "view-sort-descending-symbolic" }; - widget::icon::from_name(icon_name).size(14).into() + entry.icon(widget::icon::from_name(icon_name).size(14).handle()) } else { - space::horizontal().width(Length::Fixed(14.0)).into() - }; - menu_button!( - leading, - space::horizontal().width(Length::Fixed(theme::spacing().space_xxs.into())), - text::body(label), - space::horizontal(), - text::body(key).class(theme::Text::Custom(key_style)) - ) - .on_press(tab::Message::ContextAction(Action::ToggleSort(variant))) - .into() + entry.reserve_icon() + }) }; let mut selected_dir = 0; @@ -174,8 +119,8 @@ pub fn context_menu<'a>( .iter() .enumerate() .filter(|(_, action)| action.matches_selection(selected, selected_dir)) - .map(|(i, action)| menu_item(action.name.clone(), Action::RunContextAction(i)).into()) - .collect::>>() + .map(|(i, action)| menu_item(action.name.clone(), Action::RunContextAction(i))) + .collect::>() }; // Parse the desktop entry if it is the only selection #[cfg(feature = "desktop")] @@ -190,7 +135,7 @@ pub fn context_menu<'a>( } }); - let mut children: Vec> = Vec::new(); + let mut children: Vec> = Vec::new(); match (&tab.mode, &tab.location) { ( tab::Mode::App | tab::Mode::Desktop, @@ -202,108 +147,114 @@ pub fn context_menu<'a>( | Location::Network(_, _, Some(_)), ) => { if selected_trash_only { - children.push(menu_item(fl!("open"), Action::Open).into()); + children.push(menu_item(fl!("open"), Action::Open)); if !Trash::is_empty() { - children.push(menu_item(fl!("empty-trash"), Action::EmptyTrash).into()); + children.push(menu_item(fl!("empty-trash"), Action::EmptyTrash)); } - } else if let Some(_entry) = selected_desktop_entry { - children.push(menu_item(fl!("open"), Action::Open).into()); + } else if let Some(entry) = selected_desktop_entry { + children.push(menu_item(fl!("open"), Action::Open)); #[cfg(feature = "desktop")] { - children.extend(_entry.desktop_actions.into_iter().enumerate().map( - |(i, action)| menu_item(action.name, Action::ExecEntryAction(i)).into(), - )); + children.extend( + entry + .desktop_actions + .into_iter() + .enumerate() + .map(|(i, action)| menu_item(action.name, Action::ExecEntryAction(i))), + ); } - children - .push(menu_item(fl!("edit-desktop-entry"), Action::EditDesktopEntry).into()); - children.push(divider::horizontal::light().into()); - children.push(menu_item(fl!("rename"), Action::Rename).into()); - children.push(menu_item(fl!("cut"), Action::Cut).into()); + children.push(menu_item(fl!("edit-desktop-entry"), Action::EditDesktopEntry)); + children.push(menu::Item::Divider); + children.push(menu_item(fl!("rename"), Action::Rename)); + children.push(menu_item(fl!("cut"), Action::Cut)); if modifiers.shift() && !modifiers.control() { - children.push(menu_item(fl!("copy-path"), Action::CopyPath).into()); + children.push(menu_item(fl!("copy-path"), Action::CopyPath)); } else { - children.push(menu_item(fl!("copy"), Action::Copy).into()); + children.push(menu_item(fl!("copy"), Action::Copy)); } // Should this simply bypass trash and remove the shortcut? - children.push(menu_item(fl!("move-to-trash"), Action::Delete).into()); + children.push(menu_item(fl!("move-to-trash"), Action::Delete)); let action_items = context_action_items(selected, selected_dir); if !action_items.is_empty() { - children.push(divider::horizontal::light().into()); + children.push(menu::Item::Divider); children.extend(action_items); } } else if selected > 0 { if selected_dir == 1 && selected == 1 || selected_dir == 0 { - children.push(menu_item(fl!("open"), Action::Open).into()); + children.push(menu_item(fl!("open"), Action::Open)); } if selected == 1 { - children.push(menu_item(fl!("menu-open-with"), Action::OpenWith).into()); + children.push(menu_item(fl!("menu-open-with"), Action::OpenWith)); if selected_dir == 1 { - children - .push(menu_item(fl!("open-in-terminal"), Action::OpenTerminal).into()); + children.push(menu_item(fl!("open-in-terminal"), Action::OpenTerminal)); } } if tab.location.is_recents() || matches!(tab.location, Location::Search(..)) { - children.push( - menu_item(fl!("open-item-location"), Action::OpenItemLocation).into(), - ); + children.push(menu_item( + fl!("open-item-location"), + Action::OpenItemLocation, + )); } // All selected items are directories if selected == selected_dir && matches!(tab.mode, tab::Mode::App) { - children.push(menu_item(fl!("open-in-new-tab"), Action::OpenInNewTab).into()); - children - .push(menu_item(fl!("open-in-new-window"), Action::OpenInNewWindow).into()); + children.push(menu_item(fl!("open-in-new-tab"), Action::OpenInNewTab)); + children.push(menu_item( + fl!("open-in-new-window"), + Action::OpenInNewWindow, + )); } let action_items = context_action_items(selected, selected_dir); if !action_items.is_empty() { - children.push(divider::horizontal::light().into()); + children.push(menu::Item::Divider); children.extend(action_items); } - children.push(divider::horizontal::light().into()); + children.push(menu::Item::Divider); if selected_mount_point == 0 { - children.push(menu_item(fl!("rename"), Action::Rename).into()); - children.push(menu_item(fl!("cut"), Action::Cut).into()); + children.push(menu_item(fl!("rename"), Action::Rename)); + children.push(menu_item(fl!("cut"), Action::Cut)); } if modifiers.shift() && !modifiers.control() { - children.push(menu_item(fl!("copy-path"), Action::CopyPath).into()); + children.push(menu_item(fl!("copy-path"), Action::CopyPath)); } else { - children.push(menu_item(fl!("copy"), Action::Copy).into()); + children.push(menu_item(fl!("copy"), Action::Copy)); } if selected_mount_point == 0 { - children.push(menu_item(fl!("move-to"), Action::MoveTo).into()); + children.push(menu_item(fl!("move-to"), Action::MoveTo)); } - children.push(menu_item(fl!("copy-to"), Action::CopyTo).into()); + children.push(menu_item(fl!("copy-to"), Action::CopyTo)); - children.push(divider::horizontal::light().into()); + children.push(menu::Item::Divider); let supported_archive_types = crate::archive::SUPPORTED_ARCHIVE_TYPES; selected_types.retain(|t| supported_archive_types.iter().copied().all(|m| *t != m)); if selected_types.is_empty() { - children.push(menu_item(fl!("extract-here"), Action::ExtractHere).into()); - children.push(menu_item(fl!("extract-to"), Action::ExtractTo).into()); + children.push(menu_item(fl!("extract-here"), Action::ExtractHere)); + children.push(menu_item(fl!("extract-to"), Action::ExtractTo)); } - children.push(menu_item(fl!("compress"), Action::Compress).into()); - children.push(divider::horizontal::light().into()); + children.push(menu_item(fl!("compress"), Action::Compress)); + children.push(menu::Item::Divider); //TODO: Print? - children.push(menu_item(fl!("show-details"), Action::Preview).into()); + children.push(menu_item(fl!("show-details"), Action::Preview)); if any_trash_item { - children.push(divider::horizontal::light().into()); - children.push( - menu_item(fl!("restore-from-trash"), Action::RestoreFromTrash).into(), - ); - children.push(divider::horizontal::light().into()); - children.push(menu_item(fl!("delete-permanently"), Action::Delete).into()); + children.push(menu::Item::Divider); + children.push(menu_item( + fl!("restore-from-trash"), + Action::RestoreFromTrash, + )); + children.push(menu::Item::Divider); + children.push(menu_item(fl!("delete-permanently"), Action::Delete)); } else { if matches!(tab.mode, tab::Mode::App) { - children.push(divider::horizontal::light().into()); - children - .push(menu_item(fl!("add-to-sidebar"), Action::AddToSidebar).into()); + children.push(menu::Item::Divider); + children.push(menu_item(fl!("add-to-sidebar"), Action::AddToSidebar)); } - children.push(divider::horizontal::light().into()); + children.push(menu::Item::Divider); if tab.location.is_recents() { - children.push( - menu_item(fl!("remove-from-recents"), Action::RemoveFromRecents).into(), - ); - children.push(divider::horizontal::light().into()); + children.push(menu_item( + fl!("remove-from-recents"), + Action::RemoveFromRecents, + )); + children.push(menu::Item::Divider); } if selected_mount_point == 0 { if modifiers.shift() && !modifiers.control() { @@ -312,55 +263,59 @@ pub fn context_menu<'a>( .into(), ); } else { - children.push(menu_item(fl!("move-to-trash"), Action::Delete).into()); + children.push(menu_item(fl!("move-to-trash"), Action::Delete)); } } else if selected == 1 { - children.push(menu_item(fl!("eject"), Action::Eject).into()); + children.push(menu_item(fl!("eject"), Action::Eject)); } } } else { //TODO: need better designs for menu with no selection //TODO: have things like properties but they apply to the folder? if tab.location != Location::Recents { - children.push(menu_item(fl!("new-folder"), Action::NewFolder).into()); - children.push(menu_item(fl!("new-file"), Action::NewFile).into()); - children.push(menu_item(fl!("open-in-terminal"), Action::OpenTerminal).into()); - children.push(divider::horizontal::light().into()); + children.push(menu_item(fl!("new-folder"), Action::NewFolder)); + children.push(menu_item(fl!("new-file"), Action::NewFile)); + children.push(menu_item(fl!("open-in-terminal"), Action::OpenTerminal)); + children.push(menu::Item::Divider); } if tab.mode.multiple() { - children.push(menu_item(fl!("select-all"), Action::SelectAll).into()); + children.push(menu_item(fl!("select-all"), Action::SelectAll)); } if can_paste { - children.push(menu_item(fl!("paste"), Action::Paste).into()); + children.push(menu_item(fl!("paste"), Action::Paste)); } else { - children.push(menu_item_disabled(fl!("paste"), Action::Paste).into()); + children.push(menu_item_disabled(fl!("paste"), Action::Paste)); } //TODO: only show if cosmic-settings is found? if matches!(tab.mode, tab::Mode::Desktop) { - children.push(divider::horizontal::light().into()); - children.push( - menu_item(fl!("change-wallpaper"), Action::CosmicSettingsWallpaper).into(), - ); - children.push( - menu_item(fl!("desktop-appearance"), Action::CosmicSettingsDesktop).into(), - ); - children.push( - menu_item(fl!("display-settings"), Action::CosmicSettingsDisplays).into(), - ); + children.push(menu::Item::Divider); + children.push(menu_item( + fl!("change-wallpaper"), + Action::CosmicSettingsWallpaper, + )); + children.push(menu_item( + fl!("desktop-appearance"), + Action::CosmicSettingsDesktop, + )); + children.push(menu_item( + fl!("display-settings"), + Action::CosmicSettingsDisplays, + )); } - children.push(divider::horizontal::light().into()); + children.push(menu::Item::Divider); // TODO: Nested menu children.push(sort_item(fl!("sort-by-name"), HeadingOptions::Name)); children.push(sort_item(fl!("sort-by-modified"), HeadingOptions::Modified)); children.push(sort_item(fl!("sort-by-size"), HeadingOptions::Size)); if matches!(tab.location, Location::Desktop(..)) { - children.push(divider::horizontal::light().into()); - children.push( - menu_item(fl!("desktop-view-options"), Action::DesktopViewOptions).into(), - ); + children.push(menu::Item::Divider); + children.push(menu_item( + fl!("desktop-view-options"), + Action::DesktopViewOptions, + )); } } } @@ -375,24 +330,25 @@ pub fn context_menu<'a>( ) => { if selected > 0 { if selected_dir == 1 && selected == 1 || selected_dir == 0 { - children.push(menu_item(fl!("open"), Action::Open).into()); + children.push(menu_item(fl!("open"), Action::Open)); } if matches!(tab.location, Location::Search(..)) || tab.location.is_recents() { - children.push( - menu_item(fl!("open-item-location"), Action::OpenItemLocation).into(), - ); + children.push(menu_item( + fl!("open-item-location"), + Action::OpenItemLocation, + )); } - children.push(divider::horizontal::light().into()); - children.push(menu_item(fl!("show-details"), Action::Preview).into()); + children.push(menu::Item::Divider); + children.push(menu_item(fl!("show-details"), Action::Preview)); } else { if dialog_kind.save() { - children.push(menu_item(fl!("new-folder"), Action::NewFolder).into()); + children.push(menu_item(fl!("new-folder"), Action::NewFolder)); } if tab.mode.multiple() { - children.push(menu_item(fl!("select-all"), Action::SelectAll).into()); + children.push(menu_item(fl!("select-all"), Action::SelectAll)); } if !children.is_empty() { - children.push(divider::horizontal::light().into()); + children.push(menu::Item::Divider); } children.push(sort_item(fl!("sort-by-name"), HeadingOptions::Name)); children.push(sort_item(fl!("sort-by-modified"), HeadingOptions::Modified)); @@ -402,14 +358,14 @@ pub fn context_menu<'a>( (_, Location::Network(..)) => { if selected > 0 { if selected_dir == 1 && selected == 1 || selected_dir == 0 { - children.push(menu_item(fl!("open"), Action::Open).into()); + children.push(menu_item(fl!("open"), Action::Open)); } } else { if tab.mode.multiple() { - children.push(menu_item(fl!("select-all"), Action::SelectAll).into()); + children.push(menu_item(fl!("select-all"), Action::SelectAll)); } if !children.is_empty() { - children.push(divider::horizontal::light().into()); + children.push(menu::Item::Divider); } children.push(sort_item(fl!("sort-by-name"), HeadingOptions::Name)); children.push(sort_item(fl!("sort-by-modified"), HeadingOptions::Modified)); @@ -418,24 +374,26 @@ pub fn context_menu<'a>( } (_, Location::Trash | Location::Search(SearchLocation::Trash, ..)) => { if tab.mode.multiple() { - children.push(menu_item(fl!("select-all"), Action::SelectAll).into()); + children.push(menu_item(fl!("select-all"), Action::SelectAll)); } if !Trash::is_empty() { if !children.is_empty() { - children.push(divider::horizontal::light().into()); + children.push(menu::Item::Divider); } - children.push(menu_item(fl!("empty-trash"), Action::EmptyTrash).into()); + children.push(menu_item(fl!("empty-trash"), Action::EmptyTrash)); } if !children.is_empty() { - children.push(divider::horizontal::light().into()); + children.push(menu::Item::Divider); } if selected > 0 { - children.push(menu_item(fl!("show-details"), Action::Preview).into()); - children.push(divider::horizontal::light().into()); - children - .push(menu_item(fl!("restore-from-trash"), Action::RestoreFromTrash).into()); - children.push(divider::horizontal::light().into()); - children.push(menu_item(fl!("delete-permanently"), Action::Delete).into()); + children.push(menu_item(fl!("show-details"), Action::Preview)); + children.push(menu::Item::Divider); + children.push(menu_item( + fl!("restore-from-trash"), + Action::RestoreFromTrash, + )); + children.push(menu::Item::Divider); + children.push(menu_item(fl!("delete-permanently"), Action::Delete)); } else { // TODO: Nested menu children.push(sort_item(fl!("sort-by-name"), HeadingOptions::Name)); @@ -445,26 +403,11 @@ pub fn context_menu<'a>( } } - container(column::with_children(children)) - .padding(1) - //TODO: move style to libcosmic - .style(|theme| { - let cosmic = theme.cosmic(); - let component = &cosmic.background(false).component; - container::Style { - icon_color: Some(component.on.into()), - text_color: Some(component.on.into()), - background: Some(Background::Color(component.base.into())), - border: Border { - radius: cosmic.radius_s().map(|x| x + 1.0).into(), - width: 1.0, - color: component.divider.into(), - }, - ..Default::default() - } - }) - .width(Length::Fixed(360.0)) - .into() + let key_binds: HashMap = key_binds + .iter() + .map(|(key_bind, action)| (key_bind.clone(), TabAction(*action))) + .collect(); + menu::items(&key_binds, children) } pub fn dialog_menu( @@ -813,50 +756,33 @@ pub fn menu_bar<'a>( ) } -pub fn location_context_menu<'a>(ancestor_index: usize) -> Element<'a, tab::Message> { +pub fn location_context_menu(ancestor_index: usize) -> Vec> { //TODO: only add some of these when in App mode - let children = [ - menu_button!(text::body(fl!("open-in-new-tab"))) - .on_press(tab::Message::LocationMenuAction( + menu::items( + &HashMap::new(), + vec![ + menu::Item::Button( + fl!("open-in-new-tab"), + None, LocationMenuAction::OpenInNewTab(ancestor_index), - )) - .into(), - menu_button!(text::body(fl!("open-in-new-window"))) - .on_press(tab::Message::LocationMenuAction( + ), + menu::Item::Button( + fl!("open-in-new-window"), + None, LocationMenuAction::OpenInNewWindow(ancestor_index), - )) - .into(), - divider::horizontal::light().into(), - menu_button!(text::body(fl!("show-details"))) - .on_press(tab::Message::LocationMenuAction( + ), + menu::Item::Divider, + menu::Item::Button( + fl!("show-details"), + None, LocationMenuAction::Preview(ancestor_index), - )) - .into(), - divider::horizontal::light().into(), - menu_button!(text::body(fl!("add-to-sidebar"))) - .on_press(tab::Message::LocationMenuAction( + ), + menu::Item::Divider, + menu::Item::Button( + fl!("add-to-sidebar"), + None, LocationMenuAction::AddToSidebar(ancestor_index), - )) - .into(), - ]; - - container(column::with_children(children)) - .padding(1) - .style(|theme| { - let cosmic = theme.cosmic(); - let component = &cosmic.background(false).component; - container::Style { - icon_color: Some(component.on.into()), - text_color: Some(component.on.into()), - background: Some(Background::Color(component.base.into())), - border: Border { - radius: cosmic.radius_s().map(|x| x + 1.0).into(), - width: 1.0, - color: component.divider.into(), - }, - ..Default::default() - } - }) - .width(Length::Fixed(360.0)) - .into() + ), + ], + ) } diff --git a/src/mounter/gvfs.rs b/src/mounter/gvfs.rs index e2c6ba1..b675dd0 100644 --- a/src/mounter/gvfs.rs +++ b/src/mounter/gvfs.rs @@ -18,6 +18,15 @@ use crate::tab::{self, ChecksumState, DirSize, ItemMetadata, ItemThumbnail, Loca const TARGET_URI_ATTRIBUTE: &str = "standard::target-uri"; +// Attributes requested when listing a network directory. +const SCAN_ATTRIBUTES: &str = "standard::name,\ +standard::display-name,\ +standard::type,\ +standard::size,\ +standard::icon,\ +standard::is-hidden,\ +time::modified"; + fn resolve_uri(uri: &str) -> (String, gio::File) { let file = gio::File::for_uri(uri); // Resolve the target-uri if it exists @@ -119,9 +128,27 @@ fn network_scan(uri: &str, sizes: IconSizes) -> Result, String> { Box::from([]) }; + // `filesystem::remote` belongs to the filesystem namespace, which `enumerate_children` + // never fills in, so it has to be queried once for the directory being listed. + let remote = file + .query_filesystem_info( + gio::FILE_ATTRIBUTE_FILESYSTEM_REMOTE, + gio::Cancellable::NONE, + ) + .map(|info| info.boolean(gio::FILE_ATTRIBUTE_FILESYSTEM_REMOTE)) + .unwrap_or_else(|err| { + log::warn!("failed to get GIO filesystem info for {uri}: {err}"); + // Assume remote, so per-entry work is skipped rather than retried + true + }); + let mut items = Vec::new(); for info_res in file - .enumerate_children("*", gio::FileQueryInfoFlags::NONE, gio::Cancellable::NONE) + .enumerate_children( + SCAN_ATTRIBUTES, + gio::FileQueryInfoFlags::NONE, + gio::Cancellable::NONE, + ) .map_err(err_str)? { let info = info_res.map_err(err_str)?; @@ -133,13 +160,17 @@ fn network_scan(uri: &str, sizes: IconSizes) -> Result, String> { //TODO: what is the best way to resolve shortcuts? let location = Location::Network(uri, display_name.clone(), file.child(&name).path()); - let metadata = if !force_dir && !info.boolean(gio::FILE_ATTRIBUTE_FILESYSTEM_REMOTE) { + let metadata = if force_dir { + ItemMetadata::SimpleDir { entries: 0 } + } else { let mtime = info.attribute_uint64(gio::FILE_ATTRIBUTE_TIME_MODIFIED); let is_dir = matches!(info.file_type(), gio::FileType::Directory); let size_opt = (!is_dir).then_some(info.size() as u64); let mut children_opt = None; - if is_dir { + // Counting children costs a directory listing per entry, which is far too + // expensive on a remote filesystem + if is_dir && !remote { if let Some(path) = file.child(&name).path() { //TODO: calculate children in the background (and make it cancellable?) match std::fs::read_dir(&path) { @@ -159,9 +190,8 @@ fn network_scan(uri: &str, sizes: IconSizes) -> Result, String> { mtime, size_opt, children_opt, + is_dir, } - } else { - ItemMetadata::SimpleDir { entries: 0 } }; let (mime, icon_handle_grid, icon_handle_list, icon_handle_list_condensed) = { @@ -659,7 +689,7 @@ impl Mounter for Gvfs { ) } - fn network_drive(&self, uri: String) -> Task<()> { + fn network_drive(&self, uri: String) -> Task { let command_tx = self.command_tx.clone(); Task::perform( async move { @@ -668,9 +698,15 @@ impl Mounter for Gvfs { command_tx.send(Cmd::NetworkDrive(uri, res_tx)).unwrap(); res_rx.await }, - |x| { - if let Err(err) = x { + |result| match result { + Ok(Ok(())) => true, + Ok(Err(err)) => { log::error!("{err:?}"); + false + } + Err(err) => { + log::error!("{err:?}"); + false } }, ) diff --git a/src/mounter/mod.rs b/src/mounter/mod.rs index a5ee75a..c6366c9 100644 --- a/src/mounter/mod.rs +++ b/src/mounter/mod.rs @@ -115,7 +115,7 @@ pub trait Mounter: Send + Sync { fn items(&self, sizes: IconSizes) -> Option; //TODO: send result fn mount(&self, item: MounterItem) -> Task<()>; - fn network_drive(&self, uri: String) -> Task<()>; + fn network_drive(&self, uri: String) -> Task; fn network_scan(&self, uri: &str, sizes: IconSizes) -> Option, String>>; fn dir_info(&self, uri: &str) -> Option<(String, String, Option)>; fn unmount(&self, item: MounterItem) -> Task<()>; diff --git a/src/mouse_area.rs b/src/mouse_area.rs index 73bd710..cbb7bbb 100644 --- a/src/mouse_area.rs +++ b/src/mouse_area.rs @@ -214,8 +214,9 @@ impl<'a, Message, F> OnAutoScroll<'a, Message> for F where F: Fn(Option) -> pub trait OnMouseButton<'a, Message>: Fn(Option) -> Message + 'a {} impl<'a, Message, F> OnMouseButton<'a, Message> for F where F: Fn(Option) -> Message + 'a {} -pub trait OnDrag<'a, Message>: Fn(Option) -> Message + 'a {} -impl<'a, Message, F> OnDrag<'a, Message> for F where F: Fn(Option) -> Message + 'a {} +pub trait OnDrag<'a, Message>: Fn(Option) -> Option + 'a {} +impl<'a, Message, F> OnDrag<'a, Message> for F where F: Fn(Option) -> Option + 'a +{} pub trait OnResize<'a, Message>: Fn(Rectangle) -> Message + 'a {} impl<'a, Message, F> OnResize<'a, Message> for F where F: Fn(Rectangle) -> Message + 'a {} @@ -563,6 +564,16 @@ fn update( state.last_position = position_in; } + if state.drag_initiated.is_some() + && matches!( + event, + Event::Mouse(mouse::Event::CursorMoved { .. }) + | Event::Touch(touch::Event::FingerMoved { .. }) + ) + { + shell.request_redraw(); + } + if let Event::Mouse(mouse::Event::CursorMoved { position }) = event { let virtual_position = Point::new( viewport.x - layout_bounds.x + position.x, @@ -639,6 +650,7 @@ fn update( { state.drag_initiated = None; state.prev_click = None; + shell.request_redraw(); if let Some(message) = widget.on_drag_end.as_ref() { shell.publish(message(cursor.position_in(layout_bounds))); } @@ -658,7 +670,9 @@ fn update( state.prev_click = None; return; } - state.drag_initiated = None; + if state.drag_initiated.take().is_some() { + shell.request_redraw(); + } if let Some(message) = widget.on_release.as_ref() { shell.publish(message(cursor.position_in(layout_bounds))); @@ -785,12 +799,13 @@ fn update( } if let Some((message, drag_rect)) = widget.on_drag.as_ref().zip(state.drag_rect(cursor)) { - shell.publish(message(drag_rect.intersection(&layout_bounds).map( - |mut rect| { - rect.x -= layout_bounds.x; - rect.y -= layout_bounds.y; - rect - }, - ))); + let rect_opt = drag_rect.intersection(&layout_bounds).map(|mut rect| { + rect.x -= layout_bounds.x; + rect.y -= layout_bounds.y; + rect + }); + if let Some(message) = message(rect_opt) { + shell.publish(message); + } } } diff --git a/src/operation/recursive.rs b/src/operation/recursive.rs index 0f09bd6..eb141b8 100644 --- a/src/operation/recursive.rs +++ b/src/operation/recursive.rs @@ -454,7 +454,7 @@ impl Op { } } - let (from_file, metadata, to_file) = cosmic::iced::futures::join!( + let (from_file_open_result, metadata, to_file_open_result) = cosmic::iced::futures::join!( async { compio::fs::OpenOptions::new() .read(true) @@ -470,12 +470,30 @@ impl Op { .write(true) .open(&self.to) .await - .with_context(|| format!("failed to open {} for writing", self.to.display())) } ); - let from_file = from_file?; - let mut to_file = to_file?; + let from_file = from_file_open_result?; + + let mut to_file = match to_file_open_result { + Ok(file) => file, + #[cfg(not(feature = "gvfs"))] + Err(why) => { + _ = from_file.close().await; + return Err(why) + .with_context(|| format!("failed to open {} for writing", self.to.display())) + .map_err(Into::into); + } + #[cfg(feature = "gvfs")] + Err(_why) => { + _ = from_file.close().await; + return self + .gio_file_copy(ctx, progress) + .await + .map(|()| true) + .map_err(Into::into); + } + }; progress.total_bytes = metadata.as_ref().map(|m| m.len()); (ctx.on_progress)(self, &progress); diff --git a/src/tab.rs b/src/tab.rs index dc3d925..93f3293 100644 --- a/src/tab.rs +++ b/src/tab.rs @@ -181,7 +181,9 @@ fn button_appearance( appearance.icon_color = Some(Color::from(cosmic.on_bg_component_color())); appearance.text_color = Some(Color::from(cosmic.on_bg_component_color())); if cut { - appearance.text_color = Some(Color::from(cosmic.background(false).component.on_disabled)); + appearance.text_color = Some(Color::from( + cosmic.background(theme.transparent).component.on_disabled, + )); } else { appearance.text_color = Some(Color::from(cosmic.on_bg_component_color())); } @@ -192,12 +194,16 @@ fn button_appearance( appearance.background = Some(Color::from(cosmic.bg_color()).into()); appearance.icon_color = Some(Color::from(cosmic.on_bg_color())); if cut { - appearance.text_color = Some(Color::from(cosmic.background(false).component.disabled)); + appearance.text_color = Some(Color::from( + cosmic.background(theme.transparent).component.disabled, + )); } else { appearance.text_color = Some(Color::from(cosmic.on_bg_color())); } } else if cut { - appearance.text_color = Some(Color::from(cosmic.background(false).component.on_disabled)); + appearance.text_color = Some(Color::from( + cosmic.background(theme.transparent).component.on_disabled, + )); } if focused && accent { appearance.outline_width = 1.0; @@ -452,7 +458,9 @@ impl<'a> FormatTime<'a> { impl Display for FormatTime<'_> { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { - let zoned = jiff::Zoned::try_from(self.time).unwrap(); + let Ok(zoned) = jiff::Zoned::try_from(self.time) else { + return Ok(()); + }; let now = jiff::Zoned::now(); let icu_datetime = DateTime::convert_from(zoned.datetime()); if zoned.date() == now.date() { @@ -655,6 +663,41 @@ fn display_name_for_file(path: &Path, name: &str, get_from_gvfs: bool, is_deskto Item::display_name(name) } +// Whether a dir lives on a remote filesystem, according to GIO. +#[cfg(feature = "gvfs")] +fn gvfs_dir_is_remote(dir: &Path) -> bool { + static REMOTE_CACHE: LazyLock>> = + LazyLock::new(|| RwLock::new(FxHashMap::default())); + + if let Some(remote) = REMOTE_CACHE.read().unwrap().get(dir) { + return *remote; + } + + let remote = match gio::prelude::FileExt::query_filesystem_info( + &gio::File::for_path(dir), + gio::FILE_ATTRIBUTE_FILESYSTEM_REMOTE, + gio::Cancellable::NONE, + ) { + Ok(info) => info.boolean(gio::FILE_ATTRIBUTE_FILESYSTEM_REMOTE), + Err(err) => { + log::warn!( + "failed to get GIO filesystem info for {}: {}", + dir.display(), + err + ); + + //Assume remote so that the "expensive tasks" are rather skipped then actually executed. + true + } + }; + + REMOTE_CACHE + .write() + .unwrap() + .insert(dir.to_path_buf(), remote); + remote +} + #[cfg(feature = "gvfs")] pub fn item_from_gvfs_info(path: PathBuf, file_info: gio::FileInfo, sizes: IconSizes) -> Item { let file_name = file_info @@ -662,7 +705,7 @@ pub fn item_from_gvfs_info(path: PathBuf, file_info: gio::FileInfo, sizes: IconS .unwrap_or_default(); let mtime = file_info.attribute_uint64(gio::FILE_ATTRIBUTE_TIME_MODIFIED); let mut is_desktop = false; - let remote = file_info.boolean(gio::FILE_ATTRIBUTE_FILESYSTEM_REMOTE); + let remote = path.parent().is_none_or(gvfs_dir_is_remote); let is_dir = matches!(file_info.file_type(), gio::FileType::Directory); let size_opt = (!is_dir).then_some(file_info.size() as u64); @@ -723,6 +766,7 @@ pub fn item_from_gvfs_info(path: PathBuf, file_info: gio::FileInfo, sizes: IconS mtime, size_opt, children_opt, + is_dir, }, hidden, image_dimensions: (!remote && mime.type_() == mime::IMAGE) @@ -777,23 +821,7 @@ pub fn item_from_entry( #[cfg(feature = "gvfs")] FsKind::Gvfs => { is_gvfs = true; - let file = gio::File::for_path(&path); - - match gio::prelude::FileExt::query_filesystem_info( - &file, - gio::FILE_ATTRIBUTE_FILESYSTEM_REMOTE, - gio::Cancellable::NONE, - ) { - Ok(info) => info.boolean(gio::FILE_ATTRIBUTE_FILESYSTEM_REMOTE), - Err(err) => { - log::warn!( - "failed to get GIO filesystem info for {}: {}", - path.display(), - err - ); - true - } - } + path.parent().is_none_or(gvfs_dir_is_remote) } #[cfg(not(feature = "gvfs"))] FsKind::Gvfs => { @@ -945,11 +973,24 @@ fn item_from_trash_child( metadata: fs::Metadata, sizes: IconSizes, ) -> Option { - let original_path = crate::trash::original_path_for_trash_child(&path)?; + let Some(original_path) = crate::trash::original_path_for_trash_child(&path) else { + log::warn!( + "failed to resolve original path for trash item {}, skipping entry", + path.display() + ); + return None; + }; + let Some(original_parent) = original_path.parent() else { + log::warn!( + "trash item {} has no original parent, skipping entry", + path.display() + ); + return None; + }; let entry = trash::TrashItem { id: path.as_os_str().to_os_string(), name: std::ffi::OsString::from(&name), - original_parent: original_path.parent()?.to_path_buf(), + original_parent: original_parent.to_path_buf(), time_deleted: 0, }; let size = if metadata.is_dir() { @@ -1005,7 +1046,6 @@ pub fn scan_path(tab_path: &PathBuf, sizes: IconSizes) -> Vec { // gio crate expects a comma delimited string let attr_string = [ gio::FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME.as_str(), - gio::FILE_ATTRIBUTE_FILESYSTEM_REMOTE.as_str(), gio::FILE_ATTRIBUTE_TIME_MODIFIED.as_str(), gio::FILE_ATTRIBUTE_STANDARD_SIZE.as_str(), gio::FILE_ATTRIBUTE_STANDARD_TYPE.as_str(), @@ -1042,6 +1082,7 @@ pub fn scan_path(tab_path: &PathBuf, sizes: IconSizes) -> Vec { if !remote_scannable { match fs::read_dir(tab_path) { Ok(entries) => { + let trash = crate::trash::is_trash_path(tab_path); items = entries .filter_map(|entry_res| { let entry = entry_res @@ -1082,7 +1123,6 @@ pub fn scan_path(tab_path: &PathBuf, sizes: IconSizes) -> Vec { }) .ok()?; - let trash = crate::trash::is_trash_path(tab_path); if trash { item_from_trash_child(path, name, metadata, sizes) } else { @@ -1717,11 +1757,11 @@ impl fmt::Debug for TaskWrapper { #[derive(Debug)] pub enum Command { Action(Action), + Surface(cosmic::surface::Action), AddNetworkDrive, AddToSidebar(PathBuf), AutoScroll(Option), ChangeLocation(String, Location, Option>), - ContextMenu(Option, Option), Delete(Vec), DropFiles(PathBuf, ClipboardPaste), ClearRecents, @@ -1752,9 +1792,9 @@ pub enum Message { ClickRelease(Option), Config(TabConfig), ContextAction(Action), - ContextMenu(Option, Option), - LocationContextMenuPoint(Option), - LocationContextMenuIndex(Option, Option), + RightClickBackground, + Surface(cosmic::surface::Action), + LocationContextMenuIndex(Option), LocationMenuAction(LocationMenuAction), Drag(Option), DragEnd, @@ -1814,6 +1854,8 @@ pub enum Message { HighlightDeactivate(usize), HighlightActivate(usize), DirectorySize(PathBuf, DirSize), + #[cfg(feature = "gvfs")] + DirectoryChildren(PathBuf, usize), Checksums(PathBuf, ChecksumState), CalculateChecksums(PathBuf), CopyChecksum(String), @@ -1882,6 +1924,7 @@ pub enum ItemMetadata { mtime: u64, size_opt: Option, children_opt: Option, + is_dir: bool, }, } @@ -1896,7 +1939,7 @@ impl ItemMetadata { Self::SimpleDir { .. } => true, Self::SimpleFile { .. } => false, #[cfg(feature = "gvfs")] - Self::GvfsPath { children_opt, .. } => children_opt.is_some(), + Self::GvfsPath { is_dir, .. } => *is_dir, } } @@ -1905,7 +1948,7 @@ impl ItemMetadata { Self::Path { metadata, .. } => metadata.modified().ok(), #[cfg(feature = "gvfs")] Self::GvfsPath { mtime, .. } => { - Some(SystemTime::UNIX_EPOCH + Duration::from_secs(*mtime)) + SystemTime::UNIX_EPOCH.checked_add(Duration::from_secs(*mtime)) } _ => None, } @@ -2327,6 +2370,7 @@ impl Item { ) -> widget::Text<'a, cosmic::Theme, cosmic::Renderer> { widget::text::body(name) .wrapping(text::Wrapping::WordOrGlyph) + .align_x(text::Alignment::Center) .ellipsize(text::Ellipsize::Middle(text::EllipsizeHeightLimit::Lines( 3, ))) @@ -2382,10 +2426,8 @@ impl Item { widget::image(handle.clone()).into() } ItemThumbnail::Svg(handle) => widget::svg(handle.clone()).into(), - ItemThumbnail::Text(content) => widget::text_editor(content) - .class(cosmic::theme::iced::TextEditor::Custom(Box::new( - text_editor_class, - ))) + ItemThumbnail::Text(content) => widget::text_editor::text_editor(content) + .style(text_editor_class) .width(THUMBNAIL_SIZE as f32) .height(Length::Fixed(THUMBNAIL_SIZE as f32)) .padding(spacing.space_xxs) @@ -2436,7 +2478,7 @@ impl Item { ); let mut details = widget::column::with_capacity(8).spacing(space_xxxs); - details = details.push(widget::text::heading(self.name.clone())); + details = details.push(widget::selectable_text::heading(self.name.clone())); details = details.push(widget::text::body(fl!( "type", mime = self.mime.to_string() @@ -2493,21 +2535,21 @@ impl Item { let time_formatter = time_formatter(military_time); if let Ok(time) = metadata.created() { - details = details.push(widget::text::body(fl!( + details = details.push(widget::selectable_text::body(fl!( "item-created", created = format_time(time, &date_time_formatter, &time_formatter).to_string() ))); } if let Ok(time) = metadata.modified() { - details = details.push(widget::text::body(fl!( + details = details.push(widget::selectable_text::body(fl!( "item-modified", modified = format_time(time, &date_time_formatter, &time_formatter).to_string() ))); } if let Ok(time) = metadata.accessed() { - details = details.push(widget::text::body(fl!( + details = details.push(widget::selectable_text::body(fl!( "item-accessed", accessed = format_time(time, &date_time_formatter, &time_formatter).to_string() ))); @@ -2778,9 +2820,8 @@ pub struct Tab { pub location: Location, pub location_ancestors: Vec<(Location, String)>, pub location_title: String, - pub location_context_menu_point: Option, + /// Breadcrumb whose context menu is open, drawn as active while it shows pub location_context_menu_index: Option, - pub context_menu: Option, pub mode: Mode, pub scroll_opt: Option, pub size_opt: Cell>, @@ -2808,7 +2849,6 @@ pub struct Tab { search_context: Option, date_time_formatter: DateTimeFormatter, time_formatter: DateTimeFormatter, - watch_drag: bool, window_id: Option, large_image_manager: LargeImageManager, } @@ -2925,8 +2965,6 @@ impl Tab { location, location_ancestors, location_title, - context_menu: None, - location_context_menu_point: None, location_context_menu_index: None, mode: Mode::App, scroll_opt: None, @@ -2955,7 +2993,6 @@ impl Tab { search_context: None, date_time_formatter: date_time_formatter(config.military_time), time_formatter: time_formatter(config.military_time), - watch_drag: true, window_id, large_image_manager: LargeImageManager::new(), } @@ -3468,7 +3505,6 @@ impl Tab { self.location = location.normalize(); self.location_ancestors = self.location.ancestors(); self.location_title = self.location.title(); - self.context_menu = None; self.edit_location = None; self.items_opt = None; //TODO: remember scroll by location? @@ -3513,7 +3549,6 @@ impl Tab { let mut history_i_opt = None; let mod_ctrl = modifiers.contains(Modifiers::CTRL) && self.mode.multiple(); let mod_shift = modifiers.contains(Modifiers::SHIFT) && self.mode.multiple(); - let last_context_menu = self.context_menu; match message { Message::AddNetworkDrive => { commands.push(Command::AddNetworkDrive); @@ -3548,8 +3583,6 @@ impl Tab { } if click_i_opt != self.clicked.take() { - self.context_menu = None; - self.location_context_menu_index = None; if let Some(ref mut items) = self.items_opt { for (i, item) in items.iter_mut().enumerate() { if mod_ctrl { @@ -3566,7 +3599,6 @@ impl Tab { } Message::DragEnd => { self.clicked = None; - self.watch_drag = true; } Message::DoubleClick(click_i_opt) => { if let Some(clicked_item) = self @@ -3591,9 +3623,7 @@ impl Tab { } Message::Click(click_i_opt) => { self.selected_clicked = false; - self.context_menu = None; self.edit_location = None; - self.location_context_menu_index = None; if click_i_opt.is_none() { self.clicked = click_i_opt; } @@ -3735,24 +3765,16 @@ impl Tab { } } Message::ContextAction(action) => { - // Close context menu - self.context_menu = None; - commands.push(Command::Action(action)); } Message::RunContextAction(action) => { - self.context_menu = None; - commands.push(Command::RunContextAction(action)); } - Message::ContextMenu(point_opt, _) => { + Message::RightClickBackground => { self.edit_location = None; - self.context_menu = point_opt; - self.location_context_menu_index = None; //TODO: hack for clearing selecting when right clicking empty space - if self.context_menu.is_some() - && self.last_right_click.take().is_none() + if self.last_right_click.take().is_none() && let Some(ref mut items) = self.items_opt { for item in items.iter_mut() { @@ -3760,17 +3782,13 @@ impl Tab { } } } - Message::LocationContextMenuPoint(point_opt) => { - self.context_menu = None; - self.location_context_menu_point = point_opt; + Message::Surface(action) => { + commands.push(Command::Surface(action)); } - Message::LocationContextMenuIndex(p, index_opt) => { - self.context_menu = None; - self.location_context_menu_point = p; - self.location_context_menu_index = index_opt; + Message::LocationContextMenuIndex(index) => { + self.location_context_menu_index = index; } Message::LocationMenuAction(action) => { - self.location_context_menu_index = None; let path_for_index = |ancestor_index| { self.location .path_opt() @@ -3820,10 +3838,7 @@ impl Tab { } } Message::Drag(rect_opt) => { - self.watch_drag = false; if let Some(rect) = rect_opt { - self.context_menu = None; - self.location_context_menu_index = None; if self.mode.multiple() { self.select_rect(rect, mod_ctrl, mod_shift); } @@ -3859,6 +3874,28 @@ impl Tab { } Message::EditLocationSubmit => { if let Some(mut edit_location) = self.edit_location.take() { + let typed_opt = match &edit_location.location { + Location::Path(path) => path.to_str().map(str::to_string), + Location::Network(uri, ..) => Some(uri.clone()), + _ => None, + }; + let mut typed_uri = false; + if let Some(typed) = typed_opt { + match typed.trim().parse::() { + Ok(url) if url.scheme() != "file" && url.has_host() => { + let uri = url.as_str().to_string(); + edit_location = + Location::Network(uri.clone(), uri, None).normalize().into(); + typed_uri = true; + } + Err(_) if matches!(edit_location.location, Location::Network(..)) => { + edit_location = + Location::Path(PathBuf::from(typed)).normalize().into(); + } + _ => {} + } + } + // Select first completion if current location does not exist if edit_location.selected.is_none() && edit_location @@ -3874,6 +3911,9 @@ impl Tab { } cd = edit_location.resolve(); + if cd.is_none() && typed_uri { + cd = Some(edit_location.location); + } } } Message::EditLocationTab => { @@ -4435,13 +4475,11 @@ impl Tab { } } Message::HighlightDeactivate(i) => { - self.watch_drag = true; if let Some(item) = self.items_opt.as_mut().and_then(|f| f.get_mut(i)) { item.highlighted = false; } } Message::HighlightActivate(i) => { - self.watch_drag = true; if let Some(item) = self.items_opt.as_mut().and_then(|f| f.get_mut(i)) { item.highlighted = true; } @@ -4467,7 +4505,6 @@ impl Tab { } Message::Scroll(viewport) => { self.scroll_opt = Some(viewport.absolute_offset()); - self.watch_drag = true; } Message::ScrollTab(scroll_speed) => { commands.push(Command::Iced( @@ -4800,6 +4837,20 @@ impl Tab { } } } + #[cfg(feature = "gvfs")] + Message::DirectoryChildren(path, children) => { + if let Some(ref mut items) = self.items_opt { + for item in items.iter_mut() { + if item.path_opt() == Some(&path) { + if let ItemMetadata::GvfsPath { children_opt, .. } = &mut item.metadata + { + *children_opt = Some(children); + } + break; + } + } + } + } Message::Checksums(path, checksum_state) => { let location = Location::Path(path); if let Some(ref mut item) = self.parent_item_opt @@ -4906,16 +4957,6 @@ impl Tab { } } - // Update context menu popup - if self.context_menu != last_context_menu { - if last_context_menu.is_some() { - commands.push(Command::ContextMenu(None, self.window_id)); - } - if let Some(point) = self.context_menu { - commands.push(Command::ContextMenu(Some(point), self.window_id)); - } - } - commands } @@ -4961,11 +5002,15 @@ impl Tab { ItemMetadata::GvfsPath { size_opt, children_opt, + is_dir, .. - } => match children_opt { - Some(child_count) => (true, *child_count as u64), - None => (false, size_opt.unwrap_or_default()), - }, + } => { + if *is_dir { + (true, children_opt.unwrap_or_default() as u64) + } else { + (false, size_opt.unwrap_or_default()) + } + } }; let (a_is_entry, a_size) = get_size(a.1); let (b_is_entry, b_size) = get_size(b.1); @@ -5174,9 +5219,11 @@ impl Tab { } ItemThumbnail::Text(text) => { element_opt = Some( - widget::container(widget::text_editor(text).padding(space_xxs).class( - cosmic::theme::iced::TextEditor::Custom(Box::new(text_editor_class)), - )) + widget::container( + widget::text_editor::text_editor(text) + .padding(space_xxs) + .style(text_editor_class), + ) .center(Length::Fill) .into(), ); @@ -5520,10 +5567,14 @@ impl Tab { } let location = self.location.with_path(ancestor.to_path_buf()); - let mut mouse_area = crate::mouse_area::MouseArea::new( + let mouse_area = crate::mouse_area::MouseArea::new( widget::button::custom(row) .padding(space_xxxs) - .class(theme::Button::Link) + .class(if self.location_context_menu_index == Some(index) { + theme::Button::LinkActive + } else { + theme::Button::Link + }) .on_press(if ancestor == path { Message::EditLocation(Some(self.location.clone().into())) } else { @@ -5531,21 +5582,6 @@ impl Tab { }), ); - if self.location_context_menu_index.is_some() { - mouse_area = mouse_area - .on_right_press(move |point_opt| { - Message::LocationContextMenuIndex(point_opt, None) - }) - .wayland_on_right_press_window_position(); - } else { - mouse_area = mouse_area - .on_right_press_no_capture() - .on_right_press(move |point_opt| { - Message::LocationContextMenuIndex(point_opt, Some(index)) - }) - .wayland_on_right_press_window_position(); - } - let mouse_area = if let Location::Path(_) = &self.location { mouse_area .on_middle_press(move |_| Message::OpenInNewTab(ancestor.to_path_buf())) @@ -5553,7 +5589,16 @@ impl Tab { mouse_area }; - children.push(self.dnd_dest(&location, mouse_area)); + // Each breadcrumb carries the menu for its own ancestor index + let mut context_menu = + widget::context_menu(mouse_area, Some(menu::location_context_menu(index))) + .on_open(Message::LocationContextMenuIndex(Some(index))) + .on_close(Message::LocationContextMenuIndex(None)) + .on_surface_action(Message::Surface); + if let Some(window_id) = self.window_id { + context_menu = context_menu.window_id(window_id); + } + children.push(self.dnd_dest(&location, context_menu)); if found_home || overflow { break; @@ -5604,20 +5649,7 @@ impl Tab { column = column.push(heading_rule); } - let mouse_area = crate::mouse_area::MouseArea::new(column) - .on_right_press(Message::LocationContextMenuPoint); - - let mut popover = widget::popover(mouse_area); - if let (Some(point), Some(index)) = ( - self.location_context_menu_point, - self.location_context_menu_index, - ) { - popover = popover - .popup(menu::location_context_menu(index)) - .position(widget::popover::Position::Point(point)); - } - - popover.into() + column.into() } pub fn empty_view(&self, has_hidden: bool) -> Element<'_, Message> { @@ -5806,18 +5838,13 @@ impl Tab { .height(Length::Fixed(item_height as f32)) .width(Length::Fixed(item_width as f32)); for button in buttons { - if self.context_menu.is_some() { - column = column.push(button); - } else { - column = column.push( - mouse_area::MouseArea::new(button) - .on_right_press_no_capture() - .wayland_on_right_press_window_position() - .on_right_press(move |point_opt| { - Message::RightClick(point_opt, Some(i)) - }), - ); - } + column = column.push( + mouse_area::MouseArea::new(button) + .on_right_press_no_capture() + .on_right_press(move |point_opt| { + Message::RightClick(point_opt, Some(i)) + }), + ); } let column: Element = @@ -5984,15 +6011,13 @@ impl Tab { Element::from(dnd_grid) }); - let mut mouse_area = mouse_area::MouseArea::new(column.width(Length::Fill)) + let mouse_area = mouse_area::MouseArea::new(column.width(Length::Fill)) .on_press(|_| Message::Click(None)) .on_auto_scroll(Message::AutoScroll) + .on_drag(move |rect_opt| self.on_drag(rect_opt)) .on_drag_end(|_| Message::DragEnd) .show_drag_rect(self.mode.multiple()) .on_release(|_| Message::ClickRelease(None)); - if self.watch_drag { - mouse_area = mouse_area.on_drag(Message::Drag); - } (drag_list, mouse_area.into(), true) } @@ -6141,17 +6166,21 @@ impl Tab { ItemMetadata::GvfsPath { size_opt, children_opt, + is_dir, .. - } => match children_opt { - Some(child_count) => { - if *child_count == 1 { - format!("{child_count} item") - } else { - format!("{child_count} items") + } => { + if *is_dir { + // Children are not counted on remote filesystems + match children_opt { + //TODO: translate + Some(1) => "1 item".to_string(), + Some(child_count) => format!("{child_count} items"), + None => String::new(), } + } else { + format_size(size_opt.unwrap_or_default()) } - None => format_size(size_opt.unwrap_or_default()), - }, + } }; let row = if condensed { @@ -6218,39 +6247,33 @@ impl Tab { .spacing(space_xxs) }; - let button = |row| { - let mouse_area = crate::mouse_area::MouseArea::new( - widget::button::custom(row) - .width(Length::Fill) - .id(item.button_id.clone()) - .padding([0, space_xxs]) - .class(button_style( - item.selected, - item.highlighted, - item.cut, - true, - true, - false, - )), - ) - .on_press(move |_| Message::Click(Some(i))) - .on_double_click(move |_| Message::DoubleClick(Some(i))) - .on_release(move |_| Message::ClickRelease(Some(i))) - .on_middle_press(move |_| Message::MiddleClick(i)) - .on_enter(move || Message::HighlightActivate(i)) - .on_exit(move || Message::HighlightDeactivate(i)); + let button = + |row| { + let mouse_area = crate::mouse_area::MouseArea::new( + widget::button::custom(row) + .width(Length::Fill) + .id(item.button_id.clone()) + .padding([0, space_xxs]) + .class(button_style( + item.selected, + item.highlighted, + item.cut, + true, + true, + false, + )), + ) + .on_press(move |_| Message::Click(Some(i))) + .on_double_click(move |_| Message::DoubleClick(Some(i))) + .on_release(move |_| Message::ClickRelease(Some(i))) + .on_middle_press(move |_| Message::MiddleClick(i)) + .on_enter(move || Message::HighlightActivate(i)) + .on_exit(move || Message::HighlightDeactivate(i)); - if self.context_menu.is_some() { - mouse_area - } else { - mouse_area - .on_right_press_no_capture() - .wayland_on_right_press_window_position() - .on_right_press(move |point_opt| { - Message::RightClick(point_opt, Some(i)) - }) - } - }; + mouse_area.on_right_press_no_capture().on_right_press( + move |point_opt| Message::RightClick(point_opt, Some(i)), + ) + }; let button_row = button(row.into()); let button_row: Element<_> = if item.metadata.is_dir() @@ -6378,16 +6401,14 @@ impl Tab { let drag_col = (!drag_items.is_empty()) .then(|| Element::from(widget::column::with_children(drag_items))); - let mut mouse_area = mouse_area::MouseArea::new(column.padding([0, space_s])) + let mouse_area = mouse_area::MouseArea::new(column.padding([0, space_s])) .with_id(Id::new("list-view")) .on_press(|_| Message::Click(None)) .on_auto_scroll(Message::AutoScroll) + .on_drag(move |rect_opt| self.on_drag(rect_opt)) .on_drag_end(|_| Message::DragEnd) .show_drag_rect(self.mode.multiple()) .on_release(|_| Message::ClickRelease(None)); - if self.watch_drag { - mouse_area = mouse_area.on_drag(Message::Drag); - } (drag_col, mouse_area.into(), true) } @@ -6474,51 +6495,47 @@ impl Tab { .on_back_press(move |_point_opt| Message::GoPrevious) .on_forward_press(move |_point_opt| Message::GoNext) .on_scroll(|delta| respond_to_scroll_direction(delta, modifiers)) - .on_right_press(move |p| { - Message::ContextMenu( - if self.context_menu.is_some() { None } else { p }, - self.window_id, - ) - }) - .wayland_on_right_press_window_position(); + .on_right_press(|_| Message::RightClickBackground); - let mut popover = widget::popover(mouse_area); - if let Some(point) = self.context_menu - && (!cfg!(feature = "wayland") || !crate::is_wayland()) - { - let context_menu = menu::context_menu( + let items_area: Element<'_, Message> = if can_scroll { + // FIXME: new responsive widget will remove the state from the scrollable + // id_container with custom id forces the state to be extracted in a diff + // pre-processing step + widget::id_container( + widget::scrollable(mouse_area) + .id(self.scrollable_id.clone()) + .on_scroll(Message::Scroll) + .width(Length::Fill) + .height(Length::Fill), + widget::Id::new(format!("{}-scrollable", self.scrollable_id)), + ) + .into() + } else { + mouse_area.into() + }; + + // Wrap the scrollable, not its content, so the popup anchors in window coordinates + let mut context_menu = widget::context_menu( + items_area, + Some(menu::context_menu( self, key_binds, modifiers, clipboard_paste_available, context_actions, - ); - popover = popover - .popup(context_menu) - .position(widget::popover::Position::Point(point)); + )), + ) + .item_width(cosmic::widget::menu::ItemWidth::Uniform(360)) + .on_surface_action(Message::Surface); + if let Some(window_id) = self.window_id { + context_menu = context_menu.window_id(window_id); } let mut tab_column = widget::column::with_capacity(3); if let Some(location_view) = location_view_opt { tab_column = tab_column.push(location_view); } - if can_scroll { - tab_column = tab_column.push( - // FIXME: new responsive widget will remove the state from the scrollable - // id_container with custom id forces the state to be extracted in a diff - // pre-processing step - widget::id_container( - widget::scrollable(popover) - .id(self.scrollable_id.clone()) - .on_scroll(Message::Scroll) - .width(Length::Fill) - .height(Length::Fill), - widget::Id::new(format!("{}-scrollable", self.scrollable_id)), - ), - ); - } else { - tab_column = tab_column.push(popover); - } + tab_column = tab_column.push(context_menu); match &self.location { Location::Trash | Location::Search(SearchLocation::Trash, ..) => { if let Some(items) = self.items_opt() @@ -6917,6 +6934,74 @@ impl Tab { Rectangle::new(point, size) }; + // Count the children of visible directories in the background. Doing it while + // scanning costs one directory listing per entry, which stalls remote filesystems. + #[cfg(feature = "gvfs")] + for item in items { + let ItemMetadata::GvfsPath { + children_opt: None, + is_dir: true, + .. + } = &item.metadata + else { + continue; + }; + + // Skip items that are not visible, or have no determined rect + match item.rect_opt.get() { + Some(rect) if rect.intersects(&visible_rect) => {} + _ => continue, + } + + let Some(path) = item.path_opt().cloned() else { + continue; + }; + + struct ChildrenWrapper(PathBuf); + impl Hash for ChildrenWrapper { + fn hash(&self, state: &mut H) { + self.0.hash(state); + } + } + + subscriptions.push(Subscription::run_with( + ChildrenWrapper(path), + |ChildrenWrapper(path)| { + let path = path.clone(); + stream::channel( + 1, + move |mut output: futures::channel::mpsc::Sender<_>| async move { + let message = { + let path = path.clone(); + tokio::task::spawn_blocking(move || { + let children = match fs::read_dir(&path) { + Ok(entries) => entries.count(), + Err(err) => { + log::warn!( + "failed to read directory {}: {}", + path.display(), + err + ); + 0 + } + }; + Message::DirectoryChildren(path, children) + }) + .await + .unwrap() + }; + + if let Err(err) = output.send(message).await { + log::warn!("failed to send directory children: {err}"); + } + + std::future::pending().await + }, + ) + }, + )); + } + for item in items { if item.thumbnail_opt.is_some() { // Skip items that already have a mime type and thumbnail @@ -7012,7 +7097,7 @@ impl Tab { let path = path.clone(); // Acquire semaphore permit - _ = THUMB_SEMAPHORE.acquire().await; + let _permit = THUMB_SEMAPHORE.acquire().await.unwrap(); tokio::task::spawn_blocking(move || { let start = Instant::now(); @@ -7316,6 +7401,19 @@ impl Tab { const fn format_time(&self, time: SystemTime) -> FormatTime<'_> { format_time(time, &self.date_time_formatter, &self.time_formatter) } + + fn on_drag<'a>(&self, rect_opt: Option) -> Option { + let rect = rect_opt?; + // We only want to publish a drag message if the overlapped items of the drag rect change, + // otherwise a view rebuild is triggered on every drag event. + let changed = self.items_opt.as_ref().is_some_and(|items| { + items.iter().any(|item| { + let overlaps = item.rect_opt.get().is_some_and(|r| r.intersects(&rect)); + overlaps != item.overlaps_drag_rect + }) + }); + changed.then_some(Message::Drag(Some(rect))) + } } pub fn respond_to_scroll_direction(delta: ScrollDelta, modifiers: &Modifiers) -> Option { diff --git a/src/thumbnailer.rs b/src/thumbnailer.rs index 8e61447..a31af6b 100644 --- a/src/thumbnailer.rs +++ b/src/thumbnailer.rs @@ -175,3 +175,25 @@ pub fn thumbnailer(mime: &Mime) -> Vec { let thumbnailer_cache = THUMBNAILER_CACHE.lock().unwrap(); thumbnailer_cache.get(mime) } + +#[cfg(all(test, feature = "desktop"))] +mod tests { + use super::Thumbnailer; + use std::path::Path; + + #[test] + fn command_expands_thumbnailer_arguments() { + let thumbnailer = Thumbnailer { + exec: "cosmic-files-thumbnailer %o --size %s %i".to_string(), + }; + + let command = thumbnailer + .command(Path::new("input.exe"), Path::new("output.png"), 128) + .expect("valid thumbnailer command"); + assert_eq!(command.get_program(), "cosmic-files-thumbnailer"); + assert_eq!( + command.get_args().collect::>(), + ["output.png", "--size", "128", "input.exe"] + ); + } +} diff --git a/src/trash.rs b/src/trash.rs index c0b3548..1d857f5 100644 --- a/src/trash.rs +++ b/src/trash.rs @@ -2,6 +2,7 @@ use cosmic::widget; use regex::Regex; use std::collections::HashSet; use std::path::{Path, PathBuf}; +use std::sync::LazyLock; use crate::config::IconSizes; use crate::tab::{Item, SearchItem}; @@ -89,11 +90,12 @@ pub fn trash_item_path(item: &trash::TrashItem) -> Option { /// - Read `~/.local/share/Trash/info/folder.trashinfo` to get the original path /// - Compute: `/sub/file.txt` pub fn original_path_for_trash_child(p: &Path) -> Option { - let files = p.ancestors().find(|a| a.ends_with("files"))?; + let files = trash_files_dir(p)?; let root = files.parent()?; let top = p.strip_prefix(files).ok()?.components().next()?; - let info = - std::fs::read_to_string(root.join("info").join(top).with_extension("trashinfo")).ok()?; + let mut trashinfo_name = top.as_os_str().to_os_string(); + trashinfo_name.push(".trashinfo"); + let info = std::fs::read_to_string(root.join("info").join(trashinfo_name)).ok()?; let orig = percent_decode(info.lines().find_map(|l| l.strip_prefix("Path="))?.trim())?; let rel = p.strip_prefix(files.join(top)).ok()?; let mut result = PathBuf::from(&orig); @@ -103,9 +105,29 @@ pub fn original_path_for_trash_child(p: &Path) -> Option { Some(result) } +static TRASH_FOLDERS: LazyLock> = LazyLock::new(|| { + Trash::folders().unwrap_or_else(|e| { + log::warn!("failed to list trash folders: {}", e); + HashSet::new() + }) +}); + +fn is_trash_root(root: &Path) -> bool { + if TRASH_FOLDERS.is_empty() { + root.join("info").is_dir() + } else { + TRASH_FOLDERS.contains(root) + } +} + +fn trash_files_dir(path: &Path) -> Option<&Path> { + path.ancestors() + .find(|a| a.ends_with("files") && a.parent().is_some_and(is_trash_root)) +} + /// Check whether a path is inside any trash `files/` directory. pub fn is_trash_path(path: &Path) -> bool { - path.ancestors().any(|a| a.ends_with("files")) + trash_files_dir(path).is_some() } pub struct Trash;