diff --git a/Cargo.lock b/Cargo.lock index 95274d3..4a58349 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -228,9 +228,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.86" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" +checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" [[package]] name = "apply" @@ -272,9 +272,9 @@ dependencies = [ [[package]] name = "arrayref" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a" +checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" [[package]] name = "arrayvec" @@ -338,7 +338,7 @@ dependencies = [ "url", "wayland-backend", "wayland-client", - "wayland-protocols 0.32.3", + "wayland-protocols 0.32.4", "zbus 4.4.0", ] @@ -388,9 +388,9 @@ dependencies = [ [[package]] name = "async-executor" -version = "1.13.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7ebdfa2ebdab6b1760375fa7d6f382b9f486eac35fc994625a00e89280bdbb7" +checksum = "30ca9a001c1e8ba5149f91a74362376cc6bc5b919d92d988668657bd570bdcec" dependencies = [ "async-task", "concurrent-queue", @@ -443,7 +443,7 @@ dependencies = [ "futures-lite 2.3.0", "parking", "polling 3.7.3", - "rustix 0.38.35", + "rustix 0.38.37", "slab", "tracing", "windows-sys 0.59.0", @@ -493,15 +493,15 @@ dependencies = [ "cfg-if", "event-listener 3.1.0", "futures-lite 1.13.0", - "rustix 0.38.35", + "rustix 0.38.37", "windows-sys 0.48.0", ] [[package]] name = "async-process" -version = "2.2.4" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a07789659a4d385b79b18b9127fc27e1a59e1e89117c78c5ea3b806f016374" +checksum = "63255f1dc2381611000436537bbedfe83183faa303a5a0edaf191edef06526bb" dependencies = [ "async-channel", "async-io 2.3.4", @@ -512,9 +512,8 @@ dependencies = [ "cfg-if", "event-listener 5.3.1", "futures-lite 2.3.0", - "rustix 0.38.35", + "rustix 0.38.37", "tracing", - "windows-sys 0.59.0", ] [[package]] @@ -540,7 +539,7 @@ dependencies = [ "cfg-if", "futures-core", "futures-io", - "rustix 0.38.35", + "rustix 0.38.37", "signal-hook-registry", "slab", "windows-sys 0.59.0", @@ -574,7 +573,7 @@ name = "atomicwrites" version = "0.4.2" source = "git+https://github.com/jackpot51/rust-atomicwrites#043ab4859d53ffd3d55334685303d8df39c9f768" dependencies = [ - "rustix 0.38.35", + "rustix 0.38.37", "tempfile", "windows-sys 0.48.0", ] @@ -891,9 +890,9 @@ dependencies = [ [[package]] name = "bytemuck" -version = "1.17.1" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773d90827bc3feecfb67fab12e24de0749aad83c74b9504ecde46237b5cd24e2" +checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae" dependencies = [ "bytemuck_derive", ] @@ -923,9 +922,9 @@ checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" [[package]] name = "bytes" -version = "1.7.1" +version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" +checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" [[package]] name = "calendrical_calculations" @@ -946,7 +945,7 @@ dependencies = [ "bitflags 2.6.0", "log", "polling 3.7.3", - "rustix 0.38.35", + "rustix 0.38.37", "slab", "thiserror", ] @@ -960,7 +959,7 @@ dependencies = [ "bitflags 2.6.0", "log", "polling 3.7.3", - "rustix 0.38.35", + "rustix 0.38.37", "slab", "thiserror", ] @@ -972,7 +971,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02" dependencies = [ "calloop 0.12.4", - "rustix 0.38.35", + "rustix 0.38.37", "wayland-backend", "wayland-client", ] @@ -984,16 +983,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95a66a987056935f7efce4ab5668920b5d0dac4a7c99991a67395f13702ddd20" dependencies = [ "calloop 0.13.0", - "rustix 0.38.35", + "rustix 0.38.37", "wayland-backend", "wayland-client", ] [[package]] name = "cc" -version = "1.1.15" +version = "1.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57b6a275aa2903740dc87da01c62040406b8812552e97129a63ea8850a17c6e6" +checksum = "07b1695e2c7e8fc85310cde85aeaab7e3097f593c91d209d3f9df76c928100f0" dependencies = [ "jobserver", "libc", @@ -1082,9 +1081,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.16" +version = "4.5.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019" +checksum = "3e5a21b8495e732f1b3c364c9949b201ca7bae518c502c80256c96ad79eaf6ac" dependencies = [ "clap_builder", "clap_derive", @@ -1092,9 +1091,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.15" +version = "4.5.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6" +checksum = "8cf2dd12af7a047ad9d6da2b6b249759a22a7abc0f474c1dae1777afa4b21a73" dependencies = [ "anstream", "anstyle", @@ -1324,18 +1323,18 @@ dependencies = [ [[package]] name = "const_format" -version = "0.2.32" +version = "0.2.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3a214c7af3d04997541b18d432afaff4c455e79e2029079647e72fc2bd27673" +checksum = "50c655d81ff1114fb0dcdea9225ea9f0cc712a6f8d189378e82bdf62a473a64b" dependencies = [ "const_format_proc_macros", ] [[package]] name = "const_format_proc_macros" -version = "0.2.32" +version = "0.2.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7f6ff08fd20f4f299298a28e2dfa8a8ba1036e6cd2460ac1de7b425d76f2500" +checksum = "eff1a44b93f47b1bac19a27932f5c591e43d1ba357ee4f61526c8a25603f0eb1" dependencies = [ "proc-macro2", "quote", @@ -1412,7 +1411,7 @@ dependencies = [ [[package]] name = "cosmic-bg-config" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-bg#876987a5e7b76d8005dcaf969baf0dd419296dab" +source = "git+https://github.com/pop-os/cosmic-bg#584f6b3c0454396df25d36c6c2b59b018946e81e" dependencies = [ "colorgrad", "cosmic-config", @@ -1437,7 +1436,7 @@ dependencies = [ [[package]] name = "cosmic-comp-config" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-comp#52280e9823506a480248e84caaf7545426a871c8" +source = "git+https://github.com/pop-os/cosmic-comp#ad449f9db0437b0c52f18090f0b92d2a64e59de9" dependencies = [ "cosmic-config", "input", @@ -1447,7 +1446,7 @@ dependencies = [ [[package]] name = "cosmic-config" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +source = "git+https://github.com/pop-os/libcosmic#ddb678ca6966dfdf10911feac5e5ac02d3b2b97e" dependencies = [ "atomicwrites", "cosmic-config-derive", @@ -1469,7 +1468,7 @@ dependencies = [ [[package]] name = "cosmic-config-derive" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +source = "git+https://github.com/pop-os/libcosmic#ddb678ca6966dfdf10911feac5e5ac02d3b2b97e" dependencies = [ "quote", "syn 1.0.109", @@ -1478,7 +1477,7 @@ dependencies = [ [[package]] name = "cosmic-dbus-networkmanager" version = "0.1.0" -source = "git+https://github.com/pop-os/dbus-settings-bindings#e0d6a04d6ebf6bcede1580721c84a7f01e5ef8bb" +source = "git+https://github.com/pop-os/dbus-settings-bindings#063c2ad0dbe090d7e1221817128098493838b13a" dependencies = [ "bitflags 2.6.0", "derive_builder", @@ -1492,7 +1491,7 @@ dependencies = [ [[package]] name = "cosmic-panel-config" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-panel#e184d10535e43dfc3e470a481f81f9fe24359521" +source = "git+https://github.com/pop-os/cosmic-panel#4fedcbfc3574600b58de6da6c2401c92264537bd" dependencies = [ "anyhow", "cosmic-config", @@ -1500,7 +1499,7 @@ dependencies = [ "serde", "smithay-client-toolkit 0.19.2", "tracing", - "wayland-protocols-wlr 0.3.3", + "wayland-protocols-wlr 0.3.4", "xdg-shell-wrapper-config", ] @@ -1512,8 +1511,8 @@ dependencies = [ "bitflags 2.6.0", "wayland-backend", "wayland-client", - "wayland-protocols 0.32.3", - "wayland-protocols-wlr 0.3.3", + "wayland-protocols 0.32.4", + "wayland-protocols-wlr 0.3.4", "wayland-scanner", "wayland-server", ] @@ -1531,7 +1530,7 @@ dependencies = [ "tokio", "tracing", "wayland-client", - "wayland-protocols-wlr 0.3.3", + "wayland-protocols-wlr 0.3.4", ] [[package]] @@ -1611,7 +1610,7 @@ dependencies = [ [[package]] name = "cosmic-settings-config" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-settings-daemon#add1cb3c4a6c3557c78085d51eff9b1b80035020" +source = "git+https://github.com/pop-os/cosmic-settings-daemon#a41d1991fdfdac58f0b788e43087ad6ee01d00ca" dependencies = [ "cosmic-config", "serde", @@ -1624,7 +1623,7 @@ dependencies = [ [[package]] name = "cosmic-settings-daemon" version = "0.1.0" -source = "git+https://github.com/pop-os/dbus-settings-bindings#e0d6a04d6ebf6bcede1580721c84a7f01e5ef8bb" +source = "git+https://github.com/pop-os/dbus-settings-bindings#063c2ad0dbe090d7e1221817128098493838b13a" dependencies = [ "zbus 4.4.0", ] @@ -1656,7 +1655,7 @@ dependencies = [ "libpulse-binding", "log", "pipewire", - "rustix 0.38.35", + "rustix 0.38.37", "secure-string", "thiserror", "tokio", @@ -1698,7 +1697,7 @@ dependencies = [ [[package]] name = "cosmic-text" version = "0.12.1" -source = "git+https://github.com/pop-os/cosmic-text.git#c7512170201910cfb8a021f8d749c4125dfed18d" +source = "git+https://github.com/pop-os/cosmic-text.git#e8f567cf5b456dfab749a575c257acaa36f622d9" dependencies = [ "bitflags 2.6.0", "fontdb", @@ -1721,7 +1720,7 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +source = "git+https://github.com/pop-os/libcosmic#ddb678ca6966dfdf10911feac5e5ac02d3b2b97e" dependencies = [ "almost", "cosmic-config", @@ -1737,9 +1736,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad" +checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" dependencies = [ "libc", ] @@ -1913,9 +1912,9 @@ dependencies = [ [[package]] name = "dashmap" -version = "6.0.1" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "804c8821570c3f8b70230c2ba75ffa5c0f9a4189b9a432b6656c536712acae28" +checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf" dependencies = [ "cfg-if", "crossbeam-utils", @@ -2099,7 +2098,7 @@ dependencies = [ "bytemuck", "drm-ffi", "drm-fourcc", - "rustix 0.38.35", + "rustix 0.38.37", ] [[package]] @@ -2109,7 +2108,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41334f8405792483e32ad05fbb9c5680ff4e84491883d2947a4757dc54cb2ac6" dependencies = [ "drm-sys", - "rustix 0.38.35", + "rustix 0.38.37", ] [[package]] @@ -2190,9 +2189,9 @@ dependencies = [ [[package]] name = "error-code" -version = "3.2.0" +version = "3.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b" +checksum = "a5d9305ccc6942a704f4335694ecd3de2ea531b114ac2d51f5f843750787a92f" [[package]] name = "etagere" @@ -2449,7 +2448,7 @@ checksum = "b0299020c3ef3f60f526a4f64ab4a3d4ce116b1acbf24cdd22da0068e5d81dc3" dependencies = [ "fontconfig-parser", "log", - "memmap2 0.9.4", + "memmap2 0.9.5", "slotmap", "tinyvec", "ttf-parser 0.20.0", @@ -2503,9 +2502,9 @@ dependencies = [ [[package]] name = "freedesktop-desktop-entry" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7e6dc222403f11572b39d551948ce4e9ff860a9bdf3307bb6018d4454a8e034" +checksum = "d83c9c25bc7e0ff18c6fee324db310497622be235fd45c0f7347ab81981a941e" dependencies = [ "dirs", "gettext-rs", @@ -2965,7 +2964,7 @@ checksum = "f558a64ac9af88b5ba400d99b579451af0d39c6d360980045b91aac966d705e2" [[package]] name = "hostname1-zbus" version = "0.1.0" -source = "git+https://github.com/pop-os/dbus-settings-bindings#e0d6a04d6ebf6bcede1580721c84a7f01e5ef8bb" +source = "git+https://github.com/pop-os/dbus-settings-bindings#063c2ad0dbe090d7e1221817128098493838b13a" dependencies = [ "zbus 4.4.0", ] @@ -3042,9 +3041,9 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.60" +version = "0.1.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -3066,7 +3065,7 @@ dependencies = [ [[package]] name = "iced" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +source = "git+https://github.com/pop-os/libcosmic#ddb678ca6966dfdf10911feac5e5ac02d3b2b97e" dependencies = [ "dnd", "iced_accessibility", @@ -3085,7 +3084,7 @@ dependencies = [ [[package]] name = "iced_accessibility" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +source = "git+https://github.com/pop-os/libcosmic#ddb678ca6966dfdf10911feac5e5ac02d3b2b97e" dependencies = [ "accesskit", "accesskit_unix", @@ -3094,7 +3093,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +source = "git+https://github.com/pop-os/libcosmic#ddb678ca6966dfdf10911feac5e5ac02d3b2b97e" dependencies = [ "bitflags 2.6.0", "dnd", @@ -3116,7 +3115,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +source = "git+https://github.com/pop-os/libcosmic#ddb678ca6966dfdf10911feac5e5ac02d3b2b97e" dependencies = [ "futures", "iced_core", @@ -3129,7 +3128,7 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +source = "git+https://github.com/pop-os/libcosmic#ddb678ca6966dfdf10911feac5e5ac02d3b2b97e" dependencies = [ "bitflags 2.6.0", "bytemuck", @@ -3153,7 +3152,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +source = "git+https://github.com/pop-os/libcosmic#ddb678ca6966dfdf10911feac5e5ac02d3b2b97e" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -3165,7 +3164,7 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +source = "git+https://github.com/pop-os/libcosmic#ddb678ca6966dfdf10911feac5e5ac02d3b2b97e" dependencies = [ "dnd", "iced_accessibility", @@ -3179,7 +3178,7 @@ dependencies = [ [[package]] name = "iced_sctk" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +source = "git+https://github.com/pop-os/libcosmic#ddb678ca6966dfdf10911feac5e5ac02d3b2b97e" dependencies = [ "enum-repr", "float-cmp", @@ -3195,7 +3194,7 @@ dependencies = [ "thiserror", "tracing", "wayland-backend", - "wayland-protocols 0.32.3", + "wayland-protocols 0.32.4", "window_clipboard", "xkbcommon", "xkbcommon-dl", @@ -3205,7 +3204,7 @@ dependencies = [ [[package]] name = "iced_style" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +source = "git+https://github.com/pop-os/libcosmic#ddb678ca6966dfdf10911feac5e5ac02d3b2b97e" dependencies = [ "iced_core", "once_cell", @@ -3215,7 +3214,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +source = "git+https://github.com/pop-os/libcosmic#ddb678ca6966dfdf10911feac5e5ac02d3b2b97e" dependencies = [ "bytemuck", "cosmic-text", @@ -3232,7 +3231,7 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +source = "git+https://github.com/pop-os/libcosmic#ddb678ca6966dfdf10911feac5e5ac02d3b2b97e" dependencies = [ "as-raw-xcb-connection", "bitflags 2.6.0", @@ -3247,12 +3246,12 @@ dependencies = [ "once_cell", "raw-window-handle", "resvg", - "rustix 0.38.35", + "rustix 0.38.37", "smithay-client-toolkit 0.19.2", "tiny-xlib", "wayland-backend", "wayland-client", - "wayland-protocols 0.32.3", + "wayland-protocols 0.32.4", "wayland-sys", "wgpu", "x11rb", @@ -3261,7 +3260,7 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +source = "git+https://github.com/pop-os/libcosmic#ddb678ca6966dfdf10911feac5e5ac02d3b2b97e" dependencies = [ "dnd", "iced_renderer", @@ -3278,7 +3277,7 @@ dependencies = [ [[package]] name = "iced_winit" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +source = "git+https://github.com/pop-os/libcosmic#ddb678ca6966dfdf10911feac5e5ac02d3b2b97e" dependencies = [ "dnd", "iced_graphics", @@ -4091,7 +4090,7 @@ checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" [[package]] name = "libcosmic" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +source = "git+https://github.com/pop-os/libcosmic#ddb678ca6966dfdf10911feac5e5ac02d3b2b97e" dependencies = [ "apply", "ashpd 0.9.1", @@ -4212,7 +4211,7 @@ checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ "bitflags 2.6.0", "libc", - "redox_syscall 0.5.3", + "redox_syscall 0.5.4", ] [[package]] @@ -4433,9 +4432,9 @@ dependencies = [ [[package]] name = "memmap2" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" +checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f" dependencies = [ "libc", ] @@ -5021,9 +5020,9 @@ dependencies = [ [[package]] name = "parking" -version = "2.2.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" +checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" [[package]] name = "parking_lot" @@ -5068,7 +5067,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.5.3", + "redox_syscall 0.5.4", "smallvec", "windows-targets 0.52.6", ] @@ -5229,7 +5228,7 @@ dependencies = [ "concurrent-queue", "hermit-abi 0.4.0", "pin-project-lite", - "rustix 0.38.35", + "rustix 0.38.37", "tracing", "windows-sys 0.59.0", ] @@ -5277,7 +5276,7 @@ version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" dependencies = [ - "toml_edit 0.22.20", + "toml_edit 0.22.21", ] [[package]] @@ -5323,7 +5322,7 @@ dependencies = [ "hex", "lazy_static", "procfs-core", - "rustix 0.38.35", + "rustix 0.38.37", ] [[package]] @@ -5392,9 +5391,9 @@ checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" [[package]] name = "quick-xml" -version = "0.34.0" +version = "0.36.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f24d770aeca0eacb81ac29dfbc55ebcc09312fdd1f8bbecdc7e4a84e000e3b4" +checksum = "f7649a7b4df05aed9ea7ec6f628c67c9953a43869b8bc50929569b2999d443fe" dependencies = [ "memchr", ] @@ -5576,9 +5575,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" +checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853" dependencies = [ "bitflags 2.6.0", ] @@ -5852,9 +5851,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.35" +version = "0.38.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a85d50532239da68e9addb745ba38ff4612a242c1c7ceea689c4bc7c2f43c36f" +checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" dependencies = [ "bitflags 2.6.0", "errno", @@ -5937,7 +5936,7 @@ checksum = "70b31447ca297092c5a9916fc3b955203157b37c19ca8edde4f52e9843e602c7" dependencies = [ "ab_glyph", "log", - "memmap2 0.9.4", + "memmap2 0.9.5", "smithay-client-toolkit 0.18.1", "tiny-skia", ] @@ -5975,9 +5974,9 @@ checksum = "d369a96f978623eb3dc28807c4852d6cc617fed53da5d3c400feff1ef34a714a" [[package]] name = "serde" -version = "1.0.209" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" dependencies = [ "serde_derive", ] @@ -5996,9 +5995,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.209" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", @@ -6007,9 +6006,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.127" +version = "1.0.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" dependencies = [ "indexmap 2.5.0", "itoa", @@ -6196,8 +6195,8 @@ dependencies = [ "cursor-icon", "libc", "log", - "memmap2 0.9.4", - "rustix 0.38.35", + "memmap2 0.9.5", + "rustix 0.38.37", "thiserror", "wayland-backend", "wayland-client", @@ -6222,16 +6221,16 @@ dependencies = [ "cursor-icon", "libc", "log", - "memmap2 0.9.4", + "memmap2 0.9.5", "pkg-config", - "rustix 0.38.35", + "rustix 0.38.37", "thiserror", "wayland-backend", "wayland-client", "wayland-csd-frame", "wayland-cursor", - "wayland-protocols 0.32.3", - "wayland-protocols-wlr 0.3.3", + "wayland-protocols 0.32.4", + "wayland-protocols-wlr 0.3.4", "wayland-scanner", "xkbcommon", "xkeysym", @@ -6292,11 +6291,11 @@ dependencies = [ "foreign-types", "js-sys", "log", - "memmap2 0.9.4", + "memmap2 0.9.5", "objc", "raw-window-handle", "redox_syscall 0.4.1", - "rustix 0.38.35", + "rustix 0.38.37", "tiny-xlib", "wasm-bindgen", "wayland-backend", @@ -6505,15 +6504,14 @@ dependencies = [ [[package]] name = "tachyonix" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1924ef47bc3b427ea2a0b55ba97d0e9116e9103483ecd75a43f47a66443527c5" +checksum = "86c3eafa053bbcc63bb4bfc5eb26362a33ea0bc2e589f28bce00287d1c167d45" dependencies = [ "async-event", "crossbeam-utils", "diatomic-waker", "futures-core", - "loom", "pin-project-lite", ] @@ -6555,7 +6553,7 @@ dependencies = [ "cfg-if", "fastrand 2.1.1", "once_cell", - "rustix 0.38.35", + "rustix 0.38.37", "windows-sys 0.59.0", ] @@ -6570,9 +6568,9 @@ dependencies = [ [[package]] name = "textdistance" -version = "1.0.2" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d321c8576c2b47e43953e9cce236550d4cd6af0a6ce518fe084340082ca6037b" +checksum = "7f1835c76a9d443834c04539860f3ce46b9d93ef8c260057f939e967ca81180a" [[package]] name = "thiserror" @@ -6649,7 +6647,7 @@ dependencies = [ [[package]] name = "timedate-zbus" version = "0.1.0" -source = "git+https://github.com/pop-os/dbus-settings-bindings#e0d6a04d6ebf6bcede1580721c84a7f01e5ef8bb" +source = "git+https://github.com/pop-os/dbus-settings-bindings#063c2ad0dbe090d7e1221817128098493838b13a" dependencies = [ "zbus 4.4.0", ] @@ -6758,9 +6756,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.15" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" +checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1" dependencies = [ "futures-core", "pin-project-lite", @@ -6785,7 +6783,7 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.20", + "toml_edit 0.22.21", ] [[package]] @@ -6810,9 +6808,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.20" +version = "0.22.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" +checksum = "3b072cee73c449a636ffd6f32bd8de3a9f7119139aff882f44943ce2986dc5cf" dependencies = [ "indexmap 2.5.0", "serde", @@ -7011,9 +7009,9 @@ checksum = "1df77b101bcc4ea3d78dafc5ad7e4f58ceffe0b2b16bf446aeb50b6cb4157656" [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" [[package]] name = "unicode-linebreak" @@ -7023,9 +7021,9 @@ checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" [[package]] name = "unicode-normalization" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" dependencies = [ "tinyvec", ] @@ -7038,15 +7036,15 @@ checksum = "52ea75f83c0137a9b98608359a5f1af8144876eb67bcb1ce837368e906a9f524" [[package]] name = "unicode-script" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad8d71f5726e5f285a935e9fe8edfd53f0491eb6e9a5774097fdabee7cd8c9cd" +checksum = "9fb421b350c9aff471779e262955939f565ec18b86c15364e6bdf0d662ca7c1f" [[package]] name = "unicode-segmentation" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" [[package]] name = "unicode-vo" @@ -7056,20 +7054,20 @@ checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94" [[package]] name = "unicode-width" -version = "0.1.13" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" [[package]] name = "unicode-xid" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a" +checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" [[package]] name = "upower_dbus" version = "0.3.2" -source = "git+https://github.com/pop-os/dbus-settings-bindings#e0d6a04d6ebf6bcede1580721c84a7f01e5ef8bb" +source = "git+https://github.com/pop-os/dbus-settings-bindings#063c2ad0dbe090d7e1221817128098493838b13a" dependencies = [ "serde", "serde_repr", @@ -7320,13 +7318,13 @@ dependencies = [ [[package]] name = "wayland-backend" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f90e11ce2ca99c97b940ee83edbae9da2d56a08f9ea8158550fd77fa31722993" +checksum = "056535ced7a150d45159d3a8dc30f91a2e2d588ca0b23f70e56033622b8016f6" dependencies = [ "cc", "downcast-rs", - "rustix 0.38.35", + "rustix 0.38.37", "scoped-tls", "smallvec", "wayland-sys", @@ -7334,12 +7332,12 @@ dependencies = [ [[package]] name = "wayland-client" -version = "0.31.5" +version = "0.31.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e321577a0a165911bdcfb39cf029302479d7527b517ee58ab0f6ad09edf0943" +checksum = "e3f45d1222915ef1fd2057220c1d9d9624b7654443ea35c3877f7a52bd0a5a2d" dependencies = [ "bitflags 2.6.0", - "rustix 0.38.35", + "rustix 0.38.37", "wayland-backend", "wayland-scanner", ] @@ -7357,11 +7355,11 @@ dependencies = [ [[package]] name = "wayland-cursor" -version = "0.31.5" +version = "0.31.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ef9489a8df197ebf3a8ce8a7a7f0a2320035c3743f3c1bd0bdbccf07ce64f95" +checksum = "3a94697e66e76c85923b0d28a0c251e8f0666f58fc47d316c0f4da6da75d37cb" dependencies = [ - "rustix 0.38.35", + "rustix 0.38.37", "wayland-client", "xcursor", ] @@ -7380,9 +7378,9 @@ dependencies = [ [[package]] name = "wayland-protocols" -version = "0.32.3" +version = "0.32.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62989625a776e827cc0f15d41444a3cea5205b963c3a25be48ae1b52d6b4daaa" +checksum = "2b5755d77ae9040bb872a25026555ce4cb0ae75fd923e90d25fba07d81057de0" dependencies = [ "bitflags 2.6.0", "wayland-backend", @@ -7419,23 +7417,23 @@ dependencies = [ [[package]] name = "wayland-protocols-wlr" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd993de54a40a40fbe5601d9f1fbcaef0aebcc5fda447d7dc8f6dcbaae4f8953" +checksum = "dad87b5fd1b1d3ca2f792df8f686a2a11e3fe1077b71096f7a175ab699f89109" dependencies = [ "bitflags 2.6.0", "wayland-backend", "wayland-client", - "wayland-protocols 0.32.3", + "wayland-protocols 0.32.4", "wayland-scanner", "wayland-server", ] [[package]] name = "wayland-scanner" -version = "0.31.4" +version = "0.31.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7b56f89937f1cf2ee1f1259cf2936a17a1f45d8f0aa1019fae6d470d304cfa6" +checksum = "597f2001b2e5fc1121e3d5b9791d3e78f05ba6bfa4641053846248e3a13661c3" dependencies = [ "proc-macro2", "quick-xml", @@ -7444,23 +7442,23 @@ dependencies = [ [[package]] name = "wayland-server" -version = "0.31.4" +version = "0.31.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f0a4bab6d420ee4a609b63ef4d5f9b5d309c6b93a029fccab70f2594c0cb3ae" +checksum = "0f18d47038c0b10479e695d99ed073e400ccd9bdbb60e6e503c96f62adcb12b6" dependencies = [ "bitflags 2.6.0", "downcast-rs", "io-lifetimes 2.0.3", - "rustix 0.38.35", + "rustix 0.38.37", "wayland-backend", "wayland-scanner", ] [[package]] name = "wayland-sys" -version = "0.31.4" +version = "0.31.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43676fe2daf68754ecf1d72026e4e6c15483198b5d24e888b74d3f22f887a148" +checksum = "efa8ac0d8e8ed3e3b5c9fc92c7881406a268e11555abe36493efabe649a29e09" dependencies = [ "dlib", "log", @@ -7962,7 +7960,7 @@ dependencies = [ "js-sys", "libc", "log", - "memmap2 0.9.4", + "memmap2 0.9.5", "ndk", "ndk-sys", "objc2", @@ -7971,7 +7969,7 @@ dependencies = [ "percent-encoding", "raw-window-handle", "redox_syscall 0.3.5", - "rustix 0.38.35", + "rustix 0.38.37", "sctk-adwaita", "smithay-client-toolkit 0.18.1", "smol_str", @@ -8054,7 +8052,7 @@ dependencies = [ "libc", "libloading 0.8.5", "once_cell", - "rustix 0.38.35", + "rustix 0.38.37", "x11rb-protocol", ] @@ -8089,10 +8087,10 @@ dependencies = [ [[package]] name = "xdg-shell-wrapper-config" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-panel#e184d10535e43dfc3e470a481f81f9fe24359521" +source = "git+https://github.com/pop-os/cosmic-panel#4fedcbfc3574600b58de6da6c2401c92264537bd" dependencies = [ "serde", - "wayland-protocols-wlr 0.3.3", + "wayland-protocols-wlr 0.3.4", ] [[package]] @@ -8140,9 +8138,9 @@ dependencies = [ [[package]] name = "xml-rs" -version = "0.8.21" +version = "0.8.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "539a77ee7c0de333dcc6da69b177380a0b81e0dacfa4f7344c465a36871ee601" +checksum = "af4e2e2f7cba5a093896c1e150fbfe177d1883e7448200efb81d40b9d339ef26" [[package]] name = "xmlwriter" @@ -8242,7 +8240,7 @@ dependencies = [ "async-fs", "async-io 2.3.4", "async-lock 3.4.0", - "async-process 2.2.4", + "async-process 2.3.0", "async-recursion", "async-task", "async-trait", diff --git a/Cargo.toml b/Cargo.toml index 4c6e67a..ad13278 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,7 +8,7 @@ rust-version = "1.80.0" [workspace.dependencies] cosmic-randr = { git = "https://github.com/pop-os/cosmic-randr" } -tokio = { version = "1.39.3", features = ["macros"] } +tokio = { version = "1.40.0", features = ["macros"] } [workspace.dependencies.libcosmic] git = "https://github.com/pop-os/libcosmic" diff --git a/cosmic-settings/Cargo.toml b/cosmic-settings/Cargo.toml index 17e907a..d50a434 100644 --- a/cosmic-settings/Cargo.toml +++ b/cosmic-settings/Cargo.toml @@ -10,7 +10,7 @@ as-result = "0.2.1" ashpd = { version = "0.9", default-features = false, features = ["tokio"] } async-channel = "2.3.1" chrono = "0.4.38" -clap = { version = "4.5.16", features = ["derive"] } +clap = { version = "4.5.17", features = ["derive"] } color-eyre = "0.6.3" cosmic-bg-config.workspace = true cosmic-comp-config.workspace = true @@ -28,13 +28,13 @@ derive_setters = "0.1.6" dirs = "5.0.1" downcast-rs = "1.2.1" eyre = "0.6.12" -freedesktop-desktop-entry = "0.7.3" +freedesktop-desktop-entry = "0.7.5" futures = "0.3.30" hostname-validator = "1.1.1" hostname1-zbus = { git = "https://github.com/pop-os/dbus-settings-bindings" } i18n-embed-fl = "0.9.1" image = "0.25" -indexmap = "2.4.0" +indexmap = "2.5.0" itertools = "0.13.0" itoa = "1.0.11" libcosmic.workspace = true @@ -44,12 +44,12 @@ regex = "1.10.6" ron = "0.8" rust-embed = "8.5.0" secure-string = "0.3.0" -serde = { version = "1.0.208", features = ["derive"] } +serde = { version = "1.0.210", features = ["derive"] } slab = "0.4.9" slotmap = "1.0.7" static_init = "1.0.3" sunrise = "1.0.1" -tachyonix = "0.3.0" +tachyonix = "0.3.1" timedate-zbus = { git = "https://github.com/pop-os/dbus-settings-bindings" } tokio.workspace = true tracing = "0.1.40" diff --git a/cosmic-settings/src/pages/desktop/appearance.rs b/cosmic-settings/src/pages/desktop/appearance.rs index ed5dd2a..e4b65e7 100644 --- a/cosmic-settings/src/pages/desktop/appearance.rs +++ b/cosmic-settings/src/pages/desktop/appearance.rs @@ -379,7 +379,7 @@ impl Page { let theme = theme.cosmic(); cosmic::iced::widget::column![ // Export theme choice - settings::view_section("").add( + settings::section().add( settings::item::builder(fl!("enable-export")) .description(fl!("enable-export", "desc")) .toggler(self.tk.apply_theme_global, Message::ApplyThemeGlobal) @@ -1360,12 +1360,13 @@ pub fn mode_and_colors() -> Section { .theme_builder .accent .map_or(palette.accent_blue, Srgba::from); - let mut section = settings::view_section(§ion.title) + let mut section = settings::section() + .title(§ion.title) .add( container( cosmic::iced::widget::row![ cosmic::iced::widget::column![ - button( + button::custom( icon(dark_mode_illustration.clone()) .width(Length::Fill) .height(Length::Fixed(100.0)) @@ -1380,7 +1381,7 @@ pub fn mode_and_colors() -> Section { .width(Length::FillPortion(1)) .align_items(cosmic::iced_core::Alignment::Center), cosmic::iced::widget::column![ - button( + button::custom( icon(light_mode_illustration.clone(),) .width(Length::Fill) .height(Length::Fixed(100.0)) @@ -1609,12 +1610,13 @@ pub fn style() -> Section { .view::(move |_binder, page, section| { let descriptions = §ion.descriptions; - settings::view_section(§ion.title) + settings::section() + .title(§ion.title) .add( container( cosmic::iced::widget::row![ cosmic::iced::widget::column![ - button( + button::custom( icon( if page.theme_mode.is_dark { &dark_round_style @@ -1636,7 +1638,7 @@ pub fn style() -> Section { .width(Length::FillPortion(1)) .align_items(cosmic::iced_core::Alignment::Center), cosmic::iced::widget::column![ - button( + button::custom( icon( if page.theme_mode.is_dark { &dark_slightly_round_style @@ -1658,7 +1660,7 @@ pub fn style() -> Section { .width(Length::FillPortion(1)) .align_items(cosmic::iced_core::Alignment::Center), cosmic::iced::widget::column![ - button( + button::custom( icon( if page.theme_mode.is_dark { &dark_square_style @@ -1706,7 +1708,8 @@ pub fn window_management() -> Section { .view::(move |_binder, page, section| { let descriptions = §ion.descriptions; - settings::view_section(§ion.title) + settings::section() + .title(§ion.title) .add(settings::item::builder(&descriptions[active_hint]).control( cosmic::widget::spin_button( page.theme_builder.active_hint.to_string(), @@ -1739,13 +1742,13 @@ pub fn experimental() -> Section { icon::from_name("go-next-symbolic").size(16).into(), ]); - settings::view_section("") + settings::section() .add( settings::item::builder(&descriptions[experimental_label]) .control(control) .apply(container) .style(cosmic::theme::Container::List) - .apply(button) + .apply(button::custom) .style(cosmic::theme::Button::Transparent) .on_press(Message::ExperimentalContextDrawer), ) @@ -1784,7 +1787,7 @@ pub fn color_button<'a, Message: 'a + Clone>( width: u16, height: u16, ) -> Element<'a, Message> { - button(color_image( + button::custom(color_image( wallpaper::Color::Single([color.r, color.g, color.b]), width, height, diff --git a/cosmic-settings/src/pages/desktop/dock/mod.rs b/cosmic-settings/src/pages/desktop/dock/mod.rs index 8eea160..dfe8b8e 100644 --- a/cosmic-settings/src/pages/desktop/dock/mod.rs +++ b/cosmic-settings/src/pages/desktop/dock/mod.rs @@ -164,7 +164,8 @@ pub(crate) fn enable() -> Section { let Some(container_config) = page.inner.container_config.as_ref() else { return Element::from(text::body(fl!("unknown"))); }; - settings::view_section(§ion.title) + settings::section() + .title(§ion.title) .add(settings::item( &descriptions[dock], toggler( diff --git a/cosmic-settings/src/pages/desktop/panel/applets_inner.rs b/cosmic-settings/src/pages/desktop/panel/applets_inner.rs index be2dc52..d774c5b 100644 --- a/cosmic-settings/src/pages/desktop/panel/applets_inner.rs +++ b/cosmic-settings/src/pages/desktop/panel/applets_inner.rs @@ -269,7 +269,7 @@ impl Page { .spacing(spacing.space_xxxs) .width(Length::Fill) .into(), - button(text::body(fl!("add"))) + button::standard(fl!("add")) .style(button::Style::Custom { active: Box::new(|focused, theme| { let mut style = theme.active(focused, false, &button::Style::Text); @@ -294,7 +294,6 @@ impl Page { style }), }) - .padding(8.0) .on_press(msg_map(Message::AddApplet(info.clone()))) .into(), ]) diff --git a/cosmic-settings/src/pages/desktop/panel/inner.rs b/cosmic-settings/src/pages/desktop/panel/inner.rs index b3b1cc6..83d7520 100644 --- a/cosmic-settings/src/pages/desktop/panel/inner.rs +++ b/cosmic-settings/src/pages/desktop/panel/inner.rs @@ -114,7 +114,8 @@ pub(crate) fn behavior_and_position< let Some(panel_config) = page.panel_config.as_ref() else { return Element::from(text::body(fl!("unknown"))); }; - settings::view_section(§ion.title) + settings::section() + .title(§ion.title) .add(settings::item( &descriptions[autohide_label], toggler(None, panel_config.autohide.is_some(), |value| { @@ -170,7 +171,8 @@ pub(crate) fn style< let Some(panel_config) = inner.panel_config.as_ref() else { return Element::from(text::body(fl!("unknown"))); }; - settings::view_section(§ion.title) + settings::section() + .title(§ion.title) .add(settings::item( &descriptions[gap_label], toggler(None, panel_config.anchor_gap, |value| { @@ -264,7 +266,7 @@ pub(crate) fn configuration + PanelPage>( .title(fl!("panel-applets")) .descriptions(descriptions) .view::

(move |binder, page, section| { - let mut settings = settings::view_section(§ion.title); + let mut settings = settings::section().title(§ion.title); let descriptions = §ion.descriptions; settings = if let Some((panel_applets_entity, _panel_applets_info)) = binder .info @@ -282,7 +284,7 @@ pub(crate) fn configuration + PanelPage>( .spacing(16) .apply(container) .style(theme::Container::List) - .apply(button) + .apply(button::custom) .style(theme::Button::Transparent) .on_press(crate::pages::Message::Page(panel_applets_entity)), ) diff --git a/cosmic-settings/src/pages/desktop/window_management.rs b/cosmic-settings/src/pages/desktop/window_management.rs index 9fdd971..fa22cb1 100644 --- a/cosmic-settings/src/pages/desktop/window_management.rs +++ b/cosmic-settings/src/pages/desktop/window_management.rs @@ -175,7 +175,8 @@ pub fn super_key_action() -> Section { .view::(move |_binder, page, section| { let descriptions = §ion.descriptions; - settings::view_section(§ion.title) + settings::section() + .title(§ion.title) .add( settings::item::builder(&descriptions[super_key]).control(widget::dropdown( &page.super_key_selections, @@ -203,7 +204,8 @@ pub fn window_controls() -> Section { .expect("desktop page not found"); let descriptions = §ion.descriptions; - settings::view_section(§ion.title) + settings::section() + .title(§ion.title) .add(settings::item( &descriptions[maximize], toggler( @@ -239,7 +241,8 @@ pub fn focus_navigation() -> Section { .view::(move |_binder, page, section| { let descriptions = §ion.descriptions; - settings::view_section(§ion.title) + settings::section() + .title(§ion.title) .add(settings::item( &descriptions[focus_follows_cursor], toggler( diff --git a/cosmic-settings/src/pages/desktop/workspaces.rs b/cosmic-settings/src/pages/desktop/workspaces.rs index 993dffe..c66c6c5 100644 --- a/cosmic-settings/src/pages/desktop/workspaces.rs +++ b/cosmic-settings/src/pages/desktop/workspaces.rs @@ -134,7 +134,8 @@ fn multi_behavior() -> Section { .descriptions(descriptions) .view::(move |_binder, page, section| { let descriptions = §ion.descriptions; - settings::view_section(§ion.title) + settings::section() + .title(§ion.title) .add(settings::item_row(vec![radio( text::body(&descriptions[span]), WorkspaceMode::Global, @@ -167,7 +168,8 @@ fn workspace_orientation() -> Section { .descriptions(descriptions) .view::(move |_binder, page, section| { let descriptions = §ion.descriptions; - settings::view_section(§ion.title) + settings::section() + .title(§ion.title) .add(settings::item_row(vec![radio( text::body(&descriptions[vertical]), WorkspaceLayout::Vertical, diff --git a/cosmic-settings/src/pages/display/mod.rs b/cosmic-settings/src/pages/display/mod.rs index 1683b95..3fe6395 100644 --- a/cosmic-settings/src/pages/display/mod.rs +++ b/cosmic-settings/src/pages/display/mod.rs @@ -1155,7 +1155,8 @@ pub fn legacy_applications() -> Section { .descriptions(descriptions) .view::(move |_binder, page, section| { let descriptions = §ion.descriptions; - widget::settings::view_section(§ion.title) + widget::settings::section() + .title(§ion.title) .add(widget::settings::item_row(vec![widget::radio( widget::column() .push(text::body(&descriptions[system])) diff --git a/cosmic-settings/src/pages/input/keyboard/mod.rs b/cosmic-settings/src/pages/input/keyboard/mod.rs index 677054d..00ee6d1 100644 --- a/cosmic-settings/src/pages/input/keyboard/mod.rs +++ b/cosmic-settings/src/pages/input/keyboard/mod.rs @@ -149,7 +149,7 @@ fn popover_menu_row( ..container::StyleSheet::appearance(theme, &cosmic::theme::Container::List) } })) - .apply(button) + .apply(button::custom) .on_press(()) .style(theme::Button::Transparent) .apply(Element::from) @@ -611,7 +611,7 @@ fn input_sources() -> Section { .title(fl!("keyboard-sources")) .view::(move |_binder, page, section| { // TODO Need something more custom, with drag and drop - let mut section = settings::view_section(§ion.title); + let mut section = settings::section().title(§ion.title); for id in &page.active_layouts { if let Some((_locale, _variant, description, _source)) = @@ -650,7 +650,8 @@ fn special_character_entry() -> Section { .view::(move |_binder, _page, section| { let descriptions = §ion.descriptions; - settings::view_section(§ion.title) + settings::section() + .title(§ion.title) .add(crate::widget::go_next_item( &*descriptions[alternate], Message::OpenSpecialCharacterContext(SpecialKey::AlternateCharacters), @@ -675,7 +676,7 @@ fn keyboard_shortcuts() -> Section { .view::(move |binder, _page, section| { let descriptions = §ion.descriptions; - let mut section = settings::view_section(§ion.title); + let mut section = settings::section().title(§ion.title); if let Some((shortcuts_entity, _)) = binder .info .iter() @@ -707,7 +708,8 @@ fn keyboard_typing_assist() -> Section { let descriptions = §ion.descriptions; let theme = cosmic::theme::active(); - settings::view_section(§ion.title) + settings::section() + .title(§ion.title) .add(settings::flex_item(&descriptions[repeat_delay], { // Delay let delay_slider = cosmic::widget::slider( diff --git a/cosmic-settings/src/pages/input/keyboard/shortcuts/common.rs b/cosmic-settings/src/pages/input/keyboard/shortcuts/common.rs index 4fc4e55..0c624b3 100644 --- a/cosmic-settings/src/pages/input/keyboard/shortcuts/common.rs +++ b/cosmic-settings/src/pages/input/keyboard/shortcuts/common.rs @@ -588,7 +588,7 @@ fn shortcut_item(custom: bool, id: usize, data: &ShortcutModel) -> Element Section { .descriptions(descriptions) .view::(move |_binder, page, _section| { let content = if page.model.shortcut_models.is_empty() { - widget::settings::view_section("") + widget::settings::section() .add(widget::settings::item_row(vec![widget::text::body(fl!( "custom-shortcuts", "none" diff --git a/cosmic-settings/src/pages/input/keyboard/shortcuts/mod.rs b/cosmic-settings/src/pages/input/keyboard/shortcuts/mod.rs index 363d86d..4d27551 100644 --- a/cosmic-settings/src/pages/input/keyboard/shortcuts/mod.rs +++ b/cosmic-settings/src/pages/input/keyboard/shortcuts/mod.rs @@ -374,7 +374,7 @@ fn shortcuts() -> Section { // If the search input is not empty, show the category view, else the search results. let content = if page.search.input.is_empty() { - settings::view_section("") + settings::section() .add(category_item( Category::ManageWindow, &descriptions[manage_window_label], @@ -437,7 +437,7 @@ fn category_item(category: Category, name: &str, modified: u16) -> Element Section { let input = binder.page::().expect("input page not found"); let theme = cosmic::theme::active(); - settings::view_section(§ion.title) + settings::section() + .title(§ion.title) .add(settings::flex_item( &descriptions[primary_button], cosmic::widget::segmented_control::horizontal(&input.primary_button) @@ -117,7 +118,8 @@ fn scrolling() -> Section { let input = binder.page::().expect("input page not found"); let theme = cosmic::theme::active(); - settings::view_section(§ion.title) + settings::section() + .title(§ion.title) .add(settings::flex_item(&descriptions[scroll_speed], { let value = input .input_default diff --git a/cosmic-settings/src/pages/input/touchpad.rs b/cosmic-settings/src/pages/input/touchpad.rs index 029af24..7b35237 100644 --- a/cosmic-settings/src/pages/input/touchpad.rs +++ b/cosmic-settings/src/pages/input/touchpad.rs @@ -71,7 +71,8 @@ fn touchpad() -> Section { let input = binder.page::().expect("input page not found"); let theme = cosmic::theme::active(); - settings::view_section(§ion.title) + settings::section() + .title(§ion.title) .add( settings::item::builder(&descriptions[primary_button]) .description(&descriptions[primary_button_desc]) @@ -148,7 +149,8 @@ fn click_behavior() -> Section { .page::() .expect("input devices page not found"); - settings::view_section(&*section.title) + settings::section() + .title(&*section.title) // Secondary click via two fingers, and middle-click via three fingers .add(settings::item_row(vec![widget::radio( text::body(&descriptions[click_finger]), @@ -200,7 +202,8 @@ fn scrolling() -> Section { .expect("input devices page not found"); let theme = cosmic::theme::active(); - settings::view_section(§ion.title) + settings::section() + .title(§ion.title) // Two-finger scrolling toggle .add(settings::item_row(vec![widget::radio( text::body(&descriptions[two_finger]), @@ -291,7 +294,8 @@ fn gestures() -> Section { .view::(move |_binder, page, section| { let descriptions = §ion.descriptions; - settings::view_section(§ion.title) + settings::section() + .title(§ion.title) // .add( // settings::item::builder(&descriptions[three_finger_any]) // .flex_control(text::body(&descriptions[switch_between_windows])), diff --git a/cosmic-settings/src/pages/networking/vpn/mod.rs b/cosmic-settings/src/pages/networking/vpn/mod.rs index 000bb9c..d513472 100644 --- a/cosmic-settings/src/pages/networking/vpn/mod.rs +++ b/cosmic-settings/src/pages/networking/vpn/mod.rs @@ -621,7 +621,7 @@ fn devices_view() -> Section { let mut view = widget::column::with_capacity(4); let vpn_connections = - widget::settings::view_section(§ion.descriptions[vpn_conns_txt]); + widget::settings::section().title(§ion.descriptions[vpn_conns_txt]); if page.known_connections.is_empty() { view = view.push(vpn_connections.add(widget::settings::item_row(vec![ @@ -725,7 +725,7 @@ fn devices_view() -> Section { fn popup_button<'a>(message: Message, text: &'a str) -> Element<'a, Message> { widget::text::body(text) .vertical_alignment(alignment::Vertical::Center) - .apply(widget::button) + .apply(widget::button::custom) .padding([4, 16]) .width(Length::Fill) .style(cosmic::theme::Button::MenuItem) diff --git a/cosmic-settings/src/pages/networking/wifi.rs b/cosmic-settings/src/pages/networking/wifi.rs index 44ee08f..46ff9be 100644 --- a/cosmic-settings/src/pages/networking/wifi.rs +++ b/cosmic-settings/src/pages/networking/wifi.rs @@ -567,8 +567,10 @@ fn devices_view() -> Section { // Create separate sections for known and visible networks. let (known_networks, visible_networks) = state.wireless_access_points.iter().fold( ( - widget::settings::view_section(§ion.descriptions[known_networks_txt]), - widget::settings::view_section(§ion.descriptions[visible_networks_txt]), + widget::settings::section() + .title(§ion.descriptions[known_networks_txt]), + widget::settings::section() + .title(§ion.descriptions[visible_networks_txt]), ), |(mut known_networks, mut visible_networks), network| { let is_connected = is_connected(state, network); @@ -715,7 +717,7 @@ fn is_connected(state: &NetworkManagerState, network: &AccessPoint) -> bool { fn popup_button<'a>(message: Message, text: &'a str) -> Element<'a, Message> { widget::text::body(text) .vertical_alignment(alignment::Vertical::Center) - .apply(widget::button) + .apply(widget::button::custom) .padding([4, 16]) .width(Length::Fill) .style(cosmic::theme::Button::MenuItem) diff --git a/cosmic-settings/src/pages/networking/wired.rs b/cosmic-settings/src/pages/networking/wired.rs index 7ddb0b7..067a359 100644 --- a/cosmic-settings/src/pages/networking/wired.rs +++ b/cosmic-settings/src/pages/networking/wired.rs @@ -455,7 +455,7 @@ impl Page { .available_connections .iter() .fold( - widget::settings::view_section(header_txt), + widget::settings::section().title(header_txt), |networks, connection| { let is_connected = nm_state.active_conns.iter().any(|conn| match conn { ActiveConnectionInfo::Wired { name, .. } => { @@ -598,7 +598,7 @@ fn devices_view() -> Section { fn popup_button<'a>(message: Message, text: &'a str) -> Element<'a, Message> { widget::text::body(text) .vertical_alignment(alignment::Vertical::Center) - .apply(widget::button) + .apply(widget::button::custom) .padding([4, 16]) .width(Length::Fill) .style(cosmic::theme::Button::MenuItem) diff --git a/cosmic-settings/src/pages/power/mod.rs b/cosmic-settings/src/pages/power/mod.rs index e02e2e1..c652958 100644 --- a/cosmic-settings/src/pages/power/mod.rs +++ b/cosmic-settings/src/pages/power/mod.rs @@ -199,7 +199,7 @@ fn profiles() -> Section { .title(fl!("power-mode")) .descriptions(descriptions) .view::(move |_binder, _page, section| { - let mut section = settings::view_section(§ion.title); + let mut section = settings::section().title(§ion.title); let runtime = tokio::runtime::Runtime::new().unwrap(); diff --git a/cosmic-settings/src/pages/sound.rs b/cosmic-settings/src/pages/sound.rs index e83e1ee..5ed0f23 100644 --- a/cosmic-settings/src/pages/sound.rs +++ b/cosmic-settings/src/pages/sound.rs @@ -631,7 +631,8 @@ fn input() -> Section { Message::SourceChanged, ); - let mut controls = settings::view_section(§ion.title) + let mut controls = settings::section() + .title(§ion.title) .add(settings::flex_item( &*section.descriptions[volume], volume_control, @@ -688,7 +689,8 @@ fn output() -> Section { Message::SinkChanged, ); - let mut controls = settings::view_section(§ion.title) + let mut controls = settings::section() + .title(§ion.title) .add(settings::flex_item( &*section.descriptions[volume], volume_control, @@ -718,7 +720,7 @@ fn output() -> Section { // .title(fl!("sound-alerts")) // .descriptions(descriptions) // .view::(move |_binder, _page, section| { -// settings::view_section(§ion.title) +// settings::section().title(§ion.title) // .add(settings::item(§ion.descriptions[volume], text::body("TODO"))) // .add(settings::item(§ion.descriptions[sound], text::body("TODO"))) // .into() @@ -734,7 +736,7 @@ fn output() -> Section { // .title(fl!("sound-applications")) // .descriptions(descriptions) // .view::(move |_binder, _page, section| { -// settings::view_section(§ion.title) +// settings::section().title(§ion.title) // .add(settings::item( // &*section.descriptions[applications], // text::body("TODO"), diff --git a/cosmic-settings/src/pages/system/about.rs b/cosmic-settings/src/pages/system/about.rs index 32fbb8e..fd93703 100644 --- a/cosmic-settings/src/pages/system/about.rs +++ b/cosmic-settings/src/pages/system/about.rs @@ -150,7 +150,8 @@ fn hardware() -> Section { .view::(move |_binder, page, section| { let desc = §ion.descriptions; - let sections = settings::view_section(§ion.title) + let sections = settings::section() + .title(§ion.title) .add(settings::flex_item( &*desc[model], text::body(&page.info.hardware_model), @@ -194,7 +195,8 @@ fn os() -> Section { .descriptions(descriptions) .view::(move |_binder, page, section| { let desc = §ion.descriptions; - settings::view_section(§ion.title) + settings::section() + .title(§ion.title) .add(settings::flex_item( &*desc[os], text::body(&page.info.operating_system), @@ -221,7 +223,7 @@ fn os() -> Section { // .title(fl!("about-related")) // .descriptions(vec![fl!("about-related", "support").into()]) // .view::(move |_binder, _page, section| { -// settings::view_section(§ion.title) +// settings::section().title(§ion.title) // .add(settings::item(&*section.descriptions[0], text::body("TODO"))) // .into() // }) diff --git a/cosmic-settings/src/pages/time/date.rs b/cosmic-settings/src/pages/time/date.rs index 1f93b96..e8c5376 100644 --- a/cosmic-settings/src/pages/time/date.rs +++ b/cosmic-settings/src/pages/time/date.rs @@ -330,7 +330,7 @@ impl Page { } fn timezone_context_item<'a>(&self, id: usize, timezone: &'a str) -> Element<'a, Message> { - widget::button(widget::settings::item_row(vec![ + widget::button::custom(widget::settings::item_row(vec![ widget::text::body(timezone).wrap(Wrap::Word).into(), widget::horizontal_space(Length::Fill).into(), ])) @@ -376,7 +376,8 @@ fn date() -> Section { .title(fl!("time-date")) .descriptions(descriptions) .view::(move |_binder, page, section| { - settings::view_section(§ion.title) + settings::section() + .title(§ion.title) .add( settings::item::builder(&*section.descriptions[title]) .description(fl!("time-date", "auto-ntp")) @@ -399,7 +400,8 @@ fn format() -> Section { .title(fl!("time-format")) .descriptions(descriptions) .view::(move |_binder, page, section| { - settings::view_section(§ion.title) + settings::section() + .title(§ion.title) // 24-hour toggle .add( settings::item::builder(§ion.descriptions[military]) @@ -462,11 +464,12 @@ fn timezone() -> Section { .push(widget::icon::from_name("go-next-symbolic").size(16).icon()) .apply(widget::container) .style(cosmic::theme::Container::List) - .apply(widget::button) + .apply(widget::button::custom) .style(cosmic::theme::Button::Transparent) .on_press(Message::TimezoneContext); - settings::view_section(§ion.title) + settings::section() + .title(§ion.title) // Time zone select .add( settings::item::builder(&*section.descriptions[time_zone]) diff --git a/cosmic-settings/src/widget/mod.rs b/cosmic-settings/src/widget/mod.rs index e6190f2..b5a8f93 100644 --- a/cosmic-settings/src/widget/mod.rs +++ b/cosmic-settings/src/widget/mod.rs @@ -96,7 +96,7 @@ pub fn page_title(page: &page::Info) -> Element { #[must_use] pub fn unimplemented_page() -> Element<'static, Message> { - settings::view_section("") + settings::section().title("") .add(text::body("We haven't created that panel yet, and/or it is using a similar idea as current Pop! designs.")) .into() } @@ -146,7 +146,7 @@ pub fn page_list_item<'a, Message: 'static + Clone>( .padding([space_s, space_m]) .align_x(alignment::Horizontal::Center) .style(theme::Container::List) - .apply(button) + .apply(button::custom) .padding(0) .style(theme::Button::Transparent) .on_press(message) @@ -185,7 +185,7 @@ pub fn go_next_item(description: &str, msg: Msg) -> cosmic ]) .apply(widget::container) .style(cosmic::theme::Container::List) - .apply(button) + .apply(button::custom) .style(theme::Button::Transparent) .on_press(msg) .into() diff --git a/page/src/section.rs b/page/src/section.rs index 03aae2e..583f828 100644 --- a/page/src/section.rs +++ b/page/src/section.rs @@ -121,6 +121,5 @@ pub fn unimplemented<'a, Message: 'static>( _page: &'a dyn Page, _section: &'a Section, ) -> cosmic::Element<'a, Message> { - cosmic::widget::settings::view_column(vec![cosmic::widget::settings::view_section("").into()]) - .into() + cosmic::widget::settings::view_column(vec![cosmic::widget::settings::section().into()]).into() } diff --git a/pages/system/Cargo.toml b/pages/system/Cargo.toml index 1f8c5c2..85792a6 100644 --- a/pages/system/Cargo.toml +++ b/pages/system/Cargo.toml @@ -8,9 +8,9 @@ license = "GPL-3.0-only" [dependencies] byte-unit = "5.1.4" -const_format = "0.2.32" +const_format = "0.2.33" concat-in-place = "1.1.0" -sysinfo = "0.31.2" +sysinfo = "0.31.4" memchr = "2.7.4" [dependencies.bumpalo] diff --git a/pages/wallpapers/Cargo.toml b/pages/wallpapers/Cargo.toml index a0d6da4..50e8982 100644 --- a/pages/wallpapers/Cargo.toml +++ b/pages/wallpapers/Cargo.toml @@ -15,5 +15,5 @@ futures-lite = "2.3.0" futures-util = "0.3.30" image = "0.25.2" infer = "0.16.0" -tokio = { version = "1.39.3", features = ["sync"] } +tokio = { version = "1.40.0", features = ["sync"] } tracing = "0.1.40"