From 941cbf546be76032148981dd16a2ee3564d688b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vuka=C5=A1in=20Vojinovi=C4=87?= <150025636+git-f0x@users.noreply.github.com> Date: Tue, 24 Sep 2024 15:52:17 +0200 Subject: [PATCH] fix: padding, spacing, context menu style, and settings buttons --- Cargo.lock | 887 +++++++++--------- cosmic-app-list/src/app.rs | 43 +- .../i18n/en/cosmic_applet_audio.ftl | 2 +- cosmic-applet-audio/src/lib.rs | 28 +- .../i18n/de/cosmic_applet_battery.ftl | 3 +- .../i18n/en/cosmic_applet_battery.ftl | 5 +- .../i18n/es-419/cosmic_applet_battery.ftl | 1 - .../i18n/es-ES/cosmic_applet_battery.ftl | 1 - .../i18n/fa/cosmic_applet_battery.ftl | 1 - .../i18n/fi/cosmic_applet_battery.ftl | 1 - .../i18n/fr/cosmic_applet_battery.ftl | 3 +- .../i18n/hu/cosmic_applet_battery.ftl | 3 +- .../i18n/id/cosmic_applet_battery.ftl | 5 +- .../i18n/it/cosmic_applet_battery.ftl | 3 +- .../i18n/ja/cosmic_applet_battery.ftl | 1 - .../i18n/nl/cosmic_applet_battery.ftl | 1 - .../i18n/pl/cosmic_applet_battery.ftl | 1 - .../i18n/pt-BR/cosmic_applet_battery.ftl | 1 - .../i18n/pt/cosmic_applet_battery.ftl | 1 - .../i18n/ru/cosmic_applet_battery.ftl | 3 +- .../i18n/sk/cosmic_applet_battery.ftl | 3 +- .../i18n/sr-Cyrl/cosmic_applet_battery.ftl | 1 - .../i18n/sr-Latn/cosmic_applet_battery.ftl | 1 - .../i18n/tr/cosmic_applet_battery.ftl | 1 - .../i18n/uk/cosmic_applet_battery.ftl | 1 - .../i18n/zh-CN/cosmic_applet_battery.ftl | 1 - cosmic-applet-battery/src/app.rs | 36 +- .../i18n/en/cosmic_applet_bluetooth.ftl | 6 +- cosmic-applet-bluetooth/src/app.rs | 25 +- cosmic-applet-input-sources/src/window.rs | 12 +- cosmic-applet-minimize/src/window_image.rs | 2 +- .../i18n/en/cosmic_applet_network.ftl | 12 +- cosmic-applet-network/src/app.rs | 35 +- cosmic-applet-notifications/src/lib.rs | 10 +- cosmic-applet-power/src/lib.rs | 26 +- cosmic-applet-tiling/src/window.rs | 41 +- cosmic-applet-time/src/window.rs | 21 +- cosmic-panel-button/src/lib.rs | 2 +- 38 files changed, 693 insertions(+), 537 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 604f8859..6a538836 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -33,9 +33,9 @@ dependencies = [ [[package]] name = "addr2line" -version = "0.22.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" +checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375" dependencies = [ "gimli", ] @@ -46,6 +46,12 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +[[package]] +name = "adler2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + [[package]] name = "ahash" version = "0.8.11" @@ -102,9 +108,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" @@ -129,15 +135,15 @@ checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" [[package]] name = "arrayref" -version = "0.3.7" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" +checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" [[package]] name = "arrayvec" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "as-raw-xcb-connection" @@ -170,7 +176,7 @@ dependencies = [ "serde_repr", "tokio", "url", - "zbus 4.3.1", + "zbus 4.4.0", ] [[package]] @@ -190,7 +196,7 @@ dependencies = [ "wayland-backend", "wayland-client", "wayland-protocols", - "zbus 4.3.1", + "zbus 4.4.0", ] [[package]] @@ -229,13 +235,13 @@ 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", - "fastrand 2.1.0", + "fastrand 2.1.1", "futures-lite 2.3.0", "slab", ] @@ -273,9 +279,9 @@ dependencies = [ [[package]] name = "async-io" -version = "2.3.3" +version = "2.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964" +checksum = "444b0228950ee6501b3568d3c93bf1176a1fdbc3b758dcd9475046d30f4dc7e8" dependencies = [ "async-lock 3.4.0", "cfg-if", @@ -283,11 +289,11 @@ dependencies = [ "futures-io", "futures-lite 2.3.0", "parking", - "polling 3.7.2", - "rustix 0.38.34", + "polling 3.7.3", + "rustix 0.38.37", "slab", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -316,7 +322,7 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b948000fad4873c1c9339d60f2623323a0cfd3816e5181033c6a5cb68b2accf7" dependencies = [ - "async-io 2.3.3", + "async-io 2.3.4", "blocking", "futures-lite 2.3.0", ] @@ -334,18 +340,18 @@ dependencies = [ "cfg-if", "event-listener 3.1.0", "futures-lite 1.13.0", - "rustix 0.38.34", + "rustix 0.38.37", "windows-sys 0.48.0", ] [[package]] name = "async-process" -version = "2.2.3" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7eda79bbd84e29c2b308d1dc099d7de8dcc7035e48f4bf5dc4a531a44ff5e2a" +checksum = "63255f1dc2381611000436537bbedfe83183faa303a5a0edaf191edef06526bb" dependencies = [ "async-channel", - "async-io 2.3.3", + "async-io 2.3.4", "async-lock 3.4.0", "async-signal", "async-task", @@ -353,9 +359,8 @@ dependencies = [ "cfg-if", "event-listener 5.3.1", "futures-lite 2.3.0", - "rustix 0.38.34", + "rustix 0.38.37", "tracing", - "windows-sys 0.52.0", ] [[package]] @@ -366,25 +371,25 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.77", ] [[package]] name = "async-signal" -version = "0.2.8" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "794f185324c2f00e771cd9f1ae8b5ac68be2ca7abb129a87afd6e86d228bc54d" +checksum = "637e00349800c0bdf8bfc21ebbc0b6524abea702b0da4168ac00d070d0c0b9f3" dependencies = [ - "async-io 2.3.3", + "async-io 2.3.4", "async-lock 3.4.0", "atomic-waker", "cfg-if", "futures-core", "futures-io", - "rustix 0.38.34", + "rustix 0.38.37", "signal-hook-registry", "slab", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -395,13 +400,13 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.81" +version = "0.1.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" +checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.77", ] [[package]] @@ -415,7 +420,7 @@ name = "atomicwrites" version = "0.4.2" source = "git+https://github.com/jackpot51/rust-atomicwrites#043ab4859d53ffd3d55334685303d8df39c9f768" dependencies = [ - "rustix 0.38.34", + "rustix 0.38.37", "tempfile", "windows-sys 0.48.0", ] @@ -476,17 +481,17 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "backtrace" -version = "0.3.73" +version = "0.3.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" +checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" dependencies = [ "addr2line", - "cc", "cfg-if", "libc", - "miniz_oxide", + "miniz_oxide 0.8.0", "object", "rustc-demangle", + "windows-targets 0.52.6", ] [[package]] @@ -495,6 +500,15 @@ version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" +[[package]] +name = "basic-toml" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "823388e228f614e9558c6804262db37960ec8821856535f5c3f59913140558f8" +dependencies = [ + "serde", +] + [[package]] name = "bit-set" version = "0.5.3" @@ -602,22 +616,22 @@ checksum = "64fa3c856b712db6612c019f14756e64e4bcea13337a6b33b696333a9eaa2d06" [[package]] name = "bytemuck" -version = "1.16.1" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e" +checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.7.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee891b04274a59bd38b412188e24b849617b2e45a0fd8d057deb63e7403761b" +checksum = "0cc8b54b395f2fcfbb3d90c47b01c7f444d94d05bdeb775811dec868ac3bbc26" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.77", ] [[package]] @@ -626,11 +640,17 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" +[[package]] +name = "byteorder-lite" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" + [[package]] name = "bytes" -version = "1.6.1" +version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12916984aab3fa6e39d655a33e09c0071eb36d6ab3aea5c2d78551f1df6d952" +checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" [[package]] name = "calendrical_calculations" @@ -650,8 +670,8 @@ checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec" dependencies = [ "bitflags 2.6.0", "log", - "polling 3.7.2", - "rustix 0.38.34", + "polling 3.7.3", + "rustix 0.38.37", "slab", "thiserror", ] @@ -663,16 +683,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95a66a987056935f7efce4ab5668920b5d0dac4a7c99991a67395f13702ddd20" dependencies = [ "calloop", - "rustix 0.38.34", + "rustix 0.38.37", "wayland-backend", "wayland-client", ] [[package]] name = "cc" -version = "1.1.5" +version = "1.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "324c74f2155653c90b04f25b2a47a8a631360cb908f92a772695f430c7e31052" +checksum = "07b1695e2c7e8fc85310cde85aeaab7e3097f593c91d209d3f9df76c928100f0" +dependencies = [ + "shlex", +] [[package]] name = "cfg-if" @@ -884,9 +907,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "core-graphics" @@ -933,14 +956,14 @@ dependencies = [ "futures", "i18n-embed 0.14.1", "i18n-embed-fl 0.8.0", - "image 0.25.1", + "image 0.25.2", "itertools 0.13.0", "libcosmic", - "memmap2 0.9.4", + "memmap2 0.9.5", "once_cell", "rand", "rust-embed 8.5.0", - "rustix 0.38.34", + "rustix 0.38.37", "serde", "switcheroo-control", "tokio", @@ -948,7 +971,7 @@ dependencies = [ "tracing-log", "tracing-subscriber", "url", - "zbus 4.3.1", + "zbus 4.4.0", ] [[package]] @@ -978,7 +1001,7 @@ dependencies = [ "tracing-subscriber", "url", "urlencoding", - "zbus 4.3.1", + "zbus 4.4.0", ] [[package]] @@ -999,7 +1022,7 @@ dependencies = [ "tracing-log", "tracing-subscriber", "udev", - "zbus 4.3.1", + "zbus 4.4.0", ] [[package]] @@ -1049,12 +1072,12 @@ dependencies = [ "anyhow", "i18n-embed 0.14.1", "i18n-embed-fl 0.8.0", - "image 0.25.1", + "image 0.25.2", "libcosmic", - "memmap2 0.9.4", + "memmap2 0.9.5", "once_cell", "rust-embed 8.5.0", - "rustix 0.38.34", + "rustix 0.38.37", "tokio", "tracing", "tracing-log", @@ -1079,7 +1102,7 @@ dependencies = [ "tracing", "tracing-log", "tracing-subscriber", - "zbus 4.3.1", + "zbus 4.4.0", ] [[package]] @@ -1103,7 +1126,7 @@ dependencies = [ "tracing-log", "tracing-subscriber", "url", - "zbus 4.3.1", + "zbus 4.4.0", ] [[package]] @@ -1116,11 +1139,11 @@ dependencies = [ "logind-zbus", "once_cell", "rust-embed 8.5.0", - "rustix 0.38.34", + "rustix 0.38.37", "tracing", "tracing-log", "tracing-subscriber", - "zbus 4.3.1", + "zbus 4.4.0", ] [[package]] @@ -1134,7 +1157,7 @@ dependencies = [ "tracing", "tracing-log", "tracing-subscriber", - "zbus 4.3.1", + "zbus 4.4.0", ] [[package]] @@ -1175,7 +1198,7 @@ dependencies = [ "tracing", "tracing-log", "tracing-subscriber", - "zbus 4.3.1", + "zbus 4.4.0", ] [[package]] @@ -1245,7 +1268,7 @@ dependencies = [ [[package]] name = "cosmic-config" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#57256e53e58146e5984783ea6c29d0af515bebea" +source = "git+https://github.com/pop-os/libcosmic#701638009df09a254b7d077ddc4d1076cd87a147" dependencies = [ "atomicwrites", "cosmic-config-derive", @@ -1261,13 +1284,13 @@ dependencies = [ "tokio", "tracing", "xdg", - "zbus 4.3.1", + "zbus 4.4.0", ] [[package]] name = "cosmic-config-derive" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#57256e53e58146e5984783ea6c29d0af515bebea" +source = "git+https://github.com/pop-os/libcosmic#701638009df09a254b7d077ddc4d1076cd87a147" dependencies = [ "quote", "syn 1.0.109", @@ -1276,21 +1299,21 @@ dependencies = [ [[package]] name = "cosmic-dbus-networkmanager" version = "0.1.0" -source = "git+https://github.com/pop-os/dbus-settings-bindings#cd21ddcb1b5cbfc80ab84b34d3c8b1ff3d81179a" +source = "git+https://github.com/pop-os/dbus-settings-bindings#063c2ad0dbe090d7e1221817128098493838b13a" dependencies = [ "bitflags 2.6.0", "derive_builder", "procfs", "thiserror", "time", - "zbus 4.3.1", - "zvariant 4.1.2", + "zbus 4.4.0", + "zvariant 4.2.0", ] [[package]] name = "cosmic-notifications-config" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-notifications#2caf2fb640e3601fac4dee1ae5c0121f75adcb51" +source = "git+https://github.com/pop-os/cosmic-notifications#e9abef567a928cfa88949dbbdb5c49bb87c2f6a0" dependencies = [ "cosmic-config", "serde", @@ -1299,14 +1322,14 @@ dependencies = [ [[package]] name = "cosmic-notifications-util" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-notifications#2caf2fb640e3601fac4dee1ae5c0121f75adcb51" +source = "git+https://github.com/pop-os/cosmic-notifications#e9abef567a928cfa88949dbbdb5c49bb87c2f6a0" dependencies = [ "bytemuck", "fast_image_resize", "serde", "tracing", "url", - "zbus 4.3.1", + "zbus 4.4.0", ] [[package]] @@ -1325,7 +1348,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", @@ -1354,31 +1377,36 @@ dependencies = [ [[package]] name = "cosmic-settings-daemon" version = "0.1.0" -source = "git+https://github.com/pop-os/dbus-settings-bindings#cd21ddcb1b5cbfc80ab84b34d3c8b1ff3d81179a" +source = "git+https://github.com/pop-os/dbus-settings-bindings#063c2ad0dbe090d7e1221817128098493838b13a" dependencies = [ - "zbus 4.3.1", + "zbus 4.4.0", ] [[package]] name = "cosmic-settings-subscriptions" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-settings-subscriptions#c19240ad2c9f11ef5cec8ed8c70255c3dc9ae8d4" +source = "git+https://github.com/pop-os/cosmic-settings-subscriptions#ece1b2475c9eb90e0f2042b743577670e799a010" dependencies = [ + "cosmic-dbus-networkmanager", "futures", "iced_futures", + "itertools 0.13.0", "libpulse-binding", "log", - "rustix 0.38.34", + "rustix 0.38.37", + "secure-string", + "thiserror", "tokio", "tokio-stream", + "tracing", "upower_dbus", - "zbus 4.3.1", + "zbus 4.4.0", ] [[package]] name = "cosmic-text" version = "0.12.1" -source = "git+https://github.com/pop-os/cosmic-text.git#e16b39f29c84773a05457fe39577a602de27855c" +source = "git+https://github.com/pop-os/cosmic-text.git#4fe90bb6126c22f589b46768d7754d65ae300c5e" dependencies = [ "bitflags 2.6.0", "fontdb", @@ -1388,6 +1416,7 @@ dependencies = [ "rustc-hash", "rustybuzz 0.14.1", "self_cell 1.0.4", + "smol_str", "swash", "sys-locale", "ttf-parser 0.21.1", @@ -1400,7 +1429,7 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#57256e53e58146e5984783ea6c29d0af515bebea" +source = "git+https://github.com/pop-os/libcosmic#701638009df09a254b7d077ddc4d1076cd87a147" dependencies = [ "almost", "cosmic-config", @@ -1417,7 +1446,7 @@ dependencies = [ [[package]] name = "cosmic-time" version = "0.4.0" -source = "git+https://github.com/pop-os/cosmic-time#dd973b3ced4b6cf784c78a1c36f1526dfbfbfa19" +source = "git+https://github.com/pop-os/cosmic-time#447ff6dc0cb63490deb997f830ada8408597945d" dependencies = [ "float-cmp", "libcosmic", @@ -1426,9 +1455,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.12" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" dependencies = [ "libc", ] @@ -1539,7 +1568,7 @@ dependencies = [ "itertools 0.12.1", "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.77", "synstructure", ] @@ -1549,7 +1578,7 @@ version = "0.19.0" source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" dependencies = [ "bitflags 2.6.0", - "libloading 0.8.4", + "libloading 0.8.5", "winapi", ] @@ -1598,7 +1627,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.11.1", - "syn 2.0.71", + "syn 2.0.77", ] [[package]] @@ -1620,7 +1649,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core 0.20.10", "quote", - "syn 2.0.71", + "syn 2.0.77", ] [[package]] @@ -1735,7 +1764,7 @@ dependencies = [ "darling 0.20.10", "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.77", ] [[package]] @@ -1803,7 +1832,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.77", ] [[package]] @@ -1812,7 +1841,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" dependencies = [ - "libloading 0.8.4", + "libloading 0.8.5", ] [[package]] @@ -1852,7 +1881,7 @@ dependencies = [ "bytemuck", "drm-ffi", "drm-fourcc", - "rustix 0.38.34", + "rustix 0.38.37", ] [[package]] @@ -1862,7 +1891,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41334f8405792483e32ad05fbb9c5680ff4e84491883d2947a4757dc54cb2ac6" dependencies = [ "drm-sys", - "rustix 0.38.34", + "rustix 0.38.37", ] [[package]] @@ -1878,7 +1907,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d09ff881f92f118b11105ba5e34ff8f4adf27b30dae8f12e28c193af1c83176" dependencies = [ "libc", - "linux-raw-sys 0.6.4", + "linux-raw-sys 0.6.5", ] [[package]] @@ -1922,7 +1951,7 @@ checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.77", ] [[package]] @@ -1943,9 +1972,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" @@ -1959,9 +1988,9 @@ dependencies = [ [[package]] name = "euclid" -version = "0.22.10" +version = "0.22.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0f0eb73b934648cd7a4a61f1b15391cd95dab0b4da6e2e66c2a072c144b4a20" +checksum = "ad9cdb4b747e485a12abb0e6566612956c7a1bafa3bdb8d682c5b6d403589e48" dependencies = [ "num-traits", ] @@ -2014,7 +2043,7 @@ dependencies = [ "flume", "half", "lebe", - "miniz_oxide", + "miniz_oxide 0.7.4", "rayon-core", "smallvec", "zune-inflate", @@ -2047,9 +2076,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "fdeflate" @@ -2062,14 +2091,14 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.23" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" +checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.4.1", - "windows-sys 0.52.0", + "libredox", + "windows-sys 0.59.0", ] [[package]] @@ -2078,7 +2107,7 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "59a98bbaacea1c0eb6a0876280051b892eb73594fd90cf3b20e9c817029c57d2" dependencies = [ - "toml 0.5.11", + "toml", ] [[package]] @@ -2094,12 +2123,12 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.30" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" +checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" dependencies = [ "crc32fast", - "miniz_oxide", + "miniz_oxide 0.8.0", ] [[package]] @@ -2178,20 +2207,20 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "font-types" -version = "0.5.5" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34fd7136aca682873d859ef34494ab1a7d3f57ecd485ed40eb6437ee8c85aa29" +checksum = "8f0189ccb084f77c5523e08288d418cbaa09c451a08515678a0aa265df9a8b60" dependencies = [ "bytemuck", ] [[package]] name = "fontconfig-parser" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a595cb550439a117696039dfc69830492058211b771a2a165379f2a1a53d84d" +checksum = "c1fcfcd44ca6e90c921fee9fa665d530b21ef1327a4c1a6c5250ea44b776ada7" dependencies = [ - "roxmltree", + "roxmltree 0.20.0", ] [[package]] @@ -2202,7 +2231,7 @@ checksum = "b0299020c3ef3f60f526a4f64ab4a3d4ce116b1acbf24cdd22da0068e5d81dc3" dependencies = [ "fontconfig-parser", "log", - "memmap2 0.9.4", + "memmap2 0.9.5", "slotmap", "tinyvec", "ttf-parser 0.20.0", @@ -2226,7 +2255,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.77", ] [[package]] @@ -2375,7 +2404,7 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" dependencies = [ - "fastrand 2.1.0", + "fastrand 2.1.1", "futures-core", "futures-io", "parking", @@ -2390,7 +2419,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.77", ] [[package]] @@ -2456,9 +2485,9 @@ dependencies = [ [[package]] name = "gettext-rs" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e49ea8a8fad198aaa1f9655a2524b64b70eb06b2f3ff37da407566c93054f364" +checksum = "4a6716b8a0db461a2720b850ba1623e5b69e4b1aa0224cf5e1fb23a0fe49e65c" dependencies = [ "gettext-sys", "locale_config", @@ -2466,9 +2495,9 @@ dependencies = [ [[package]] name = "gettext-sys" -version = "0.21.3" +version = "0.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c63ce2e00f56a206778276704bbe38564c8695249fdc8f354b4ef71c57c3839d" +checksum = "f7b8797f28f2dabfbe2caadb6db4f7fd739e251b5ede0a2ba49e506071edcf67" dependencies = [ "cc", "temp-dir", @@ -2496,9 +2525,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.29.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" +checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64" [[package]] name = "gl_generator" @@ -2646,7 +2675,7 @@ dependencies = [ "bitflags 2.6.0", "com", "libc", - "libloading 0.8.4", + "libloading 0.8.5", "thiserror", "widestring", "winapi", @@ -2690,15 +2719,15 @@ checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" [[package]] name = "i18n-config" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c9ce3c48cbc21fd5b22b9331f32b5b51f6ad85d969b99e793427332e76e7640" +checksum = "8e88074831c0be5b89181b05e6748c4915f77769ecc9a4c372f88b169a8509c9" dependencies = [ + "basic-toml", "log", "serde", "serde_derive", "thiserror", - "toml 0.8.14", "unic-langid", ] @@ -2763,7 +2792,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.10.0", - "syn 2.0.71", + "syn 2.0.77", "unic-langid", ] @@ -2784,7 +2813,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.10.0", - "syn 2.0.71", + "syn 2.0.77", "unic-langid", ] @@ -2798,14 +2827,14 @@ dependencies = [ "i18n-config", "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.77", ] [[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", @@ -2827,7 +2856,7 @@ dependencies = [ [[package]] name = "iced" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#57256e53e58146e5984783ea6c29d0af515bebea" +source = "git+https://github.com/pop-os/libcosmic#701638009df09a254b7d077ddc4d1076cd87a147" dependencies = [ "dnd", "iced_accessibility", @@ -2845,7 +2874,7 @@ dependencies = [ [[package]] name = "iced_accessibility" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#57256e53e58146e5984783ea6c29d0af515bebea" +source = "git+https://github.com/pop-os/libcosmic#701638009df09a254b7d077ddc4d1076cd87a147" dependencies = [ "accesskit", "accesskit_unix", @@ -2854,7 +2883,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#57256e53e58146e5984783ea6c29d0af515bebea" +source = "git+https://github.com/pop-os/libcosmic#701638009df09a254b7d077ddc4d1076cd87a147" dependencies = [ "bitflags 2.6.0", "dnd", @@ -2876,7 +2905,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#57256e53e58146e5984783ea6c29d0af515bebea" +source = "git+https://github.com/pop-os/libcosmic#701638009df09a254b7d077ddc4d1076cd87a147" dependencies = [ "futures", "iced_core", @@ -2889,7 +2918,7 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#57256e53e58146e5984783ea6c29d0af515bebea" +source = "git+https://github.com/pop-os/libcosmic#701638009df09a254b7d077ddc4d1076cd87a147" dependencies = [ "bitflags 2.6.0", "bytemuck", @@ -2913,7 +2942,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#57256e53e58146e5984783ea6c29d0af515bebea" +source = "git+https://github.com/pop-os/libcosmic#701638009df09a254b7d077ddc4d1076cd87a147" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -2925,7 +2954,7 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#57256e53e58146e5984783ea6c29d0af515bebea" +source = "git+https://github.com/pop-os/libcosmic#701638009df09a254b7d077ddc4d1076cd87a147" dependencies = [ "dnd", "iced_accessibility", @@ -2939,7 +2968,7 @@ dependencies = [ [[package]] name = "iced_sctk" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#57256e53e58146e5984783ea6c29d0af515bebea" +source = "git+https://github.com/pop-os/libcosmic#701638009df09a254b7d077ddc4d1076cd87a147" dependencies = [ "enum-repr", "float-cmp", @@ -2965,7 +2994,7 @@ dependencies = [ [[package]] name = "iced_style" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#57256e53e58146e5984783ea6c29d0af515bebea" +source = "git+https://github.com/pop-os/libcosmic#701638009df09a254b7d077ddc4d1076cd87a147" dependencies = [ "iced_core", "once_cell", @@ -2975,7 +3004,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#57256e53e58146e5984783ea6c29d0af515bebea" +source = "git+https://github.com/pop-os/libcosmic#701638009df09a254b7d077ddc4d1076cd87a147" dependencies = [ "bytemuck", "cosmic-text", @@ -2992,7 +3021,7 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#57256e53e58146e5984783ea6c29d0af515bebea" +source = "git+https://github.com/pop-os/libcosmic#701638009df09a254b7d077ddc4d1076cd87a147" dependencies = [ "as-raw-xcb-connection", "bitflags 2.6.0", @@ -3007,7 +3036,7 @@ dependencies = [ "once_cell", "raw-window-handle", "resvg", - "rustix 0.38.34", + "rustix 0.38.37", "smithay-client-toolkit", "tiny-xlib", "wayland-backend", @@ -3021,7 +3050,7 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#57256e53e58146e5984783ea6c29d0af515bebea" +source = "git+https://github.com/pop-os/libcosmic#701638009df09a254b7d077ddc4d1076cd87a147" dependencies = [ "dnd", "iced_renderer", @@ -3383,7 +3412,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.77", ] [[package]] @@ -3465,12 +3494,12 @@ dependencies = [ [[package]] name = "image" -version = "0.25.1" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd54d660e773627692c524beaad361aca785a4f9f5730ce91f42aabe5bce3d11" +checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10" dependencies = [ "bytemuck", - "byteorder", + "byteorder-lite", "num-traits", ] @@ -3482,9 +3511,9 @@ checksum = "029d73f573d8e8d63e6d5020011d3255b28c3ba85d6cf870a07184ed23de9284" [[package]] name = "indexmap" -version = "2.2.6" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" dependencies = [ "equivalent", "hashbrown", @@ -3610,9 +3639,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.69" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" dependencies = [ "wasm-bindgen", ] @@ -3633,7 +3662,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76" dependencies = [ "libc", - "libloading 0.8.4", + "libloading 0.8.5", "pkg-config", ] @@ -3645,11 +3674,11 @@ checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" [[package]] name = "known-folders" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4397c789f2709d23cfcb703b316e0766a8d4b17db2d47b0ab096ef6047cae1d8" +checksum = "b7d9a1740cc8b46e259a0eb787d79d855e79ff10b9855a5eba58868d5da7927c" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -3695,14 +3724,14 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" [[package]] name = "libc" -version = "0.2.155" +version = "0.2.158" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" [[package]] name = "libcosmic" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#57256e53e58146e5984783ea6c29d0af515bebea" +source = "git+https://github.com/pop-os/libcosmic#701638009df09a254b7d077ddc4d1076cd87a147" dependencies = [ "apply", "ashpd 0.9.1", @@ -3732,7 +3761,7 @@ dependencies = [ "palette", "rfd", "ron", - "rustix 0.38.34", + "rustix 0.38.37", "serde", "shlex", "slotmap", @@ -3742,7 +3771,7 @@ dependencies = [ "tracing", "unicode-segmentation", "url", - "zbus 4.3.1", + "zbus 4.4.0", ] [[package]] @@ -3766,9 +3795,9 @@ dependencies = [ [[package]] name = "libloading" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d" +checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" dependencies = [ "cfg-if", "windows-targets 0.52.6", @@ -3815,6 +3844,7 @@ checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ "bitflags 2.6.0", "libc", + "redox_syscall 0.5.4", ] [[package]] @@ -3841,9 +3871,9 @@ checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "linux-raw-sys" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0b5399f6804fbab912acbd8878ed3532d506b7c951b8f9f164ef90fef39e3f4" +checksum = "2a385b1be4e5c3e362ad2ffa73c392e53f031eaa5b7d648e64cd87f27f6063d7" [[package]] name = "litemap" @@ -3882,19 +3912,19 @@ checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "logind-zbus" -version = "4.0.3" +version = "4.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e77231dda256523272d8168cf57a9f214ccef06d385c126ce64df662ca5721e" +checksum = "a85a07c35bc3d71bd5ce956b6e89420fbce7e221da18ce2c685c0c784e64fa01" dependencies = [ "serde", - "zbus 4.3.1", + "zbus 4.4.0", ] [[package]] name = "lru" -version = "0.12.3" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" +checksum = "37ee39891760e7d94734f6f63fedc29a2e4a152f836120753a72503f09fcf904" dependencies = [ "hashbrown", ] @@ -3992,9 +4022,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", ] @@ -4056,6 +4086,15 @@ dependencies = [ "simd-adler32", ] +[[package]] +name = "miniz_oxide" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +dependencies = [ + "adler2", +] + [[package]] name = "mio" version = "0.8.11" @@ -4068,17 +4107,29 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "mio" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" +dependencies = [ + "hermit-abi 0.3.9", + "libc", + "wasi", + "windows-sys 0.52.0", +] + [[package]] name = "mpris2-zbus" version = "0.1.0" -source = "git+https://github.com/pop-os/dbus-settings-bindings#cd21ddcb1b5cbfc80ab84b34d3c8b1ff3d81179a" +source = "git+https://github.com/pop-os/dbus-settings-bindings#063c2ad0dbe090d7e1221817128098493838b13a" dependencies = [ "futures-util", "serde", "thiserror", "time", - "zbus 4.3.1", - "zvariant 4.1.2", + "zbus 4.4.0", + "zvariant 4.2.0", ] [[package]] @@ -4146,7 +4197,7 @@ dependencies = [ "kqueue", "libc", "log", - "mio", + "mio 0.8.11", "walkdir", "windows-sys 0.48.0", ] @@ -4219,7 +4270,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.77", ] [[package]] @@ -4314,9 +4365,9 @@ dependencies = [ [[package]] name = "object" -version = "0.36.1" +version = "0.36.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce" +checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" dependencies = [ "memchr", ] @@ -4374,7 +4425,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.77", ] [[package]] @@ -4405,14 +4456,14 @@ dependencies = [ "by_address", "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.77", ] [[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" @@ -4457,7 +4508,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.5.3", + "redox_syscall 0.5.4", "smallvec", "windows-targets 0.52.6", ] @@ -4523,7 +4574,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.77", ] [[package]] @@ -4558,7 +4609,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.77", ] [[package]] @@ -4575,20 +4626,20 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "piper" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391" +checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066" dependencies = [ "atomic-waker", - "fastrand 2.1.0", + "fastrand 2.1.1", "futures-io", ] [[package]] name = "pkg-config" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" [[package]] name = "png" @@ -4600,7 +4651,7 @@ dependencies = [ "crc32fast", "fdeflate", "flate2", - "miniz_oxide", + "miniz_oxide 0.7.4", ] [[package]] @@ -4621,17 +4672,17 @@ dependencies = [ [[package]] name = "polling" -version = "3.7.2" +version = "3.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b" +checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511" dependencies = [ "cfg-if", "concurrent-queue", "hermit-abi 0.4.0", "pin-project-lite", - "rustix 0.38.34", + "rustix 0.38.37", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -4648,9 +4699,12 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppv-lite86" -version = "0.2.17" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] [[package]] name = "presser" @@ -4670,11 +4724,11 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "3.1.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" dependencies = [ - "toml_edit 0.21.1", + "toml_edit 0.22.21", ] [[package]] @@ -4720,7 +4774,7 @@ dependencies = [ "hex", "lazy_static", "procfs-core", - "rustix 0.38.34", + "rustix 0.38.37", ] [[package]] @@ -4750,18 +4804,18 @@ dependencies = [ [[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", ] [[package]] name = "quote" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] @@ -4842,9 +4896,9 @@ checksum = "3b42e27ef78c35d3998403c1d26f3efd9e135d3e5121b0a4845cc5cc27547f4f" [[package]] name = "read-fonts" -version = "0.19.3" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8b8af39d1f23869711ad4cea5e7835a20daa987f80232f7f2a2374d648ca64d" +checksum = "8c141b9980e1150201b2a3a32879001c8f975fe313ec3df5471a9b5c79a880cd" dependencies = [ "bytemuck", "font-types", @@ -4870,18 +4924,18 @@ 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", ] [[package]] name = "redox_users" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" +checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom", "libredox", @@ -4890,9 +4944,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.5" +version = "1.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" dependencies = [ "aho-corasick", "memchr", @@ -4989,9 +5043,9 @@ dependencies = [ [[package]] name = "rgb" -version = "0.8.45" +version = "0.8.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ade4539f42266ded9e755c605bdddf546242b2c961b03b06a7375260788a0523" +checksum = "57397d16646700483b67d2dd6511d79318f9d057fdbd21a4066aeac8b41d310a" dependencies = [ "bytemuck", ] @@ -5014,6 +5068,12 @@ version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f" +[[package]] +name = "roxmltree" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97" + [[package]] name = "rust-embed" version = "6.8.1" @@ -5045,7 +5105,7 @@ dependencies = [ "proc-macro2", "quote", "rust-embed-utils 7.8.1", - "syn 2.0.71", + "syn 2.0.77", "walkdir", ] @@ -5058,7 +5118,7 @@ dependencies = [ "proc-macro2", "quote", "rust-embed-utils 8.5.0", - "syn 2.0.71", + "syn 2.0.77", "walkdir", ] @@ -5120,9 +5180,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.34" +version = "0.38.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" dependencies = [ "bitflags 2.6.0", "errno", @@ -5197,6 +5257,16 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" +[[package]] +name = "secure-string" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "548ba8c9ff631f7bb3a64de1e8ad73fe20f6d04090724f2b496ed45314ad7488" +dependencies = [ + "libc", + "zeroize", +] + [[package]] name = "self_cell" version = "0.10.3" @@ -5224,9 +5294,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.204" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" dependencies = [ "serde_derive", ] @@ -5245,23 +5315,24 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.204" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.77", ] [[package]] name = "serde_json" -version = "1.0.120" +version = "1.0.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" dependencies = [ "indexmap", "itoa", + "memchr", "ryu", "serde", ] @@ -5274,16 +5345,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", -] - -[[package]] -name = "serde_spanned" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" -dependencies = [ - "serde", + "syn 2.0.77", ] [[package]] @@ -5355,9 +5417,9 @@ checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" [[package]] name = "skrifa" -version = "0.19.3" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ab45fb68b53576a43d4fc0e9ec8ea64e29a4d2cc7f44506964cb75f288222e9" +checksum = "abea4738067b1e628c6ce28b2c216c19e9ea95715cdb332680e821c3bec2ef23" dependencies = [ "bytemuck", "read-fonts", @@ -5400,9 +5462,9 @@ dependencies = [ "cursor-icon", "libc", "log", - "memmap2 0.9.4", + "memmap2 0.9.5", "pkg-config", - "rustix 0.38.34", + "rustix 0.38.37", "thiserror", "wayland-backend", "wayland-client", @@ -5466,15 +5528,15 @@ dependencies = [ "cocoa", "core-graphics", "drm", - "fastrand 2.1.0", + "fastrand 2.1.1", "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.34", + "rustix 0.38.37", "tiny-xlib", "wasm-bindgen", "wayland-backend", @@ -5555,7 +5617,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.71", + "syn 2.0.77", ] [[package]] @@ -5576,9 +5638,9 @@ dependencies = [ [[package]] name = "swash" -version = "0.1.17" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d7773d67fe3373048cf840bfcc54ec3207cfc1e95c526b287ef2eb5eff9faf6" +checksum = "93cdc334a50fcc2aa3f04761af3b28196280a6aaadb1ef11215c478ae32615ac" dependencies = [ "skrifa", "yazi", @@ -5588,9 +5650,9 @@ dependencies = [ [[package]] name = "switcheroo-control" version = "0.1.0" -source = "git+https://github.com/pop-os/dbus-settings-bindings#cd21ddcb1b5cbfc80ab84b34d3c8b1ff3d81179a" +source = "git+https://github.com/pop-os/dbus-settings-bindings#063c2ad0dbe090d7e1221817128098493838b13a" dependencies = [ - "zbus 4.3.1", + "zbus 4.4.0", ] [[package]] @@ -5606,9 +5668,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.71" +version = "2.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b146dcf730474b4bcd16c311627b31ede9ab149045db4d6088b3becaea046462" +checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" dependencies = [ "proc-macro2", "quote", @@ -5623,7 +5685,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.77", ] [[package]] @@ -5654,14 +5716,15 @@ checksum = "1f227968ec00f0e5322f9b8173c7a0cbcff6181a0a5b28e9892491c286277231" [[package]] name = "tempfile" -version = "3.10.1" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" dependencies = [ "cfg-if", - "fastrand 2.1.0", - "rustix 0.38.34", - "windows-sys 0.52.0", + "fastrand 2.1.1", + "once_cell", + "rustix 0.38.37", + "windows-sys 0.59.0", ] [[package]] @@ -5675,28 +5738,28 @@ 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" -version = "1.0.62" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2675633b1499176c2dff06b0856a27976a8f9d436737b4cf4f312d4d91d8bbb" +checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.62" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d20468752b09f49e909e55a5d338caa8bedf615594e9d80bc4c565d30faf798c" +checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.77", ] [[package]] @@ -5753,9 +5816,9 @@ dependencies = [ [[package]] name = "timedate-zbus" version = "0.1.0" -source = "git+https://github.com/pop-os/dbus-settings-bindings#cd21ddcb1b5cbfc80ab84b34d3c8b1ff3d81179a" +source = "git+https://github.com/pop-os/dbus-settings-bindings#063c2ad0dbe090d7e1221817128098493838b13a" dependencies = [ - "zbus 4.3.1", + "zbus 4.4.0", ] [[package]] @@ -5801,7 +5864,7 @@ checksum = "1d52f22673960ad13af14ff4025997312def1223bfa7c8e4949d099e6b3d5d1c" dependencies = [ "as-raw-xcb-connection", "ctor-lite", - "libloading 0.8.4", + "libloading 0.8.5", "pkg-config", "tracing", ] @@ -5833,40 +5896,39 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.38.0" +version = "1.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" +checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" dependencies = [ "backtrace", "bytes", "libc", - "mio", - "num_cpus", + "mio 1.0.2", "parking_lot 0.12.3", "pin-project-lite", "signal-hook-registry", "socket2 0.5.7", "tokio-macros", "tracing", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "tokio-macros" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.77", ] [[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", @@ -5882,26 +5944,11 @@ dependencies = [ "serde", ] -[[package]] -name = "toml" -version = "0.8.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit 0.22.15", -] - [[package]] name = "toml_datetime" -version = "0.6.6" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" -dependencies = [ - "serde", -] +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" [[package]] name = "toml_edit" @@ -5916,26 +5963,13 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" -dependencies = [ - "indexmap", - "toml_datetime", - "winnow 0.5.40", -] - -[[package]] -name = "toml_edit" -version = "0.22.15" +version = "0.22.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59a3a72298453f564e2b111fa896f8d07fabb36f51f06d7e875fc5e0b5a3ef1" +checksum = "3b072cee73c449a636ffd6f32bd8de3a9f7119139aff882f44943ce2986dc5cf" dependencies = [ "indexmap", - "serde", - "serde_spanned", "toml_datetime", - "winnow 0.6.13", + "winnow 0.6.18", ] [[package]] @@ -5957,7 +5991,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.77", ] [[package]] @@ -6100,9 +6134,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" @@ -6112,30 +6146,30 @@ 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", ] [[package]] name = "unicode-properties" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4259d9d4425d9f0661581b804cb85fe66a4c631cadd8f490d1c13a35d5d9291" +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" @@ -6145,24 +6179,24 @@ 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.4" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" +checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" [[package]] name = "upower_dbus" version = "0.3.2" -source = "git+https://github.com/pop-os/dbus-settings-bindings#cd21ddcb1b5cbfc80ab84b34d3c8b1ff3d81179a" +source = "git+https://github.com/pop-os/dbus-settings-bindings#063c2ad0dbe090d7e1221817128098493838b13a" dependencies = [ "serde", "serde_repr", - "zbus 4.3.1", + "zbus 4.4.0", ] [[package]] @@ -6209,7 +6243,7 @@ dependencies = [ "imagesize", "kurbo", "log", - "roxmltree", + "roxmltree 0.19.0", "simplecss", "siphasher", "svgtypes", @@ -6273,9 +6307,9 @@ checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" [[package]] name = "version_check" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "waker-fn" @@ -6301,34 +6335,35 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" dependencies = [ "cfg-if", + "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.77", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.42" +version = "0.4.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" +checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" dependencies = [ "cfg-if", "js-sys", @@ -6338,9 +6373,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -6348,22 +6383,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.77", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" [[package]] name = "wasm-timer" @@ -6382,13 +6417,13 @@ dependencies = [ [[package]] name = "wayland-backend" -version = "0.3.5" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "269c04f203640d0da2092d1b8d89a2d081714ae3ac2f1b53e99f205740517198" +checksum = "056535ced7a150d45159d3a8dc30f91a2e2d588ca0b23f70e56033622b8016f6" dependencies = [ "cc", "downcast-rs", - "rustix 0.38.34", + "rustix 0.38.37", "scoped-tls", "smallvec", "wayland-sys", @@ -6396,12 +6431,12 @@ dependencies = [ [[package]] name = "wayland-client" -version = "0.31.4" +version = "0.31.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08bd0f46c069d3382a36c8666c1b9ccef32b8b04f41667ca1fef06a1adcc2982" +checksum = "e3f45d1222915ef1fd2057220c1d9d9624b7654443ea35c3877f7a52bd0a5a2d" dependencies = [ "bitflags 2.6.0", - "rustix 0.38.34", + "rustix 0.38.37", "wayland-backend", "wayland-scanner", ] @@ -6419,20 +6454,20 @@ dependencies = [ [[package]] name = "wayland-cursor" -version = "0.31.4" +version = "0.31.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09414bcf0fd8d9577d73e9ac4659ebc45bcc9cff1980a350543ad8e50ee263b2" +checksum = "3a94697e66e76c85923b0d28a0c251e8f0666f58fc47d316c0f4da6da75d37cb" dependencies = [ - "rustix 0.38.34", + "rustix 0.38.37", "wayland-client", "xcursor", ] [[package]] name = "wayland-protocols" -version = "0.32.2" +version = "0.32.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1794d82d869f38439d15c24b26f06f6c8603d27d47b4f786d5197c99044de415" +checksum = "2b5755d77ae9040bb872a25026555ce4cb0ae75fd923e90d25fba07d81057de0" dependencies = [ "bitflags 2.6.0", "wayland-backend", @@ -6443,9 +6478,9 @@ dependencies = [ [[package]] name = "wayland-protocols-wlr" -version = "0.3.2" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa43c961473aed713d44c1f616f775186249dfca657f256d8841ca0690366aba" +checksum = "dad87b5fd1b1d3ca2f792df8f686a2a11e3fe1077b71096f7a175ab699f89109" dependencies = [ "bitflags 2.6.0", "wayland-backend", @@ -6457,9 +6492,9 @@ dependencies = [ [[package]] name = "wayland-scanner" -version = "0.31.3" +version = "0.31.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edf466fc49a4feb65a511ca403fec3601494d0dee85dbf37fff6fa0dd4eec3b6" +checksum = "597f2001b2e5fc1121e3d5b9791d3e78f05ba6bfa4641053846248e3a13661c3" dependencies = [ "proc-macro2", "quick-xml", @@ -6468,23 +6503,23 @@ dependencies = [ [[package]] name = "wayland-server" -version = "0.31.3" +version = "0.31.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a29060303e79e4c3d44936efdcf00941a78c86850bf67a88078dd1d6c99702b9" +checksum = "0f18d47038c0b10479e695d99ed073e400ccd9bdbb60e6e503c96f62adcb12b6" dependencies = [ "bitflags 2.6.0", "downcast-rs", "io-lifetimes 2.0.3", - "rustix 0.38.34", + "rustix 0.38.37", "wayland-backend", "wayland-scanner", ] [[package]] name = "wayland-sys" -version = "0.31.3" +version = "0.31.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a6754825230fa5b27bafaa28c30b3c9e72c55530581220cef401fa422c0fae7" +checksum = "efa8ac0d8e8ed3e3b5c9fc92c7881406a268e11555abe36493efabe649a29e09" dependencies = [ "dlib", "log", @@ -6494,9 +6529,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.69" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" dependencies = [ "js-sys", "wasm-bindgen", @@ -6590,7 +6625,7 @@ dependencies = [ "js-sys", "khronos-egl", "libc", - "libloading 0.8.4", + "libloading 0.8.5", "log", "metal", "naga", @@ -6644,11 +6679,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -6709,6 +6744,15 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", +] + [[package]] name = "windows-targets" version = "0.48.5" @@ -6841,9 +6885,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.13" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1" +checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" dependencies = [ "memchr", ] @@ -6872,9 +6916,9 @@ dependencies = [ "as-raw-xcb-connection", "gethostname", "libc", - "libloading 0.8.4", + "libloading 0.8.5", "once_cell", - "rustix 0.38.34", + "rustix 0.38.37", "x11rb-protocol", ] @@ -6886,9 +6930,9 @@ checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d" [[package]] name = "xcursor" -version = "0.3.5" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a0ccd7b4a5345edfcd0c3535718a4e9ff7798ffc536bb5b5a0e26ff84732911" +checksum = "0ef33da6b1660b4ddbfb3aef0ade110c8b8a781a3b6382fa5f2b5b040fd55f61" [[package]] name = "xdg" @@ -6898,18 +6942,18 @@ checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546" [[package]] name = "xdg-home" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca91dcf8f93db085f3a0a29358cd0b9d670915468f4290e8b85d118a34211ab8" +checksum = "ec1cdab258fb55c0da61328dc52c8764709b249011b2cad0454c72f0bf10a1f6" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[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", @@ -6960,9 +7004,9 @@ dependencies = [ [[package]] name = "xml-rs" -version = "0.8.20" +version = "0.8.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193" +checksum = "af4e2e2f7cba5a093896c1e150fbfe177d1883e7448200efb81d40b9d339ef26" [[package]] name = "xmlwriter" @@ -6972,9 +7016,9 @@ checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9" [[package]] name = "xxhash-rust" -version = "0.8.11" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63658493314859b4dfdf3fb8c1defd61587839def09582db50b8a4e93afca6bb" +checksum = "6a5cbf750400958819fb6178eaa83bee5cd9c29a26a40cc241df8c70fdd46984" [[package]] name = "yazi" @@ -7002,7 +7046,7 @@ checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.77", "synstructure", ] @@ -7044,16 +7088,16 @@ dependencies = [ [[package]] name = "zbus" -version = "4.3.1" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "851238c133804e0aa888edf4a0229481c753544ca12a60fd1c3230c8a500fe40" +checksum = "bb97012beadd29e654708a0fdb4c84bc046f537aecfde2c3ee0a9e4b4d48c725" dependencies = [ "async-broadcast 0.7.1", "async-executor", "async-fs", - "async-io 2.3.3", + "async-io 2.3.4", "async-lock 3.4.0", - "async-process 2.2.3", + "async-process 2.3.0", "async-recursion", "async-task", "async-trait", @@ -7076,9 +7120,9 @@ dependencies = [ "uds_windows", "windows-sys 0.52.0", "xdg-home", - "zbus_macros 4.3.1", + "zbus_macros 4.4.0", "zbus_names 3.0.0", - "zvariant 4.1.2", + "zvariant 4.2.0", ] [[package]] @@ -7097,15 +7141,15 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "4.3.1" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d5a3f12c20bd473be3194af6b49d50d7bb804ef3192dc70eddedb26b85d9da7" +checksum = "267db9407081e90bbfa46d841d3cbc60f59c0351838c4bc65199ecd79ab1983e" dependencies = [ - "proc-macro-crate 3.1.0", + "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.71", - "zvariant_utils 2.0.0", + "syn 2.0.77", + "zvariant_utils 2.1.0", ] [[package]] @@ -7127,7 +7171,7 @@ checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c" dependencies = [ "serde", "static_assertions", - "zvariant 4.1.2", + "zvariant 4.2.0", ] [[package]] @@ -7142,6 +7186,7 @@ version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ + "byteorder", "zerocopy-derive", ] @@ -7153,7 +7198,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.77", ] [[package]] @@ -7173,10 +7218,16 @@ checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.77", "synstructure", ] +[[package]] +name = "zeroize" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" + [[package]] name = "zerotrie" version = "0.1.3" @@ -7207,7 +7258,7 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.77", ] [[package]] @@ -7235,16 +7286,16 @@ dependencies = [ [[package]] name = "zvariant" -version = "4.1.2" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1724a2b330760dc7d2a8402d841119dc869ef120b139d29862d6980e9c75bfc9" +checksum = "2084290ab9a1c471c38fc524945837734fbf124487e105daec2bb57fd48c81fe" dependencies = [ "endi", "enumflags2", "serde", "static_assertions", "url", - "zvariant_derive 4.1.2", + "zvariant_derive 4.2.0", ] [[package]] @@ -7262,15 +7313,15 @@ dependencies = [ [[package]] name = "zvariant_derive" -version = "4.1.2" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55025a7a518ad14518fb243559c058a2e5b848b015e31f1d90414f36e3317859" +checksum = "73e2ba546bda683a90652bac4a279bc146adad1386f25379cf73200d2002c449" dependencies = [ - "proc-macro-crate 3.1.0", + "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.71", - "zvariant_utils 2.0.0", + "syn 2.0.77", + "zvariant_utils 2.1.0", ] [[package]] @@ -7286,11 +7337,11 @@ dependencies = [ [[package]] name = "zvariant_utils" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc242db087efc22bd9ade7aa7809e4ba828132edc312871584a6b4391bdf8786" +checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.77", ] diff --git a/cosmic-app-list/src/app.rs b/cosmic-app-list/src/app.rs index 919dc901..b5029b08 100755 --- a/cosmic-app-list/src/app.rs +++ b/cosmic-app-list/src/app.rs @@ -41,7 +41,7 @@ use cosmic::{ accept_mime_type, finish_dnd, request_dnd_data, set_actions, start_drag, }, iced_style::{application, svg}, - theme::{Button, Container}, + theme::{self, Button, Container}, widget::{ button, divider, horizontal_space, icon, icon::from_name, @@ -62,7 +62,7 @@ use futures::future::pending; use iced::{widget::container, Alignment, Background, Length}; use itertools::Itertools; use rand::{thread_rng, Rng}; -use std::{collections::HashMap, fs, path::PathBuf, rc::Rc, str::FromStr, time::Duration}; +use std::{collections::HashMap, path::PathBuf, rc::Rc, str::FromStr, time::Duration}; use switcheroo_control::Gpu; use tokio::time::sleep; use url::Url; @@ -262,7 +262,7 @@ impl DockItem { .into(), }; - let icon_button = cosmic::widget::button(icon_wrapper) + let icon_button = button::custom(icon_wrapper) .padding(app_icon.padding) .selected(is_focused) .style(app_list_icon_style(is_focused)); @@ -456,7 +456,7 @@ where Msg: 'static + Clone, { let border = 1.0; - cosmic::widget::button( + button::custom( container( column![ container(if let Some(img) = img { @@ -1715,14 +1715,14 @@ impl cosmic::Application for CosmicAppList { fn menu_button<'a, Message>( content: impl Into>, ) -> cosmic::widget::Button<'a, Message> { - cosmic::widget::button(content) - .height(36) - .style(Button::AppletMenu) + button::custom(content) + .height(20 + 2 * theme::active().cosmic().space_xxs()) + .style(Button::MenuItem) .padding(menu_control_padding()) .width(Length::Fill) } - let mut content = column![].padding([8, 0]).align_items(Alignment::Center); + let mut content = column![].align_items(Alignment::Center); if let Some(exec) = desktop_info.exec() { if !toplevels.is_empty() { @@ -1774,7 +1774,7 @@ impl cosmic::Application for CosmicAppList { .on_press(Message::Exec(exec.into(), None)), ); } - content = content.push(divider::horizontal::default()); + content = content.push(divider::horizontal::light()); } if !toplevels.is_empty() { @@ -1791,7 +1791,7 @@ impl cosmic::Application for CosmicAppList { ); } content = content.push(list_col); - content = content.push(divider::horizontal::default()); + content = content.push(divider::horizontal::light()); } let svg_accent = Rc::new(|theme: &cosmic::Theme| { @@ -1820,7 +1820,7 @@ impl cosmic::Application for CosmicAppList { ); if toplevels.len() > 0 { - content = content.push(divider::horizontal::default()); + content = content.push(divider::horizontal::light()); content = match toplevels.len() { 1 => content.push( menu_button(text::body(fl!("quit"))) @@ -1832,7 +1832,26 @@ impl cosmic::Application for CosmicAppList { ), }; } - self.core.applet.popup_container(content).into() + container(content) + .padding(1) + //TODO: move style to libcosmic + .style(theme::Container::custom(|theme| { + let cosmic = theme.cosmic(); + let component = &cosmic.background.component; + container::Appearance { + icon_color: Some(component.on.into()), + text_color: Some(component.on.into()), + background: Some(Background::Color(component.base.into())), + border: Border { + radius: 8.0.into(), + width: 1.0, + color: component.divider.into(), + }, + ..Default::default() + } + })) + .width(Length::Fill) + .into() } PopupType::TopLevelList => match self.core.applet.anchor { PanelAnchor::Left | PanelAnchor::Right => { diff --git a/cosmic-applet-audio/i18n/en/cosmic_applet_audio.ftl b/cosmic-applet-audio/i18n/en/cosmic_applet_audio.ftl index 883a1ffc..bb13bf4a 100644 --- a/cosmic-applet-audio/i18n/en/cosmic_applet_audio.ftl +++ b/cosmic-applet-audio/i18n/en/cosmic_applet_audio.ftl @@ -1,6 +1,6 @@ output = Output input = Input -show-media-controls = Show Media Controls on Top Panel +show-media-controls = Show media controls on panel sound-settings = Sound Settings... disconnected = PulseAudio Disconnected no-device = No device selected diff --git a/cosmic-applet-audio/src/lib.rs b/cosmic-applet-audio/src/lib.rs index d4c19531..93e56104 100644 --- a/cosmic-applet-audio/src/lib.rs +++ b/cosmic-applet-audio/src/lib.rs @@ -15,15 +15,17 @@ use cosmic::{ menu_button, menu_control_padding, padded_control, token::subscription::{activation_token_subscription, TokenRequest, TokenUpdate}, }, - cctk::sctk::reexports::{calloop, protocols::xdg::shell::client::xdg_positioner::Anchor}, + cctk::sctk::reexports::calloop, cosmic_config::CosmicConfigEntry, + cosmic_theme::Spacing, iced::{ self, widget::{self, column, row, slider}, - window, Alignment, Length, Limits, Rectangle, Subscription, + window, Alignment, Length, Limits, Subscription, }, iced_runtime::core::alignment::Horizontal, iced_style::application, + theme, widget::{button, divider, horizontal_space, icon, text, Column, Row}, Element, Renderer, Theme, }; @@ -665,6 +667,9 @@ impl cosmic::Application for Audio { input.mute = value; } } + sub_pulse::Event::DefaultSink(_) => {} + sub_pulse::Event::DefaultSource(_) => {} + sub_pulse::Event::CardInfo(_) => {} }, }; @@ -735,16 +740,19 @@ impl cosmic::Application for Audio { } fn view_window(&self, _id: window::Id) -> Element { + let Spacing { + space_xxs, space_s, .. + } = theme::active().cosmic().spacing; + let audio_disabled = matches!(self.pulse_state, PulseState::Disconnected(_)); let out_mute = self.current_output_mute(); let in_mute = self.current_input_mute(); let mut audio_content = if audio_disabled { column![padded_control( - text(fl!("disconnected")) + text::title3(fl!("disconnected")) .width(Length::Fill) .horizontal_alignment(Horizontal::Center) - .size(24) )] } else { column![ @@ -790,7 +798,7 @@ impl cosmic::Application for Audio { .spacing(12) .align_items(Alignment::Center) ), - padded_control(divider::horizontal::default()), + padded_control(divider::horizontal::default()).padding([space_xxs, space_s]), revealer( self.is_open == IsOpen::Output, fl!("output"), @@ -906,7 +914,8 @@ impl cosmic::Application for Audio { .into(), ); - audio_content = audio_content.push(padded_control(divider::horizontal::default())); + audio_content = audio_content + .push(padded_control(divider::horizontal::default()).padding([space_xxs, space_s])); audio_content = audio_content.push( Row::with_children(elements) .align_items(Alignment::Center) @@ -916,7 +925,7 @@ impl cosmic::Application for Audio { } let content = column![ audio_content, - padded_control(divider::horizontal::default()), + padded_control(divider::horizontal::default()).padding([space_xxs, space_s]), padded_control( anim!( // toggler @@ -928,9 +937,8 @@ impl cosmic::Application for Audio { ) .text_size(14) .width(Length::Fill) - ) - .padding([8, 24]), - padded_control(divider::horizontal::default()), + ), + padded_control(divider::horizontal::default()).padding([space_xxs, space_s]), menu_button(text::body(fl!("sound-settings"))).on_press(Message::OpenSettings) ] .align_items(Alignment::Start) diff --git a/cosmic-applet-battery/i18n/de/cosmic_applet_battery.ftl b/cosmic-applet-battery/i18n/de/cosmic_applet_battery.ftl index d5999915..3137ce21 100644 --- a/cosmic-applet-battery/i18n/de/cosmic_applet_battery.ftl +++ b/cosmic-applet-battery/i18n/de/cosmic_applet_battery.ftl @@ -1,4 +1,3 @@ -cosmic-applet-button = Cosmic Taste battery = Akku battery-desc = Reduzierter Stromverbrauch und Leistung. balanced = Ausgeglichen @@ -12,4 +11,4 @@ hours = h until-empty = bis leer power-settings = Energie- und Akkueinstellungen... dgpu-running = Dedizierte GPU ist aktiv und kann die Akkulaufzeit reduzieren -dgpu-applications = Anwendungen, die die dedizierte GPU {$gpu_name} nutzen \ No newline at end of file +dgpu-applications = Anwendungen, die die dedizierte GPU {$gpu_name} nutzen diff --git a/cosmic-applet-battery/i18n/en/cosmic_applet_battery.ftl b/cosmic-applet-battery/i18n/en/cosmic_applet_battery.ftl index 3214e58b..27c6b3ce 100644 --- a/cosmic-applet-battery/i18n/en/cosmic_applet_battery.ftl +++ b/cosmic-applet-battery/i18n/en/cosmic_applet_battery.ftl @@ -1,4 +1,3 @@ -cosmic-applet-button = Cosmic Button battery = Battery battery-desc = Reduced power usage and performance. balanced = Balanced @@ -10,6 +9,6 @@ seconds = s minutes = m hours = h until-empty = until empty -power-settings = Power and Battery Settings... +power-settings = Power & Battery settings... dgpu-running = Discrete GPU is active and can reduce battery life -dgpu-applications = Applications using {$gpu_name} discrete GPU \ No newline at end of file +dgpu-applications = Applications using {$gpu_name} discrete GPU diff --git a/cosmic-applet-battery/i18n/es-419/cosmic_applet_battery.ftl b/cosmic-applet-battery/i18n/es-419/cosmic_applet_battery.ftl index b3c3264b..f86a2b32 100644 --- a/cosmic-applet-battery/i18n/es-419/cosmic_applet_battery.ftl +++ b/cosmic-applet-battery/i18n/es-419/cosmic_applet_battery.ftl @@ -1,4 +1,3 @@ -cosmic-applet-button = Botón de Cosmic battery = Ahorro de energía battery-desc = Rendimiento y uso de energía reducido. balanced = Balanceado diff --git a/cosmic-applet-battery/i18n/es-ES/cosmic_applet_battery.ftl b/cosmic-applet-battery/i18n/es-ES/cosmic_applet_battery.ftl index 51c6559f..df54d61a 100644 --- a/cosmic-applet-battery/i18n/es-ES/cosmic_applet_battery.ftl +++ b/cosmic-applet-battery/i18n/es-ES/cosmic_applet_battery.ftl @@ -1,4 +1,3 @@ -cosmic-applet-button = Botón Cosmic battery = Batería battery-desc = Rendimiento y consumo de alimentación reducidos. balanced = Balanceado diff --git a/cosmic-applet-battery/i18n/fa/cosmic_applet_battery.ftl b/cosmic-applet-battery/i18n/fa/cosmic_applet_battery.ftl index 4e8abc00..05aac465 100644 --- a/cosmic-applet-battery/i18n/fa/cosmic_applet_battery.ftl +++ b/cosmic-applet-battery/i18n/fa/cosmic_applet_battery.ftl @@ -1,4 +1,3 @@ -cosmic-applet-button = دکمه Cosmic battery = باتری battery-desc = کاهش مصرف برق و عملکرد. balanced = متعادل diff --git a/cosmic-applet-battery/i18n/fi/cosmic_applet_battery.ftl b/cosmic-applet-battery/i18n/fi/cosmic_applet_battery.ftl index 5150403b..e1c8bb77 100644 --- a/cosmic-applet-battery/i18n/fi/cosmic_applet_battery.ftl +++ b/cosmic-applet-battery/i18n/fi/cosmic_applet_battery.ftl @@ -1,4 +1,3 @@ -cosmic-applet-button = Cosmic Painike battery = Akku battery-desc = Vähentynyt virrankulutus ja suorituskyky. balanced = Tasapainoitettu diff --git a/cosmic-applet-battery/i18n/fr/cosmic_applet_battery.ftl b/cosmic-applet-battery/i18n/fr/cosmic_applet_battery.ftl index 38db6846..9d529190 100644 --- a/cosmic-applet-battery/i18n/fr/cosmic_applet_battery.ftl +++ b/cosmic-applet-battery/i18n/fr/cosmic_applet_battery.ftl @@ -1,4 +1,3 @@ -cosmic-applet-button = Bouton Cosmic battery = Batterie battery-desc = Performance et consommation réduites. balanced = Équilibré @@ -12,4 +11,4 @@ hours = h until-empty = avant la décharge totale power-settings = Paramètres d'alimentation... dgpu-running = Le GPU dédié est actif et peu réduire l'autonomie de la batterie -dgpu-applications = Applications utilisant le GPU dédié {$gpu_name} \ No newline at end of file +dgpu-applications = Applications utilisant le GPU dédié {$gpu_name} diff --git a/cosmic-applet-battery/i18n/hu/cosmic_applet_battery.ftl b/cosmic-applet-battery/i18n/hu/cosmic_applet_battery.ftl index 866a6f95..923eca9e 100644 --- a/cosmic-applet-battery/i18n/hu/cosmic_applet_battery.ftl +++ b/cosmic-applet-battery/i18n/hu/cosmic_applet_battery.ftl @@ -1,4 +1,3 @@ -cosmic-applet-button = Cosmic Gomb battery = Akkumulátor battery-desc = Csökkentett energiafogyasztás és teljesítmény. balanced = Kiegyensúlyozott @@ -12,4 +11,4 @@ hours = h until-empty = lemerülésig power-settings = Tápellátás és akkumulátor beállítások... dgpu-running = A dedikált GPU aktív, és csökkentheti az akkumulátor élettartamát -dgpu-applications = A {$gpu_name} dedikált GPU-t használó alkalmazások \ No newline at end of file +dgpu-applications = A {$gpu_name} dedikált GPU-t használó alkalmazások diff --git a/cosmic-applet-battery/i18n/id/cosmic_applet_battery.ftl b/cosmic-applet-battery/i18n/id/cosmic_applet_battery.ftl index 74b9f23c..3fa3caa7 100644 --- a/cosmic-applet-battery/i18n/id/cosmic_applet_battery.ftl +++ b/cosmic-applet-battery/i18n/id/cosmic_applet_battery.ftl @@ -1,4 +1,3 @@ -cosmic-applet-button = Tombol Cosmic battery = Baterai battery-desc = Penggunaan daya dan kinerja yang dikurangi. balanced = Seimbang @@ -7,9 +6,9 @@ performance = Kinerja Tinggi performance-desc = Kinerja dan penggunaan daya yang tinggi. max-charge = Tingkatkan masa pakai baterai Anda dengan mengatur nilai pengisian maksimum 80% seconds = d -minutes = m +minutes = m hours = j until-empty = hingga kosong power-settings = Pengaturan Daya dan Baterai... dgpu-running = GPU Diskrit aktif dan dapat mengurangi masa pakai baterai -dgpu-applications = Aplikasi yang menggunakan {$gpu_name} GPU Diskrit \ No newline at end of file +dgpu-applications = Aplikasi yang menggunakan {$gpu_name} GPU Diskrit diff --git a/cosmic-applet-battery/i18n/it/cosmic_applet_battery.ftl b/cosmic-applet-battery/i18n/it/cosmic_applet_battery.ftl index b2dd428c..208c505f 100644 --- a/cosmic-applet-battery/i18n/it/cosmic_applet_battery.ftl +++ b/cosmic-applet-battery/i18n/it/cosmic_applet_battery.ftl @@ -1,4 +1,3 @@ -cosmic-applet-button = Pulsante Cosmic battery = Batteria battery-desc = Consumi e performance ridotte. balanced = Bilanciato @@ -12,4 +11,4 @@ hours = h until-empty = fino alla scarica power-settings = Impostazioni energetiche dgpu-running = La GPU discreta è attiva e può ridurre la durata della batteria. -dgpu-applications = Applicazioni che stanno usando la GPU discreta {$gpu_name} \ No newline at end of file +dgpu-applications = Applicazioni che stanno usando la GPU discreta {$gpu_name} diff --git a/cosmic-applet-battery/i18n/ja/cosmic_applet_battery.ftl b/cosmic-applet-battery/i18n/ja/cosmic_applet_battery.ftl index 58b4e3d8..742f8ecc 100644 --- a/cosmic-applet-battery/i18n/ja/cosmic_applet_battery.ftl +++ b/cosmic-applet-battery/i18n/ja/cosmic_applet_battery.ftl @@ -1,4 +1,3 @@ -cosmic-applet-button = Cosmicボタン battery = バッテリー battery-desc = 性能と消費は低くなります。 balanced = バランス diff --git a/cosmic-applet-battery/i18n/nl/cosmic_applet_battery.ftl b/cosmic-applet-battery/i18n/nl/cosmic_applet_battery.ftl index a7a7351a..43f365b7 100644 --- a/cosmic-applet-battery/i18n/nl/cosmic_applet_battery.ftl +++ b/cosmic-applet-battery/i18n/nl/cosmic_applet_battery.ftl @@ -1,4 +1,3 @@ -cosmic-applet-button = Cosmic Knop battery = Batterij battery-desc = Verminderd stroom verbruik en prestatie. balanced = Gebalanceerd diff --git a/cosmic-applet-battery/i18n/pl/cosmic_applet_battery.ftl b/cosmic-applet-battery/i18n/pl/cosmic_applet_battery.ftl index e6a935e8..56d54844 100644 --- a/cosmic-applet-battery/i18n/pl/cosmic_applet_battery.ftl +++ b/cosmic-applet-battery/i18n/pl/cosmic_applet_battery.ftl @@ -1,4 +1,3 @@ -cosmic-applet-button = Przycisk Cosmic battery = Na Baterii battery-desc = Zmniejszone zużycie energii i zmniejszona wydajność. balanced = Zbalansowany diff --git a/cosmic-applet-battery/i18n/pt-BR/cosmic_applet_battery.ftl b/cosmic-applet-battery/i18n/pt-BR/cosmic_applet_battery.ftl index 3d34da69..1129448c 100644 --- a/cosmic-applet-battery/i18n/pt-BR/cosmic_applet_battery.ftl +++ b/cosmic-applet-battery/i18n/pt-BR/cosmic_applet_battery.ftl @@ -1,4 +1,3 @@ -cosmic-applet-button = Botão Cosmic battery = Bateria battery-desc = Uso reduzido de energia e desempenho. balanced = Equilibrado diff --git a/cosmic-applet-battery/i18n/pt/cosmic_applet_battery.ftl b/cosmic-applet-battery/i18n/pt/cosmic_applet_battery.ftl index 50bdaf4e..23fbffc3 100644 --- a/cosmic-applet-battery/i18n/pt/cosmic_applet_battery.ftl +++ b/cosmic-applet-battery/i18n/pt/cosmic_applet_battery.ftl @@ -1,4 +1,3 @@ -cosmic-applet-button = Botão Cosmic battery = Bateria battery-desc = Uso reduzido de energia e desempenho. balanced = Equilibrado diff --git a/cosmic-applet-battery/i18n/ru/cosmic_applet_battery.ftl b/cosmic-applet-battery/i18n/ru/cosmic_applet_battery.ftl index 4fb5c4c7..7bffcdb2 100644 --- a/cosmic-applet-battery/i18n/ru/cosmic_applet_battery.ftl +++ b/cosmic-applet-battery/i18n/ru/cosmic_applet_battery.ftl @@ -1,4 +1,3 @@ -cosmic-applet-button = Кнопка Cosmic battery = Аккумулятор battery-desc = Пониженные энергопотребление и производительность. balanced = Сбалансированный @@ -12,4 +11,4 @@ hours = ч. until-empty = до полного разряда power-settings = Параметры питания и аккумулятора... dgpu-running = Дискретная видеокарта активна и может сократить время автономной работы -dgpu-applications = Приложения, использующие видеокарту {$gpu_name} \ No newline at end of file +dgpu-applications = Приложения, использующие видеокарту {$gpu_name} diff --git a/cosmic-applet-battery/i18n/sk/cosmic_applet_battery.ftl b/cosmic-applet-battery/i18n/sk/cosmic_applet_battery.ftl index 16633aae..5d96c01b 100644 --- a/cosmic-applet-battery/i18n/sk/cosmic_applet_battery.ftl +++ b/cosmic-applet-battery/i18n/sk/cosmic_applet_battery.ftl @@ -1,4 +1,3 @@ -cosmic-applet-button = Cosmic Button battery = Batéria battery-desc = Obmedzená spotreba energie a výkonu. balanced = Vyvážený @@ -12,4 +11,4 @@ hours = h until-empty = pokiaľ prázdne power-settings = Nastavenia napájania a batérie... dgpu-running = Diskrétne GPU sa práve používa. To môže ovplyvniť životnosť batérie. -dgpu-applications = Aplikácie, ktoré používajú {$gpu_name} diskrétne GPU \ No newline at end of file +dgpu-applications = Aplikácie, ktoré používajú {$gpu_name} diskrétne GPU diff --git a/cosmic-applet-battery/i18n/sr-Cyrl/cosmic_applet_battery.ftl b/cosmic-applet-battery/i18n/sr-Cyrl/cosmic_applet_battery.ftl index 8524a62e..075f8e2c 100644 --- a/cosmic-applet-battery/i18n/sr-Cyrl/cosmic_applet_battery.ftl +++ b/cosmic-applet-battery/i18n/sr-Cyrl/cosmic_applet_battery.ftl @@ -1,4 +1,3 @@ -cosmic-applet-button = Cosmic дугме battery = Батерија battery-desc = Смањене перформансе и потрошња батерије. balanced = Балансирано diff --git a/cosmic-applet-battery/i18n/sr-Latn/cosmic_applet_battery.ftl b/cosmic-applet-battery/i18n/sr-Latn/cosmic_applet_battery.ftl index da2968d1..0ee8d81d 100644 --- a/cosmic-applet-battery/i18n/sr-Latn/cosmic_applet_battery.ftl +++ b/cosmic-applet-battery/i18n/sr-Latn/cosmic_applet_battery.ftl @@ -1,4 +1,3 @@ -cosmic-applet-button = Cosmic dugme battery = Baterija battery-desc = Smanjene performanse i potrošnja baterije. balanced = Balansirano diff --git a/cosmic-applet-battery/i18n/tr/cosmic_applet_battery.ftl b/cosmic-applet-battery/i18n/tr/cosmic_applet_battery.ftl index 5239fbf3..881f01f6 100644 --- a/cosmic-applet-battery/i18n/tr/cosmic_applet_battery.ftl +++ b/cosmic-applet-battery/i18n/tr/cosmic_applet_battery.ftl @@ -1,4 +1,3 @@ -cosmic-applet-button = Cosmic Düğmesi battery = Pil battery-desc = Daha az güç tüketimi ve başarım. balanced = Dengeli diff --git a/cosmic-applet-battery/i18n/uk/cosmic_applet_battery.ftl b/cosmic-applet-battery/i18n/uk/cosmic_applet_battery.ftl index 0fdc3a26..399c7192 100644 --- a/cosmic-applet-battery/i18n/uk/cosmic_applet_battery.ftl +++ b/cosmic-applet-battery/i18n/uk/cosmic_applet_battery.ftl @@ -1,4 +1,3 @@ -cosmic-applet-button = Кнопка Cosmic battery = Акумулятор battery-desc = Зменшення споживання енергії та продуктивності. balanced = Збалансовано diff --git a/cosmic-applet-battery/i18n/zh-CN/cosmic_applet_battery.ftl b/cosmic-applet-battery/i18n/zh-CN/cosmic_applet_battery.ftl index 15823dcc..7d6e56c3 100644 --- a/cosmic-applet-battery/i18n/zh-CN/cosmic_applet_battery.ftl +++ b/cosmic-applet-battery/i18n/zh-CN/cosmic_applet_battery.ftl @@ -1,4 +1,3 @@ -cosmic-applet-button = Cosmic 按钮 battery = 省电 battery-desc = 降低功耗和性能 balanced = 平衡 diff --git a/cosmic-applet-battery/src/app.rs b/cosmic-applet-battery/src/app.rs index 40194b7b..a3cca8b1 100644 --- a/cosmic-applet-battery/src/app.rs +++ b/cosmic-applet-battery/src/app.rs @@ -17,6 +17,7 @@ use cosmic::{ token::subscription::{activation_token_subscription, TokenRequest, TokenUpdate}, }, cctk::sctk::reexports::calloop, + cosmic_theme::Spacing, iced::{ alignment::Horizontal, wayland::popup::{destroy_popup, get_popup}, @@ -27,6 +28,7 @@ use cosmic::{ iced_runtime::core::layout::Limits, iced_style::application, iced_widget::{Column, Row}, + theme, widget::{divider, horizontal_space, icon, scrollable, text, vertical_space}, Command, Element, Theme, }; @@ -446,6 +448,10 @@ impl cosmic::Application for CosmicBatteryApplet { } fn view_window(&self, _id: window::Id) -> Element { + let Spacing { + space_xxs, space_s, .. + } = theme::active().cosmic().spacing; + let name = text::body(fl!("battery")); let description = text::caption(if !self.on_battery { format!("{:.0}%", self.battery_percent) @@ -468,7 +474,9 @@ impl cosmic::Application for CosmicBatteryApplet { .align_items(Alignment::Center), ) .into(), - padded_control(divider::horizontal::default()).into(), + padded_control(divider::horizontal::default()) + .padding([space_xxs, space_s]) + .into(), menu_button( row![ column![ @@ -532,7 +540,9 @@ impl cosmic::Application for CosmicBatteryApplet { ) .on_press(Message::SelectProfile(Power::Performance)) .into(), - padded_control(divider::horizontal::default()).into(), + padded_control(divider::horizontal::default()) + .padding([space_xxs, space_s]) + .into(), padded_control( anim!( //toggler @@ -546,7 +556,9 @@ impl cosmic::Application for CosmicBatteryApplet { .width(Length::Fill), ) .into(), - padded_control(divider::horizontal::default()).into(), + padded_control(divider::horizontal::default()) + .padding([space_xxs, space_s]) + .into(), ]; if let Some(max_screen_brightness) = self.max_screen_brightness { @@ -605,7 +617,11 @@ impl cosmic::Application for CosmicBatteryApplet { } } - content.push(padded_control(divider::horizontal::default()).into()); + content.push( + padded_control(divider::horizontal::default()) + .padding([space_xxs, space_s]) + .into(), + ); if !self.gpus.is_empty() { content.push( @@ -637,7 +653,11 @@ impl cosmic::Application for CosmicBatteryApplet { ) .into(), ); - content.push(padded_control(divider::horizontal::default()).into()); + content.push( + padded_control(divider::horizontal::default()) + .padding([space_xxs, space_s]) + .into(), + ); } for (key, gpu) in &self.gpus { @@ -706,7 +726,11 @@ impl cosmic::Application for CosmicBatteryApplet { .into(), ); } - content.push(padded_control(divider::horizontal::default()).into()); + content.push( + padded_control(divider::horizontal::default()) + .padding([space_xxs, space_s]) + .into(), + ); } content.push( diff --git a/cosmic-applet-bluetooth/i18n/en/cosmic_applet_bluetooth.ftl b/cosmic-applet-bluetooth/i18n/en/cosmic_applet_bluetooth.ftl index d9e98b67..c7077fc2 100644 --- a/cosmic-applet-bluetooth/i18n/en/cosmic_applet_bluetooth.ftl +++ b/cosmic-applet-bluetooth/i18n/en/cosmic_applet_bluetooth.ftl @@ -1,6 +1,6 @@ bluetooth = Bluetooth -other-devices = Other Bluetooth Devices -settings = Bluetooth Settings... +other-devices = Other Bluetooth devices +settings = Bluetooth settings... connected = Connected confirm-pin = Please confirm that the following PIN matches the one displayed on {$deviceName} confirm = Confirm @@ -9,4 +9,4 @@ unsuccessful = Pairing Unsuccessful check-device = Make sure {$deviceName} is turned on, in range, and is ready to pair. try-again = Try Again discoverable = Discoverable -pairable = Pairable \ No newline at end of file +pairable = Pairable diff --git a/cosmic-applet-bluetooth/src/app.rs b/cosmic-applet-bluetooth/src/app.rs index 50dc97e3..b10698e0 100644 --- a/cosmic-applet-bluetooth/src/app.rs +++ b/cosmic-applet-bluetooth/src/app.rs @@ -9,6 +9,7 @@ use cosmic::{ use cosmic::{ applet::{menu_button, padded_control}, + cosmic_theme::Spacing, iced::{ self, wayland::popup::{destroy_popup, get_popup}, @@ -21,6 +22,7 @@ use cosmic::{ window, }, iced_style::application, + theme, widget::{button, divider, icon, text}, Command, Element, Theme, }; @@ -349,6 +351,10 @@ impl cosmic::Application for CosmicBluetoothApplet { } fn view_window(&self, _id: window::Id) -> Element { + let Spacing { + space_xxs, space_s, .. + } = theme::active().cosmic().spacing; + let mut known_bluetooth = vec![]; for dev in self.bluer_state.devices.iter().filter(|d| { !self @@ -447,20 +453,21 @@ impl cosmic::Application for CosmicBluetoothApplet { .align_items(Alignment::Center) .padding([8, 0]); if !known_bluetooth.is_empty() { - content = content.push(padded_control(divider::horizontal::default())); + content = content + .push(padded_control(divider::horizontal::default()).padding([space_xxs, space_s])); content = content.push(Column::with_children(known_bluetooth)); } let dropdown_icon = if self.show_visible_devices { - "go-down-symbolic" + "go-up-symbolic" } else { - "go-next-symbolic" + "go-down-symbolic" }; let available_connections_btn = menu_button(row![ text::body(fl!("other-devices")) .width(Length::Fill) .height(Length::Fixed(24.0)) .vertical_alignment(Vertical::Center), - container(icon::from_name(dropdown_icon).size(14).symbolic(true)) + container(icon::from_name(dropdown_icon).size(16).symbolic(true)) .align_x(Horizontal::Center) .align_y(Vertical::Center) .width(Length::Fixed(24.0)) @@ -468,7 +475,8 @@ impl cosmic::Application for CosmicBluetoothApplet { ]) .on_press(Message::ToggleVisibleDevices(!self.show_visible_devices)); if self.bluer_state.bluetooth_enabled { - content = content.push(padded_control(divider::horizontal::default())); + content = content + .push(padded_control(divider::horizontal::default()).padding([space_xxs, space_s])); content = content.push(available_connections_btn); } let mut list_column: Vec> = @@ -503,7 +511,7 @@ impl cosmic::Application for CosmicBluetoothApplet { .align_x(Horizontal::Center), padded_control( row![ - button( + button::custom( text::body(fl!("cancel")) .vertical_alignment(Vertical::Center) .horizontal_alignment(Horizontal::Center) @@ -512,7 +520,7 @@ impl cosmic::Application for CosmicBluetoothApplet { .height(Length::Fixed(28.0)) .width(Length::Fixed(105.0)) .on_press(Message::Cancel), - button( + button::custom( text::body(fl!("confirm")) .vertical_alignment(Vertical::Center) .horizontal_alignment(Horizontal::Center) @@ -570,6 +578,9 @@ impl cosmic::Application for CosmicBluetoothApplet { } else { content = content.push(Column::with_children(list_column)); } + // content = content + // .push(padded_control(divider::horizontal::default()).padding([space_xxs, space_s])) + // .push(menu_button(text::body(fl!("settings"))).on_press(Message::OpenSettings)); self.core.applet.popup_container(content).into() } diff --git a/cosmic-applet-input-sources/src/window.rs b/cosmic-applet-input-sources/src/window.rs index a258064a..63eb9ca9 100644 --- a/cosmic-applet-input-sources/src/window.rs +++ b/cosmic-applet-input-sources/src/window.rs @@ -10,6 +10,7 @@ use cosmic::{ app::Core, applet::{self}, cosmic_config::{self, ConfigSet}, + cosmic_theme::Spacing, iced::{ wayland::popup::{destroy_popup, get_popup}, widget::{column, row}, @@ -20,6 +21,7 @@ use cosmic::{ iced_runtime::core::window, iced_style::application, prelude::*, + theme, widget::{self, horizontal_space, vertical_space}, }; use cosmic_comp_config::CosmicCompConfig; @@ -172,7 +174,7 @@ impl cosmic::Application for Window { .map_or(String::new(), |l| l.layout.clone()), ); - cosmic::widget::button( + cosmic::widget::button::custom( row!( column!( input_source_text, @@ -200,6 +202,10 @@ impl cosmic::Application for Window { } fn view_window(&self, _id: Id) -> Element { + let Spacing { + space_xxs, space_s, .. + } = theme::active().cosmic().spacing; + let mut content_list = widget::column::with_capacity(4 + self.active_layouts.len()).padding([8, 0]); for layout in &self.active_layouts { @@ -212,7 +218,9 @@ impl cosmic::Application for Window { } if !self.active_layouts.is_empty() { content_list = content_list.push( - applet::padded_control(widget::divider::horizontal::default()).apply(Element::from), + applet::padded_control(widget::divider::horizontal::default()) + .padding([space_xxs, space_s]) + .apply(Element::from), ); } content_list = content_list.push( diff --git a/cosmic-applet-minimize/src/window_image.rs b/cosmic-applet-minimize/src/window_image.rs index 5790ab80..28c1b7dc 100644 --- a/cosmic-applet-minimize/src/window_image.rs +++ b/cosmic-applet-minimize/src/window_image.rs @@ -30,7 +30,7 @@ where ) -> Self { let border = 1.0; Self { - image_button: button( + image_button: button::custom( container( container(if let Some(img) = img { let max_dim = img.img.width().max(img.img.height()).max(1); diff --git a/cosmic-applet-network/i18n/en/cosmic_applet_network.ftl b/cosmic-applet-network/i18n/en/cosmic_applet_network.ftl index fdd8661d..fbda56d0 100644 --- a/cosmic-applet-network/i18n/en/cosmic_applet_network.ftl +++ b/cosmic-applet-network/i18n/en/cosmic_applet_network.ftl @@ -1,20 +1,20 @@ network = Network airplane-mode = Airplane mode -airplane-mode-on = Airplane Mode is on +airplane-mode-on = Airplane mode is on turn-off-airplane-mode = Turn off to enable Wi-Fi, Bluetooth and mobile broadband. wifi = Wi-Fi -ipv4 = IPv4 Address -ipv6 = IPv6 Address +ipv4 = IPv4 address +ipv6 = IPv6 address mac = MAC megabits-per-second = Mbps connected = Connected connecting = Connecting connect = Connect cancel = Cancel -settings = Network Settings... -visible-wireless-networks = Visible Wireless Networks +settings = Network settings... +visible-wireless-networks = Visible wireless networks enter-password = Enter the password or encryption key router-wps-button = You can also connect by pressing the "WPS" button on the router unable-to-connect = Unable to connect to network check-wifi-connection = Make sure Wi-Fi is connected to the internet and the password is correct -reset = Reset \ No newline at end of file +reset = Reset diff --git a/cosmic-applet-network/src/app.rs b/cosmic-applet-network/src/app.rs index 1b02d758..ab12f3f3 100644 --- a/cosmic-applet-network/src/app.rs +++ b/cosmic-applet-network/src/app.rs @@ -7,6 +7,7 @@ use cosmic::{ token::subscription::{activation_token_subscription, TokenRequest, TokenUpdate}, }, cctk::sctk::reexports::calloop, + cosmic_theme::Spacing, iced::{ wayland::popup::{destroy_popup, get_popup}, widget::{column, row}, @@ -19,6 +20,7 @@ use cosmic::{ }, iced_style::application, iced_widget::Row, + theme, widget::{ button, container, divider, icon, icon::from_name, scrollable, text, text_input, Column, }, @@ -548,6 +550,10 @@ impl cosmic::Application for CosmicNetworkApplet { } fn view_window(&self, _id: window::Id) -> Element { + let Spacing { + space_xxs, space_s, .. + } = theme::active().cosmic().spacing; + let mut vpn_ethernet_col = column![]; let mut known_wifi = Vec::new(); for conn in &self.nm_state.active_conns { @@ -574,7 +580,8 @@ impl cosmic::Application for CosmicNetworkApplet { .align_items(Alignment::Center) .spacing(8) .padding(menu_control_padding()), - padded_control(divider::horizontal::default()), + padded_control(divider::horizontal::default()) + .padding([space_xxs, space_s]), ]); } ActiveConnectionInfo::Wired { @@ -609,7 +616,8 @@ impl cosmic::Application for CosmicNetworkApplet { .align_items(Alignment::Center) .spacing(8) .padding(menu_control_padding()), - padded_control(divider::horizontal::default()), + padded_control(divider::horizontal::default()) + .padding([space_xxs, space_s]), ]); } ActiveConnectionInfo::WiFi { @@ -687,7 +695,7 @@ impl cosmic::Application for CosmicNetworkApplet { .text_size(14) .width(Length::Fill) ), - padded_control(divider::horizontal::default()), + padded_control(divider::horizontal::default()).padding([space_xxs, space_s]), padded_control( anim!( //toggler @@ -705,7 +713,7 @@ impl cosmic::Application for CosmicNetworkApplet { if self.nm_state.airplane_mode { content = content.push( column!( - padded_control(divider::horizontal::default()), + padded_control(divider::horizontal::default()).padding([space_xxs, space_s]), icon::from_name("airplane-mode-symbolic") .size(48) .symbolic(true), @@ -719,7 +727,9 @@ impl cosmic::Application for CosmicNetworkApplet { ); } else { if self.nm_state.wifi_enabled { - content = content.push(padded_control(divider::horizontal::default())); + content = content.push( + padded_control(divider::horizontal::default()).padding([space_xxs, space_s]), + ); for known in &self.nm_state.known_access_points { let mut btn_content = Vec::with_capacity(2); let ssid = text::body(&known.ssid).width(Length::Fill); @@ -790,19 +800,23 @@ impl cosmic::Application for CosmicNetworkApplet { let has_known_wifi = !known_wifi.is_empty(); content = content.push(Column::with_children(known_wifi)); if has_known_wifi { - content = content.push(padded_control(divider::horizontal::default())); + content = content.push( + padded_control(divider::horizontal::default()) + .padding([space_xxs, space_s]), + ); } let dropdown_icon = if self.show_visible_networks { - "go-down-symbolic" + "go-up-symbolic" } else { - "go-next-symbolic" + "go-down-symbolic" }; let available_connections_btn = menu_button(row![ text::body(fl!("visible-wireless-networks")) .width(Length::Fill) + .height(Length::Fixed(24.0)) .vertical_alignment(Vertical::Center), - container(icon::from_name(dropdown_icon).size(14).symbolic(true)) + container(icon::from_name(dropdown_icon).size(16).symbolic(true)) .align_x(Horizontal::Center) .align_y(Vertical::Center) .width(Length::Fixed(24.0)) @@ -935,6 +949,9 @@ impl cosmic::Application for CosmicNetworkApplet { .push(scrollable(Column::with_children(list_col)).height(Length::Fixed(300.0))); } } + content = content + .push(padded_control(divider::horizontal::default()).padding([space_xxs, space_s])) + .push(menu_button(text::body(fl!("settings"))).on_press(Message::OpenSettings)); self.core .applet diff --git a/cosmic-applet-notifications/src/lib.rs b/cosmic-applet-notifications/src/lib.rs index 300e817f..f5be046d 100644 --- a/cosmic-applet-notifications/src/lib.rs +++ b/cosmic-applet-notifications/src/lib.rs @@ -10,6 +10,7 @@ use cosmic::{ }, cctk::sctk::reexports::calloop, cosmic_config::{Config, CosmicConfigEntry}, + cosmic_theme::Spacing, iced::{ wayland::popup::{destroy_popup, get_popup}, widget::{column, row}, @@ -17,6 +18,7 @@ use cosmic::{ }, iced_core::alignment::Horizontal, iced_widget::{scrollable, Column}, + theme, widget::{button, container, divider, icon, text}, Command, Element, Theme, }; @@ -364,6 +366,10 @@ impl cosmic::Application for Notifications { } fn view_window(&self, _id: window::Id) -> Element { + let Spacing { + space_xxs, space_s, .. + } = theme::active().cosmic().spacing; + let do_not_disturb = padded_control(row![anim!( DO_NOT_DISTURB, &self.timeline, @@ -421,7 +427,7 @@ impl cosmic::Application for Notifications { let duration_since = text::caption(duration_ago_msg(n)); - let close_notif = button( + let close_notif = button::custom( icon::from_name("window-close-symbolic") .size(16) .symbolic(true), @@ -535,7 +541,7 @@ impl cosmic::Application for Notifications { }; let main_content = column![ - padded_control(divider::horizontal::default()), + padded_control(divider::horizontal::default()).padding([space_xxs, space_s]), notifications, ]; diff --git a/cosmic-applet-power/src/lib.rs b/cosmic-applet-power/src/lib.rs index 3a432a6c..252a3707 100644 --- a/cosmic-applet-power/src/lib.rs +++ b/cosmic-applet-power/src/lib.rs @@ -6,6 +6,7 @@ use std::{collections::HashMap, process, time::Duration}; use cosmic::{ app::Command, applet::{menu_button, padded_control}, + cosmic_theme::Spacing, iced, iced::{ alignment::{Horizontal, Vertical}, @@ -247,6 +248,13 @@ impl cosmic::Application for Power { } fn view_window(&self, id: window::Id) -> Element { + let Spacing { + space_xxs, + space_s, + space_m, + .. + } = theme::active().cosmic().spacing; + if matches!(self.popup, Some(p) if p == id) { let settings = menu_button(text::body(fl!("settings"))).on_press(Message::Settings); @@ -259,7 +267,7 @@ impl cosmic::Application for Power { text::body(fl!("lock-screen-shortcut")), ] .align_items(Alignment::Center) - .spacing(8) + .spacing(space_xxs) ) .on_press(Message::Action(PowerAction::Lock)), menu_button( @@ -270,7 +278,7 @@ impl cosmic::Application for Power { text::body(fl!("log-out-shortcut")), ] .align_items(Alignment::Center) - .spacing(8) + .spacing(space_xxs) ) .on_press(Message::Action(PowerAction::LogOut)), ]; @@ -283,14 +291,14 @@ impl cosmic::Application for Power { power_buttons("system-shutdown-symbolic", fl!("shutdown")) .on_press(Message::Action(PowerAction::Shutdown)), ] - .spacing(24) - .padding([0, 24]); + .spacing(space_m) + .padding([0, space_m]); let content = column![ settings, - padded_control(divider::horizontal::default()), + padded_control(divider::horizontal::default()).padding([space_xxs, space_s]), session, - padded_control(divider::horizontal::default()), + padded_control(divider::horizontal::default()).padding([space_xxs, space_s]), power ] .align_items(Alignment::Start) @@ -319,7 +327,7 @@ impl cosmic::Application for Power { HashMap::from_iter(vec![("action", action), ("countdown", countdown)]) )) .primary_action( - button(min_width_and_height( + button::custom(min_width_and_height( text::body(fl!("confirm", HashMap::from_iter(vec![("action", action)]))) .into(), 142.0, @@ -331,7 +339,7 @@ impl cosmic::Application for Power { .on_press(Message::Confirm), ) .secondary_action( - button(min_width_and_height( + button::custom(min_width_and_height( text::body(fl!("cancel")).into(), 142.0, 32.0, @@ -380,7 +388,7 @@ impl cosmic::Application for Power { } fn power_buttons(name: &str, msg: String) -> cosmic::widget::Button { - cosmic::widget::button( + button::custom( column![text_icon(name, 40), text::body(msg)] .spacing(4) .align_items(Alignment::Center) diff --git a/cosmic-applet-tiling/src/window.rs b/cosmic-applet-tiling/src/window.rs index cd7df2bf..c8a2a838 100644 --- a/cosmic-applet-tiling/src/window.rs +++ b/cosmic-applet-tiling/src/window.rs @@ -7,8 +7,9 @@ use crate::{ use cctk::sctk::reexports::calloop::channel::SyncSender; use cosmic::{ app::Core, - applet::padded_control, + applet::{menu_button, padded_control}, cosmic_config::{Config, ConfigSet, CosmicConfigEntry}, + cosmic_theme::Spacing, iced::{ wayland::popup::{destroy_popup, get_popup}, window::Id, @@ -16,9 +17,10 @@ use cosmic::{ }, iced_style::application, iced_widget::{column, row}, + theme, widget::{ - container, divider, segmented_button, - segmented_button::{Entity, SingleSelectModel}, + container, divider, + segmented_button::{self, Entity, SingleSelectModel}, segmented_control, spin_button, text, }, Element, Theme, @@ -58,6 +60,7 @@ pub enum Message { MyConfigUpdate(Box), WorkspaceUpdate(WorkspacesUpdate), NewWorkspace(Entity), + OpenSettings, } impl cosmic::Application for Window { @@ -267,6 +270,11 @@ impl cosmic::Application for Window { } }); } + Message::OpenSettings => { + let mut cmd = std::process::Command::new("cosmic-settings"); + cmd.arg("window-management"); + tokio::spawn(cosmic::process::spawn(cmd)); + } } Command::none() } @@ -280,6 +288,13 @@ impl cosmic::Application for Window { } fn view_window(&self, _id: Id) -> Element { + let Spacing { + space_xxxs, + space_xxs, + space_s, + .. + } = theme::active().cosmic().spacing; + let new_workspace_behavior_button = segmented_control::horizontal(&self.new_workspace_behavior_model) .on_activate(Message::NewWorkspace); @@ -296,12 +311,15 @@ impl cosmic::Application for Window { .width(Length::Fill), )) .width(Length::Fill), - padded_control(divider::horizontal::default(),), - padded_control(column![ - text::body(fl!("new-workspace")), - new_workspace_behavior_button, - ]), - padded_control(divider::horizontal::default()), + padded_control(divider::horizontal::default()).padding([space_xxs, space_s]), + padded_control( + column![ + text::body(fl!("new-workspace")), + new_workspace_behavior_button, + ] + .spacing(space_xxxs) + ), + padded_control(divider::horizontal::default()).padding([space_xxs, space_s]), padded_control(row!( text::body(fl!("navigate-windows")).width(Length::Fill), text::body(format!("{} + {}", fl!("super"), fl!("arrow-keys"))), @@ -319,7 +337,7 @@ impl cosmic::Application for Window { text::body(fl!("toggle-floating-window")).width(Length::Fill), text::body(format!("{} + G", fl!("super"))), )), - padded_control(divider::horizontal::default()), + padded_control(divider::horizontal::default()).padding([space_xxs, space_s]), padded_control( anim!( self.active_hint, @@ -331,6 +349,9 @@ impl cosmic::Application for Window { .text_size(14) .width(Length::Fill), ), + padded_control(divider::horizontal::default()).padding([space_xxs, space_s]), + menu_button(text::body(fl!("window-management-settings"))) + .on_press(Message::OpenSettings) ] .padding([8, 0]); diff --git a/cosmic-applet-time/src/window.rs b/cosmic-applet-time/src/window.rs index 9fad82f1..0ade58e8 100644 --- a/cosmic-applet-time/src/window.rs +++ b/cosmic-applet-time/src/window.rs @@ -1,13 +1,14 @@ // Copyright 2023 System76 // SPDX-License-Identifier: GPL-3.0-only -use std::{borrow::Cow, str::FromStr}; +use std::str::FromStr; use chrono::{Datelike, Timelike}; use cosmic::{ app, applet::{cosmic_panel_config::PanelAnchor, menu_button, padded_control}, cctk::sctk::reexports::calloop, + cosmic_theme::Spacing, iced::{ futures::{channel::mpsc, SinkExt, StreamExt, TryFutureExt}, subscription, @@ -18,6 +19,7 @@ use cosmic::{ iced_core::alignment::{Horizontal, Vertical}, iced_style::application, iced_widget::{horizontal_rule, Column}, + theme, widget::{ button, container, divider, grid, horizontal_space, icon, rectangle_tracker::*, text, Button, Grid, Space, @@ -432,7 +434,7 @@ impl cosmic::Application for Window { PanelAnchor::Top | PanelAnchor::Bottom ); - let button = cosmic::widget::button(if horizontal { + let button = button::custom(if horizontal { let mut bag = Bag::empty(); if self.config.show_date_in_top_panel { @@ -547,6 +549,10 @@ impl cosmic::Application for Window { } fn view_window(&self, _id: window::Id) -> Element { + let Spacing { + space_xxs, space_s, .. + } = theme::active().cosmic().spacing; + let mut date_bag = Bag::empty(); date_bag.month = Some(components::Month::Long); date_bag.day = Some(components::Day::NumericDayOfMonth); @@ -622,7 +628,7 @@ impl cosmic::Application for Window { .align_items(Alignment::Center) .padding([12, 20]), calender.padding([0, 12].into()), - padded_control(divider::horizontal::default()), + padded_control(divider::horizontal::default()).padding([space_xxs, space_s]), menu_button(text::body(fl!("datetime-settings"))) .on_press(Message::OpenDateTimeSettings), ] @@ -641,14 +647,13 @@ impl cosmic::Application for Window { fn date_button(day: u32, is_month: bool, is_day: bool) -> Button<'static, Message> { let style = if is_day { - cosmic::widget::button::Style::Suggested + button::Style::Suggested } else { - cosmic::widget::button::Style::Text + button::Style::Text }; - let button = button( - text(format!("{day}")) - .size(14.0) + let button = button::custom( + text::body(format!("{day}")) .horizontal_alignment(Horizontal::Center) .vertical_alignment(Vertical::Center), ) diff --git a/cosmic-panel-button/src/lib.rs b/cosmic-panel-button/src/lib.rs index bfcf1fce..ff313dfa 100644 --- a/cosmic-panel-button/src/lib.rs +++ b/cosmic-panel-button/src/lib.rs @@ -123,7 +123,7 @@ impl cosmic::Application for Button { )) ) .align_items(iced::Alignment::Center); - cosmic::widget::button(content) + cosmic::widget::button::custom(content) .padding([0, self.core.applet.suggested_padding(true)]) .style(cosmic::theme::Button::AppletIcon) }