chore: align applets with local stack
Some checks failed
Continuous Integration / linting (push) Has been cancelled
Continuous Integration / formatting (push) Has been cancelled

This commit is contained in:
Lionel DARNIS 2026-05-23 20:49:24 +02:00
parent 1c7143af97
commit 6c24edfae2
39 changed files with 165 additions and 313 deletions

252
Cargo.lock generated
View file

@ -244,12 +244,6 @@ version = "0.7.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
[[package]]
name = "as-raw-xcb-connection"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b"
[[package]] [[package]]
name = "ash" name = "ash"
version = "0.38.0+1.3.281" version = "0.38.0+1.3.281"
@ -864,7 +858,7 @@ dependencies = [
[[package]] [[package]]
name = "clipboard_macos" name = "clipboard_macos"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/window_clipboard.git?tag=sctk-0.20#f68595ee0e62fbd6589f4709b5aaa5c3c7ea5f6c" source = "git+https://forge.aditua.com/leyoda/window_clipboard.git?branch=yoda-x11-optional#319db02e5219c557c8f03b0e33a8eb4075cabb85"
dependencies = [ dependencies = [
"objc", "objc",
"objc-foundation", "objc-foundation",
@ -874,22 +868,13 @@ dependencies = [
[[package]] [[package]]
name = "clipboard_wayland" name = "clipboard_wayland"
version = "0.2.2" version = "0.2.2"
source = "git+https://github.com/pop-os/window_clipboard.git?tag=sctk-0.20#f68595ee0e62fbd6589f4709b5aaa5c3c7ea5f6c" source = "git+https://forge.aditua.com/leyoda/window_clipboard.git?branch=yoda-x11-optional#319db02e5219c557c8f03b0e33a8eb4075cabb85"
dependencies = [ dependencies = [
"dnd", "dnd",
"mime 0.1.0", "mime 0.1.0",
"smithay-clipboard", "smithay-clipboard",
] ]
[[package]]
name = "clipboard_x11"
version = "0.4.2"
source = "git+https://github.com/pop-os/window_clipboard.git?tag=sctk-0.20#f68595ee0e62fbd6589f4709b5aaa5c3c7ea5f6c"
dependencies = [
"thiserror 1.0.69",
"x11rb",
]
[[package]] [[package]]
name = "cocoa" name = "cocoa"
version = "0.25.0" version = "0.25.0"
@ -1060,7 +1045,7 @@ dependencies = [
"i18n-embed", "i18n-embed",
"i18n-embed-fl", "i18n-embed-fl",
"image", "image",
"libcosmic", "libcosmic-yoda",
"memmap2 0.9.10", "memmap2 0.9.10",
"rust-embed", "rust-embed",
"rustc-hash 2.1.2", "rustc-hash 2.1.2",
@ -1078,7 +1063,7 @@ dependencies = [
name = "cosmic-app-list-config" name = "cosmic-app-list-config"
version = "1.0.2" version = "1.0.2"
dependencies = [ dependencies = [
"libcosmic", "libcosmic-yoda",
"serde", "serde",
] ]
@ -1093,7 +1078,7 @@ dependencies = [
"cosmic-settings-accessibility-subscription", "cosmic-settings-accessibility-subscription",
"i18n-embed", "i18n-embed",
"i18n-embed-fl", "i18n-embed-fl",
"libcosmic", "libcosmic-yoda",
"rust-embed", "rust-embed",
"tokio", "tokio",
"tracing", "tracing",
@ -1108,7 +1093,7 @@ dependencies = [
"cosmic-settings-sound-subscription", "cosmic-settings-sound-subscription",
"i18n-embed", "i18n-embed",
"i18n-embed-fl", "i18n-embed-fl",
"libcosmic", "libcosmic-yoda",
"mpris2-zbus", "mpris2-zbus",
"rust-embed", "rust-embed",
"serde", "serde",
@ -1130,11 +1115,11 @@ dependencies = [
"cosmic-config", "cosmic-config",
"cosmic-settings-daemon-subscription", "cosmic-settings-daemon-subscription",
"cosmic-settings-upower-subscription", "cosmic-settings-upower-subscription",
"drm 0.14.1", "drm",
"futures", "futures",
"i18n-embed", "i18n-embed",
"i18n-embed-fl", "i18n-embed-fl",
"libcosmic", "libcosmic-yoda",
"rust-embed", "rust-embed",
"rustc-hash 2.1.2", "rustc-hash 2.1.2",
"serde", "serde",
@ -1156,7 +1141,7 @@ dependencies = [
"futures", "futures",
"i18n-embed", "i18n-embed",
"i18n-embed-fl", "i18n-embed-fl",
"libcosmic", "libcosmic-yoda",
"rust-embed", "rust-embed",
"rustc-hash 2.1.2", "rustc-hash 2.1.2",
"tokio", "tokio",
@ -1172,7 +1157,7 @@ dependencies = [
"cosmic-comp-config", "cosmic-comp-config",
"i18n-embed", "i18n-embed",
"i18n-embed-fl", "i18n-embed-fl",
"libcosmic", "libcosmic-yoda",
"rust-embed", "rust-embed",
"tokio", "tokio",
"tracing", "tracing",
@ -1189,7 +1174,7 @@ dependencies = [
"i18n-embed", "i18n-embed",
"i18n-embed-fl", "i18n-embed-fl",
"image", "image",
"libcosmic", "libcosmic-yoda",
"memmap2 0.9.10", "memmap2 0.9.10",
"rust-embed", "rust-embed",
"rustix 1.1.4", "rustix 1.1.4",
@ -1213,7 +1198,7 @@ dependencies = [
"i18n-embed", "i18n-embed",
"i18n-embed-fl", "i18n-embed-fl",
"indexmap 2.14.0", "indexmap 2.14.0",
"libcosmic", "libcosmic-yoda",
"nm-secret-agent-manager", "nm-secret-agent-manager",
"rust-embed", "rust-embed",
"rustc-hash 2.1.2", "rustc-hash 2.1.2",
@ -1236,7 +1221,7 @@ dependencies = [
"futures-util", "futures-util",
"i18n-embed", "i18n-embed",
"i18n-embed-fl", "i18n-embed-fl",
"libcosmic", "libcosmic-yoda",
"rust-embed", "rust-embed",
"tokio", "tokio",
"tracing", "tracing",
@ -1252,7 +1237,7 @@ version = "1.0.2"
dependencies = [ dependencies = [
"i18n-embed", "i18n-embed",
"i18n-embed-fl", "i18n-embed-fl",
"libcosmic", "libcosmic-yoda",
"logind-zbus", "logind-zbus",
"rust-embed", "rust-embed",
"rustix 1.1.4", "rustix 1.1.4",
@ -1268,7 +1253,7 @@ name = "cosmic-applet-status-area"
version = "1.0.2" version = "1.0.2"
dependencies = [ dependencies = [
"futures", "futures",
"libcosmic", "libcosmic-yoda",
"rustc-hash 2.1.2", "rustc-hash 2.1.2",
"serde", "serde",
"tokio", "tokio",
@ -1288,7 +1273,7 @@ dependencies = [
"cosmic-protocols", "cosmic-protocols",
"i18n-embed", "i18n-embed",
"i18n-embed-fl", "i18n-embed-fl",
"libcosmic", "libcosmic-yoda",
"rust-embed", "rust-embed",
"rustc-hash 2.1.2", "rustc-hash 2.1.2",
"tokio", "tokio",
@ -1306,7 +1291,7 @@ dependencies = [
"i18n-embed-fl", "i18n-embed-fl",
"icu", "icu",
"jiff", "jiff",
"libcosmic", "libcosmic-yoda",
"logind-zbus", "logind-zbus",
"rust-embed", "rust-embed",
"timedate-zbus", "timedate-zbus",
@ -1326,7 +1311,7 @@ dependencies = [
"futures", "futures",
"i18n-embed", "i18n-embed",
"i18n-embed-fl", "i18n-embed-fl",
"libcosmic", "libcosmic-yoda",
"rust-embed", "rust-embed",
"tokio", "tokio",
"tracing", "tracing",
@ -1353,7 +1338,7 @@ dependencies = [
"cosmic-applet-time", "cosmic-applet-time",
"cosmic-applet-workspaces", "cosmic-applet-workspaces",
"cosmic-panel-button", "cosmic-panel-button",
"libcosmic", "libcosmic-yoda",
"tracing", "tracing",
"tracing-log", "tracing-log",
"tracing-subscriber", "tracing-subscriber",
@ -1371,7 +1356,6 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-client-toolkit" name = "cosmic-client-toolkit"
version = "0.2.0" version = "0.2.0"
source = "git+https://github.com/pop-os/cosmic-protocols//?branch=main#160b086abe03cd34a8a375d7fbe47b24308d1f38"
dependencies = [ dependencies = [
"bitflags 2.11.0", "bitflags 2.11.0",
"cosmic-protocols", "cosmic-protocols",
@ -1394,7 +1378,6 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-config" name = "cosmic-config"
version = "1.0.0" version = "1.0.0"
source = "git+https://github.com/pop-os/libcosmic#6caccaba337ed9bab21c5fe3c2aa7392e322e89c"
dependencies = [ dependencies = [
"atomicwrites", "atomicwrites",
"cosmic-config-derive", "cosmic-config-derive",
@ -1415,7 +1398,6 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-config-derive" name = "cosmic-config-derive"
version = "1.0.0" version = "1.0.0"
source = "git+https://github.com/pop-os/libcosmic#6caccaba337ed9bab21c5fe3c2aa7392e322e89c"
dependencies = [ dependencies = [
"quote", "quote",
"syn", "syn",
@ -1459,7 +1441,6 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-notifications-config" name = "cosmic-notifications-config"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/cosmic-notifications#6046bb29d570161196ab98d60806f6d6489df7a6"
dependencies = [ dependencies = [
"cosmic-config", "cosmic-config",
"serde", "serde",
@ -1468,10 +1449,9 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-notifications-util" name = "cosmic-notifications-util"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/cosmic-notifications#6046bb29d570161196ab98d60806f6d6489df7a6"
dependencies = [ dependencies = [
"fast_image_resize", "fast_image_resize",
"libcosmic", "libcosmic-yoda",
"serde", "serde",
"tl", "tl",
"tracing", "tracing",
@ -1484,7 +1464,7 @@ name = "cosmic-panel-button"
version = "1.0.2" version = "1.0.2"
dependencies = [ dependencies = [
"cosmic-config", "cosmic-config",
"libcosmic", "libcosmic-yoda",
"rustc-hash 2.1.2", "rustc-hash 2.1.2",
"serde", "serde",
"tracing", "tracing",
@ -1495,7 +1475,6 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-panel-config" name = "cosmic-panel-config"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/cosmic-panel#d518c7d25ef96f1a9696aa8cce008656bf66ece4"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"cosmic-config", "cosmic-config",
@ -1509,7 +1488,6 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-pipewire" name = "cosmic-pipewire"
version = "1.0.7" version = "1.0.7"
source = "git+https://github.com/pop-os/cosmic-settings#3639bafcfa3b27fd6a8a9bca7e77589b903975e8"
dependencies = [ dependencies = [
"intmap", "intmap",
"libspa", "libspa",
@ -1523,7 +1501,6 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-protocols" name = "cosmic-protocols"
version = "0.2.0" version = "0.2.0"
source = "git+https://github.com/pop-os/cosmic-protocols//?branch=main#160b086abe03cd34a8a375d7fbe47b24308d1f38"
dependencies = [ dependencies = [
"bitflags 2.11.0", "bitflags 2.11.0",
"wayland-backend", "wayland-backend",
@ -1537,7 +1514,6 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-settings-a11y-manager-subscription" name = "cosmic-settings-a11y-manager-subscription"
version = "1.0.7" version = "1.0.7"
source = "git+https://github.com/pop-os/cosmic-settings#3639bafcfa3b27fd6a8a9bca7e77589b903975e8"
dependencies = [ dependencies = [
"cosmic-protocols", "cosmic-protocols",
"iced_futures", "iced_futures",
@ -1551,7 +1527,6 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-settings-accessibility-subscription" name = "cosmic-settings-accessibility-subscription"
version = "1.0.7" version = "1.0.7"
source = "git+https://github.com/pop-os/cosmic-settings#3639bafcfa3b27fd6a8a9bca7e77589b903975e8"
dependencies = [ dependencies = [
"cosmic-dbus-a11y", "cosmic-dbus-a11y",
"futures", "futures",
@ -1564,7 +1539,6 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-settings-airplane-mode-subscription" name = "cosmic-settings-airplane-mode-subscription"
version = "1.0.7" version = "1.0.7"
source = "git+https://github.com/pop-os/cosmic-settings#3639bafcfa3b27fd6a8a9bca7e77589b903975e8"
dependencies = [ dependencies = [
"futures", "futures",
"iced_futures", "iced_futures",
@ -1597,7 +1571,6 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-settings-daemon-subscription" name = "cosmic-settings-daemon-subscription"
version = "1.0.7" version = "1.0.7"
source = "git+https://github.com/pop-os/cosmic-settings#3639bafcfa3b27fd6a8a9bca7e77589b903975e8"
dependencies = [ dependencies = [
"futures", "futures",
"iced_futures", "iced_futures",
@ -1610,7 +1583,6 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-settings-network-manager-subscription" name = "cosmic-settings-network-manager-subscription"
version = "1.0.7" version = "1.0.7"
source = "git+https://github.com/pop-os/cosmic-settings#3639bafcfa3b27fd6a8a9bca7e77589b903975e8"
dependencies = [ dependencies = [
"bitflags 2.11.0", "bitflags 2.11.0",
"cosmic-dbus-networkmanager", "cosmic-dbus-networkmanager",
@ -1629,12 +1601,11 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-settings-sound-subscription" name = "cosmic-settings-sound-subscription"
version = "1.0.7" version = "1.0.7"
source = "git+https://github.com/pop-os/cosmic-settings#3639bafcfa3b27fd6a8a9bca7e77589b903975e8"
dependencies = [ dependencies = [
"cosmic-pipewire", "cosmic-pipewire",
"futures", "futures",
"intmap", "intmap",
"libcosmic", "libcosmic-yoda",
"numtoa", "numtoa",
"rustix 1.1.4", "rustix 1.1.4",
"tokio", "tokio",
@ -1644,7 +1615,6 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-settings-upower-subscription" name = "cosmic-settings-upower-subscription"
version = "1.0.7" version = "1.0.7"
source = "git+https://github.com/pop-os/cosmic-settings#3639bafcfa3b27fd6a8a9bca7e77589b903975e8"
dependencies = [ dependencies = [
"futures", "futures",
"iced_futures", "iced_futures",
@ -1681,7 +1651,6 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-theme" name = "cosmic-theme"
version = "1.0.0" version = "1.0.0"
source = "git+https://github.com/pop-os/libcosmic#6caccaba337ed9bab21c5fe3c2aa7392e322e89c"
dependencies = [ dependencies = [
"almost", "almost",
"configparser", "configparser",
@ -1765,12 +1734,6 @@ dependencies = [
"uncased", "uncased",
] ]
[[package]]
name = "ctor-lite"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e162d0c2e2068eb736b71e5597eff0b9944e6b973cd9f37b6a288ab9bf20e300"
[[package]] [[package]]
name = "cursor-icon" name = "cursor-icon"
version = "1.2.0" version = "1.2.0"
@ -2073,7 +2036,7 @@ dependencies = [
[[package]] [[package]]
name = "dnd" name = "dnd"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/window_clipboard.git?tag=sctk-0.20#f68595ee0e62fbd6589f4709b5aaa5c3c7ea5f6c" source = "git+https://forge.aditua.com/leyoda/window_clipboard.git?branch=yoda-x11-optional#319db02e5219c557c8f03b0e33a8eb4075cabb85"
dependencies = [ dependencies = [
"bitflags 2.11.0", "bitflags 2.11.0",
"mime 0.1.0", "mime 0.1.0",
@ -2102,19 +2065,6 @@ name = "dpi"
version = "0.1.2" version = "0.1.2"
source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#a610ac9c7a72b39ff102ed4d946291618dc725b6" source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#a610ac9c7a72b39ff102ed4d946291618dc725b6"
[[package]]
name = "drm"
version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a0f8a69e60d75ae7dab4ef26a59ca99f2a89d4c142089b537775ae0c198bdcde"
dependencies = [
"bitflags 2.11.0",
"bytemuck",
"drm-ffi 0.7.1",
"drm-fourcc",
"rustix 0.38.44",
]
[[package]] [[package]]
name = "drm" name = "drm"
version = "0.14.1" version = "0.14.1"
@ -2123,29 +2073,19 @@ checksum = "80bc8c5c6c2941f70a55c15f8d9f00f9710ebda3ffda98075f996a0e6c92756f"
dependencies = [ dependencies = [
"bitflags 2.11.0", "bitflags 2.11.0",
"bytemuck", "bytemuck",
"drm-ffi 0.9.1", "drm-ffi",
"drm-fourcc", "drm-fourcc",
"libc", "libc",
"rustix 0.38.44", "rustix 0.38.44",
] ]
[[package]]
name = "drm-ffi"
version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "41334f8405792483e32ad05fbb9c5680ff4e84491883d2947a4757dc54cb2ac6"
dependencies = [
"drm-sys 0.6.1",
"rustix 0.38.44",
]
[[package]] [[package]]
name = "drm-ffi" name = "drm-ffi"
version = "0.9.1" version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "51a91c9b32ac4e8105dec255e849e0d66e27d7c34d184364fb93e469db08f690" checksum = "51a91c9b32ac4e8105dec255e849e0d66e27d7c34d184364fb93e469db08f690"
dependencies = [ dependencies = [
"drm-sys 0.8.1", "drm-sys",
"rustix 1.1.4", "rustix 1.1.4",
] ]
@ -2155,16 +2095,6 @@ version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0aafbcdb8afc29c1a7ee5fbe53b5d62f4565b35a042a662ca9fecd0b54dae6f4" checksum = "0aafbcdb8afc29c1a7ee5fbe53b5d62f4565b35a042a662ca9fecd0b54dae6f4"
[[package]]
name = "drm-sys"
version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2d09ff881f92f118b11105ba5e34ff8f4adf27b30dae8f12e28c193af1c83176"
dependencies = [
"libc",
"linux-raw-sys 0.6.5",
]
[[package]] [[package]]
name = "drm-sys" name = "drm-sys"
version = "0.8.1" version = "0.8.1"
@ -2284,9 +2214,9 @@ checksum = "dd2e7510819d6fbf51a5545c8f922716ecfb14df168a3242f7d33e0239efe6a1"
[[package]] [[package]]
name = "fast_image_resize" name = "fast_image_resize"
version = "5.5.0" version = "6.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fbc7fe45cf92b43817ff62a3723e862b85bd1d06288f63007f7645d1d2f7a060" checksum = "12dd43e5011e8d8411a3215a0d57a2ec5c68282fb90eb5d7221fab0113442174"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"document-features", "document-features",
@ -2642,16 +2572,6 @@ dependencies = [
"version_check", "version_check",
] ]
[[package]]
name = "gethostname"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1bd49230192a3797a9a4d6abe9b3eed6f7fa4c8a8a4947977c6f80025f92cbd8"
dependencies = [
"rustix 1.1.4",
"windows-link 0.2.1",
]
[[package]] [[package]]
name = "getrandom" name = "getrandom"
version = "0.2.17" version = "0.2.17"
@ -3032,7 +2952,6 @@ dependencies = [
[[package]] [[package]]
name = "iced" name = "iced"
version = "0.14.0" version = "0.14.0"
source = "git+https://github.com/pop-os/libcosmic#6caccaba337ed9bab21c5fe3c2aa7392e322e89c"
dependencies = [ dependencies = [
"dnd", "dnd",
"iced_accessibility", "iced_accessibility",
@ -3053,7 +2972,6 @@ dependencies = [
[[package]] [[package]]
name = "iced_accessibility" name = "iced_accessibility"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic#6caccaba337ed9bab21c5fe3c2aa7392e322e89c"
dependencies = [ dependencies = [
"accesskit", "accesskit",
"accesskit_winit", "accesskit_winit",
@ -3062,7 +2980,6 @@ dependencies = [
[[package]] [[package]]
name = "iced_core" name = "iced_core"
version = "0.14.0" version = "0.14.0"
source = "git+https://github.com/pop-os/libcosmic#6caccaba337ed9bab21c5fe3c2aa7392e322e89c"
dependencies = [ dependencies = [
"bitflags 2.11.0", "bitflags 2.11.0",
"bytes", "bytes",
@ -3086,7 +3003,6 @@ dependencies = [
[[package]] [[package]]
name = "iced_debug" name = "iced_debug"
version = "0.14.0" version = "0.14.0"
source = "git+https://github.com/pop-os/libcosmic#6caccaba337ed9bab21c5fe3c2aa7392e322e89c"
dependencies = [ dependencies = [
"iced_core", "iced_core",
"iced_futures", "iced_futures",
@ -3096,7 +3012,6 @@ dependencies = [
[[package]] [[package]]
name = "iced_futures" name = "iced_futures"
version = "0.14.0" version = "0.14.0"
source = "git+https://github.com/pop-os/libcosmic#6caccaba337ed9bab21c5fe3c2aa7392e322e89c"
dependencies = [ dependencies = [
"futures", "futures",
"iced_core", "iced_core",
@ -3110,7 +3025,6 @@ dependencies = [
[[package]] [[package]]
name = "iced_graphics" name = "iced_graphics"
version = "0.14.0" version = "0.14.0"
source = "git+https://github.com/pop-os/libcosmic#6caccaba337ed9bab21c5fe3c2aa7392e322e89c"
dependencies = [ dependencies = [
"bitflags 2.11.0", "bitflags 2.11.0",
"bytemuck", "bytemuck",
@ -3131,7 +3045,6 @@ dependencies = [
[[package]] [[package]]
name = "iced_program" name = "iced_program"
version = "0.14.0" version = "0.14.0"
source = "git+https://github.com/pop-os/libcosmic#6caccaba337ed9bab21c5fe3c2aa7392e322e89c"
dependencies = [ dependencies = [
"iced_graphics", "iced_graphics",
"iced_runtime", "iced_runtime",
@ -3140,7 +3053,6 @@ dependencies = [
[[package]] [[package]]
name = "iced_renderer" name = "iced_renderer"
version = "0.14.0" version = "0.14.0"
source = "git+https://github.com/pop-os/libcosmic#6caccaba337ed9bab21c5fe3c2aa7392e322e89c"
dependencies = [ dependencies = [
"iced_graphics", "iced_graphics",
"iced_tiny_skia", "iced_tiny_skia",
@ -3152,7 +3064,6 @@ dependencies = [
[[package]] [[package]]
name = "iced_runtime" name = "iced_runtime"
version = "0.14.0" version = "0.14.0"
source = "git+https://github.com/pop-os/libcosmic#6caccaba337ed9bab21c5fe3c2aa7392e322e89c"
dependencies = [ dependencies = [
"bytes", "bytes",
"cosmic-client-toolkit", "cosmic-client-toolkit",
@ -3167,7 +3078,6 @@ dependencies = [
[[package]] [[package]]
name = "iced_tiny_skia" name = "iced_tiny_skia"
version = "0.14.0" version = "0.14.0"
source = "git+https://github.com/pop-os/libcosmic#6caccaba337ed9bab21c5fe3c2aa7392e322e89c"
dependencies = [ dependencies = [
"bytemuck", "bytemuck",
"cosmic-text", "cosmic-text",
@ -3184,9 +3094,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_wgpu" name = "iced_wgpu"
version = "0.14.0" version = "0.14.0"
source = "git+https://github.com/pop-os/libcosmic#6caccaba337ed9bab21c5fe3c2aa7392e322e89c"
dependencies = [ dependencies = [
"as-raw-xcb-connection",
"bitflags 2.11.0", "bitflags 2.11.0",
"bytemuck", "bytemuck",
"cosmic-client-toolkit", "cosmic-client-toolkit",
@ -3203,19 +3111,16 @@ dependencies = [
"rustc-hash 2.1.2", "rustc-hash 2.1.2",
"rustix 0.38.44", "rustix 0.38.44",
"thiserror 2.0.18", "thiserror 2.0.18",
"tiny-xlib",
"wayland-backend", "wayland-backend",
"wayland-client", "wayland-client",
"wayland-protocols", "wayland-protocols",
"wayland-sys", "wayland-sys",
"wgpu", "wgpu",
"x11rb",
] ]
[[package]] [[package]]
name = "iced_widget" name = "iced_widget"
version = "0.14.2" version = "0.14.2"
source = "git+https://github.com/pop-os/libcosmic#6caccaba337ed9bab21c5fe3c2aa7392e322e89c"
dependencies = [ dependencies = [
"cosmic-client-toolkit", "cosmic-client-toolkit",
"dnd", "dnd",
@ -3233,7 +3138,6 @@ dependencies = [
[[package]] [[package]]
name = "iced_winit" name = "iced_winit"
version = "0.14.0" version = "0.14.0"
source = "git+https://github.com/pop-os/libcosmic#6caccaba337ed9bab21c5fe3c2aa7392e322e89c"
dependencies = [ dependencies = [
"cosmic-client-toolkit", "cosmic-client-toolkit",
"cursor-icon", "cursor-icon",
@ -3709,6 +3613,15 @@ dependencies = [
"zune-jpeg 0.5.15", "zune-jpeg 0.5.15",
] ]
[[package]]
name = "image-extras"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "60d02eb2c9ccbbab470538fce34c7bc3be7b4e59268e65a3171367b296cdb842"
dependencies = [
"image",
]
[[package]] [[package]]
name = "image-webp" name = "image-webp"
version = "0.2.4" version = "0.2.4"
@ -4089,9 +4002,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "48f5d2a454e16a5ea0f4ced81bd44e4cfc7bd3a507b61887c99fd3538b28e4af" checksum = "48f5d2a454e16a5ea0f4ced81bd44e4cfc7bd3a507b61887c99fd3538b28e4af"
[[package]] [[package]]
name = "libcosmic" name = "libcosmic-yoda"
version = "1.0.0" version = "0.1.0-yoda.2"
source = "git+https://github.com/pop-os/libcosmic#6caccaba337ed9bab21c5fe3c2aa7392e322e89c"
dependencies = [ dependencies = [
"apply", "apply",
"ashpd 0.12.3", "ashpd 0.12.3",
@ -4120,6 +4032,7 @@ dependencies = [
"iced_widget", "iced_widget",
"iced_winit", "iced_winit",
"image", "image",
"image-extras",
"jiff", "jiff",
"libc", "libc",
"log", "log",
@ -4238,12 +4151,6 @@ version = "0.4.15"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
[[package]]
name = "linux-raw-sys"
version = "0.6.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2a385b1be4e5c3e362ad2ffa73c392e53f031eaa5b7d648e64cd87f27f6063d7"
[[package]] [[package]]
name = "linux-raw-sys" name = "linux-raw-sys"
version = "0.9.4" version = "0.9.4"
@ -4439,7 +4346,7 @@ dependencies = [
[[package]] [[package]]
name = "mime" name = "mime"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/window_clipboard.git?tag=sctk-0.20#f68595ee0e62fbd6589f4709b5aaa5c3c7ea5f6c" source = "git+https://forge.aditua.com/leyoda/window_clipboard.git?branch=yoda-x11-optional#319db02e5219c557c8f03b0e33a8eb4075cabb85"
dependencies = [ dependencies = [
"smithay-clipboard", "smithay-clipboard",
] ]
@ -6249,12 +6156,10 @@ name = "softbuffer"
version = "0.4.1" version = "0.4.1"
source = "git+https://github.com/pop-os/softbuffer?tag=cosmic-4.0#a3f77e251e7422803f693df6e3fc313c010c4dcb" source = "git+https://github.com/pop-os/softbuffer?tag=cosmic-4.0#a3f77e251e7422803f693df6e3fc313c010c4dcb"
dependencies = [ dependencies = [
"as-raw-xcb-connection",
"bytemuck", "bytemuck",
"cfg_aliases", "cfg_aliases",
"cocoa", "cocoa",
"core-graphics", "core-graphics",
"drm 0.11.1",
"fastrand", "fastrand",
"foreign-types", "foreign-types",
"js-sys", "js-sys",
@ -6264,14 +6169,12 @@ dependencies = [
"raw-window-handle", "raw-window-handle",
"redox_syscall 0.5.18", "redox_syscall 0.5.18",
"rustix 0.38.44", "rustix 0.38.44",
"tiny-xlib",
"wasm-bindgen", "wasm-bindgen",
"wayland-backend", "wayland-backend",
"wayland-client", "wayland-client",
"wayland-sys", "wayland-sys",
"web-sys", "web-sys",
"windows-sys 0.52.0", "windows-sys 0.52.0",
"x11rb",
] ]
[[package]] [[package]]
@ -6577,19 +6480,6 @@ dependencies = [
"strict-num", "strict-num",
] ]
[[package]]
name = "tiny-xlib"
version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0324504befd01cab6e0c994f34b2ffa257849ee019d3fb3b64fb2c858887d89e"
dependencies = [
"as-raw-xcb-connection",
"ctor-lite",
"libloading",
"pkg-config",
"tracing",
]
[[package]] [[package]]
name = "tinystr" name = "tinystr"
version = "0.8.3" version = "0.8.3"
@ -7533,12 +7423,11 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
[[package]] [[package]]
name = "window_clipboard" name = "window_clipboard"
version = "0.4.1" version = "0.4.1"
source = "git+https://github.com/pop-os/window_clipboard.git?tag=sctk-0.20#f68595ee0e62fbd6589f4709b5aaa5c3c7ea5f6c" source = "git+https://forge.aditua.com/leyoda/window_clipboard.git?branch=yoda-x11-optional#319db02e5219c557c8f03b0e33a8eb4075cabb85"
dependencies = [ dependencies = [
"clipboard-win", "clipboard-win",
"clipboard_macos", "clipboard_macos",
"clipboard_wayland", "clipboard_wayland",
"clipboard_x11",
"dnd", "dnd",
"mime 0.1.0", "mime 0.1.0",
"raw-window-handle", "raw-window-handle",
@ -8011,7 +7900,6 @@ dependencies = [
"winit-wayland", "winit-wayland",
"winit-web", "winit-web",
"winit-win32", "winit-win32",
"winit-x11",
] ]
[[package]] [[package]]
@ -8062,7 +7950,6 @@ dependencies = [
"smol_str", "smol_str",
"tracing", "tracing",
"winit-core", "winit-core",
"x11-dl",
"xkbcommon-dl", "xkbcommon-dl",
] ]
@ -8180,29 +8067,6 @@ dependencies = [
"winit-core", "winit-core",
] ]
[[package]]
name = "winit-x11"
version = "0.31.0-beta.2"
source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#a610ac9c7a72b39ff102ed4d946291618dc725b6"
dependencies = [
"bitflags 2.11.0",
"bytemuck",
"calloop",
"cursor-icon",
"dpi",
"libc",
"percent-encoding",
"raw-window-handle",
"rustix 1.1.4",
"smol_str",
"tracing",
"winit-common",
"winit-core",
"x11-dl",
"x11rb",
"xkbcommon-dl",
]
[[package]] [[package]]
name = "winnow" name = "winnow"
version = "0.7.15" version = "0.7.15"
@ -8324,39 +8188,6 @@ dependencies = [
"either", "either",
] ]
[[package]]
name = "x11-dl"
version = "2.21.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f"
dependencies = [
"libc",
"once_cell",
"pkg-config",
]
[[package]]
name = "x11rb"
version = "0.13.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9993aa5be5a26815fe2c3eacfc1fde061fc1a1f094bf1ad2a18bf9c495dd7414"
dependencies = [
"as-raw-xcb-connection",
"gethostname",
"libc",
"libloading",
"once_cell",
"rustix 1.1.4",
"x11rb-protocol",
"xcursor",
]
[[package]]
name = "x11rb-protocol"
version = "0.13.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ea6fc2961e4ef194dcbfe56bb845534d0dc8098940c7e5c012a258bfec6701bd"
[[package]] [[package]]
name = "xcursor" name = "xcursor"
version = "0.3.10" version = "0.3.10"
@ -8372,7 +8203,6 @@ checksum = "2fb433233f2df9344722454bc7e96465c9d03bff9d77c248f9e7523fe79585b5"
[[package]] [[package]]
name = "xdg-shell-wrapper-config" name = "xdg-shell-wrapper-config"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/cosmic-panel#d518c7d25ef96f1a9696aa8cce008656bf66ece4"
dependencies = [ dependencies = [
"serde", "serde",
"wayland-protocols-wlr", "wayland-protocols-wlr",

View file

@ -25,11 +25,11 @@ resolver = "3"
[workspace.dependencies] [workspace.dependencies]
anyhow = "1.0.102" anyhow = "1.0.102"
cctk = { git = "https://github.com/pop-os/cosmic-protocols", package = "cosmic-client-toolkit", rev = "d0e95be" } cctk = { package = "cosmic-client-toolkit", path = "../cosmic-protocols/client-toolkit" }
cosmic-applets-config = { path = "cosmic-applets-config" } cosmic-applets-config = { path = "cosmic-applets-config" }
cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols", default-features = false, features = [ cosmic-protocols = { path = "../cosmic-protocols", default-features = false, features = [
"client", "client",
], rev = "d0e95be" } ]}
futures = "0.3" futures = "0.3"
futures-util = "0.3" futures-util = "0.3"
@ -38,7 +38,7 @@ i18n-embed = { version = "0.16.0", features = [
"desktop-requester", "desktop-requester",
] } ] }
i18n-embed-fl = "0.10" i18n-embed-fl = "0.10"
libcosmic = { git = "https://github.com/pop-os/libcosmic", default-features = false, features = [ cosmic = { package = "libcosmic-yoda", path = "../libcosmic", default-features = false, features = [
"applet", "applet",
"applet-token", "applet-token",
"dbus-config", "dbus-config",
@ -58,7 +58,7 @@ tracing-subscriber = { version = "0.3.22", features = ["env-filter"] }
tracing-log = "0.2.0" tracing-log = "0.2.0"
tokio = { version = "1.49.0", features = ["full"] } tokio = { version = "1.49.0", features = ["full"] }
# cosmic-config = { path = "../libcosmic/cosmic-config" } # cosmic-config = { path = "../libcosmic/cosmic-config" }
cosmic-config = { git = "https://github.com/pop-os/libcosmic" } cosmic-config = { path = "../libcosmic/cosmic-config" }
serde = { version = "1.0.228", features = ["derive"] } serde = { version = "1.0.228", features = ["derive"] }
[profile.release] [profile.release]
@ -82,12 +82,48 @@ ignored = ["libcosmic"]
# winit = { git = "https://github.com/rust-windowing/winit.git", rev = "241b7a80bba96c91fa3901729cd5dec66abb9be4" } # winit = { git = "https://github.com/rust-windowing/winit.git", rev = "241b7a80bba96c91fa3901729cd5dec66abb9be4" }
# winit = { path = "../winit" } # winit = { path = "../winit" }
[patch."https://github.com/pop-os/libcosmic"]
cosmic-config = { path = "/home/lionel/Projets/COSMIC/libcosmic/cosmic-config" }
cosmic-theme = { path = "/home/lionel/Projets/COSMIC/libcosmic/cosmic-theme" }
iced = { path = "/home/lionel/Projets/COSMIC/libcosmic/iced" }
iced_accessibility = { path = "/home/lionel/Projets/COSMIC/libcosmic/iced/accessibility" }
iced_core = { path = "/home/lionel/Projets/COSMIC/libcosmic/iced/core" }
iced_futures = { path = "/home/lionel/Projets/COSMIC/libcosmic/iced/futures" }
iced_graphics = { path = "/home/lionel/Projets/COSMIC/libcosmic/iced/graphics" }
iced_renderer = { path = "/home/lionel/Projets/COSMIC/libcosmic/iced/renderer" }
iced_runtime = { path = "/home/lionel/Projets/COSMIC/libcosmic/iced/runtime" }
iced_tiny_skia = { path = "/home/lionel/Projets/COSMIC/libcosmic/iced/tiny_skia" }
iced_wgpu = { path = "/home/lionel/Projets/COSMIC/libcosmic/iced/wgpu" }
iced_widget = { path = "/home/lionel/Projets/COSMIC/libcosmic/iced/widget" }
iced_winit = { path = "/home/lionel/Projets/COSMIC/libcosmic/iced/winit" }
[patch."https://github.com/smithay/client-toolkit.git"] [patch."https://github.com/smithay/client-toolkit.git"]
sctk = { package = "smithay-client-toolkit", version = "0.20.0" } sctk = { package = "smithay-client-toolkit", version = "0.20.0" }
[patch."https://github.com/pop-os/cosmic-protocols"] [patch."https://github.com/pop-os/cosmic-protocols"]
cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols//", branch = "main" } cosmic-protocols = { path = "/home/lionel/Projets/COSMIC/cosmic-protocols" }
cosmic-client-toolkit = { git = "https://github.com/pop-os/cosmic-protocols//", branch = "main" } cosmic-client-toolkit = { path = "/home/lionel/Projets/COSMIC/cosmic-protocols/client-toolkit" }
[patch."https://github.com/pop-os/cosmic-panel"]
cosmic-panel-config = { path = "/home/lionel/Projets/COSMIC/cosmic-panel/cosmic-panel-config" }
xdg-shell-wrapper-config = { path = "/home/lionel/Projets/COSMIC/cosmic-panel/xdg-shell-wrapper-config" }
[patch."https://github.com/pop-os/cosmic-notifications"]
cosmic-notifications-config = { path = "/home/lionel/Projets/COSMIC/cosmic-notifications/cosmic-notifications-config" }
cosmic-notifications-util = { path = "/home/lionel/Projets/COSMIC/cosmic-notifications/cosmic-notifications-util" }
[patch."https://github.com/pop-os/cosmic-settings"]
cosmic-settings-a11y-manager-subscription = { path = "/home/lionel/Projets/COSMIC/cosmic-settings/subscriptions/a11y-manager" }
cosmic-settings-accessibility-subscription = { path = "/home/lionel/Projets/COSMIC/cosmic-settings/subscriptions/accessibility" }
cosmic-settings-airplane-mode-subscription = { path = "/home/lionel/Projets/COSMIC/cosmic-settings/subscriptions/airplane-mode" }
cosmic-settings-daemon-subscription = { path = "/home/lionel/Projets/COSMIC/cosmic-settings/subscriptions/settings-daemon" }
cosmic-settings-network-manager-subscription = { path = "/home/lionel/Projets/COSMIC/cosmic-settings/subscriptions/network-manager" }
cosmic-settings-sound-subscription = { path = "/home/lionel/Projets/COSMIC/cosmic-settings/subscriptions/sound" }
cosmic-settings-upower-subscription = { path = "/home/lionel/Projets/COSMIC/cosmic-settings/subscriptions/upower" }
[patch."https://github.com/pop-os/cosmic-settings/"]
cosmic-settings-airplane-mode-subscription = { path = "/home/lionel/Projets/COSMIC/cosmic-settings/subscriptions/airplane-mode" }
cosmic-settings-network-manager-subscription = { path = "/home/lionel/Projets/COSMIC/cosmic-settings/subscriptions/network-manager" }
# [patch.'https://github.com/pop-os/dbus-settings-bindings'] # [patch.'https://github.com/pop-os/dbus-settings-bindings']
# cosmic-dbus-networkmanager = { path = "../dbus-settings-bindings/networkmanager" } # cosmic-dbus-networkmanager = { path = "../dbus-settings-bindings/networkmanager" }

View file

@ -13,7 +13,7 @@ futures.workspace = true
i18n-embed.workspace = true i18n-embed.workspace = true
i18n-embed-fl.workspace = true i18n-embed-fl.workspace = true
image = { version = "0.25.9", default-features = false } image = { version = "0.25.9", default-features = false }
libcosmic.workspace = true cosmic.workspace = true
memmap2 = "0.9.10" memmap2 = "0.9.10"
fastrand = "2.3.0" fastrand = "2.3.0"
rust-embed.workspace = true rust-embed.workspace = true

View file

@ -6,5 +6,5 @@ edition = "2024"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
libcosmic.workspace = true cosmic.workspace = true
serde = { workspace = true, features = ["derive"] } serde = { workspace = true, features = ["derive"] }

View file

@ -435,6 +435,7 @@ pub enum PopupType {
} }
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
#[allow(dead_code)]
enum Message { enum Message {
Wayland(WaylandUpdate), Wayland(WaylandUpdate),
PinApp(u32), PinApp(u32),

View file

@ -9,7 +9,7 @@ cctk.workspace = true
cosmic-protocols.workspace = true cosmic-protocols.workspace = true
i18n-embed-fl.workspace = true i18n-embed-fl.workspace = true
i18n-embed.workspace = true i18n-embed.workspace = true
libcosmic.workspace = true cosmic.workspace = true
rust-embed.workspace = true rust-embed.workspace = true
tokio.workspace = true tokio.workspace = true
tracing-log.workspace = true tracing-log.workspace = true
@ -17,9 +17,7 @@ tracing-subscriber.workspace = true
tracing.workspace = true tracing.workspace = true
[dependencies.cosmic-settings-a11y-manager-subscription] [dependencies.cosmic-settings-a11y-manager-subscription]
git = "https://github.com/pop-os/cosmic-settings" path = "../../cosmic-settings/subscriptions/a11y-manager"
# path = "../../cosmic-settings/subscriptions/a11y-manager"
[dependencies.cosmic-settings-accessibility-subscription] [dependencies.cosmic-settings-accessibility-subscription]
git = "https://github.com/pop-os/cosmic-settings" path = "../../cosmic-settings/subscriptions/accessibility"
# path = "../../cosmic-settings/subscriptions/accessibility"

View file

@ -26,10 +26,9 @@ use cosmic::{
}; };
use cosmic_settings_a11y_manager_subscription::{ use cosmic_settings_a11y_manager_subscription::{
self as cosmic_a11y_manager, AccessibilityEvent, AccessibilityRequest, ColorFilter, AccessibilityEvent, AccessibilityRequest, ColorFilter,
}; };
use cosmic_settings_accessibility_subscription::{self as accessibility}; use cosmic_settings_accessibility_subscription::{self as accessibility};
use std::sync::LazyLock;
use tokio::sync::mpsc::UnboundedSender; use tokio::sync::mpsc::UnboundedSender;
pub fn run() -> cosmic::iced::Result { pub fn run() -> cosmic::iced::Result {
@ -52,6 +51,7 @@ struct CosmicA11yApplet {
} }
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
#[allow(dead_code)]
enum Message { enum Message {
TogglePopup, TogglePopup,
CloseRequested(window::Id), CloseRequested(window::Id),

View file

@ -2,13 +2,12 @@
// SPDX-License-Identifier: GPL-3.0-only // SPDX-License-Identifier: GPL-3.0-only
use anyhow; use anyhow;
use cctk::sctk::reexports::calloop::{self, channel::SyncSender}; use cctk::sctk::reexports::calloop::{self};
use cosmic::iced::{ use cosmic::iced::{
self, Subscription, self, Subscription,
futures::{self, SinkExt, StreamExt, channel::mpsc}, futures::{self, SinkExt},
stream, stream,
}; };
use cosmic_protocols::a11y::v1::client::cosmic_a11y_manager_v1::Filter;
use cosmic_settings_a11y_manager_subscription::{ use cosmic_settings_a11y_manager_subscription::{
self as thread, AccessibilityEvent, AccessibilityRequest, self as thread, AccessibilityEvent, AccessibilityRequest,
}; };

View file

@ -7,7 +7,7 @@ license = "GPL-3.0-only"
[dependencies] [dependencies]
i18n-embed-fl.workspace = true i18n-embed-fl.workspace = true
i18n-embed.workspace = true i18n-embed.workspace = true
libcosmic.workspace = true cosmic.workspace = true
mpris2-zbus = { git = "https://github.com/pop-os/dbus-settings-bindings" } mpris2-zbus = { git = "https://github.com/pop-os/dbus-settings-bindings" }
# mpris2-zbus = { path = "../../dbus-settings-bindings/mpris2" } # mpris2-zbus = { path = "../../dbus-settings-bindings/mpris2" }
rust-embed.workspace = true rust-embed.workspace = true
@ -21,5 +21,4 @@ urlencoding = "2.1.3"
zbus.workspace = true zbus.workspace = true
[dependencies.cosmic-settings-sound-subscription] [dependencies.cosmic-settings-sound-subscription]
git = "https://github.com/pop-os/cosmic-settings" path = "../../cosmic-settings/subscriptions/sound"
# path = "../../cosmic-settings/subscriptions/sound"

View file

@ -5,7 +5,7 @@ use cosmic::iced::core::Point;
use cosmic::iced::core::{ use cosmic::iced::core::{
Clipboard, Element, Layout, Length, Rectangle, Shell, Size, Widget, Clipboard, Element, Layout, Length, Rectangle, Shell, Size, Widget,
event::{self, Event}, event::Event,
layout, mouse, overlay, renderer, touch, layout, mouse, overlay, renderer, touch,
widget::{Operation, Tree, tree}, widget::{Operation, Tree, tree},
}; };

View file

@ -12,7 +12,7 @@ drm = "0.14.1"
futures.workspace = true futures.workspace = true
i18n-embed-fl.workspace = true i18n-embed-fl.workspace = true
i18n-embed.workspace = true i18n-embed.workspace = true
libcosmic.workspace = true cosmic.workspace = true
rust-embed.workspace = true rust-embed.workspace = true
rustc-hash.workspace = true rustc-hash.workspace = true
tokio.workspace = true tokio.workspace = true
@ -24,9 +24,7 @@ zbus.workspace = true
serde.workspace = true serde.workspace = true
[dependencies.cosmic-settings-upower-subscription] [dependencies.cosmic-settings-upower-subscription]
git = "https://github.com/pop-os/cosmic-settings" path = "../../cosmic-settings/subscriptions/upower"
# path = "../../cosmic-settings/subscriptions/upower"
[dependencies.cosmic-settings-daemon-subscription] [dependencies.cosmic-settings-daemon-subscription]
git = "https://github.com/pop-os/cosmic-settings" path = "../../cosmic-settings/subscriptions/settings-daemon"
# path = "../../cosmic-settings/subscriptions/settings-daemon"

View file

@ -40,7 +40,7 @@ use cosmic_settings_upower_subscription::{
}; };
use rustc_hash::FxHashMap; use rustc_hash::FxHashMap;
use std::{path::PathBuf, sync::LazyLock, time::Duration}; use std::{path::PathBuf, time::Duration};
use tokio::sync::mpsc::UnboundedSender; use tokio::sync::mpsc::UnboundedSender;
// XXX improve // XXX improve
@ -172,6 +172,7 @@ impl CosmicBatteryApplet {
} }
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
#[allow(dead_code)]
enum Message { enum Message {
TogglePopup, TogglePopup,
CloseRequested(window::Id), CloseRequested(window::Id),
@ -507,7 +508,7 @@ impl cosmic::Application for CosmicBatteryApplet {
Task::none() Task::none()
} }
fn view(&self) -> Element<Message> { fn view(&self) -> Element<'_, Message> {
let is_horizontal = match self.core.applet.anchor { let is_horizontal = match self.core.applet.anchor {
PanelAnchor::Top | PanelAnchor::Bottom => true, PanelAnchor::Top | PanelAnchor::Bottom => true,
PanelAnchor::Left | PanelAnchor::Right => false, PanelAnchor::Left | PanelAnchor::Right => false,

View file

@ -10,7 +10,7 @@ bluer = { version = "0.17", features = ["bluetoothd", "id"] }
futures.workspace = true futures.workspace = true
i18n-embed-fl.workspace = true i18n-embed-fl.workspace = true
i18n-embed.workspace = true i18n-embed.workspace = true
libcosmic.workspace = true cosmic.workspace = true
fastrand = "2.3.0" fastrand = "2.3.0"
rust-embed.workspace = true rust-embed.workspace = true
rustc-hash.workspace = true rustc-hash.workspace = true

View file

@ -24,7 +24,7 @@ use cosmic::{
widget::{button, divider, icon, scrollable, text}, widget::{button, divider, icon, scrollable, text},
}; };
use futures::FutureExt; use futures::FutureExt;
use std::{collections::HashMap, sync::LazyLock, time::Duration}; use std::{collections::HashMap, time::Duration};
use tokio::sync::mpsc::Sender; use tokio::sync::mpsc::Sender;
use crate::{ use crate::{
@ -63,6 +63,7 @@ impl CosmicBluetoothApplet {
} }
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
#[allow(dead_code)]
enum Message { enum Message {
TogglePopup, TogglePopup,
CloseRequested(window::Id), CloseRequested(window::Id),
@ -145,7 +146,7 @@ impl cosmic::Application for CosmicBluetoothApplet {
} }
Message::BluetoothEvent(e) => match e { Message::BluetoothEvent(e) => match e {
BluerEvent::RequestResponse { BluerEvent::RequestResponse {
req, req: _,
state, state,
err_msg, err_msg,
} => { } => {

View file

@ -149,8 +149,6 @@ pub fn bluetooth_subscription<I: 'static + Hash + Copy + Send + Sync + Debug>(
}, },
BluerSessionEvent::AgentEvent(e) => BluerEvent::AgentEvent(e), BluerSessionEvent::AgentEvent(e) => BluerEvent::AgentEvent(e),
_ => return,
}; };
_ = output.send(message).await; _ = output.send(message).await;
@ -199,6 +197,7 @@ pub enum BluerRequest {
} }
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
#[allow(dead_code)]
pub enum BluerEvent { pub enum BluerEvent {
RequestResponse { RequestResponse {
req: BluerRequest, req: BluerRequest,

View file

@ -8,7 +8,7 @@ license = "GPL-3.0-only"
cosmic-comp-config = { git = "https://github.com/pop-os/cosmic-comp.git", rev = "5eb5af4" } cosmic-comp-config = { git = "https://github.com/pop-os/cosmic-comp.git", rev = "5eb5af4" }
i18n-embed-fl.workspace = true i18n-embed-fl.workspace = true
i18n-embed.workspace = true i18n-embed.workspace = true
libcosmic.workspace = true cosmic.workspace = true
rust-embed.workspace = true rust-embed.workspace = true
tokio.workspace = true tokio.workspace = true
tracing-log.workspace = true tracing-log.workspace = true

View file

@ -3,7 +3,6 @@
mod localize; mod localize;
use cosmic::iced::{Alignment, Length};
use cosmic::{ use cosmic::{
app, app,
app::Core, app::Core,
@ -14,16 +13,14 @@ use cosmic::{
iced::{ iced::{
Rectangle, Task, Rectangle, Task,
platform_specific::shell::commands::popup::{destroy_popup, get_popup}, platform_specific::shell::commands::popup::{destroy_popup, get_popup},
widget::{column, row},
window::Id, window::Id,
}, },
iced::{core::window, runtime::Appearance}, iced::core::window,
prelude::*, prelude::*,
surface, theme, surface, theme,
widget::{ widget::{
self, autosize, self, autosize,
rectangle_tracker::{RectangleTracker, RectangleUpdate, rectangle_tracker_subscription}, rectangle_tracker::{RectangleTracker, RectangleUpdate, rectangle_tracker_subscription},
space,
}, },
}; };
use cosmic_comp_config::CosmicCompConfig; use cosmic_comp_config::CosmicCompConfig;

View file

@ -9,7 +9,7 @@ anyhow.workspace = true
i18n-embed-fl.workspace = true i18n-embed-fl.workspace = true
i18n-embed.workspace = true i18n-embed.workspace = true
image = { version = "0.25.9", default-features = false } image = { version = "0.25.9", default-features = false }
libcosmic.workspace = true cosmic.workspace = true
memmap2 = "0.9.10" memmap2 = "0.9.10"
rust-embed.workspace = true rust-embed.workspace = true
rustix.workspace = true rustix.workspace = true

View file

@ -316,7 +316,7 @@ impl cosmic::Application for Minimize {
} else { } else {
(cross_padding, major_padding) (cross_padding, major_padding)
}; };
let theme = self.core.system_theme().cosmic(); let _theme = self.core.system_theme().cosmic();
let icon_buttons = self.apps[..max_icon_count].iter().map(|app| { let icon_buttons = self.apps[..max_icon_count].iter().map(|app| {
self.core self.core
.applet .applet
@ -420,7 +420,7 @@ impl cosmic::Application for Minimize {
(cross_padding, major_padding) (cross_padding, major_padding)
}; };
let theme = self.core.system_theme().cosmic(); let theme = self.core.system_theme().cosmic();
let space_xxs = theme.space_xxs(); let _space_xxs = theme.space_xxs();
let icon_buttons = self.apps[max_icon_count..].iter().map(|app| { let icon_buttons = self.apps[max_icon_count..].iter().map(|app| {
tooltip( tooltip(
Element::from(crate::window_image::WindowImage::new( Element::from(crate::window_image::WindowImage::new(

View file

@ -12,7 +12,7 @@ futures.workspace = true
futures-util.workspace = true futures-util.workspace = true
i18n-embed-fl.workspace = true i18n-embed-fl.workspace = true
i18n-embed.workspace = true i18n-embed.workspace = true
libcosmic = { workspace = true, features = [ cosmic = { workspace = true, features = [
"applet", "applet",
"applet-token", "applet-token",
"tokio", "tokio",
@ -33,9 +33,7 @@ uuid = { version = "1.21.0", features = ["v4"] }
[dependencies.cosmic-settings-network-manager-subscription] [dependencies.cosmic-settings-network-manager-subscription]
git = "https://github.com/pop-os/cosmic-settings/" path = "../../cosmic-settings/subscriptions/network-manager"
# path = "../../cosmic-settings/subscriptions/network-manager"
[dependencies.cosmic-settings-airplane-mode-subscription] [dependencies.cosmic-settings-airplane-mode-subscription]
git = "https://github.com/pop-os/cosmic-settings/" path = "../../cosmic-settings/subscriptions/airplane-mode"
# path = "../../cosmic-settings/subscriptions/airplane-mode"

View file

@ -2,7 +2,6 @@ use anyhow::Context;
use cosmic_dbus_networkmanager::settings::{NetworkManagerSettings, connection::Settings}; use cosmic_dbus_networkmanager::settings::{NetworkManagerSettings, connection::Settings};
use cosmic_settings_network_manager_subscription::{ use cosmic_settings_network_manager_subscription::{
self as network_manager, NetworkManagerState, UUID, self as network_manager, NetworkManagerState, UUID,
active_conns::active_conns_subscription,
available_wifi::{AccessPoint, NetworkType}, available_wifi::{AccessPoint, NetworkType},
current_networks::ActiveConnectionInfo, current_networks::ActiveConnectionInfo,
hw_address::HwAddress, hw_address::HwAddress,
@ -15,7 +14,6 @@ use std::{
borrow::Cow, borrow::Cow,
collections::{BTreeMap, BTreeSet}, collections::{BTreeMap, BTreeSet},
sync::{Arc, LazyLock}, sync::{Arc, LazyLock},
time::Duration,
}; };
use cosmic::{ use cosmic::{
@ -33,17 +31,14 @@ use cosmic::{
}, },
surface, theme, surface, theme,
widget::{ widget::{
Column, Id, Row, button, column, container, divider, Id, button, column, container, divider,
icon::{self, from_name}, icon::{self, from_name},
row, scrollable, secure_input, text, text_input, toggler, row, scrollable, secure_input, text, text_input, toggler,
}, },
}; };
use cosmic_dbus_networkmanager::interface::{ use cosmic_dbus_networkmanager::interface::enums::{ActiveConnectionState, DeviceState, NmConnectivityState};
access_point,
enums::{ActiveConnectionState, DeviceState, NmConnectivityState, NmState},
};
use futures::{StreamExt, channel::mpsc::TrySendError}; use futures::StreamExt;
use zbus::{Connection, zvariant::ObjectPath}; use zbus::{Connection, zvariant::ObjectPath};
use crate::{config, fl}; use crate::{config, fl};
@ -74,6 +69,7 @@ impl NewConnectionState {
} }
.ssid .ssid
} }
#[allow(dead_code)]
pub fn hw_address(&self) -> HwAddress { pub fn hw_address(&self) -> HwAddress {
match self { match self {
Self::EnterPassword { access_point, .. } => access_point, Self::EnterPassword { access_point, .. } => access_point,
@ -96,6 +92,7 @@ impl From<NewConnectionState> for AccessPoint {
pub static SECURE_INPUT_WIFI: LazyLock<Id> = LazyLock::new(Id::unique); pub static SECURE_INPUT_WIFI: LazyLock<Id> = LazyLock::new(Id::unique);
#[allow(dead_code)]
#[derive(Default, Debug, Clone)] #[derive(Default, Debug, Clone)]
pub struct MyNetworkState { pub struct MyNetworkState {
pub known_vpns: IndexMap<UUID, ConnectionSettings>, pub known_vpns: IndexMap<UUID, ConnectionSettings>,
@ -107,6 +104,7 @@ pub struct MyNetworkState {
pub requested_vpn: Option<RequestedVpn>, pub requested_vpn: Option<RequestedVpn>,
} }
#[allow(dead_code)]
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub struct RequestedVpn { pub struct RequestedVpn {
name: String, name: String,
@ -123,6 +121,7 @@ pub enum ConnectionSettings {
Wireguard { id: String }, Wireguard { id: String },
} }
#[allow(dead_code)]
#[derive(Clone, Debug, Default)] #[derive(Clone, Debug, Default)]
pub struct VpnConnectionSettings { pub struct VpnConnectionSettings {
id: String, id: String,
@ -136,6 +135,7 @@ enum ConnectionType {
Password, Password,
} }
#[allow(dead_code)]
impl VpnConnectionSettings { impl VpnConnectionSettings {
fn password_flag(&self) -> Option<PasswordFlag> { fn password_flag(&self) -> Option<PasswordFlag> {
self.connection_type self.connection_type
@ -366,15 +366,12 @@ impl CosmicNetworkApplet {
} }
fn update_togglers(&mut self, state: &NetworkManagerState) { fn update_togglers(&mut self, state: &NetworkManagerState) {
let mut changed = false;
if self.nm_state.nm_state.wifi_enabled != state.wifi_enabled { if self.nm_state.nm_state.wifi_enabled != state.wifi_enabled {
self.nm_state.nm_state.wifi_enabled = state.wifi_enabled; self.nm_state.nm_state.wifi_enabled = state.wifi_enabled;
changed = true;
} }
if self.nm_state.nm_state.airplane_mode != state.airplane_mode { if self.nm_state.nm_state.airplane_mode != state.airplane_mode {
self.nm_state.nm_state.airplane_mode = state.airplane_mode; self.nm_state.nm_state.airplane_mode = state.airplane_mode;
changed = true;
} }
} }
@ -447,6 +444,7 @@ impl CosmicNetworkApplet {
} }
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
#[allow(dead_code)]
pub(crate) enum Message { pub(crate) enum Message {
TogglePopup, TogglePopup,
CloseRequested(window::Id), CloseRequested(window::Id),
@ -501,8 +499,9 @@ pub(crate) enum Message {
SelectDevice(Option<Arc<network_manager::devices::DeviceInfo>>), SelectDevice(Option<Arc<network_manager::devices::DeviceInfo>>),
} }
#[allow(dead_code)]
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
struct Password { pub(crate) struct Password {
ssid: network_manager::SSID, ssid: network_manager::SSID,
hw_address: HwAddress, hw_address: HwAddress,
identity: Option<String>, identity: Option<String>,
@ -759,7 +758,7 @@ impl cosmic::Application for CosmicNetworkApplet {
const APP_ID: &'static str = config::APP_ID; const APP_ID: &'static str = config::APP_ID;
fn init(core: cosmic::app::Core, _flags: ()) -> (Self, app::Task<Message>) { fn init(core: cosmic::app::Core, _flags: ()) -> (Self, app::Task<Message>) {
let mut applet = Self { let applet = Self {
core, core,
icon_name: "network-wired-disconnected-symbolic".to_string(), icon_name: "network-wired-disconnected-symbolic".to_string(),
token_tx: None, token_tx: None,
@ -1153,9 +1152,9 @@ impl cosmic::Application for CosmicNetworkApplet {
} => { } => {
if let network_manager::Request::SelectAccessPoint( if let network_manager::Request::SelectAccessPoint(
ssid, ssid,
hw_address, _hw_address,
_network_type, _network_type,
secret_tx, _secret_tx,
) = &req ) = &req
{ {
let conn_match = self let conn_match = self
@ -1168,7 +1167,7 @@ impl cosmic::Application for CosmicNetworkApplet {
.active_conns .active_conns
.iter_mut() .iter_mut()
.find(|ap| { .find(|ap| {
let ap_hw_address = match ap { let _ap_hw_address = match ap {
ActiveConnectionInfo::Wired { hw_address, .. } ActiveConnectionInfo::Wired { hw_address, .. }
| ActiveConnectionInfo::WiFi { hw_address, .. } => { | ActiveConnectionInfo::WiFi { hw_address, .. } => {
HwAddress::from_str(&hw_address).unwrap() HwAddress::from_str(&hw_address).unwrap()
@ -1192,8 +1191,8 @@ impl cosmic::Application for CosmicNetworkApplet {
ssid, ssid,
identity: _, identity: _,
password: _, password: _,
secret_tx, secret_tx: _,
interface interface: _
} = &req } = &req
{ {
if let Some(NewConnectionState::Waiting(access_point)) = if let Some(NewConnectionState::Waiting(access_point)) =
@ -1246,9 +1245,9 @@ impl cosmic::Application for CosmicNetworkApplet {
} }
} }
cosmic_settings_network_manager_subscription::Event::WiFiCredentials { cosmic_settings_network_manager_subscription::Event::WiFiCredentials {
ssid, ssid: _,
password, password: _,
security_type, security_type: _,
} => {} } => {}
}, },
Message::NetworkManagerConnect(connection) => { Message::NetworkManagerConnect(connection) => {
@ -1441,7 +1440,7 @@ impl cosmic::Application for CosmicNetworkApplet {
} }
ActiveConnectionInfo::Wired { ActiveConnectionInfo::Wired {
name, name,
hw_address, hw_address: _,
speed, speed,
ip_addresses, ip_addresses,
} => { } => {

View file

@ -8,7 +8,7 @@ license = "GPL-3.0-only"
cosmic-notifications-util = { git = "https://github.com/pop-os/cosmic-notifications" } cosmic-notifications-util = { git = "https://github.com/pop-os/cosmic-notifications" }
cosmic-notifications-config = { git = "https://github.com/pop-os/cosmic-notifications" } cosmic-notifications-config = { git = "https://github.com/pop-os/cosmic-notifications" }
anyhow.workspace = true anyhow.workspace = true
libcosmic.workspace = true cosmic.workspace = true
tokio.workspace = true tokio.workspace = true
# cosmic-notifications-util = { path = "../../cosmic-notifications-daemon/cosmic-notifications-util" } # cosmic-notifications-util = { path = "../../cosmic-notifications-daemon/cosmic-notifications-util" }
# cosmic-notifications-config = { path = "../../cosmic-notifications-daemon/cosmic-notifications-config" } # cosmic-notifications-config = { path = "../../cosmic-notifications-daemon/cosmic-notifications-config" }

View file

@ -20,14 +20,14 @@ use cosmic::{
window, window,
}, },
surface, theme, surface, theme,
widget::{Column, button, cards, container, divider, icon, scrollable, space, text, toggler}, widget::{Column, button, cards, container, divider, icon, scrollable, text, toggler},
}; };
use cosmic::iced::futures::executor::block_on; use cosmic::iced::futures::executor::block_on;
use cosmic_notifications_config::NotificationsConfig; use cosmic_notifications_config::NotificationsConfig;
use cosmic_notifications_util::{ActionId, Image, Notification}; use cosmic_notifications_util::{ActionId, Image, Notification};
use std::{borrow::Cow, collections::HashMap, path::PathBuf, sync::LazyLock}; use std::{borrow::Cow, collections::HashMap};
use subscriptions::notifications::{self, NotificationsAppletProxy}; use subscriptions::notifications::{self, NotificationsAppletProxy};
use tokio::sync::mpsc::Sender; use tokio::sync::mpsc::Sender;
use tracing::info; use tracing::info;
@ -65,6 +65,7 @@ impl Notifications {
} }
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
#[allow(dead_code)]
enum Message { enum Message {
TogglePopup, TogglePopup,
CloseRequested(window::Id), CloseRequested(window::Id),
@ -279,7 +280,7 @@ impl cosmic::Application for Notifications {
} }
} }
Message::CardsToggled(name, expanded) => { Message::CardsToggled(name, expanded) => {
let id = if let Some((id, _, n_expanded, ..)) = self let _id = if let Some((id, _, n_expanded, ..)) = self
.cards .cards
.iter_mut() .iter_mut()
.find(|c| c.1.iter().any(|notif| name == notif.app_name)) .find(|c| c.1.iter().any(|notif| name == notif.app_name))

View file

@ -7,7 +7,7 @@ license = "GPL-3.0-only"
[dependencies] [dependencies]
i18n-embed-fl.workspace = true i18n-embed-fl.workspace = true
i18n-embed.workspace = true i18n-embed.workspace = true
libcosmic.workspace = true cosmic.workspace = true
logind-zbus = "5.3.2" logind-zbus = "5.3.2"
rust-embed.workspace = true rust-embed.workspace = true
rustix.workspace = true rustix.workspace = true

View file

@ -16,9 +16,8 @@ use cosmic::{
window, window,
}, },
surface, theme, surface, theme,
widget::{Space, button, divider, icon, space, text}, widget::{button, divider, icon, space, text},
}; };
use std::sync::LazyLock;
use logind_zbus::{ use logind_zbus::{
manager::ManagerProxy, manager::ManagerProxy,
@ -35,9 +34,6 @@ pub mod session_manager;
use crate::{cosmic_session::CosmicSessionProxy, session_manager::SessionManagerProxy}; use crate::{cosmic_session::CosmicSessionProxy, session_manager::SessionManagerProxy};
static SUBSURFACE_ID: LazyLock<cosmic::widget::Id> =
LazyLock::new(|| cosmic::widget::Id::new("subsurface"));
pub fn run() -> cosmic::iced::Result { pub fn run() -> cosmic::iced::Result {
localize::localize(); localize::localize();
@ -49,7 +45,6 @@ struct Power {
icon_name: String, icon_name: String,
popup: Option<window::Id>, popup: Option<window::Id>,
token_tx: Option<calloop::channel::Sender<TokenRequest>>, token_tx: Option<calloop::channel::Sender<TokenRequest>>,
subsurface_id: window::Id,
} }
#[derive(Debug, Clone, Copy)] #[derive(Debug, Clone, Copy)]
@ -75,6 +70,7 @@ impl PowerAction {
} }
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
#[allow(dead_code)]
enum Message { enum Message {
Action(PowerAction), Action(PowerAction),
TogglePopup, TogglePopup,
@ -104,7 +100,6 @@ impl cosmic::Application for Power {
Self { Self {
core, core,
icon_name: "system-shutdown-symbolic".to_string(), icon_name: "system-shutdown-symbolic".to_string(),
subsurface_id: window::Id::unique(),
token_tx: None, token_tx: None,
popup: Option::default(), popup: Option::default(),
}, },

View file

@ -6,7 +6,7 @@ license = "GPL-3.0-only"
[dependencies] [dependencies]
futures.workspace = true futures.workspace = true
libcosmic.workspace = true cosmic.workspace = true
serde.workspace = true serde.workspace = true
rustc-hash.workspace = true rustc-hash.workspace = true
tokio.workspace = true tokio.workspace = true

View file

@ -11,7 +11,6 @@ use cosmic::{
iced::{ iced::{
self, Length, Subscription, self, Length, Subscription,
platform_specific::shell::commands::popup::{destroy_popup, get_popup}, platform_specific::shell::commands::popup::{destroy_popup, get_popup},
theme::Style,
window, window,
}, },
surface, surface,
@ -25,6 +24,7 @@ use crate::{
}; };
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
#[allow(dead_code)]
pub enum Msg { pub enum Msg {
None, None,
Activate(usize), Activate(usize),
@ -577,7 +577,7 @@ fn menu_icon_button<'a>(
let icon = menu.icon_handle().clone(); let icon = menu.icon_handle().clone();
let theme = cosmic::theme::active(); let theme = cosmic::theme::active();
let theme = theme.cosmic(); let _theme = theme.cosmic();
let suggested = applet.suggested_size(true); let suggested = applet.suggested_size(true);
let padding = applet.suggested_padding(true).1; let padding = applet.suggested_padding(true).1;

View file

@ -8,7 +8,7 @@ use cosmic::{
iced, iced,
widget::icon::{self, IconFallback}, widget::icon::{self, IconFallback},
}; };
use std::path::{Path, PathBuf}; use std::path::Path;
use crate::subscriptions::status_notifier_item::{IconUpdate, Layout, StatusNotifierItem}; use crate::subscriptions::status_notifier_item::{IconUpdate, Layout, StatusNotifierItem};

View file

@ -10,21 +10,18 @@
//! can be socket-activated and not conflict with anything else running as a status notifier //! can be socket-activated and not conflict with anything else running as a status notifier
//! watcher. //! watcher.
//! //!
//! The daemon runs as long as as there is at least one client still connected. Which it checks //! The daemon runs as long as there is at least one client still connected.
//! for every `REFRESH_INTERVAL`.
use crate::subscriptions::status_notifier_watcher::server::create_service; use crate::subscriptions::status_notifier_watcher::server::create_service;
use crate::unique_names::UniqueNames; use crate::unique_names::UniqueNames;
use futures::StreamExt; use futures::StreamExt;
use std::{collections::HashSet, time::Duration}; use std::collections::HashSet;
use zbus::fdo; use zbus::fdo;
use zbus::message::Header; use zbus::message::Header;
const DBUS_NAME: &str = "com.system76.CosmicStatusNotifierWatcher"; const DBUS_NAME: &str = "com.system76.CosmicStatusNotifierWatcher";
const OBJECT_PATH: &str = "/CosmicStatusNotifierWatcher"; const OBJECT_PATH: &str = "/CosmicStatusNotifierWatcher";
const REFRESH_INTERVAL: Duration = Duration::from_secs(60);
/// Run daemon /// Run daemon
pub fn run() -> cosmic::iced::Result { pub fn run() -> cosmic::iced::Result {
if let Err(err) = run_inner() { if let Err(err) = run_inner() {
@ -42,7 +39,7 @@ pub async fn cosmic_register(conn: &zbus::Connection) -> zbus::Result<()> {
tokio::spawn(async move { tokio::spawn(async move {
while let Some(value) = stream.next().await { while let Some(value) = stream.next().await {
if let Some(_unique_name) = value { if let Some(_unique_name) = value {
/// Register with new owner // Register with new owner.
let _ = cosmic_watcher.register_applet().await; let _ = cosmic_watcher.register_applet().await;
} }
} }

View file

@ -5,7 +5,7 @@ edition = "2024"
license = "GPL-3.0-only" license = "GPL-3.0-only"
[dependencies] [dependencies]
libcosmic.workspace = true cosmic.workspace = true
anyhow.workspace = true anyhow.workspace = true
cctk.workspace = true cctk.workspace = true
cosmic-comp-config = { git = "https://github.com/pop-os/cosmic-comp.git", rev = "5eb5af4" } cosmic-comp-config = { git = "https://github.com/pop-os/cosmic-comp.git", rev = "5eb5af4" }

View file

@ -26,7 +26,7 @@ use cosmic::{
}; };
use cosmic_comp_config::{CosmicCompConfig, TileBehavior}; use cosmic_comp_config::{CosmicCompConfig, TileBehavior};
use cosmic_protocols::workspace::v2::client::zcosmic_workspace_handle_v2::TilingState; use cosmic_protocols::workspace::v2::client::zcosmic_workspace_handle_v2::TilingState;
use std::{thread, time::Instant}; use std::thread;
use tracing::error; use tracing::error;
const ID: &str = "com.system76.CosmicAppletTiling"; const ID: &str = "com.system76.CosmicAppletTiling";
@ -46,6 +46,7 @@ pub struct Window {
} }
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
#[allow(dead_code)]
pub enum Message { pub enum Message {
TogglePopup, TogglePopup,
PopupClosed(Id), PopupClosed(Id),

View file

@ -9,7 +9,7 @@ cosmic-applets-config.workspace = true
jiff = "0.2" jiff = "0.2"
i18n-embed-fl.workspace = true i18n-embed-fl.workspace = true
i18n-embed.workspace = true i18n-embed.workspace = true
libcosmic.workspace = true cosmic.workspace = true
rust-embed.workspace = true rust-embed.workspace = true
tokio.workspace = true tokio.workspace = true
tracing-log.workspace = true tracing-log.workspace = true

View file

@ -94,6 +94,7 @@ pub struct Window {
} }
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
#[allow(dead_code)]
pub enum Message { pub enum Message {
TogglePopup, TogglePopup,
CloseRequested(window::Id), CloseRequested(window::Id),
@ -361,7 +362,7 @@ impl cosmic::Application for Window {
} }
fn subscription(&self) -> Subscription<Message> { fn subscription(&self) -> Subscription<Message> {
fn time_subscription(mut show_seconds: watch::Receiver<bool>) -> Subscription<Message> { fn time_subscription(show_seconds: watch::Receiver<bool>) -> Subscription<Message> {
struct Wrapper { struct Wrapper {
inner: watch::Receiver<bool>, inner: watch::Receiver<bool>,
id: &'static str, id: &'static str,
@ -376,7 +377,7 @@ impl cosmic::Application for Window {
inner: show_seconds, inner: show_seconds,
id: "time-sub", id: "time-sub",
}, },
|Wrapper { inner, id }| { |Wrapper { inner, id: _ }| {
let mut show_seconds = inner.clone(); let mut show_seconds = inner.clone();
stream::channel(1, move |mut output: mpsc::Sender<Message>| async move { stream::channel(1, move |mut output: mpsc::Sender<Message>| async move {
// Mark this receiver's state as changed so that it always receives an initial // Mark this receiver's state as changed so that it always receives an initial

View file

@ -6,7 +6,7 @@ edition = "2024"
license = "GPL-3.0-only" license = "GPL-3.0-only"
[dependencies] [dependencies]
libcosmic.workspace = true cosmic.workspace = true
cctk.workspace = true cctk.workspace = true
tracing.workspace = true tracing.workspace = true
tracing-subscriber.workspace = true tracing-subscriber.workspace = true

View file

@ -84,6 +84,7 @@ impl IcedWorkspacesApplet {
} }
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
#[allow(dead_code)]
enum Message { enum Message {
WorkspaceUpdate(WorkspacesUpdate), WorkspaceUpdate(WorkspacesUpdate),
WorkspacePressed(ExtWorkspaceHandleV1), WorkspacePressed(ExtWorkspaceHandleV1),

View file

@ -23,7 +23,7 @@ cosmic-applet-time = { path = "../cosmic-applet-time" }
cosmic-applet-workspaces = { path = "../cosmic-applet-workspaces" } cosmic-applet-workspaces = { path = "../cosmic-applet-workspaces" }
cosmic-applet-input-sources = { path = "../cosmic-applet-input-sources" } cosmic-applet-input-sources = { path = "../cosmic-applet-input-sources" }
cosmic-panel-button = { path = "../cosmic-panel-button" } cosmic-panel-button = { path = "../cosmic-panel-button" }
libcosmic.workspace = true cosmic.workspace = true
tracing.workspace = true tracing.workspace = true
tracing-subscriber.workspace = true tracing-subscriber.workspace = true
tracing-log.workspace = true tracing-log.workspace = true

View file

@ -5,7 +5,7 @@ edition = "2024"
license = "GPL-3.0-only" license = "GPL-3.0-only"
[dependencies] [dependencies]
libcosmic.workspace = true cosmic.workspace = true
rustc-hash.workspace = true rustc-hash.workspace = true
tracing.workspace = true tracing.workspace = true
tracing-subscriber.workspace = true tracing-subscriber.workspace = true

View file

@ -48,7 +48,7 @@ impl Button {
icon: cosmic::widget::icon::Handle, icon: cosmic::widget::icon::Handle,
) -> cosmic::widget::Button<'a, Message> { ) -> cosmic::widget::Button<'a, Message> {
let theme = cosmic::theme::active(); let theme = cosmic::theme::active();
let theme = theme.cosmic(); let _theme = theme.cosmic();
let suggested = self.core.applet.suggested_size(icon.symbolic); let suggested = self.core.applet.suggested_size(icon.symbolic);
let (major_padding, applet_padding_minor_axis) = let (major_padding, applet_padding_minor_axis) =

View file

@ -1,2 +1,2 @@
[toolchain] [toolchain]
channel = "1.90.0" channel = "1.93.0"