From 144fba37063b955a550747539deaa859e6087fc8 Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Tue, 30 Sep 2025 13:14:03 -0500 Subject: [PATCH] updating and formatting more --- Cargo.lock | 431 ++++++++++++++++------------- flake.lock | 24 +- flake.nix | 13 +- rustfmt.toml | 2 +- src/core/images.rs | 4 +- src/core/kinds.rs | 2 +- src/core/model.rs | 2 +- src/core/presentations.rs | 4 +- src/core/service_items.rs | 2 +- src/core/slide.rs | 2 +- src/core/songs.rs | 8 +- src/core/videos.rs | 4 +- src/lisp.rs | 2 +- src/main.rs | 122 ++++---- src/ui/image_editor.rs | 10 +- src/ui/library.rs | 34 ++- src/ui/presentation_editor.rs | 10 +- src/ui/presenter.rs | 14 +- src/ui/service.rs | 7 +- src/ui/slide_editor.rs | 2 +- src/ui/song_editor.rs | 8 +- src/ui/text_svg.rs | 6 +- src/ui/video_editor.rs | 10 +- src/ui/widgets/draggable/column.rs | 9 +- src/ui/widgets/draggable/row.rs | 6 +- 25 files changed, 392 insertions(+), 346 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 17cf474..d4d770f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,9 +4,9 @@ version = 4 [[package]] name = "ab_glyph" -version = "0.2.31" +version = "0.2.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e074464580a518d16a7126262fffaaa47af89d4099d4cb403f8ed938ba12ee7d" +checksum = "01c0457472c38ea5bd1c3b5ada5e368271cb550be7a4ca4a0b4634e9913f6cc2" dependencies = [ "ab_glyph_rasterizer", "owned_ttf_parser", @@ -21,12 +21,12 @@ checksum = "366ffbaa4442f4684d91e2cd7c5ea7c4ed8add41959a31447066e279e432b618" [[package]] name = "accesskit" version = "0.16.0" -source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#956955342dadab7e588e21be726817fca39510f3" +source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13-rc#c46afc041b1968a5af0186fa6aba3ea9cf24c8c3" [[package]] name = "accesskit_atspi_common" version = "0.9.0" -source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#956955342dadab7e588e21be726817fca39510f3" +source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13-rc#c46afc041b1968a5af0186fa6aba3ea9cf24c8c3" dependencies = [ "accesskit", "accesskit_consumer", @@ -39,7 +39,7 @@ dependencies = [ [[package]] name = "accesskit_consumer" version = "0.24.0" -source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#956955342dadab7e588e21be726817fca39510f3" +source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13-rc#c46afc041b1968a5af0186fa6aba3ea9cf24c8c3" dependencies = [ "accesskit", "immutable-chunkmap", @@ -48,7 +48,7 @@ dependencies = [ [[package]] name = "accesskit_macos" version = "0.17.0" -source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#956955342dadab7e588e21be726817fca39510f3" +source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13-rc#c46afc041b1968a5af0186fa6aba3ea9cf24c8c3" dependencies = [ "accesskit", "accesskit_consumer", @@ -61,7 +61,7 @@ dependencies = [ [[package]] name = "accesskit_unix" version = "0.12.0" -source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#956955342dadab7e588e21be726817fca39510f3" +source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13-rc#c46afc041b1968a5af0186fa6aba3ea9cf24c8c3" dependencies = [ "accesskit", "accesskit_atspi_common", @@ -76,7 +76,7 @@ dependencies = [ [[package]] name = "accesskit_windows" version = "0.22.0" -source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#956955342dadab7e588e21be726817fca39510f3" +source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13-rc#c46afc041b1968a5af0186fa6aba3ea9cf24c8c3" dependencies = [ "accesskit", "accesskit_consumer", @@ -88,7 +88,7 @@ dependencies = [ [[package]] name = "accesskit_winit" version = "0.22.0" -source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#956955342dadab7e588e21be726817fca39510f3" +source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13-rc#c46afc041b1968a5af0186fa6aba3ea9cf24c8c3" dependencies = [ "accesskit", "accesskit_macos", @@ -100,9 +100,9 @@ dependencies = [ [[package]] name = "addr2line" -version = "0.24.2" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" +checksum = "1b5d307320b3181d6d7954e663bd7c774a838b8220fe0593c86d9fb09f498b4b" dependencies = [ "gimli", ] @@ -237,9 +237,9 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.11" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd" +checksum = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78" [[package]] name = "anstyle-parse" @@ -272,9 +272,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.99" +version = "1.0.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0674a1ddeecb70197781e945de4b3b8ffb61fa939a5597bcf48503737663100" +checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61" [[package]] name = "apply" @@ -465,7 +465,7 @@ dependencies = [ "polling 3.11.0", "rustix 1.1.2", "slab", - "windows-sys 0.61.0", + "windows-sys 0.61.1", ] [[package]] @@ -549,7 +549,7 @@ dependencies = [ "rustix 1.1.2", "signal-hook-registry", "slab", - "windows-sys 0.61.0", + "windows-sys 0.61.1", ] [[package]] @@ -691,9 +691,9 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.75" +version = "0.3.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002" +checksum = "bb531853791a215d7c62a30daf0dde835f381ab5de4589cfe7c649d2cbe92bd6" dependencies = [ "addr2line", "cfg-if", @@ -701,7 +701,7 @@ dependencies = [ "miniz_oxide", "object", "rustc-demangle", - "windows-targets 0.52.6", + "windows-link", ] [[package]] @@ -955,9 +955,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.37" +version = "1.2.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65193589c6404eb80b450d618eaf9a2cafaaafd57ecce47370519ef674a7bd44" +checksum = "e1354349954c6fc9cb0deab020f27f783cf0b604e8bb754dc4658ecf0d29c35f" dependencies = [ "find-msvc-tools", "jobserver", @@ -992,9 +992,9 @@ dependencies = [ [[package]] name = "cfg-expr" -version = "0.20.2" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8d458d63f0f0f482c8da9b7c8b76c21bd885a02056cc94c6404d861ca2b8206" +checksum = "1a2c5f3bf25ec225351aa1c8e230d04d880d3bd89dea133537dafad4ae291e5c" dependencies = [ "smallvec", "target-lexicon 0.13.2", @@ -1029,7 +1029,7 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-link 0.2.0", + "windows-link", ] [[package]] @@ -1045,9 +1045,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.47" +version = "4.5.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eac00902d9d136acd712710d71823fb8ac8004ca445a89e73a41d45aa712931" +checksum = "e2134bb3ea021b78629caa971416385309e0131b351b25e01dc16fb54e1b5fae" dependencies = [ "clap_builder", "clap_derive", @@ -1055,9 +1055,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.47" +version = "4.5.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ad9bbf750e73b5884fb8a211a9424a1906c1e156724260fdae972f31d70e1d6" +checksum = "c2ba64afa3c0a6df7fa517765e31314e983f51dda798ffba27b988194fb65dc9" dependencies = [ "anstream", "anstyle", @@ -1314,7 +1314,7 @@ dependencies = [ [[package]] name = "cosmic-client-toolkit" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-protocols?rev=6254f50#6254f50abc6dbfccadc6939f80e20081ab5f9d51" +source = "git+https://github.com/pop-os/cosmic-protocols?rev=d0e95be#d0e95be25e423cfe523b11111a3666ed7aaf0dc4" dependencies = [ "bitflags 2.9.4", "cosmic-protocols", @@ -1327,7 +1327,7 @@ dependencies = [ [[package]] name = "cosmic-config" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#0e797b244043ee86610113d547950204258dea83" +source = "git+https://github.com/pop-os/libcosmic#4a71189d346e766c46f5bfaeb494a921fe0fccbd" dependencies = [ "atomicwrites", "cosmic-config-derive", @@ -1348,7 +1348,7 @@ dependencies = [ [[package]] name = "cosmic-config-derive" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#0e797b244043ee86610113d547950204258dea83" +source = "git+https://github.com/pop-os/libcosmic#4a71189d346e766c46f5bfaeb494a921fe0fccbd" dependencies = [ "quote", "syn 2.0.106", @@ -1362,7 +1362,7 @@ dependencies = [ "dirs 5.0.1", "ini_core", "memmap2 0.9.8", - "thiserror 2.0.16", + "thiserror 2.0.17", "tracing", "xdg 2.5.2", ] @@ -1370,7 +1370,7 @@ dependencies = [ [[package]] name = "cosmic-protocols" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-protocols?rev=6254f50#6254f50abc6dbfccadc6939f80e20081ab5f9d51" +source = "git+https://github.com/pop-os/cosmic-protocols?rev=d0e95be#d0e95be25e423cfe523b11111a3666ed7aaf0dc4" dependencies = [ "bitflags 2.9.4", "wayland-backend", @@ -1384,7 +1384,7 @@ dependencies = [ [[package]] name = "cosmic-settings-config" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-settings-daemon#ee782f454a09310a28abe73653e6c82d06a79855" +source = "git+https://github.com/pop-os/cosmic-settings-daemon#eac9b17070947d627d2450ee58a77d48377c511e" dependencies = [ "cosmic-config", "ron 0.11.0", @@ -1405,11 +1405,12 @@ dependencies = [ [[package]] name = "cosmic-text" version = "0.14.2" -source = "git+https://github.com/pop-os/cosmic-text.git#355b7febb17ecb0522346fcc5aff6ea78e33e78a" +source = "git+https://github.com/pop-os/cosmic-text.git#e04bfd098f58958b09f0cf5e14a67f87e49dbaec" dependencies = [ "bitflags 2.9.4", "fontdb 0.23.0", "harfrust", + "linebender_resource_handle", "log", "rangemap", "rustc-hash 1.1.0", @@ -1427,7 +1428,7 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#0e797b244043ee86610113d547950204258dea83" +source = "git+https://github.com/pop-os/libcosmic#4a71189d346e766c46f5bfaeb494a921fe0fccbd" dependencies = [ "almost", "cosmic-config", @@ -1437,7 +1438,7 @@ dependencies = [ "ron 0.11.0", "serde", "serde_json", - "thiserror 2.0.16", + "thiserror 2.0.17", ] [[package]] @@ -1606,8 +1607,18 @@ version = "0.20.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee" dependencies = [ - "darling_core", - "darling_macro", + "darling_core 0.20.11", + "darling_macro 0.20.11", +] + +[[package]] +name = "darling" +version = "0.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cdf337090841a411e2a7f3deb9187445851f91b309c0c0a29e05f74a00a48c0" +dependencies = [ + "darling_core 0.21.3", + "darling_macro 0.21.3", ] [[package]] @@ -1624,13 +1635,38 @@ dependencies = [ "syn 2.0.106", ] +[[package]] +name = "darling_core" +version = "0.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1247195ecd7e3c85f83c8d2a366e4210d588e802133e1e355180a9870b517ea4" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn 2.0.106", +] + [[package]] name = "darling_macro" version = "0.20.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead" dependencies = [ - "darling_core", + "darling_core 0.20.11", + "quote", + "syn 2.0.106", +] + +[[package]] +name = "darling_macro" +version = "0.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81" +dependencies = [ + "darling_core 0.21.3", "quote", "syn 2.0.106", ] @@ -1660,12 +1696,12 @@ dependencies = [ [[package]] name = "deranged" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d630bccd429a5bb5a64b5e94f693bfc48c9f8566418fda4c494cc94f911f87cc" +checksum = "a41953f86f8a05768a6cda24def994fd2f424b04ec5c719cf89989779f199071" dependencies = [ "powerfmt", - "serde", + "serde_core", ] [[package]] @@ -1685,7 +1721,7 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae5c625eda104c228c06ecaf988d1c60e542176bd7a490e60eeda3493244c0c9" dependencies = [ - "darling", + "darling 0.20.11", "proc-macro2", "quote", "syn 2.0.106", @@ -1759,7 +1795,7 @@ dependencies = [ "libc", "option-ext", "redox_users 0.5.2", - "windows-sys 0.61.0", + "windows-sys 0.61.1", ] [[package]] @@ -1836,7 +1872,7 @@ checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" [[package]] name = "dpi" version = "0.1.1" -source = "git+https://github.com/pop-os/winit.git?tag=iced-xdg-surface-0.13#dbe91fcc363c101f1d6ed5301d49911b01a26f61" +source = "git+https://github.com/pop-os/winit.git?tag=iced-xdg-surface-0.13-rc#8dfaba290f9a00d3e13be71f1e6f438889cf5546" [[package]] name = "drm" @@ -1979,7 +2015,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.61.0", + "windows-sys 0.61.1", ] [[package]] @@ -2149,9 +2185,9 @@ dependencies = [ [[package]] name = "find-msvc-tools" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fd99930f64d146689264c637b5af2f0233a933bef0d8570e2526bf9e083192d" +checksum = "1ced73b1dacfc750a6db6c0a0c3a3853c8b41997e2e2c563dc90804ae6867959" [[package]] name = "flate2" @@ -2223,7 +2259,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "54f0d287c53ffd184d04d8677f590f4ac5379785529e5e08b1c8083acdd5c198" dependencies = [ "memchr", - "thiserror 2.0.16", + "thiserror 2.0.17", ] [[package]] @@ -2358,16 +2394,16 @@ dependencies = [ [[package]] name = "freedesktop-desktop-entry" -version = "0.7.14" +version = "0.7.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de88bb3b555a4b38372082c5ede431e1e0e14f32be1d02998c6366eb4d2682ed" +checksum = "6cad6ec36904c816446700d81a2a2b7968aa9f678c24821974fa9bd53b315228" dependencies = [ "gettext-rs", "log", "memchr", - "thiserror 2.0.16", + "thiserror 2.0.17", "unicase", - "xdg 2.5.2", + "xdg 3.0.0", ] [[package]] @@ -2594,9 +2630,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.31.1" +version = "0.32.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" +checksum = "e629b9b98ef3dd8afe6ca2bd0f89306cec16d43d907889945bc5d6687f2f13c7" [[package]] name = "gio-sys" @@ -2790,7 +2826,7 @@ dependencies = [ "paste", "pin-project-lite", "smallvec", - "thiserror 2.0.16", + "thiserror 2.0.17", ] [[package]] @@ -2890,7 +2926,7 @@ dependencies = [ "gstreamer-pbutils-sys", "gstreamer-video", "libc", - "thiserror 2.0.16", + "thiserror 2.0.17", ] [[package]] @@ -2934,7 +2970,7 @@ dependencies = [ "gstreamer-video-sys", "libc", "once_cell", - "thiserror 2.0.16", + "thiserror 2.0.17", ] [[package]] @@ -3001,6 +3037,12 @@ dependencies = [ "foldhash", ] +[[package]] +name = "hashbrown" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d" + [[package]] name = "hashlink" version = "0.10.0" @@ -3176,7 +3218,7 @@ dependencies = [ "js-sys", "log", "wasm-bindgen", - "windows-core 0.62.0", + "windows-core 0.62.1", ] [[package]] @@ -3191,7 +3233,7 @@ dependencies = [ [[package]] name = "iced" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#0e797b244043ee86610113d547950204258dea83" +source = "git+https://github.com/pop-os/libcosmic#4a71189d346e766c46f5bfaeb494a921fe0fccbd" dependencies = [ "dnd", "iced_accessibility", @@ -3209,7 +3251,7 @@ dependencies = [ [[package]] name = "iced_accessibility" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#0e797b244043ee86610113d547950204258dea83" +source = "git+https://github.com/pop-os/libcosmic#4a71189d346e766c46f5bfaeb494a921fe0fccbd" dependencies = [ "accesskit", "accesskit_winit", @@ -3218,7 +3260,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#0e797b244043ee86610113d547950204258dea83" +source = "git+https://github.com/pop-os/libcosmic#4a71189d346e766c46f5bfaeb494a921fe0fccbd" dependencies = [ "bitflags 2.9.4", "bytes", @@ -3243,7 +3285,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#0e797b244043ee86610113d547950204258dea83" +source = "git+https://github.com/pop-os/libcosmic#4a71189d346e766c46f5bfaeb494a921fe0fccbd" dependencies = [ "futures", "iced_core", @@ -3269,7 +3311,7 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#0e797b244043ee86610113d547950204258dea83" +source = "git+https://github.com/pop-os/libcosmic#4a71189d346e766c46f5bfaeb494a921fe0fccbd" dependencies = [ "bitflags 2.9.4", "bytemuck", @@ -3291,7 +3333,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#0e797b244043ee86610113d547950204258dea83" +source = "git+https://github.com/pop-os/libcosmic#4a71189d346e766c46f5bfaeb494a921fe0fccbd" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -3303,7 +3345,7 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#0e797b244043ee86610113d547950204258dea83" +source = "git+https://github.com/pop-os/libcosmic#4a71189d346e766c46f5bfaeb494a921fe0fccbd" dependencies = [ "bytes", "cosmic-client-toolkit", @@ -3319,7 +3361,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#0e797b244043ee86610113d547950204258dea83" +source = "git+https://github.com/pop-os/libcosmic#4a71189d346e766c46f5bfaeb494a921fe0fccbd" dependencies = [ "bytemuck", "cosmic-text", @@ -3352,7 +3394,7 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#0e797b244043ee86610113d547950204258dea83" +source = "git+https://github.com/pop-os/libcosmic#4a71189d346e766c46f5bfaeb494a921fe0fccbd" dependencies = [ "as-raw-xcb-connection", "bitflags 2.9.4", @@ -3383,7 +3425,7 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#0e797b244043ee86610113d547950204258dea83" +source = "git+https://github.com/pop-os/libcosmic#4a71189d346e766c46f5bfaeb494a921fe0fccbd" dependencies = [ "cosmic-client-toolkit", "dnd", @@ -3403,7 +3445,7 @@ dependencies = [ [[package]] name = "iced_winit" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#0e797b244043ee86610113d547950204258dea83" +source = "git+https://github.com/pop-os/libcosmic#4a71189d346e766c46f5bfaeb494a921fe0fccbd" dependencies = [ "cosmic-client-toolkit", "dnd", @@ -3591,9 +3633,9 @@ checksum = "edcd27d72f2f071c64249075f42e205ff93c9a4c5f6c6da53e79ed9f9832c285" [[package]] name = "imgref" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0263a3d970d5c054ed9312c0057b4f3bde9c0b33836d3637361d4a9e6e7a408" +checksum = "e7c5cedc30da3a610cac6b4ba17597bdf7152cf974e8aab3afb3d54455e371c8" [[package]] name = "immutable-chunkmap" @@ -3617,12 +3659,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.11.3" +version = "2.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92119844f513ffa41556430369ab02c295a3578af21cf945caa3e9e0c2481ac3" +checksum = "4b0f83760fb341a774ed326568e19f5a863af4a952def8c39f9ab92fd95b88e5" dependencies = [ "equivalent", - "hashbrown 0.15.5", + "hashbrown 0.16.0", "serde", "serde_core", ] @@ -3802,9 +3844,9 @@ checksum = "00810f1d8b74be64b13dbf3db89ac67740615d6c891f0e7b6179326533011a07" [[package]] name = "js-sys" -version = "0.3.79" +version = "0.3.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6247da8b8658ad4e73a186e747fcc5fc2a29f979d6fe6269127fdb5fd08298d0" +checksum = "ec48937a97411dcb524a265206ccd4c90bb711fca92b2792c407f268825b9305" dependencies = [ "once_cell", "wasm-bindgen", @@ -3903,14 +3945,14 @@ checksum = "7a79a3332a6609480d7d0c9eab957bca6b455b91bb84e66d19f5ff66294b85b8" [[package]] name = "libc" -version = "0.2.175" +version = "0.2.176" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a82ae493e598baaea5209805c49bbf2ea7de956d50d7da0da1164f9c6d28543" +checksum = "58f929b4d672ea937a23a1ab494143d968337a5f47e56d0815df1e0890ddf174" [[package]] name = "libcosmic" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#0e797b244043ee86610113d547950204258dea83" +source = "git+https://github.com/pop-os/libcosmic#4a71189d346e766c46f5bfaeb494a921fe0fccbd" dependencies = [ "apply", "ashpd 0.12.0", @@ -3950,7 +3992,7 @@ dependencies = [ "shlex", "slotmap", "taffy", - "thiserror 2.0.16", + "thiserror 2.0.17", "tokio", "tracing", "unicode-segmentation", @@ -3970,12 +4012,12 @@ dependencies = [ [[package]] name = "libloading" -version = "0.8.8" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07033963ba89ebaf1584d767badaa2e8fcec21aedea6b8c0346d487d49c28667" +checksum = "d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55" dependencies = [ "cfg-if", - "windows-targets 0.53.3", + "windows-link", ] [[package]] @@ -4006,6 +4048,12 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "linebender_resource_handle" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4a5ff6bcca6c4867b1c4fd4ef63e4db7436ef363e0ad7531d1558856bae64f4" + [[package]] name = "linux-raw-sys" version = "0.3.8" @@ -4141,9 +4189,9 @@ dependencies = [ [[package]] name = "lyon_geom" -version = "1.0.16" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce9333c02ea4517fd31207f126124352ad59975218c114c55dbb8f9d56fd4b45" +checksum = "4e16770d760c7848b0c1c2d209101e408207a65168109509f8483837a36cf2e7" dependencies = [ "arrayvec", "euclid", @@ -4220,9 +4268,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.5" +version = "2.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0" +checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273" [[package]] name = "memmap2" @@ -4406,7 +4454,7 @@ dependencies = [ "cfg_aliases 0.1.1", "codespan-reporting", "hexf-parse", - "indexmap 2.11.3", + "indexmap 2.11.4", "log", "rustc-hash 1.1.0", "spirv", @@ -4995,9 +5043,9 @@ dependencies = [ [[package]] name = "object" -version = "0.36.7" +version = "0.37.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87" +checksum = "ff76201f031d8863c38aa7f905eca4f53abbfa15f609db4277d44cd8938f33fe" dependencies = [ "memchr", ] @@ -5083,9 +5131,9 @@ dependencies = [ [[package]] name = "owo-colors" -version = "4.2.2" +version = "4.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48dd4f4a2c8405440fd0462561f0e5806bd0f77e86f51c761481bdd4018b545e" +checksum = "9c6901729fa79e91a0913333229e9ca5dc725089d1c363b2f4b4760709dc4a52" [[package]] name = "palette" @@ -5377,7 +5425,7 @@ dependencies = [ "hermit-abi 0.5.2", "pin-project-lite", "rustix 1.1.2", - "windows-sys 0.61.0", + "windows-sys 0.61.1", ] [[package]] @@ -5442,7 +5490,7 @@ version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "219cb19e96be00ab2e37d6e299658a0cfa83e52429179969b0f0121b4ac46983" dependencies = [ - "toml_edit 0.23.5", + "toml_edit 0.23.6", ] [[package]] @@ -5510,9 +5558,9 @@ dependencies = [ [[package]] name = "pxfm" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f55f4fedc84ed39cb7a489322318976425e42a147e2be79d8f878e2884f94e84" +checksum = "83f9b339b02259ada5c0f4a389b7fb472f933aa17ce176fd2ad98f28bb401fde" dependencies = [ "num-traits", ] @@ -5543,9 +5591,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.40" +version = "1.0.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" +checksum = "ce25767e7b499d1b604768e7cde645d14cc8584231ea6b295e9c9eb22c02e1d1" dependencies = [ "proc-macro2", ] @@ -5786,23 +5834,23 @@ checksum = "a4e608c6638b9c18977b00b475ac1f28d14e84b27d8d42f70e0bf1e3dec127ac" dependencies = [ "getrandom 0.2.16", "libredox", - "thiserror 2.0.16", + "thiserror 2.0.17", ] [[package]] name = "ref-cast" -version = "1.0.24" +version = "1.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a0ae411dbe946a674d89546582cea4ba2bb8defac896622d6496f14c23ba5cf" +checksum = "f354300ae66f76f1c85c5f84693f0ce81d747e2c3f21a45fef496d89c960bf7d" dependencies = [ "ref-cast-impl", ] [[package]] name = "ref-cast-impl" -version = "1.0.24" +version = "1.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1165225c21bff1f3bbce98f5a1f889949bc902d3575308cc7b0de30b4f6d27c7" +checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da" dependencies = [ "proc-macro2", "quote", @@ -5811,9 +5859,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.11.2" +version = "1.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d7fd106d8c02486a8d64e778353d1cffe08ce79ac2e82f540c86d0facf6912" +checksum = "8b5288124840bee7b386bc413c487869b360b2b4ec421ea56425128692f2a82c" dependencies = [ "aho-corasick", "memchr", @@ -5823,9 +5871,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b9458fa0bfeeac22b5ca447c63aaf45f28439a709ccd244698632f9aa6394d6" +checksum = "833eb9ce86d40ef33cb1306d8accf7bc8ec2bfea4355cbdebb3df68b40925cad" dependencies = [ "aho-corasick", "memchr", @@ -6072,7 +6120,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys 0.11.0", - "windows-sys 0.61.0", + "windows-sys 0.61.1", ] [[package]] @@ -6215,9 +6263,9 @@ checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2" [[package]] name = "serde" -version = "1.0.225" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd6c24dee235d0da097043389623fb913daddf92c76e9f5a1db88607a0bcbd1d" +checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" dependencies = [ "serde_core", "serde_derive", @@ -6225,18 +6273,18 @@ dependencies = [ [[package]] name = "serde_core" -version = "1.0.225" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "659356f9a0cb1e529b24c01e43ad2bdf520ec4ceaf83047b83ddcc2251f96383" +checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.225" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ea936adf78b1f766949a4977b91d2f5595825bd6ec079aa9543ad2685fc4516" +checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", @@ -6249,7 +6297,7 @@ version = "1.0.145" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c" dependencies = [ - "indexmap 2.11.3", + "indexmap 2.11.4", "itoa", "memchr", "ryu", @@ -6291,15 +6339,15 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.14.0" +version = "3.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2c45cd61fefa9db6f254525d46e392b852e0e61d9a1fd36e5bd183450a556d5" +checksum = "c522100790450cf78eeac1507263d0a350d4d5b30df0c8e1fe051a10c22b376e" dependencies = [ "base64 0.22.1", "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.11.3", + "indexmap 2.11.4", "schemars 0.9.0", "schemars 1.0.4", "serde", @@ -6311,11 +6359,11 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.14.0" +version = "3.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de90945e6565ce0d9a25098082ed4ee4002e047cb59892c318d66821e14bb30f" +checksum = "327ada00f7d64abaac1e55a6911e90cf665aa051b9a561c7006c157f4633135e" dependencies = [ - "darling", + "darling 0.21.3", "proc-macro2", "quote", "syn 2.0.106", @@ -6492,7 +6540,7 @@ dependencies = [ "memmap2 0.9.8", "pkg-config", "rustix 1.1.2", - "thiserror 2.0.16", + "thiserror 2.0.17", "wayland-backend", "wayland-client", "wayland-csd-frame", @@ -6635,7 +6683,7 @@ dependencies = [ "futures-util", "hashbrown 0.15.5", "hashlink", - "indexmap 2.11.3", + "indexmap 2.11.4", "log", "memchr", "once_cell", @@ -6644,7 +6692,7 @@ dependencies = [ "serde_json", "sha2", "smallvec", - "thiserror 2.0.16", + "thiserror 2.0.17", "tokio", "tokio-stream", "tracing", @@ -6726,7 +6774,7 @@ dependencies = [ "smallvec", "sqlx-core", "stringprep", - "thiserror 2.0.16", + "thiserror 2.0.17", "tracing", "whoami", ] @@ -6763,7 +6811,7 @@ dependencies = [ "smallvec", "sqlx-core", "stringprep", - "thiserror 2.0.16", + "thiserror 2.0.17", "tracing", "whoami", ] @@ -6787,7 +6835,7 @@ dependencies = [ "serde", "serde_urlencoded", "sqlx-core", - "thiserror 2.0.16", + "thiserror 2.0.17", "tracing", "url", ] @@ -7159,7 +7207,7 @@ version = "7.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e4be53aa0cba896d2dc615bd42bbc130acdcffa239e0a2d965ea5b3b2a86ffdb" dependencies = [ - "cfg-expr 0.20.2", + "cfg-expr 0.20.3", "heck 0.5.0", "pkg-config", "toml 0.8.23", @@ -7197,15 +7245,15 @@ checksum = "83176759e9416cf81ee66cb6508dbfe9c96f20b8b56265a39917551c23c70964" [[package]] name = "tempfile" -version = "3.22.0" +version = "3.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84fa4d11fadde498443cca10fd3ac23c951f0dc59e080e9f4b93d4df4e4eea53" +checksum = "2d31c77bdf42a745371d260a26ca7163f1e0924b64afa0b688e61b5a9fa02f16" dependencies = [ "fastrand 2.3.0", "getrandom 0.3.3", "once_cell", "rustix 1.1.2", - "windows-sys 0.61.0", + "windows-sys 0.61.1", ] [[package]] @@ -7248,11 +7296,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.16" +version = "2.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3467d614147380f2e4e374161426ff399c91084acd2363eaf549172b3d5e60c0" +checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8" dependencies = [ - "thiserror-impl 2.0.16", + "thiserror-impl 2.0.17", ] [[package]] @@ -7268,9 +7316,9 @@ dependencies = [ [[package]] name = "thiserror-impl" -version = "2.0.16" +version = "2.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c5e1be1c48b9172ee610da68fd9cd2770e7a4056cb3fc98710ee6906f0c7960" +checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913" dependencies = [ "proc-macro2", "quote", @@ -7302,11 +7350,12 @@ dependencies = [ [[package]] name = "time" -version = "0.3.43" +version = "0.3.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83bde6f1ec10e72d583d91623c939f623002284ef622b87de38cfd546cbf2031" +checksum = "91e7d9e3bb61134e77bde20dd4825b97c010155709965fedf0f49bb138e52a9d" dependencies = [ "deranged", + "itoa", "libc", "num-conv", "num_threads", @@ -7470,9 +7519,9 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a197c0ec7d131bfc6f7e82c8442ba1595aeab35da7adbf05b6b73cd06a16b6be" +checksum = "32f1085dec27c2b6632b04c80b3bb1b4300d6495d1e129693bdda7d91e72eec1" dependencies = [ "serde_core", ] @@ -7483,7 +7532,7 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.11.3", + "indexmap 2.11.4", "toml_datetime 0.6.11", "winnow 0.5.40", ] @@ -7494,7 +7543,7 @@ version = "0.22.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a" dependencies = [ - "indexmap 2.11.3", + "indexmap 2.11.4", "serde", "serde_spanned", "toml_datetime 0.6.11", @@ -7503,21 +7552,21 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.23.5" +version = "0.23.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2ad0b7ae9cfeef5605163839cb9221f453399f15cfb5c10be9885fcf56611f9" +checksum = "f3effe7c0e86fdff4f69cdd2ccc1b96f933e24811c5441d44904e8683e27184b" dependencies = [ - "indexmap 2.11.3", - "toml_datetime 0.7.1", + "indexmap 2.11.4", + "toml_datetime 0.7.2", "toml_parser", "winnow 0.7.13", ] [[package]] name = "toml_parser" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b551886f449aa90d4fe2bdaa9f4a2577ad2dde302c61ecf262d80b116db95c10" +checksum = "4cf893c33be71572e0e9aa6dd15e6677937abd686b066eac3f8cd3531688a627" dependencies = [ "winnow 0.7.13", ] @@ -7918,9 +7967,9 @@ checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" [[package]] name = "wasm-bindgen" -version = "0.2.102" +version = "0.2.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ad224d2776649cfb4f4471124f8176e54c1cca67a88108e30a0cd98b90e7ad3" +checksum = "c1da10c01ae9f1ae40cbfac0bac3b1e724b320abfcf52229f80b547c0d250e2d" dependencies = [ "cfg-if", "once_cell", @@ -7931,9 +7980,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.102" +version = "0.2.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a1364104bdcd3c03f22b16a3b1c9620891469f5e9f09bc38b2db121e593e732" +checksum = "671c9a5a66f49d8a47345ab942e2cb93c7d1d0339065d4f8139c486121b43b19" dependencies = [ "bumpalo", "log", @@ -7945,9 +7994,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.52" +version = "0.4.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c0a08ecf5d99d5604a6666a70b3cde6ab7cc6142f5e641a8ef48fc744ce8854" +checksum = "7e038d41e478cc73bae0ff9b36c60cff1c98b8f38f8d7e8061e79ee63608ac5c" dependencies = [ "cfg-if", "js-sys", @@ -7958,9 +8007,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.102" +version = "0.2.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d7ab4ca3e367bb1ed84ddbd83cc6e41e115f8337ed047239578210214e36c76" +checksum = "7ca60477e4c59f5f2986c50191cd972e3a50d8a95603bc9434501cf156a9a119" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -7968,9 +8017,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.102" +version = "0.2.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a518014843a19e2dbbd0ed5dfb6b99b23fb886b14e6192a00803a3e14c552b0" +checksum = "9f07d2f20d4da7b26400c9f4a0511e6e0345b040694e8a75bd41d578fa4421d7" dependencies = [ "proc-macro2", "quote", @@ -7981,9 +8030,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.102" +version = "0.2.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "255eb0aa4cc2eea3662a00c2bbd66e93911b7361d5e0fcd62385acfd7e15dcee" +checksum = "bad67dc8b2a1a6e5448428adec4c3e84c43e561d8c9ee8a9e5aabeb193ec41d1" dependencies = [ "unicode-ident", ] @@ -8155,9 +8204,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.79" +version = "0.3.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50462a022f46851b81d5441d1a6f5bac0b21a1d72d64bd4906fbdd4bf7230ec7" +checksum = "9367c417a924a74cae129e6a2ae3b47fabb1f8995595ab474029da749a8be120" dependencies = [ "js-sys", "wasm-bindgen", @@ -8215,7 +8264,7 @@ dependencies = [ "bitflags 2.9.4", "cfg_aliases 0.1.1", "document-features", - "indexmap 2.11.3", + "indexmap 2.11.4", "log", "naga", "once_cell", @@ -8323,7 +8372,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.61.0", + "windows-sys 0.61.1", ] [[package]] @@ -8390,13 +8439,13 @@ dependencies = [ [[package]] name = "windows-core" -version = "0.62.0" +version = "0.62.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57fe7168f7de578d2d8a05b07fd61870d2e73b4020e9f49aa00da8471723497c" +checksum = "6844ee5416b285084d3d3fffd743b925a6c9385455f64f6d4fa3031c4c2749a9" dependencies = [ - "windows-implement 0.60.0", - "windows-interface 0.59.1", - "windows-link 0.2.0", + "windows-implement 0.60.1", + "windows-interface 0.59.2", + "windows-link", "windows-result 0.4.0", "windows-strings", ] @@ -8414,9 +8463,9 @@ dependencies = [ [[package]] name = "windows-implement" -version = "0.60.0" +version = "0.60.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836" +checksum = "edb307e42a74fb6de9bf3a02d9712678b22399c87e6fa869d6dfcd8c1b7754e0" dependencies = [ "proc-macro2", "quote", @@ -8436,21 +8485,15 @@ dependencies = [ [[package]] name = "windows-interface" -version = "0.59.1" +version = "0.59.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8" +checksum = "c0abd1ddbc6964ac14db11c7213d6532ef34bd9aa042c2e5935f59d7908b46a5" dependencies = [ "proc-macro2", "quote", "syn 2.0.106", ] -[[package]] -name = "windows-link" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a" - [[package]] name = "windows-link" version = "0.2.0" @@ -8472,7 +8515,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7084dcc306f89883455a206237404d3eaf961e5bd7e0f312f7c91f57eb44167f" dependencies = [ - "windows-link 0.2.0", + "windows-link", ] [[package]] @@ -8481,7 +8524,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7218c655a553b0bed4426cf54b20d7ba363ef543b52d515b3e48d7fd55318dda" dependencies = [ - "windows-link 0.2.0", + "windows-link", ] [[package]] @@ -8526,16 +8569,16 @@ version = "0.60.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" dependencies = [ - "windows-targets 0.53.3", + "windows-targets 0.53.4", ] [[package]] name = "windows-sys" -version = "0.61.0" +version = "0.61.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e201184e40b2ede64bc2ea34968b28e33622acdbbf37104f0e4a33f7abe657aa" +checksum = "6f109e41dd4a3c848907eb83d5a42ea98b3769495597450cf6d153507b166f0f" dependencies = [ - "windows-link 0.2.0", + "windows-link", ] [[package]] @@ -8586,11 +8629,11 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.53.3" +version = "0.53.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5fe6031c4041849d7c496a8ded650796e7b6ecc19df1a431c1a363342e5dc91" +checksum = "2d42b7b7f66d2a06854650af09cfdf8713e427a439c97ad65a6375318033ac4b" dependencies = [ - "windows-link 0.1.3", + "windows-link", "windows_aarch64_gnullvm 0.53.0", "windows_aarch64_msvc 0.53.0", "windows_i686_gnu 0.53.0", @@ -8784,7 +8827,7 @@ checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486" [[package]] name = "winit" version = "0.30.5" -source = "git+https://github.com/pop-os/winit.git?tag=iced-xdg-surface-0.13#dbe91fcc363c101f1d6ed5301d49911b01a26f61" +source = "git+https://github.com/pop-os/winit.git?tag=iced-xdg-surface-0.13-rc#8dfaba290f9a00d3e13be71f1e6f438889cf5546" dependencies = [ "ahash", "android-activity", @@ -9217,9 +9260,9 @@ dependencies = [ [[package]] name = "zeroize" -version = "1.8.1" +version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" +checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0" [[package]] name = "zerotrie" diff --git a/flake.lock b/flake.lock index 4780b18..d60478a 100644 --- a/flake.lock +++ b/flake.lock @@ -6,11 +6,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1758177713, - "narHash": "sha256-4Mesi0sOxCzrwnFHeAhL/vv1K1Wcwsl4D9duQ7ndYS8=", + "lastModified": 1759214609, + "narHash": "sha256-+V3SeMjAMd9j9JTECk9oc0gWhtsk79rFEbYf/tHjywo=", "owner": "nix-community", "repo": "fenix", - "rev": "60316bdc00603b483992560baa14841e42e58a7b", + "rev": "f93a2d7225bc7a93d3379acff8fe722e21d97852", "type": "github" }, "original": { @@ -80,11 +80,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1758035966, - "narHash": "sha256-qqIJ3yxPiB0ZQTT9//nFGQYn8X/PBoJbofA7hRKZnmE=", + "lastModified": 1759036355, + "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8d4ddb19d03c65a36ad8d189d001dc32ffb0306b", + "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127", "type": "github" }, "original": { @@ -112,11 +112,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1758035966, - "narHash": "sha256-qqIJ3yxPiB0ZQTT9//nFGQYn8X/PBoJbofA7hRKZnmE=", + "lastModified": 1759036355, + "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8d4ddb19d03c65a36ad8d189d001dc32ffb0306b", + "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127", "type": "github" }, "original": { @@ -137,11 +137,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1757362324, - "narHash": "sha256-/PAhxheUq4WBrW5i/JHzcCqK5fGWwLKdH6/Lu1tyS18=", + "lastModified": 1759134797, + "narHash": "sha256-YPi+jL3tx/yC5J5l7/OB7Lnlr9BMTzYnZtm7tRJzUNg=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "9edc9cbe5d8e832b5864e09854fa94861697d2fd", + "rev": "062ac7a5451e8e92a32e22a60d86882d6a034f3f", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index ce67021..ebcd5e0 100644 --- a/flake.nix +++ b/flake.nix @@ -67,8 +67,6 @@ gst_all_1.gst-plugins-rs gst_all_1.gst-vaapi gst_all_1.gstreamer - # podofo - # mpv ffmpeg-full mupdf # yt-dlp @@ -90,6 +88,17 @@ LD_LIBRARY_PATH = "$LD_LIBRARY_PATH:${ with pkgs; pkgs.lib.makeLibraryPath [ + pkgs.alsa-lib + pkgs.gst_all_1.gst-libav + pkgs.gst_all_1.gstreamer + pkgs.gst_all_1.gst-plugins-bad + pkgs.gst_all_1.gst-plugins-good + pkgs.gst_all_1.gst-plugins-ugly + pkgs.gst_all_1.gst-plugins-base + pkgs.gst_all_1.gst-plugins-rs + pkgs.gst_all_1.gst-vaapi + pkgs.glib + pkgs.fontconfig pkgs.vulkan-loader pkgs.wayland pkgs.wayland-protocols diff --git a/rustfmt.toml b/rustfmt.toml index 0f2a39c..e4e04d0 100644 --- a/rustfmt.toml +++ b/rustfmt.toml @@ -1,3 +1,3 @@ max_width = 70 -# style_edition = "2018" +# style_edition = "2024" # version = "Two" \ No newline at end of file diff --git a/src/core/images.rs b/src/core/images.rs index fda63f4..cd9b2e7 100644 --- a/src/core/images.rs +++ b/src/core/images.rs @@ -10,8 +10,8 @@ use crisp::types::{Keyword, Symbol, Value}; use miette::{IntoDiagnostic, Result}; use serde::{Deserialize, Serialize}; use sqlx::{ - pool::PoolConnection, query, query_as, Sqlite, SqliteConnection, - SqlitePool, + Sqlite, SqliteConnection, SqlitePool, pool::PoolConnection, + query, query_as, }; use std::path::{Path, PathBuf}; use tracing::{debug, error}; diff --git a/src/core/kinds.rs b/src/core/kinds.rs index 16c793f..6199fcb 100644 --- a/src/core/kinds.rs +++ b/src/core/kinds.rs @@ -3,8 +3,8 @@ use std::{error::Error, fmt::Display}; use serde::{Deserialize, Serialize}; use crate::{ - core::{content::Content, service_items::ServiceItem}, Slide, + core::{content::Content, service_items::ServiceItem}, }; use super::{ diff --git a/src/core/model.rs b/src/core/model.rs index 53f6162..62c6d84 100644 --- a/src/core/model.rs +++ b/src/core/model.rs @@ -1,7 +1,7 @@ use std::{borrow::Cow, mem::replace}; use cosmic::iced::clipboard::mime::{AllowedMimeTypes, AsMimeTypes}; -use miette::{miette, IntoDiagnostic, Result}; +use miette::{IntoDiagnostic, Result, miette}; use serde::{Deserialize, Serialize}; use sqlx::{Connection, SqliteConnection}; use tracing::debug; diff --git a/src/core/presentations.rs b/src/core/presentations.rs index a1d8b2a..3572edc 100644 --- a/src/core/presentations.rs +++ b/src/core/presentations.rs @@ -4,8 +4,8 @@ use miette::{IntoDiagnostic, Result}; use mupdf::{Colorspace, Document, Matrix}; use serde::{Deserialize, Serialize}; use sqlx::{ - pool::PoolConnection, prelude::FromRow, query, sqlite::SqliteRow, - Row, Sqlite, SqliteConnection, SqlitePool, + Row, Sqlite, SqliteConnection, SqlitePool, pool::PoolConnection, + prelude::FromRow, query, sqlite::SqliteRow, }; use std::path::{Path, PathBuf}; use tracing::{debug, error}; diff --git a/src/core/service_items.rs b/src/core/service_items.rs index 3912fa0..5b4aed7 100644 --- a/src/core/service_items.rs +++ b/src/core/service_items.rs @@ -12,7 +12,7 @@ use crate::Slide; use super::images::Image; use super::presentations::Presentation; -use super::songs::{lisp_to_song, Song}; +use super::songs::{Song, lisp_to_song}; use super::videos::Video; use super::kinds::ServiceItemKind; diff --git a/src/core/slide.rs b/src/core/slide.rs index 30bf847..70e60c1 100644 --- a/src/core/slide.rs +++ b/src/core/slide.rs @@ -2,7 +2,7 @@ use cosmic::widget::image::Handle; // use cosmic::dialog::ashpd::url::Url; use crisp::types::{Keyword, Symbol, Value}; use iced_video_player::Video; -use miette::{miette, Result}; +use miette::{Result, miette}; use serde::{Deserialize, Serialize}; use std::{ fmt::Display, diff --git a/src/core/songs.rs b/src/core/songs.rs index feb9d65..2be3a66 100644 --- a/src/core/songs.rs +++ b/src/core/songs.rs @@ -1,15 +1,15 @@ use std::{collections::HashMap, option::Option, path::PathBuf}; use crisp::types::{Keyword, Symbol, Value}; -use miette::{miette, IntoDiagnostic, Result}; +use miette::{IntoDiagnostic, Result, miette}; use serde::{Deserialize, Serialize}; use sqlx::{ - pool::PoolConnection, query, sqlite::SqliteRow, Acquire, FromRow, - Row, Sqlite, SqliteConnection, SqlitePool, + Acquire, FromRow, Row, Sqlite, SqliteConnection, SqlitePool, + pool::PoolConnection, query, sqlite::SqliteRow, }; use tracing::error; -use crate::{core::slide, Slide, SlideBuilder}; +use crate::{Slide, SlideBuilder, core::slide}; use super::{ content::Content, diff --git a/src/core/videos.rs b/src/core/videos.rs index dc97db6..c881572 100644 --- a/src/core/videos.rs +++ b/src/core/videos.rs @@ -11,8 +11,8 @@ use crisp::types::{Keyword, Symbol, Value}; use miette::{IntoDiagnostic, Result}; use serde::{Deserialize, Serialize}; use sqlx::{ - pool::PoolConnection, query, query_as, Sqlite, SqliteConnection, - SqlitePool, + Sqlite, SqliteConnection, SqlitePool, pool::PoolConnection, + query, query_as, }; use std::path::{Path, PathBuf}; use tracing::{debug, error}; diff --git a/src/lisp.rs b/src/lisp.rs index 2f803e4..c2f4c8f 100644 --- a/src/lisp.rs +++ b/src/lisp.rs @@ -40,11 +40,11 @@ mod test { use std::{fs::read_to_string, path::PathBuf}; use crate::{ + Background, TextAlignment, core::{ images::Image, kinds::ServiceItemKind, service_items::ServiceTrait, songs::Song, videos::Video, }, - Background, TextAlignment, }; use super::*; diff --git a/src/main.rs b/src/main.rs index 6c6b376..2c752a9 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,4 +1,4 @@ -use clap::{command, Parser}; +use clap::{Parser, command}; use core::service_items::ServiceItem; use core::slide::{ Background, BackgroundKind, Slide, SlideBuilder, TextAlignment, @@ -9,8 +9,8 @@ use cosmic::iced::alignment::Vertical; use cosmic::iced::keyboard::{Key, Modifiers}; use cosmic::iced::window::{Mode, Position}; use cosmic::iced::{ - self, event, window, Background as IcedBackground, Border, Color, - Length, + self, Background as IcedBackground, Border, Color, Length, event, + window, }; use cosmic::iced_core::text::Wrapping; use cosmic::iced_futures::Subscription; @@ -22,18 +22,18 @@ use cosmic::widget::menu::key_bind::Modifier; use cosmic::widget::menu::{ItemWidth, KeyBind}; use cosmic::widget::nav_bar::nav_bar_style; use cosmic::widget::tooltip::Position as TPosition; +use cosmic::widget::{Container, menu}; use cosmic::widget::{ - button, context_menu, horizontal_space, mouse_area, nav_bar, - nav_bar_toggle, responsive, scrollable, search_input, tooltip, - vertical_space, Space, + Space, button, context_menu, horizontal_space, mouse_area, + nav_bar, nav_bar_toggle, responsive, scrollable, search_input, + tooltip, }; use cosmic::widget::{container, text}; use cosmic::widget::{icon, slider}; -use cosmic::widget::{menu, Container}; -use cosmic::{executor, Application, ApplicationExt, Element}; +use cosmic::{Application, ApplicationExt, Element, executor}; use crisp::types::Value; use lisp::parse_lisp; -use miette::{miette, Result}; +use miette::{Result, miette}; use rayon::prelude::*; use resvg::usvg::fontdb; use std::collections::HashMap; @@ -43,10 +43,10 @@ use std::sync::Arc; use tracing::{debug, level_filters::LevelFilter}; use tracing::{error, warn}; use tracing_subscriber::EnvFilter; +use ui::EditorMode; use ui::library::{self, Library}; use ui::presenter::{self, Presenter}; use ui::song_editor::{self, SongEditor}; -use ui::EditorMode; use crate::core::content::Content; use crate::core::kinds::ServiceItemKind; @@ -597,9 +597,11 @@ impl cosmic::Application for App { } fn subscription(&self) -> Subscription { - event::listen_with(|event, _, id| { + event::listen_with(|event, status, id| { // debug!(?event); - match event { + match status { + event::Status::Ignored => { + match event { iced::Event::Keyboard(event) => match event { iced::keyboard::Event::KeyReleased { key, @@ -639,8 +641,8 @@ impl cosmic::Application for App { } iced::Event::Touch(_touch) => None, iced::Event::A11y(_id, _action_request) => None, - iced::Event::Dnd(_dnd_event) => { - // debug!(?dnd_event); + iced::Event::Dnd(dnd_event) => { + debug!(?dnd_event); None } iced::Event::PlatformSpecific(_platform_specific) => { @@ -648,6 +650,9 @@ impl cosmic::Application for App { None } } + } + event::Status::Captured => None, + } }) } @@ -886,15 +891,12 @@ impl cosmic::Application for App { slide_index, ), ); - match action { - presenter::Action::Task(task) => { - tasks.push(task.map(|m| { - cosmic::Action::App( - Message::Present(m), - ) - })); - } - _ => (), + if let presenter::Action::Task(task) = action { + tasks.push(task.map(|m| { + cosmic::Action::App( + Message::Present(m), + ) + })); } self.current_item = (item_index, slide_index + 1); @@ -909,20 +911,17 @@ impl cosmic::Application for App { .is_some() { let action = self.presenter.update(presenter::Message::ActivateSlide(self.current_item.0, self.current_item.1)); - match action { - presenter::Action::Task( + if let presenter::Action::Task( task, - ) => { - tasks - .push(task.map(|m| { - cosmic::Action::App( - Message::Present( - m, - ), - ) - })); - } - _ => (), + ) = action { + tasks + .push(task.map(|m| { + cosmic::Action::App( + Message::Present( + m, + ), + ) + })); } } Task::batch(tasks) @@ -946,15 +945,12 @@ impl cosmic::Application for App { slide_index, ), ); - match action { - presenter::Action::Task(task) => { - tasks.push(task.map(|m| { - cosmic::Action::App( - Message::Present(m), - ) - })); - } - _ => (), + if let presenter::Action::Task(task) = action { + tasks.push(task.map(|m| { + cosmic::Action::App( + Message::Present(m), + ) + })); } self.current_item = (item_index, slide_index - 1); @@ -984,20 +980,17 @@ impl cosmic::Application for App { .is_some() { let action = self.presenter.update(presenter::Message::ActivateSlide(self.current_item.0, self.current_item.1)); - match action { - presenter::Action::Task( + if let presenter::Action::Task( task, - ) => { - tasks - .push(task.map(|m| { - cosmic::Action::App( - Message::Present( - m, - ), - ) - })); - } - _ => (), + ) = action { + tasks + .push(task.map(|m| { + cosmic::Action::App( + Message::Present( + m, + ), + ) + })); } } Task::batch(tasks) @@ -1084,7 +1077,7 @@ impl cosmic::Application for App { let (id, spawn_window) = window::open(window::Settings { position: Position::Centered, - exit_on_close_request: count % 2 == 0, + exit_on_close_request: count.is_multiple_of(2), decorations: false, ..Default::default() }); @@ -1193,8 +1186,8 @@ impl cosmic::Application for App { Task::none() } Message::AddServiceItem(index, item) => { - let item_index = item.0 .1; - let kind = item.0 .0; + let item_index = item.0.1; + let kind = item.0.0; let mut item; match kind { core::model::LibraryKind::Song => { @@ -1293,7 +1286,7 @@ impl cosmic::Application for App { } Message::AppendServiceItemKind(item) => { let item = item.to_service_item(); - return self.update(Message::AppendServiceItem(item)); + self.update(Message::AppendServiceItem(item)) } Message::ReorderService(index, target_index) => { let item = self.service.remove(index); @@ -1317,6 +1310,9 @@ impl cosmic::Application for App { } Message::OpenEditor(item) => { let kind = item.kind; + self.search_query = String::new(); + self.search_results = vec![]; + self.searching = false; match kind { ServiceItemKind::Song(song) => { self.editor_mode = Some(EditorMode::Song); @@ -1348,7 +1344,7 @@ impl cosmic::Application for App { } Message::OpenEditorKind(item) => { let item = item.to_service_item(); - return self.update(Message::OpenEditor(item)); + self.update(Message::OpenEditor(item)) } Message::New => { debug!("new file"); diff --git a/src/ui/image_editor.rs b/src/ui/image_editor.rs index 878fe8e..194484f 100644 --- a/src/ui/image_editor.rs +++ b/src/ui/image_editor.rs @@ -2,15 +2,15 @@ use std::{io, path::PathBuf}; use crate::core::images::Image; use cosmic::{ - dialog::file_chooser::{open::Dialog, FileFilter}, - iced::{alignment::Vertical, Length}, + Element, Task, + dialog::file_chooser::{FileFilter, open::Dialog}, + iced::{Length, alignment::Vertical}, iced_widget::{column, row}, theme, widget::{ - self, button, container, horizontal_space, icon, text, - text_input, Space, + self, Space, button, container, horizontal_space, icon, text, + text_input, }, - Element, Task, }; use tracing::{debug, error, warn}; diff --git a/src/ui/library.rs b/src/ui/library.rs index d546945..462f8a7 100644 --- a/src/ui/library.rs +++ b/src/ui/library.rs @@ -1,41 +1,39 @@ use std::collections::HashMap; use cosmic::{ + Element, Task, dialog::file_chooser::open::Dialog, iced::{ - alignment::Vertical, clipboard::dnd::DndAction, - keyboard::Modifiers, wgpu::core::command::DynComputePass, - Background, Border, Color, Length, + Background, Border, Color, Length, alignment::Vertical, + clipboard::dnd::DndAction, keyboard::Modifiers, }, iced_core::widget::tree::State, iced_widget::{column, row as rowm, text as textm}, theme, widget::{ - button, container, context_menu, dnd_destination, - horizontal_space, icon, + Container, DndSource, Space, button, container, context_menu, + dnd_destination, horizontal_space, icon, menu::{self, Action as MenuAction}, mouse_area, responsive, row, scrollable, text, text_input, - Container, DndSource, Space, }, - Element, Task, }; use miette::{IntoDiagnostic, Result}; use rapidfuzz::distance::levenshtein; -use sqlx::{migrate, SqlitePool}; +use sqlx::{SqlitePool, migrate}; use tracing::{debug, error, warn}; use crate::core::{ content::Content, - images::{self, update_image_in_db, Image}, + images::{self, Image, update_image_in_db}, kinds::ServiceItemKind, model::{KindWrapper, LibraryKind, Model}, presentations::{ - self, add_presentation_to_db, update_presentation_in_db, - Presentation, + self, Presentation, add_presentation_to_db, + update_presentation_in_db, }, service_items::{ServiceItem, ServiceTrait}, - songs::{self, update_song_in_db, Song}, - videos::{self, update_video_in_db, Video}, + songs::{self, Song, update_song_in_db}, + videos::{self, Video, update_video_in_db}, }; #[derive(Debug, Clone)] @@ -557,7 +555,7 @@ impl<'a> Library { }; if items.contains(&(kind, index)) { - () + } else { items.push((kind, index)); } @@ -930,7 +928,7 @@ impl<'a> Library { .clone() .into_iter() .filter(|song| song.title.to_lowercase().contains(&query)) - .map(|song| ServiceItemKind::Song(song)) + .map(ServiceItemKind::Song) .collect(); let videos: Vec = self .video_library @@ -938,7 +936,7 @@ impl<'a> Library { .clone() .into_iter() .filter(|vid| vid.title.to_lowercase().contains(&query)) - .map(|video| ServiceItemKind::Video(video)) + .map(ServiceItemKind::Video) .collect(); let images: Vec = self .image_library @@ -948,7 +946,7 @@ impl<'a> Library { .filter(|image| { image.title.to_lowercase().contains(&query) }) - .map(|image| ServiceItemKind::Image(image)) + .map(ServiceItemKind::Image) .collect(); let presentations: Vec = self .presentation_library @@ -956,7 +954,7 @@ impl<'a> Library { .clone() .into_iter() .filter(|pres| pres.title.to_lowercase().contains(&query)) - .map(|pres| ServiceItemKind::Presentation(pres)) + .map(ServiceItemKind::Presentation) .collect(); items.extend(videos); items.extend(images); diff --git a/src/ui/presentation_editor.rs b/src/ui/presentation_editor.rs index 947b842..8132e9c 100644 --- a/src/ui/presentation_editor.rs +++ b/src/ui/presentation_editor.rs @@ -2,15 +2,15 @@ use std::{io, path::PathBuf}; use crate::core::presentations::Presentation; use cosmic::{ - dialog::file_chooser::{open::Dialog, FileFilter}, - iced::{alignment::Vertical, ContentFit, Length}, + Element, Task, + dialog::file_chooser::{FileFilter, open::Dialog}, + iced::{ContentFit, Length, alignment::Vertical}, iced_widget::{column, row}, theme, widget::{ - self, button, container, horizontal_space, icon, - image::Handle, text, text_input, Space, + self, Space, button, container, horizontal_space, icon, + image::Handle, text, text_input, }, - Element, Task, }; use miette::IntoDiagnostic; use mupdf::{Colorspace, Document, Matrix}; diff --git a/src/ui/presenter.rs b/src/ui/presenter.rs index a758311..84b9e18 100644 --- a/src/ui/presenter.rs +++ b/src/ui/presenter.rs @@ -7,32 +7,32 @@ use std::{ }; use cosmic::{ + Task, iced::{ - font::{Family, Stretch, Style, Weight}, Background, Border, Color, ContentFit, Font, Length, Shadow, Vector, + font::{Family, Stretch, Style, Weight}, }, iced_widget::{ scrollable::{ - scroll_to, AbsoluteOffset, Direction, Scrollbar, + AbsoluteOffset, Direction, Scrollbar, scroll_to, }, stack, vertical_rule, }, prelude::*, widget::{ - container, image, mouse_area, responsive, scrollable, text, - Container, Id, Row, Space, + Container, Id, Row, Space, container, image, mouse_area, + responsive, scrollable, text, }, - Task, }; -use iced_video_player::{gst_pbutils, Position, Video, VideoPlayer}; +use iced_video_player::{Position, Video, VideoPlayer, gst_pbutils}; use rodio::{Decoder, OutputStream, OutputStreamBuilder, Sink}; use tracing::{debug, error, info, warn}; use url::Url; use crate::{ - core::{service_items::ServiceItem, slide::Slide}, BackgroundKind, + core::{service_items::ServiceItem, slide::Slide}, }; const REFERENCE_WIDTH: f32 = 1920.0; diff --git a/src/ui/service.rs b/src/ui/service.rs index 4a7dd81..ceca63c 100644 --- a/src/ui/service.rs +++ b/src/ui/service.rs @@ -2,15 +2,16 @@ use cosmic::iced::Size; use cosmic::iced_core::widget::tree; use cosmic::{ + Element, iced::{ + Event, Length, Point, Rectangle, Vector, clipboard::dnd::{DndEvent, SourceEvent}, - event, mouse, Event, Length, Point, Rectangle, Vector, + event, mouse, }, iced_core::{ - self, layout, renderer, widget::Tree, Clipboard, Shell, + self, Clipboard, Shell, layout, renderer, widget::Tree, }, widget::Widget, - Element, }; use tracing::debug; diff --git a/src/ui/slide_editor.rs b/src/ui/slide_editor.rs index c9ae9cb..ca6ce51 100644 --- a/src/ui/slide_editor.rs +++ b/src/ui/slide_editor.rs @@ -1,13 +1,13 @@ use std::{io, path::PathBuf}; use cosmic::{ + Renderer, iced::{Color, Font, Length, Size}, widget::{ self, canvas::{self, Program, Stroke}, container, }, - Renderer, }; use tracing::debug; diff --git a/src/ui/song_editor.rs b/src/ui/song_editor.rs index 6a524bd..309e86c 100644 --- a/src/ui/song_editor.rs +++ b/src/ui/song_editor.rs @@ -1,8 +1,9 @@ use std::{io, path::PathBuf, sync::Arc}; use cosmic::{ - dialog::file_chooser::{open::Dialog, FileFilter}, - iced::{alignment::Vertical, Length}, + Element, Task, + dialog::file_chooser::{FileFilter, open::Dialog}, + iced::{Length, alignment::Vertical}, iced_wgpu::graphics::text::cosmic_text::fontdb, iced_widget::{column, row}, theme, @@ -10,7 +11,6 @@ use cosmic::{ button, combo_box, container, horizontal_space, icon, progress_bar, scrollable, text, text_editor, text_input, }, - Element, Task, }; use dirs::font_dir; use iced_video_player::Video; @@ -18,11 +18,11 @@ use rayon::iter::{IntoParallelIterator, ParallelIterator}; use tracing::{debug, error}; use crate::{ + Background, BackgroundKind, core::{service_items::ServiceTrait, slide::Slide, songs::Song}, ui::{ presenter::slide_view, slide_editor::SlideEditor, text_svg, }, - Background, BackgroundKind, }; #[derive(Debug)] diff --git a/src/ui/text_svg.rs b/src/ui/text_svg.rs index 58c574a..07b0e9a 100644 --- a/src/ui/text_svg.rs +++ b/src/ui/text_svg.rs @@ -8,16 +8,16 @@ use std::{ use colors_transform::Rgb; use cosmic::{ iced::{ - font::{Style, Weight}, ContentFit, Length, Size, + font::{Style, Weight}, }, prelude::*, - widget::{image::Handle, Image}, + widget::{Image, image::Handle}, }; use rapidhash::v3::rapidhash_v3; use resvg::{ tiny_skia::{self, Pixmap}, - usvg::{fontdb, Tree}, + usvg::{Tree, fontdb}, }; use tracing::{debug, error}; diff --git a/src/ui/video_editor.rs b/src/ui/video_editor.rs index 1a6343c..c57baa9 100644 --- a/src/ui/video_editor.rs +++ b/src/ui/video_editor.rs @@ -1,15 +1,15 @@ use std::{io, path::PathBuf}; use cosmic::{ - dialog::file_chooser::{open::Dialog, FileFilter}, - iced::{alignment::Vertical, Length}, + Element, Task, + dialog::file_chooser::{FileFilter, open::Dialog}, + iced::{Length, alignment::Vertical}, iced_widget::{column, row}, theme, widget::{ - button, container, horizontal_space, icon, progress_bar, - text, text_input, Space, + Space, button, container, horizontal_space, icon, + progress_bar, text, text_input, }, - Element, Task, }; use iced_video_player::{Video, VideoPlayer}; use tracing::{debug, error, warn}; diff --git a/src/ui/widgets/draggable/column.rs b/src/ui/widgets/draggable/column.rs index b35a2bc..14c8af2 100644 --- a/src/ui/widgets/draggable/column.rs +++ b/src/ui/widgets/draggable/column.rs @@ -22,18 +22,17 @@ // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +use cosmic::Theme; use cosmic::iced::advanced::layout::{self, Layout}; -use cosmic::iced::advanced::widget::{tree, Operation, Tree, Widget}; -use cosmic::iced::advanced::{overlay, renderer, Clipboard, Shell}; +use cosmic::iced::advanced::widget::{Operation, Tree, Widget, tree}; +use cosmic::iced::advanced::{Clipboard, Shell, overlay, renderer}; use cosmic::iced::alignment::{self, Alignment}; use cosmic::iced::event::{self, Event}; -use cosmic::iced::{self, mouse, Transformation}; +use cosmic::iced::{self, Transformation, mouse}; use cosmic::iced::{ Background, Border, Color, Element, Length, Padding, Pixels, Point, Rectangle, Size, Vector, }; -use cosmic::Theme; -use tracing::debug; use super::{Action, DragEvent, DropPosition}; diff --git a/src/ui/widgets/draggable/row.rs b/src/ui/widgets/draggable/row.rs index 4bbaf7d..67f2212 100644 --- a/src/ui/widgets/draggable/row.rs +++ b/src/ui/widgets/draggable/row.rs @@ -23,11 +23,11 @@ // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. use cosmic::iced::advanced::layout::{self, Layout}; -use cosmic::iced::advanced::widget::{tree, Operation, Tree, Widget}; -use cosmic::iced::advanced::{overlay, renderer, Clipboard, Shell}; +use cosmic::iced::advanced::widget::{Operation, Tree, Widget, tree}; +use cosmic::iced::advanced::{Clipboard, Shell, overlay, renderer}; use cosmic::iced::alignment::{self, Alignment}; use cosmic::iced::event::{self, Event}; -use cosmic::iced::{self, mouse, Transformation}; +use cosmic::iced::{self, Transformation, mouse}; use cosmic::iced::{ Background, Border, Color, Element, Length, Padding, Pixels, Point, Rectangle, Size, Theme, Vector,