diff --git a/Cargo.lock b/Cargo.lock index dc5deede..356ec0c8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -154,7 +154,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f2a1bb052857d5dd49572219344a7332b31b76405648eabac5bc68978251bcd" dependencies = [ "android-properties", - "bitflags 2.13.1", + "bitflags 2.13.0", "cc", "jni", "libc", @@ -183,9 +183,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.102" +version = "1.0.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c" +checksum = "2a4385e2e34eb35d6b3efe798b9eb88096925d87726c0798709bf56d9ed84af3" [[package]] name = "apply" @@ -204,9 +204,9 @@ dependencies = [ [[package]] name = "arc-swap" -version = "1.9.1" +version = "1.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a3a1fd6f75306b68087b831f025c712524bcb19aad54e557b1129cfa0a2b207" +checksum = "c049c0be4daef0b145cb3555416b3b8ef5b7888a38aea1a3a155801fe7b0810b" dependencies = [ "rustversion", ] @@ -219,9 +219,15 @@ checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" [[package]] name = "arrayvec" -version = "0.7.6" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" +checksum = "d3fb67a6e08acf24fdeccbac2cb6ac4305825bd1f117462e0e6f2f193345ad56" + +[[package]] +name = "as-raw-xcb-connection" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b" [[package]] name = "ash" @@ -467,9 +473,9 @@ dependencies = [ [[package]] name = "auto_enums" -version = "0.8.8" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65398a2893f41bce5c9259f6e1a4f03fbae40637c1bdc755b4f387f48c613b03" +checksum = "2e4487600931c9a89f8db7ffbdf3fbdd45bb7bd85e26861f659a463cd0dff966" dependencies = [ "derive_utils", "proc-macro2", @@ -479,9 +485,9 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" +checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53" [[package]] name = "base64" @@ -521,9 +527,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.13.1" +version = "2.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b588b76d00fde79687d7646a9b5bdf3cc0f655e0bbd080335a95d7e96f3587da" +checksum = "b4388bee8683e3d04af747c73422af53102d2bd24d9eadb6cbc100baef4b43f8" dependencies = [ "serde_core", ] @@ -536,11 +542,11 @@ checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" [[package]] name = "block-buffer" -version = "0.10.4" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +checksum = "d2f6c7dbe95a6ed67ad9f18e57daf93a2f034c524b99fd2b76d18fdfeb6660aa" dependencies = [ - "generic-array", + "hybrid-array", ] [[package]] @@ -605,9 +611,9 @@ dependencies = [ [[package]] name = "borsh" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfd1e3f8955a5d7de9fab72fc8373fade9fb8a703968cb200ae3dc6cf08e185a" +checksum = "2f3f6da4992df95bbcd9af42a6c7dcb994498fc9048230405f3b36ff7cd3f145" dependencies = [ "bytes", "cfg_aliases", @@ -624,13 +630,13 @@ dependencies = [ [[package]] name = "bstr" -version = "1.12.1" +version = "1.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63044e1ae8e69f3b5a92c736ca6269b8d12fa7efe39bf34ddb06d102cf0e2cab" +checksum = "5cee35f73844aa3014bb606320a6c1f010249dbdf43342fe54b5a4f6a8ed4b79" dependencies = [ "memchr", "regex-automata", - "serde", + "serde_core", ] [[package]] @@ -644,9 +650,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.20.2" +version = "3.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d20789868f4b01b2f2caec9f5c4e0213b41e3e5702a50157d699ae31ced2fcb" +checksum = "72f5acc6cb2ba439de613abc23857ec3d78374d8ed5ac84e9d11336e87da8649" [[package]] name = "by_address" @@ -682,9 +688,9 @@ checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" [[package]] name = "bytes" -version = "1.11.1" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33" +checksum = "fc652a48c352aef3ea3aed32080501cf3ef6ed5da78602a020c991775b0aff04" [[package]] name = "calendrical_calculations" @@ -702,7 +708,7 @@ version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4dbf9978365bac10f54d1d4b04f7ce4427e51f71d61f2fe15e3fed5166474df7" dependencies = [ - "bitflags 2.13.1", + "bitflags 2.13.0", "polling", "rustix 1.1.4", "slab", @@ -723,14 +729,14 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.62" +version = "1.2.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1dce859f0832a7d088c4f1119888ab94ef4b5d6795d1ce05afb7fe159d79f98" +checksum = "f5d6cac793997bd970000024b2934968efe83b382de4fdcf4fcb46b6ee4ad996" dependencies = [ "find-msvc-tools", "jobserver", "libc", - "shlex", + "shlex 2.0.1", ] [[package]] @@ -747,9 +753,9 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" [[package]] name = "chrono" -version = "0.4.44" +version = "0.4.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c673075a2e0e5f4a1dde27ce9dee1ea4558c7ffe648f576438a20ca1d2acc4b0" +checksum = "1aa79e62e7697b8e29b513a68abacf485adcd1fe8284a4316c5ae868e6633327" dependencies = [ "iana-time-zone", "num-traits", @@ -769,6 +775,7 @@ dependencies = [ [[package]] name = "clipboard_macos" version = "0.1.0" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=sctk-0.20#f68595ee0e62fbd6589f4709b5aaa5c3c7ea5f6c" dependencies = [ "objc", "objc-foundation", @@ -778,12 +785,22 @@ dependencies = [ [[package]] name = "clipboard_wayland" version = "0.2.2" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=sctk-0.20#f68595ee0e62fbd6589f4709b5aaa5c3c7ea5f6c" dependencies = [ "dnd", "mime 0.1.0", "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]] name = "cocoa" version = "0.25.0" @@ -852,9 +869,15 @@ dependencies = [ [[package]] name = "configparser" -version = "3.1.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e57e3272f0190c3f1584272d613719ba5fc7df7f4942fe542e63d949cf3a649b" +checksum = "b46dec724fd22199ebde05033a0cbae453bc3b1ecff11eb6a6bb3eec4b90c6a4" + +[[package]] +name = "const-oid" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6ef517f0926dd24a1582492c791b6a4818a4d94e789a334894aa15b0d12f55c" [[package]] name = "core-foundation" @@ -912,7 +935,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb" dependencies = [ - "bitflags 2.13.1", + "bitflags 2.13.0", "core-foundation 0.10.1", "libc", ] @@ -928,7 +951,7 @@ dependencies = [ [[package]] name = "cosmic-app-list" -version = "1.3.0" +version = "1.0.15" dependencies = [ "anyhow", "cosmic-app-list-config", @@ -939,10 +962,10 @@ dependencies = [ "i18n-embed", "i18n-embed-fl", "image", - "libcosmic-yoda", - "memmap2 0.9.10", + "libcosmic", + "memmap2 0.9.11", "rust-embed", - "rustc-hash 2.1.2", + "rustc-hash 2.1.3", "rustix 1.1.4", "switcheroo-control", "tokio", @@ -955,15 +978,15 @@ dependencies = [ [[package]] name = "cosmic-app-list-config" -version = "1.3.0" +version = "1.0.15" dependencies = [ - "libcosmic-yoda", + "libcosmic", "serde", ] [[package]] name = "cosmic-applet-a11y" -version = "1.3.0" +version = "1.0.15" dependencies = [ "anyhow", "cosmic-client-toolkit", @@ -972,7 +995,7 @@ dependencies = [ "cosmic-settings-accessibility-subscription", "i18n-embed", "i18n-embed-fl", - "libcosmic-yoda", + "libcosmic", "rust-embed", "tokio", "tracing", @@ -982,14 +1005,14 @@ dependencies = [ [[package]] name = "cosmic-applet-audio" -version = "1.3.0" +version = "1.0.15" dependencies = [ "cosmic-settings-audio-client", "futures", "i18n-embed", "i18n-embed-fl", "intmap", - "libcosmic-yoda", + "libcosmic", "mpris2-zbus", "rust-embed", "serde", @@ -1005,20 +1028,20 @@ dependencies = [ [[package]] name = "cosmic-applet-battery" -version = "1.3.0" +version = "1.0.15" dependencies = [ "anyhow", "cosmic-applets-config", "cosmic-config", "cosmic-settings-daemon-subscription", "cosmic-settings-upower-subscription", - "drm", + "drm 0.14.1", "futures", "i18n-embed", "i18n-embed-fl", - "libcosmic-yoda", + "libcosmic", "rust-embed", - "rustc-hash 2.1.2", + "rustc-hash 2.1.3", "serde", "tokio", "tracing", @@ -1030,7 +1053,7 @@ dependencies = [ [[package]] name = "cosmic-applet-bluetooth" -version = "1.3.0" +version = "1.0.15" dependencies = [ "anyhow", "bluer", @@ -1038,9 +1061,9 @@ dependencies = [ "futures", "i18n-embed", "i18n-embed-fl", - "libcosmic-yoda", + "libcosmic", "rust-embed", - "rustc-hash 2.1.2", + "rustc-hash 2.1.3", "tokio", "tracing", "tracing-log", @@ -1049,12 +1072,14 @@ dependencies = [ [[package]] name = "cosmic-applet-input-sources" -version = "1.3.0" +version = "1.0.15" dependencies = [ + "cosmic-client-toolkit", "cosmic-comp-config", + "futures", "i18n-embed", "i18n-embed-fl", - "libcosmic-yoda", + "libcosmic", "rust-embed", "tokio", "tracing", @@ -1065,14 +1090,14 @@ dependencies = [ [[package]] name = "cosmic-applet-minimize" -version = "1.3.0" +version = "1.0.15" dependencies = [ "anyhow", "i18n-embed", "i18n-embed-fl", "image", - "libcosmic-yoda", - "memmap2 0.9.10", + "libcosmic", + "memmap2 0.9.11", "rust-embed", "rustix 1.1.4", "tokio", @@ -1083,7 +1108,7 @@ dependencies = [ [[package]] name = "cosmic-applet-network" -version = "1.3.0" +version = "1.0.15" dependencies = [ "async-fn-stream", "futures", @@ -1091,10 +1116,10 @@ dependencies = [ "i18n-embed", "i18n-embed-fl", "indexmap 2.14.0", - "libcosmic-yoda", + "libcosmic", "nmrs", "rust-embed", - "rustc-hash 2.1.2", + "rustc-hash 2.1.3", "secure-string", "tokio", "tracing", @@ -1105,7 +1130,7 @@ dependencies = [ [[package]] name = "cosmic-applet-notifications" -version = "1.3.0" +version = "1.0.15" dependencies = [ "anyhow", "cosmic-notifications-config", @@ -1113,7 +1138,7 @@ dependencies = [ "futures-util", "i18n-embed", "i18n-embed-fl", - "libcosmic-yoda", + "libcosmic", "rust-embed", "tokio", "tracing", @@ -1125,11 +1150,11 @@ dependencies = [ [[package]] name = "cosmic-applet-power" -version = "1.3.0" +version = "1.0.15" dependencies = [ "i18n-embed", "i18n-embed-fl", - "libcosmic-yoda", + "libcosmic", "logind-zbus", "rust-embed", "rustix 1.1.4", @@ -1142,11 +1167,11 @@ dependencies = [ [[package]] name = "cosmic-applet-status-area" -version = "1.3.0" +version = "1.0.15" dependencies = [ "futures", - "libcosmic-yoda", - "rustc-hash 2.1.2", + "libcosmic", + "rustc-hash 2.1.3", "serde", "tokio", "tracing", @@ -1157,7 +1182,7 @@ dependencies = [ [[package]] name = "cosmic-applet-tiling" -version = "1.3.0" +version = "1.0.15" dependencies = [ "anyhow", "cosmic-client-toolkit", @@ -1165,9 +1190,9 @@ dependencies = [ "cosmic-protocols", "i18n-embed", "i18n-embed-fl", - "libcosmic-yoda", + "libcosmic", "rust-embed", - "rustc-hash 2.1.2", + "rustc-hash 2.1.3", "tokio", "tracing", "tracing-log", @@ -1176,14 +1201,14 @@ dependencies = [ [[package]] name = "cosmic-applet-time" -version = "1.3.0" +version = "1.0.15" dependencies = [ "cosmic-applets-config", "i18n-embed", "i18n-embed-fl", "icu", "jiff", - "libcosmic-yoda", + "libcosmic", "logind-zbus", "rust-embed", "timedate-zbus", @@ -1196,14 +1221,14 @@ dependencies = [ [[package]] name = "cosmic-applet-workspaces" -version = "1.3.0" +version = "1.0.15" dependencies = [ "anyhow", "cosmic-client-toolkit", "futures", "i18n-embed", "i18n-embed-fl", - "libcosmic-yoda", + "libcosmic", "rust-embed", "tokio", "tracing", @@ -1213,7 +1238,7 @@ dependencies = [ [[package]] name = "cosmic-applets" -version = "1.3.0" +version = "1.0.15" dependencies = [ "cosmic-app-list", "cosmic-applet-a11y", @@ -1230,7 +1255,7 @@ dependencies = [ "cosmic-applet-time", "cosmic-applet-workspaces", "cosmic-panel-button", - "libcosmic-yoda", + "libcosmic", "tracing", "tracing-log", "tracing-subscriber", @@ -1239,7 +1264,7 @@ dependencies = [ [[package]] name = "cosmic-applets-config" -version = "1.3.0" +version = "1.0.15" dependencies = [ "cosmic-config", "serde", @@ -1248,8 +1273,9 @@ dependencies = [ [[package]] name = "cosmic-client-toolkit" version = "0.2.0" +source = "git+https://github.com/pop-os/cosmic-protocols//?rev=32283d7#32283d76a8d0342da74c4cc022a533c52dcf378f" dependencies = [ - "bitflags 2.13.1", + "bitflags 2.13.0", "cosmic-protocols", "libc", "smithay-client-toolkit", @@ -1259,7 +1285,8 @@ dependencies = [ [[package]] name = "cosmic-comp-config" -version = "1.0.0" +version = "0.1.0" +source = "git+https://github.com/pop-os/cosmic-comp.git?rev=5eb5af4#5eb5af46756f2f2bc5e812cf68fe4c4b79efd924" dependencies = [ "cosmic-config", "input", @@ -1269,6 +1296,7 @@ dependencies = [ [[package]] name = "cosmic-config" version = "1.0.0" +source = "git+https://github.com/pop-os/libcosmic#511384f6206527cf87369da67a9164831afbabef" dependencies = [ "atomicwrites", "cosmic-config-derive", @@ -1278,7 +1306,7 @@ dependencies = [ "iced_futures", "known-folders", "notify", - "ron 0.12.1", + "ron 0.12.2", "serde", "tokio", "tracing", @@ -1289,6 +1317,7 @@ dependencies = [ [[package]] name = "cosmic-config-derive" version = "1.0.0" +source = "git+https://github.com/pop-os/libcosmic#511384f6206527cf87369da67a9164831afbabef" dependencies = [ "quote", "syn", @@ -1305,11 +1334,12 @@ dependencies = [ [[package]] name = "cosmic-freedesktop-icons" version = "0.4.0" +source = "git+https://github.com/pop-os/freedesktop-icons#ab4c57b8e416c6af9297cb04d101889896fd9a92" dependencies = [ "bstr", "btoi", "memchr", - "memmap2 0.9.10", + "memmap2 0.9.11", "thiserror 2.0.18", "tracing", "xdg", @@ -1318,6 +1348,7 @@ dependencies = [ [[package]] name = "cosmic-notifications-config" version = "0.1.0" +source = "git+https://github.com/pop-os/cosmic-notifications#7c723b7705ec77b1ad5396a1baa9ae1c0cb5a0da" dependencies = [ "cosmic-config", "serde", @@ -1326,9 +1357,10 @@ dependencies = [ [[package]] name = "cosmic-notifications-util" version = "0.1.0" +source = "git+https://github.com/pop-os/cosmic-notifications#7c723b7705ec77b1ad5396a1baa9ae1c0cb5a0da" dependencies = [ "fast_image_resize", - "libcosmic-yoda", + "libcosmic", "serde", "tl", "tracing", @@ -1338,11 +1370,11 @@ dependencies = [ [[package]] name = "cosmic-panel-button" -version = "1.3.0" +version = "1.0.15" dependencies = [ "cosmic-config", - "libcosmic-yoda", - "rustc-hash 2.1.2", + "libcosmic", + "rustc-hash 2.1.3", "serde", "tracing", "tracing-log", @@ -1351,7 +1383,8 @@ dependencies = [ [[package]] name = "cosmic-panel-config" -version = "1.3.0" +version = "0.1.0" +source = "git+https://github.com/pop-os/cosmic-panel#d520b1e9ef2c990cbb57a8c5838ce94b7d75530a" dependencies = [ "anyhow", "cosmic-config", @@ -1365,8 +1398,9 @@ dependencies = [ [[package]] name = "cosmic-protocols" version = "0.2.0" +source = "git+https://github.com/pop-os/cosmic-protocols//?rev=32283d7#32283d76a8d0342da74c4cc022a533c52dcf378f" dependencies = [ - "bitflags 2.13.1", + "bitflags 2.13.0", "wayland-backend", "wayland-client", "wayland-protocols", @@ -1378,6 +1412,7 @@ dependencies = [ [[package]] name = "cosmic-settings-a11y-manager-subscription" version = "1.0.7" +source = "git+https://github.com/pop-os/cosmic-settings#ae5c7506627373f62e78372ce9e932fb591de35b" dependencies = [ "cosmic-protocols", "iced_futures", @@ -1391,6 +1426,7 @@ dependencies = [ [[package]] name = "cosmic-settings-accessibility-subscription" version = "1.0.7" +source = "git+https://github.com/pop-os/cosmic-settings#ae5c7506627373f62e78372ce9e932fb591de35b" dependencies = [ "cosmic-dbus-a11y", "futures", @@ -1403,11 +1439,12 @@ dependencies = [ [[package]] name = "cosmic-settings-audio-client" version = "1.0.0" +source = "git+https://github.com/pop-os/cosmic-settings-daemon#8c54bbbc10485c31e8717c21e119e19b87eeb3ea" dependencies = [ "cosmic-settings-audio-core", "dirs", "futures-util", - "ron 0.12.1", + "ron 0.12.2", "serde", "tokio", "tokio-util", @@ -1418,9 +1455,10 @@ dependencies = [ [[package]] name = "cosmic-settings-audio-core" version = "1.0.0" +source = "git+https://github.com/pop-os/cosmic-settings-daemon#8c54bbbc10485c31e8717c21e119e19b87eeb3ea" dependencies = [ "dirs", - "ron 0.12.1", + "ron 0.12.2", "serde", "zlink", ] @@ -1428,6 +1466,7 @@ dependencies = [ [[package]] name = "cosmic-settings-config" version = "0.1.0" +source = "git+https://github.com/pop-os/cosmic-settings-daemon#1af414fc6cb9080349847382a66db9fd69dbe964" dependencies = [ "cosmic-config", "ron 0.11.0", @@ -1439,7 +1478,8 @@ dependencies = [ [[package]] name = "cosmic-settings-daemon" -version = "0.1.1-yoda.1" +version = "0.1.0" +source = "git+https://github.com/pop-os/dbus-settings-bindings#eed01dd3609e90e3c8cd043656734c500956c793" dependencies = [ "zbus", ] @@ -1447,6 +1487,7 @@ dependencies = [ [[package]] name = "cosmic-settings-daemon-subscription" version = "1.0.7" +source = "git+https://github.com/pop-os/cosmic-settings#ae5c7506627373f62e78372ce9e932fb591de35b" dependencies = [ "futures", "iced_futures", @@ -1459,6 +1500,7 @@ dependencies = [ [[package]] name = "cosmic-settings-upower-subscription" version = "1.0.7" +source = "git+https://github.com/pop-os/cosmic-settings#ae5c7506627373f62e78372ce9e932fb591de35b" dependencies = [ "futures", "iced_futures", @@ -1472,16 +1514,18 @@ dependencies = [ [[package]] name = "cosmic-text" version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be17b688510d934ce13f48a2beba700e11583e281e0fda99c22bb256a14eda73" dependencies = [ - "bitflags 2.13.1", + "bitflags 2.13.0", "fontdb", "harfrust", "linebender_resource_handle", "log", "rangemap", - "rustc-hash 2.1.2", + "rustc-hash 2.1.3", "self_cell", - "skrifa", + "skrifa 0.40.0", "smol_str", "swash", "sys-locale", @@ -1489,12 +1533,12 @@ dependencies = [ "unicode-linebreak", "unicode-script", "unicode-segmentation", - "unicode-width", ] [[package]] name = "cosmic-theme" version = "1.0.0" +source = "git+https://github.com/pop-os/libcosmic#511384f6206527cf87369da67a9164831afbabef" dependencies = [ "almost", "configparser", @@ -1503,7 +1547,7 @@ dependencies = [ "dirs", "hex_color", "palette", - "ron 0.12.1", + "ron 0.12.2", "serde", "serde_json", "thiserror 2.0.18", @@ -1511,9 +1555,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.17" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280" +checksum = "8b2a41393f66f16b0823bb79094d54ac5fbd34ab292ddafb9a0456ac9f87d201" dependencies = [ "libc", ] @@ -1529,9 +1573,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.21" +version = "0.8.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" +checksum = "61803da095bee82a81bb1a452ecc25d3b2f1416d1897eb86430c6159ef717c17" [[package]] name = "crunchy" @@ -1542,22 +1586,22 @@ checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5" [[package]] name = "cryoglyph" version = "0.1.0" +source = "git+https://github.com/iced-rs/cryoglyph.git?rev=e429a025df36ab8145708acb309080ae3deec17a#e429a025df36ab8145708acb309080ae3deec17a" dependencies = [ "cosmic-text", "etagere", "lru", - "rustc-hash 2.1.2", + "rustc-hash 2.1.3", "wgpu", ] [[package]] name = "crypto-common" -version = "0.1.7" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a" +checksum = "ce6e4c961d6cd6c9a86db418387425e8bdeaf05b3c8bc1411e6dca4c252f1453" dependencies = [ - "generic-array", - "typenum", + "hybrid-array", ] [[package]] @@ -1578,6 +1622,15 @@ dependencies = [ "uncased", ] +[[package]] +name = "ctor" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83cf0d42651b16c6dfe68685716d18480d18a9c39c62d76e8cf3eb6ed5d8bcbf" +dependencies = [ + "dtor", +] + [[package]] name = "cursor-icon" version = "1.2.0" @@ -1718,9 +1771,9 @@ checksum = "be1e0bca6c3637f992fc1cc7cbc52a78c1ef6db076dbf1059c4323d6a2048376" [[package]] name = "dbus" -version = "0.9.11" +version = "0.9.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b942602992bb7acfd1f51c49811c58a610ef9181b6e66f3e519d79b540a3bf73" +checksum = "3ab69f03cc8c4340c9c8e315114e1658e6775a9b16a04357973aa21cec22b32e" dependencies = [ "futures-channel", "futures-util", @@ -1749,13 +1802,43 @@ dependencies = [ "tokio", ] +[[package]] +name = "defmt" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2953bfe4f93bbd20cc71198842756f77d161884c99ebbabc41d80231ded88d1" +dependencies = [ + "bitflags 1.3.2", + "defmt-macros", +] + +[[package]] +name = "defmt-macros" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bad9c72e7ca2137e0dc3813245a0d282fd6daad32fd800af018306a9169b5fe8" +dependencies = [ + "defmt-parser", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "defmt-parser" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10d60334b3b2e7c9d91ef8150abfb6fa4c1c39ebbcf4a81c2e346aad939fee3e" +dependencies = [ + "thiserror 2.0.18", +] + [[package]] name = "deranged" version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7cd812cc2bc1d69d4764bd80df88b4317eaef9e773c75226407d9bc0876b211c" dependencies = [ - "powerfmt", "serde_core", ] @@ -1784,11 +1867,12 @@ dependencies = [ [[package]] name = "digest" -version = "0.10.7" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +checksum = "f1dd6dbb5841937940781866fa1281a1ff7bd3bf827091440879f9994983d5c2" dependencies = [ "block-buffer", + "const-oid", "crypto-common", ] @@ -1819,7 +1903,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e0e367e4e7da84520dedcac1901e4da967309406d1e51017ae1abfb97adbd38" dependencies = [ - "bitflags 2.13.1", + "bitflags 2.13.0", "block2 0.6.2", "libc", "objc2 0.6.4", @@ -1827,9 +1911,9 @@ dependencies = [ [[package]] name = "displaydoc" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +checksum = "1ac70aa55017e108007fbaf5aa0f54b021c98f92ff8af59d42eda9da96e3dd4f" dependencies = [ "proc-macro2", "quote", @@ -1848,8 +1932,9 @@ dependencies = [ [[package]] name = "dnd" version = "0.1.0" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=sctk-0.20#f68595ee0e62fbd6589f4709b5aaa5c3c7ea5f6c" dependencies = [ - "bitflags 2.13.1", + "bitflags 2.13.0", "mime 0.1.0", "raw-window-handle", "smithay-client-toolkit", @@ -1874,6 +1959,20 @@ checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" [[package]] name = "dpi" version = "0.1.2" +source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#71ce08c043814514a8fd92d9d0599f115ae854e8" + +[[package]] +name = "drm" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0f8a69e60d75ae7dab4ef26a59ca99f2a89d4c142089b537775ae0c198bdcde" +dependencies = [ + "bitflags 2.13.0", + "bytemuck", + "drm-ffi 0.7.1", + "drm-fourcc", + "rustix 0.38.44", +] [[package]] name = "drm" @@ -1881,21 +1980,31 @@ version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "80bc8c5c6c2941f70a55c15f8d9f00f9710ebda3ffda98075f996a0e6c92756f" dependencies = [ - "bitflags 2.13.1", + "bitflags 2.13.0", "bytemuck", - "drm-ffi", + "drm-ffi 0.9.1", "drm-fourcc", "libc", "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]] name = "drm-ffi" version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51a91c9b32ac4e8105dec255e849e0d66e27d7c34d184364fb93e469db08f690" dependencies = [ - "drm-sys", + "drm-sys 0.8.1", "rustix 1.1.4", ] @@ -1905,6 +2014,16 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" 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]] name = "drm-sys" version = "0.8.1" @@ -1915,6 +2034,12 @@ dependencies = [ "linux-raw-sys 0.9.4", ] +[[package]] +name = "dtor" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edf234dd1594d6dd434a8fb8cada51ddbbc593e40e4a01556a0b31c62da2775b" + [[package]] name = "dyn-clone" version = "1.0.20" @@ -1923,9 +2048,9 @@ checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555" [[package]] name = "either" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" +checksum = "91622ff5e7162018101f2fea40d6ebf4a78bbe5a49736a2020649edf9693679e" [[package]] name = "endi" @@ -2126,7 +2251,7 @@ dependencies = [ "fluent-syntax", "intl-memoizer", "intl_pluralrules", - "rustc-hash 2.1.2", + "rustc-hash 2.1.3", "self_cell", "smallvec", "unic-langid", @@ -2195,7 +2320,7 @@ checksum = "457e789b3d1202543297a350643cf459f836cade38934e7a4cf6a39e7cde2905" dependencies = [ "fontconfig-parser", "log", - "memmap2 0.9.10", + "memmap2 0.9.11", "slotmap", "tinyvec", "ttf-parser", @@ -2379,13 +2504,13 @@ dependencies = [ ] [[package]] -name = "generic-array" -version = "0.14.7" +name = "gethostname" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +checksum = "1bd49230192a3797a9a4d6abe9b3eed6f7fa4c8a8a4947977c6f80025f92cbd8" dependencies = [ - "typenum", - "version_check", + "rustix 1.1.4", + "windows-link 0.2.1", ] [[package]] @@ -2413,15 +2538,13 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0de51e6874e94e7bf76d726fc5d13ba782deca734ff60d5bb2fb2607c7406555" +checksum = "300e883d756b2e4ec94e02791f39b04b522276138852cfc41d9fb7e904106099" dependencies = [ "cfg-if", "libc", "r-efi 6.0.0", - "wasip2", - "wasip3", ] [[package]] @@ -2512,7 +2635,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b89c83349105e3732062a895becfc71a8f921bb71ecbbdd8ff99263e3b53a0ca" dependencies = [ - "bitflags 2.13.1", + "bitflags 2.13.0", "gpu-descriptor-types", "hashbrown 0.15.5", ] @@ -2523,7 +2646,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fdf242682df893b86f33a73828fb09ca4b2d3bb6cc95249707fc684d27484b91" dependencies = [ - "bitflags 2.13.1", + "bitflags 2.13.0", ] [[package]] @@ -2560,10 +2683,10 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9da2e5ae821f6e96664977bf974d6d6a2d6682f9ccee23e62ec1d134246845f9" dependencies = [ - "bitflags 2.13.1", + "bitflags 2.13.0", "bytemuck", "core_maths", - "read-fonts", + "read-fonts 0.37.0", "smallvec", ] @@ -2646,6 +2769,15 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" +[[package]] +name = "hybrid-array" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "818356c5132c1fede50f837ca96afbe78ff42413047f4abb886217845e1b6c8c" +dependencies = [ + "typenum", +] + [[package]] name = "i18n-config" version = "0.4.8" @@ -2740,6 +2872,7 @@ dependencies = [ [[package]] name = "iced" version = "0.14.0" +source = "git+https://github.com/pop-os/libcosmic#511384f6206527cf87369da67a9164831afbabef" dependencies = [ "dnd", "iced_accessibility", @@ -2760,6 +2893,7 @@ dependencies = [ [[package]] name = "iced_accessibility" version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#511384f6206527cf87369da67a9164831afbabef" dependencies = [ "accesskit", "accesskit_winit", @@ -2768,8 +2902,9 @@ dependencies = [ [[package]] name = "iced_core" version = "0.14.0" +source = "git+https://github.com/pop-os/libcosmic#511384f6206527cf87369da67a9164831afbabef" dependencies = [ - "bitflags 2.13.1", + "bitflags 2.13.0", "bytes", "cosmic-client-toolkit", "dnd", @@ -2780,7 +2915,7 @@ dependencies = [ "num-traits", "palette", "raw-window-handle", - "rustc-hash 2.1.2", + "rustc-hash 2.1.3", "serde", "smol_str", "thiserror 2.0.18", @@ -2792,6 +2927,7 @@ dependencies = [ [[package]] name = "iced_debug" version = "0.14.0" +source = "git+https://github.com/pop-os/libcosmic#511384f6206527cf87369da67a9164831afbabef" dependencies = [ "iced_core", "iced_futures", @@ -2801,11 +2937,12 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.14.0" +source = "git+https://github.com/pop-os/libcosmic#511384f6206527cf87369da67a9164831afbabef" dependencies = [ "futures", "iced_core", "log", - "rustc-hash 2.1.2", + "rustc-hash 2.1.3", "tokio", "wasm-bindgen-futures", "wasmtimer", @@ -2814,8 +2951,9 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.14.0" +source = "git+https://github.com/pop-os/libcosmic#511384f6206527cf87369da67a9164831afbabef" dependencies = [ - "bitflags 2.13.1", + "bitflags 2.13.0", "bytemuck", "cosmic-text", "half", @@ -2826,7 +2964,7 @@ dependencies = [ "log", "lyon_path", "raw-window-handle", - "rustc-hash 2.1.2", + "rustc-hash 2.1.3", "thiserror 2.0.18", "unicode-segmentation", ] @@ -2834,6 +2972,7 @@ dependencies = [ [[package]] name = "iced_program" version = "0.14.0" +source = "git+https://github.com/pop-os/libcosmic#511384f6206527cf87369da67a9164831afbabef" dependencies = [ "iced_graphics", "iced_runtime", @@ -2842,6 +2981,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.14.0" +source = "git+https://github.com/pop-os/libcosmic#511384f6206527cf87369da67a9164831afbabef" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -2853,6 +2993,7 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.14.0" +source = "git+https://github.com/pop-os/libcosmic#511384f6206527cf87369da67a9164831afbabef" dependencies = [ "bytes", "cosmic-client-toolkit", @@ -2867,6 +3008,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.14.0" +source = "git+https://github.com/pop-os/libcosmic#511384f6206527cf87369da67a9164831afbabef" dependencies = [ "bytemuck", "cosmic-text", @@ -2875,7 +3017,7 @@ dependencies = [ "kurbo 0.10.4", "log", "resvg", - "rustc-hash 2.1.2", + "rustc-hash 2.1.3", "softbuffer", "tiny-skia", ] @@ -2883,8 +3025,10 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.14.0" +source = "git+https://github.com/pop-os/libcosmic#511384f6206527cf87369da67a9164831afbabef" dependencies = [ - "bitflags 2.13.1", + "as-raw-xcb-connection", + "bitflags 2.13.0", "bytemuck", "cosmic-client-toolkit", "cryoglyph", @@ -2897,19 +3041,23 @@ dependencies = [ "lyon", "raw-window-handle", "resvg", - "rustc-hash 2.1.2", + "rustc-hash 2.1.3", "rustix 0.38.44", + "smithay-client-toolkit", "thiserror 2.0.18", + "tiny-xlib", "wayland-backend", "wayland-client", "wayland-protocols", "wayland-sys", "wgpu", + "x11rb", ] [[package]] name = "iced_widget" version = "0.14.2" +source = "git+https://github.com/pop-os/libcosmic#511384f6206527cf87369da67a9164831afbabef" dependencies = [ "cosmic-client-toolkit", "dnd", @@ -2918,7 +3066,7 @@ dependencies = [ "log", "num-traits", "ouroboros", - "rustc-hash 2.1.2", + "rustc-hash 2.1.3", "thiserror 2.0.18", "unicode-segmentation", "window_clipboard", @@ -2927,6 +3075,7 @@ dependencies = [ [[package]] name = "iced_winit" version = "0.14.0" +source = "git+https://github.com/pop-os/libcosmic#511384f6206527cf87369da67a9164831afbabef" dependencies = [ "cosmic-client-toolkit", "cursor-icon", @@ -2938,7 +3087,7 @@ dependencies = [ "iced_runtime", "log", "raw-window-handle", - "rustc-hash 2.1.2", + "rustc-hash 2.1.3", "rustix 0.38.44", "thiserror 2.0.18", "wasm-bindgen-futures", @@ -3027,9 +3176,9 @@ checksum = "846b0857ca091204be3c874bc93daaf89d4777e8d2d20b0d3ffe8f671d98014b" [[package]] name = "icu_collator" -version = "2.2.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b521b92a2666061ddda902769d8a4cf730b5c9529a845cc1b69770b12a6c9a71" +checksum = "8bbdf98e5e0aa827770acee171ebb568aaab975a36b56afdb5fd0e2f525750bb" dependencies = [ "icu_collator_data", "icu_collections", @@ -3354,12 +3503,6 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6f2f8aeca682d874a5247084aa4fb7d1cef9ba45d889c21209a8818dcaaa0ec9" -[[package]] -name = "id-arena" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954" - [[package]] name = "ident_case" version = "1.0.1" @@ -3452,31 +3595,31 @@ dependencies = [ [[package]] name = "inotify" -version = "0.11.1" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd5b3eaf1a28b758ac0faa5a4254e8ab2705605496f1b1f3fbbc3988ad73d199" +checksum = "153be1941a183ec9ccd095ddbe17a8b8d435ef6c76e9e02451b933c3999af2c8" dependencies = [ - "bitflags 2.13.1", + "bitflags 2.13.0", "inotify-sys", "libc", ] [[package]] name = "inotify-sys" -version = "0.1.5" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" +checksum = "c033f80b2c113cdf91ab7a33faa9cbc014726dcad99880c8609af2a370edf37d" dependencies = [ "libc", ] [[package]] name = "input" -version = "0.10.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9793345a65d71317763a33066b5d8351f8760dde8d4930fe9e39b5f14a7959d" +checksum = "fbdc09524a91f9cacd26f16734ff63d7dc650daffadd2b6f84d17a285bd875a9" dependencies = [ - "bitflags 2.13.1", + "bitflags 2.13.0", "input-sys", "libc", "log", @@ -3539,24 +3682,25 @@ checksum = "2ceaf4c6c48465bead8cb6a0b7c4ee0c86ecbb31239032b9c66ab9a08d2f3ee1" [[package]] name = "jiff" -version = "0.2.24" +version = "0.2.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f00b5dbd620d61dfdcb6007c9c1f6054ebd75319f163d886a9055cec1155073d" +checksum = "961d16382652bfdd8c6f68b223b26a8c93e0d475c672f414411db31c6c5c900e" dependencies = [ + "defmt", "jiff-static", "jiff-tzdb-platform", "log", "portable-atomic", "portable-atomic-util", "serde_core", - "windows-sys 0.61.2", + "windows-link 0.2.1", ] [[package]] name = "jiff-static" -version = "0.2.24" +version = "0.2.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e000de030ff8022ea1da3f466fbb0f3a809f5e51ed31f6dd931c35181ad8e6d7" +checksum = "d0879bd39df99c4c5e2c6615ccc026391a423dde10532c573e6086eb94a802cc" dependencies = [ "proc-macro2", "quote", @@ -3565,9 +3709,9 @@ dependencies = [ [[package]] name = "jiff-tzdb" -version = "0.1.6" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c900ef84826f1338a557697dc8fc601df9ca9af4ac137c7fb61d4c6f2dfd3076" +checksum = "142bd39932ad231f10513df9ab62661fead8719872150b7ad02a2df79f4e141e" [[package]] name = "jiff-tzdb-platform" @@ -3638,23 +3782,22 @@ dependencies = [ [[package]] name = "jobserver" -version = "0.1.34" +version = "0.1.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33" +checksum = "1c00acbd29eabad4a2392fa0e921c874934dbbf4194312ad20f04a0ed67a3cb3" dependencies = [ - "getrandom 0.3.4", + "getrandom 0.4.3", "libc", ] [[package]] name = "js-sys" -version = "0.3.98" +version = "0.3.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67df7112613f8bfd9150013a0314e196f4800d3201ae742489d999db2f979f08" +checksum = "53b44bfcdb3f8d5837a46dae1ca9660a837176eee74a28b229bc626816589102" dependencies = [ "cfg-if", "futures-util", - "once_cell", "wasm-bindgen", ] @@ -3673,7 +3816,7 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fbe853b403ae61a04233030ae8a79d94975281ed9770a1f9e246732b534b28d" dependencies = [ - "bitflags 2.13.1", + "bitflags 2.13.0", "serde", ] @@ -3705,9 +3848,9 @@ dependencies = [ [[package]] name = "kqueue" -version = "1.1.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac30106d7dce88daf4a3fcb4879ea939476d5074a9b7ddd0fb97fa4bed5596a" +checksum = "273c0752728918e0ac4976f2b275b6fefb9ecd400585dec929419f3844cd87b5" dependencies = [ "kqueue-sys", "libc", @@ -3719,7 +3862,7 @@ version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07293a4e297ac234359b510362495713f75ea345d5307140414f20c69ffeb087" dependencies = [ - "bitflags 2.13.1", + "bitflags 2.13.0", "libc", ] @@ -3750,12 +3893,6 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" -[[package]] -name = "leb128fmt" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2" - [[package]] name = "libc" version = "0.2.186" @@ -3763,8 +3900,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66" [[package]] -name = "libcosmic-yoda" -version = "0.1.0-yoda.2" +name = "libcosmic" +version = "1.0.0" +source = "git+https://github.com/pop-os/libcosmic#511384f6206527cf87369da67a9164831afbabef" dependencies = [ "apply", "ashpd 0.12.3", @@ -3802,11 +3940,11 @@ dependencies = [ "palette", "phf 0.13.1", "rfd", - "ron 0.12.1", + "ron 0.12.2", "rust-embed", "rustix 1.1.4", "serde", - "shlex", + "shlex 1.3.0", "slotmap", "taffy", "thiserror 2.0.18", @@ -3844,14 +3982,14 @@ checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981" [[package]] name = "libredox" -version = "0.1.17" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f02ab6bace2054fb888a3c16f990117b579d14a3088e472d63c6011fa185c9d3" +checksum = "c943259e342f1e06ff2da7a83eabdfe7f92ce10262688dbf1895ff0b3e6e4652" dependencies = [ - "bitflags 2.13.1", + "bitflags 2.13.0", "libc", "plain", - "redox_syscall 0.8.1", + "redox_syscall 0.9.0", ] [[package]] @@ -3885,6 +4023,12 @@ version = "0.4.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" +[[package]] +name = "linux-raw-sys" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a385b1be4e5c3e362ad2ffa73c392e53f031eaa5b7d648e64cd87f27f6063d7" + [[package]] name = "linux-raw-sys" version = "0.9.4" @@ -4031,9 +4175,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.8.0" +version = "2.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79" +checksum = "cf8baf1c55e62ffcace7a9f06f4bd9cd3f0c4beb022d3b367256b91b87513d98" [[package]] name = "memmap2" @@ -4046,9 +4190,9 @@ dependencies = [ [[package]] name = "memmap2" -version = "0.9.10" +version = "0.9.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "714098028fe011992e1c3962653c96b2d578c4b4bce9036e15ff220319b1e0e3" +checksum = "d1219ed1b7f229ee7104d281dd01d6802fe28bb6e95d292942c4daacdeb798c0" dependencies = [ "libc", ] @@ -4068,7 +4212,7 @@ version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c7047791b5bc903b8cd963014b355f71dc9864a9a0b727057676c1dcae5cbc15" dependencies = [ - "bitflags 2.13.1", + "bitflags 2.13.0", "block", "core-graphics-types 0.2.0", "foreign-types", @@ -4080,6 +4224,7 @@ dependencies = [ [[package]] name = "mime" version = "0.1.0" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=sctk-0.20#f68595ee0e62fbd6589f4709b5aaa5c3c7ea5f6c" dependencies = [ "smithay-clipboard", ] @@ -4090,6 +4235,16 @@ version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" +[[package]] +name = "mime_guess" +version = "2.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" +dependencies = [ + "mime 0.3.17", + "unicase", +] + [[package]] name = "miniz_oxide" version = "0.8.9" @@ -4102,9 +4257,9 @@ dependencies = [ [[package]] name = "mio" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50b7e5b27aa02a74bac8c3f23f448f8d87ff11f92d3aac1a6ed369ee08cc56c1" +checksum = "02bd0af71c67b473010cbbc60715ee815645a4dc942899111f494b4b737d6fda" dependencies = [ "libc", "log", @@ -4125,6 +4280,7 @@ dependencies = [ [[package]] name = "mpris2-zbus" version = "0.1.0" +source = "git+https://github.com/pop-os/dbus-settings-bindings#eed01dd3609e90e3c8cd043656734c500956c793" dependencies = [ "futures-util", "jiff", @@ -4148,7 +4304,7 @@ checksum = "618f667225063219ddfc61251087db8a9aec3c3f0950c916b614e403486f1135" dependencies = [ "arrayvec", "bit-set", - "bitflags 2.13.1", + "bitflags 2.13.0", "cfg-if", "cfg_aliases", "codespan-reporting", @@ -4172,7 +4328,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4" dependencies = [ - "bitflags 2.13.1", + "bitflags 2.13.0", "jni-sys 0.3.1", "log", "ndk-sys", @@ -4202,7 +4358,7 @@ version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ - "bitflags 2.13.1", + "bitflags 2.13.0", "cfg-if", "cfg_aliases", "libc", @@ -4210,13 +4366,13 @@ dependencies = [ [[package]] name = "nmrs" -version = "3.4.2" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33e42c05118e18f29f55eefa2fbfd98a06b0c7a1a829bdb0f328137d358c6013" +checksum = "62c427203beda58ac05815b356d64a34eeb2fba180b3077d543ebb1472fc1269" dependencies = [ "async-trait", "base64", - "bitflags 2.13.1", + "bitflags 2.13.0", "futures", "futures-timer", "log", @@ -4243,7 +4399,7 @@ version = "8.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4d3d07927151ff8575b7087f245456e549fea62edf0ec4e565a5ee50c8402bc3" dependencies = [ - "bitflags 2.13.1", + "bitflags 2.13.0", "fsevent-sys", "inotify", "kqueue", @@ -4261,7 +4417,7 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42b8cfee0e339a0337359f3c88165702ac6e600dc01c0cc9579a92d62b08477a" dependencies = [ - "bitflags 2.13.1", + "bitflags 2.13.0", ] [[package]] @@ -4275,9 +4431,9 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.6" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" +checksum = "c89e69e7e0f03bea5ef08013795c25018e101932225a656383bd384495ecc367" dependencies = [ "num-integer", "num-traits", @@ -4403,7 +4559,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff" dependencies = [ - "bitflags 2.13.1", + "bitflags 2.13.0", "block2 0.5.1", "libc", "objc2 0.5.2", @@ -4419,7 +4575,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d49e936b501e5c5bf01fda3a9452ff86dc3ea98ad5f283e1455153142d97518c" dependencies = [ - "bitflags 2.13.1", + "bitflags 2.13.0", "block2 0.6.2", "objc2 0.6.4", "objc2-core-foundation", @@ -4432,7 +4588,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef" dependencies = [ - "bitflags 2.13.1", + "bitflags 2.13.0", "block2 0.5.1", "objc2 0.5.2", "objc2-foundation 0.2.2", @@ -4444,7 +4600,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536" dependencies = [ - "bitflags 2.13.1", + "bitflags 2.13.0", "block2 0.6.2", "dispatch2", "objc2 0.6.4", @@ -4456,7 +4612,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e022c9d066895efa1345f8e33e584b9f958da2fd4cd116792e15e07e4720a807" dependencies = [ - "bitflags 2.13.1", + "bitflags 2.13.0", "libc", "objc2-core-foundation", ] @@ -4479,7 +4635,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d425caf1df73233f29fd8a5c3e5edbc30d2d4307870f802d18f00d83dc5141a6" dependencies = [ - "bitflags 2.13.1", + "bitflags 2.13.0", "objc2-core-foundation", "objc2-core-graphics", ] @@ -4496,7 +4652,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" dependencies = [ - "bitflags 2.13.1", + "bitflags 2.13.0", "block2 0.5.1", "libc", "objc2 0.5.2", @@ -4508,7 +4664,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3e0adef53c21f888deb4fa59fc59f7eb17404926ee8a6f59f5df0fd7f9f3272" dependencies = [ - "bitflags 2.13.1", + "bitflags 2.13.0", "block2 0.6.2", "objc2 0.6.4", "objc2-core-foundation", @@ -4520,7 +4676,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6" dependencies = [ - "bitflags 2.13.1", + "bitflags 2.13.0", "block2 0.5.1", "objc2 0.5.2", "objc2-foundation 0.2.2", @@ -4532,7 +4688,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a" dependencies = [ - "bitflags 2.13.1", + "bitflags 2.13.0", "block2 0.5.1", "objc2 0.5.2", "objc2-foundation 0.2.2", @@ -4545,7 +4701,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d87d638e33c06f577498cbcc50491496a3ed4246998a7fbba7ccb98b1e7eab22" dependencies = [ - "bitflags 2.13.1", + "bitflags 2.13.0", "objc2 0.6.4", "objc2-core-foundation", "objc2-foundation 0.3.2", @@ -4574,9 +4730,9 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] name = "orbclient" -version = "0.3.54" +version = "0.3.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a570f6bca41d29acb2139229a7c873ec99bc9a313bd10804081d89bfac8ff329" +checksum = "5df339f526ea9a60e371768d50efc2f2508c7203290731565d1f7a6f71d21747" dependencies = [ "libc", "libredox", @@ -4867,7 +5023,7 @@ version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "60769b8b31b2a9f263dae2776c37b1b28ae246943cf719eb6946a1db05128a61" dependencies = [ - "bitflags 2.13.1", + "bitflags 2.13.0", "crc32fast", "fdeflate", "flate2", @@ -4941,16 +5097,6 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa" -[[package]] -name = "prettyplease" -version = "0.2.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b" -dependencies = [ - "proc-macro2", - "syn", -] - [[package]] name = "proc-macro-crate" version = "3.5.0" @@ -5012,9 +5158,9 @@ checksum = "3d595e54a326bc53c1c197b32d295e14b169e3cfeaa8dc82b529f947fba6bcf5" [[package]] name = "pxfm" -version = "0.1.29" +version = "0.1.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0c5ccf5294c6ccd63a74f1565028353830a9c2f5eb0c682c355c471726a6e3f" +checksum = "d55d956fa96f5ec02be2e13af0e20391a5aa83d6a074e3ad368959d0fab299ea" [[package]] name = "quick-error" @@ -5029,14 +5175,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cdcc8dd4e2f670d309a5f0e83fe36dfdc05af317008fea29144da1a2ac858e5e" dependencies = [ "memchr", - "serde", ] [[package]] name = "quote" -version = "1.0.45" +version = "1.0.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924" +checksum = "dfbc457d0c7a0759a614551b11a6409e5951f6c7537be1f1b7682b9ae9230368" dependencies = [ "proc-macro2", ] @@ -5142,12 +5287,22 @@ dependencies = [ ] [[package]] -name = "redox_event" -version = "0.4.7" +name = "read-fonts" +version = "0.39.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c07d0d6d291e3a951bd847b1cd4af32fc6243d64116cf7702838c02797688b7" +checksum = "c4ed38b89c2c77ff968c524145ad65fb010f38af5c7a224b53b81d47ac2daa81" dependencies = [ - "bitflags 2.13.1", + "bytemuck", + "font-types", +] + +[[package]] +name = "redox_event" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5018d583d6d2f5499352aea8d177e9067d1eb03ab17c78169d5ba7a30001b15" +dependencies = [ + "bitflags 2.13.0", "libredox", ] @@ -5157,16 +5312,16 @@ version = "0.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d" dependencies = [ - "bitflags 2.13.1", + "bitflags 2.13.0", ] [[package]] name = "redox_syscall" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b44b894f2a6e36457d665d1e08c3866add6ed5e70050c1b4ba8a8ddedb02ce7" +checksum = "c5102a6aaa05aa011a238e178e6bca86d2cb56fc9f586d37cb80f5bca6e07759" dependencies = [ - "bitflags 2.13.1", + "bitflags 2.13.0", ] [[package]] @@ -5202,9 +5357,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.12.3" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e10754a14b9137dd7b1e3e5b0493cc9171fdd105e0ab477f51b72e7f3ac0e276" +checksum = "2a0e75113e14dc5acb068cd0786884f214f1312650a3d36d269f5c4f3cdee8a2" dependencies = [ "aho-corasick", "memchr", @@ -5214,9 +5369,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.14" +version = "0.4.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e1dd4122fc1595e8162618945476892eefca7b88c52820e74af6262213cae8f" +checksum = "1f388202e4b80542a0921078cc23b6333bcf1409c1e3f86404cae4766a6131db" dependencies = [ "aho-corasick", "memchr", @@ -5225,9 +5380,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.10" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a" +checksum = "d6f6ff9a378485b298a5286656da665ba74413d36db0979633275d2e708145d4" [[package]] name = "renderdoc-sys" @@ -5292,7 +5447,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "db09040cc89e461f1a265139777a2bde7f8d8c67c4936f700c63ce3e2904d468" dependencies = [ "base64", - "bitflags 2.13.1", + "bitflags 2.13.0", "serde", "serde_derive", "unicode-ident", @@ -5300,11 +5455,11 @@ dependencies = [ [[package]] name = "ron" -version = "0.12.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4147b952f3f819eca0e99527022f7d6a8d05f111aeb0a62960c74eb283bec8fc" +checksum = "81116b9531d61eabc41aeb228e4b6b2435bcca3233b98cf3b3077d4e6e9debb3" dependencies = [ - "bitflags 2.13.1", + "bitflags 2.13.0", "once_cell", "serde", "serde_derive", @@ -5320,9 +5475,9 @@ checksum = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97" [[package]] name = "rust-embed" -version = "8.11.0" +version = "8.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04113cb9355a377d83f06ef1f0a45b8ab8cd7d8b1288160717d66df5c7988d27" +checksum = "e9e7760e252aaba7b09f4be00e36476cf585bdb68a53552ac954cdf504ab4bc9" dependencies = [ "rust-embed-impl", "rust-embed-utils", @@ -5331,10 +5486,11 @@ dependencies = [ [[package]] name = "rust-embed-impl" -version = "8.11.0" +version = "8.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0902e4c7c8e997159ab384e6d0fc91c221375f6894346ae107f47dd0f3ccaa" +checksum = "3bcfc4d6f53af43755f7a723e4b6b8794fcce052a178dd8c6c1dadc5f5343097" dependencies = [ + "mime_guess", "proc-macro2", "quote", "rust-embed-utils", @@ -5344,9 +5500,9 @@ dependencies = [ [[package]] name = "rust-embed-utils" -version = "8.11.0" +version = "8.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bcdef0be6fe7f6fa333b1073c949729274b05f123a0ad7efcb8efd878e5c3b1" +checksum = "42ffa149f6aa81b58a5b3011d01a857c4ed12c7a732d2c51947a4c7c692185f0" dependencies = [ "sha2", "walkdir", @@ -5360,9 +5516,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustc-hash" -version = "2.1.2" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94300abf3f1ae2e2b8ffb7b58043de3d399c73fa6f4b73826402a5c457614dbe" +checksum = "6b1e7f9a428571be2dc5bc0505c13fb6bf936822b894ec87abf8a08a4e51742d" [[package]] name = "rustc_version" @@ -5379,7 +5535,7 @@ version = "0.38.44" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" dependencies = [ - "bitflags 2.13.1", + "bitflags 2.13.0", "errno", "libc", "linux-raw-sys 0.4.15", @@ -5392,7 +5548,7 @@ version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190" dependencies = [ - "bitflags 2.13.1", + "bitflags 2.13.0", "errno", "libc", "linux-raw-sys 0.12.1", @@ -5401,9 +5557,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" +checksum = "cf54715a573b99ac80df0bc206da022bcd442c974952c7b9720069370852e21f" [[package]] name = "rustybuzz" @@ -5411,7 +5567,7 @@ version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd3c7c96f8a08ee34eff8857b11b49b07d71d1c3f4e88f8a88d4c9e9f90b1702" dependencies = [ - "bitflags 2.13.1", + "bitflags 2.13.0", "bytemuck", "core_maths", "log", @@ -5482,7 +5638,7 @@ checksum = "1dd3accc0f3f4bbaf2c9e1957a030dc582028130c67660d44c0a0345a22ca69b" dependencies = [ "ab_glyph", "log", - "memmap2 0.9.10", + "memmap2 0.9.11", "smithay-client-toolkit", "tiny-skia", ] @@ -5553,9 +5709,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.149" +version = "1.0.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86" +checksum = "e8014e44b4736ed0538adeecded0fce2a272f22dc9578a7eb6b2d9993c74cfb9" dependencies = [ "indexmap 2.14.0", "itoa", @@ -5578,9 +5734,9 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.20.0" +version = "3.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e72c1c2cb7b223fafb600a619537a871c2818583d619401b785e7c0b746ccde2" +checksum = "76a5c54c7310e7b8b9577c286d7e399ddd876c3e12b3ed917a8aabc4b96e9e8c" dependencies = [ "base64", "bs58", @@ -5598,9 +5754,9 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.20.0" +version = "3.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b90c488738ecb4fb0262f41f43bc40efc5868d9fb744319ddf5f5317f417bfac" +checksum = "84d57bc0c8b9a17920c178daa6bb924850d54a9c97ab45194bb8c17ad66bb660" dependencies = [ "darling 0.23.0", "proc-macro2", @@ -5616,9 +5772,9 @@ checksum = "bbfa15b3dddfee50a0fff136974b3e1bde555604ba463834a7eb7deb6417705d" [[package]] name = "sha2" -version = "0.10.9" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" +checksum = "446ba717509524cb3f22f17ecc096f10f4822d76ab5c0b9822c5f9c284e825f4" dependencies = [ "cfg-if", "cpufeatures", @@ -5640,6 +5796,12 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" +[[package]] +name = "shlex" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8fadd59c855ef2080decdef8ff161eb6661b86933c9d82e5ba29dc602a55aba" + [[package]] name = "signal-hook-registry" version = "1.4.8" @@ -5694,7 +5856,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7fbdfe3d2475fbd7ddd1f3e5cf8288a30eb3e5f95832829570cd88115a7434ac" dependencies = [ "bytemuck", - "read-fonts", + "read-fonts 0.37.0", +] + +[[package]] +name = "skrifa" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c34617370ae968efb7161bb2beb517d9084659aae19e24b89e3db25b46e4564" +dependencies = [ + "bytemuck", + "read-fonts 0.39.2", ] [[package]] @@ -5714,9 +5886,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.15.1" +version = "1.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" +checksum = "8ed6a63f02c8539c91a8685a86f4099661ba3da017932f6ebbea6de3f0fa7c90" [[package]] name = "smithay-client-toolkit" @@ -5724,14 +5896,14 @@ version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0512da38f5e2b31201a93524adb8d3136276fa4fe4aafab4e1f727a82b534cc0" dependencies = [ - "bitflags 2.13.1", + "bitflags 2.13.0", "bytemuck", "calloop", "calloop-wayland-source", "cursor-icon", "libc", "log", - "memmap2 0.9.10", + "memmap2 0.9.11", "pkg-config", "rustix 1.1.4", "thiserror 2.0.18", @@ -5751,6 +5923,7 @@ dependencies = [ [[package]] name = "smithay-clipboard" version = "0.8.0" +source = "git+https://github.com/pop-os/smithay-clipboard?tag=sctk-0.20#859b02c88f45c554049a67c6ddeec1692ce0e20b" dependencies = [ "libc", "raw-window-handle", @@ -5770,9 +5943,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e" +checksum = "52d1cfed4120b4d927bf7c0f86d2087a4a7d6027c906d9f9d525a80573b9be51" dependencies = [ "libc", "windows-sys 0.61.2", @@ -5781,26 +5954,31 @@ dependencies = [ [[package]] name = "softbuffer" version = "0.4.1" +source = "git+https://github.com/pop-os/softbuffer?tag=cosmic-4.0#c2b2c19ddb38ff17495643699f97cb1f2064a1be" dependencies = [ + "as-raw-xcb-connection", "bytemuck", "cfg_aliases", "cocoa", "core-graphics", + "drm 0.11.1", "fastrand", "foreign-types", "js-sys", "log", - "memmap2 0.9.10", + "memmap2 0.9.11", "objc", "raw-window-handle", "redox_syscall 0.5.18", "rustix 0.38.44", + "tiny-xlib", "wasm-bindgen", "wayland-backend", "wayland-client", "wayland-sys", "web-sys", "windows-sys 0.52.0", + "x11rb", ] [[package]] @@ -5809,7 +5987,7 @@ version = "0.3.0+sdk-1.3.268.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844" dependencies = [ - "bitflags 2.13.1", + "bitflags 2.13.0", ] [[package]] @@ -5879,11 +6057,11 @@ dependencies = [ [[package]] name = "swash" -version = "0.2.7" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "842f3cd369c2ba38966204f983eaa5e54a8e84a7d7159ed36ade2b6c335aae64" +checksum = "0811b01ca2c4e8718760713911feaf4675c24f94e50530a015ec646cfb622f7c" dependencies = [ - "skrifa", + "skrifa 0.42.1", "yazi", "zeno", ] @@ -5891,15 +6069,16 @@ dependencies = [ [[package]] name = "switcheroo-control" version = "0.1.0" +source = "git+https://github.com/pop-os/dbus-settings-bindings#eed01dd3609e90e3c8cd043656734c500956c793" dependencies = [ "zbus", ] [[package]] name = "syn" -version = "2.0.117" +version = "2.0.118" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99" +checksum = "1b9ae57f904213ebb649ce6895b8a66c66f0203b9319718f69a5612a065b1422" dependencies = [ "proc-macro2", "quote", @@ -5951,7 +6130,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd" dependencies = [ "fastrand", - "getrandom 0.4.2", + "getrandom 0.4.3", "once_cell", "rustix 1.1.4", "windows-sys 0.61.2", @@ -6017,12 +6196,11 @@ dependencies = [ [[package]] name = "time" -version = "0.3.47" +version = "0.3.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "743bd48c283afc0388f9b8827b976905fb217ad9e647fae3a379a9283c4def2c" +checksum = "18dfaaeddcb932337b5e7866ee7d0ce9b76d2fd092997146f187ec09b4558a50" dependencies = [ "deranged", - "itoa", "num-conv", "powerfmt", "serde_core", @@ -6032,15 +6210,15 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7694e1cfe791f8d31026952abf09c69ca6f6fa4e1a1229e18988f06a04a12dca" +checksum = "9e1c906769ad99c88eaa54e728060edef082f8e358ff32030cb7c7d315e81109" [[package]] name = "time-macros" -version = "0.2.27" +version = "0.2.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e70e4c5a0e0a8a4823ad65dfe1a6930e4f4d756dcd9dd7939022b5e8c501215" +checksum = "c431b87111666e491a90baa837f914fb45cd5dc3c268591b0220ff5057f2085f" dependencies = [ "num-conv", "time-core", @@ -6049,6 +6227,7 @@ dependencies = [ [[package]] name = "timedate-zbus" version = "0.1.0" +source = "git+https://github.com/pop-os/dbus-settings-bindings#eed01dd3609e90e3c8cd043656734c500956c793" dependencies = [ "zbus", ] @@ -6079,6 +6258,19 @@ dependencies = [ "strict-num", ] +[[package]] +name = "tiny-xlib" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a90a0ca3ee6a69f2ad28fd11621a4c3f03b371f366be500b64df260c4ffbafb4" +dependencies = [ + "as-raw-xcb-connection", + "ctor", + "libloading", + "pkg-config", + "tracing", +] + [[package]] name = "tinystr" version = "0.8.3" @@ -6185,9 +6377,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.25.11+spec-1.1.0" +version = "0.25.12+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b59c4d22ed448339746c59b905d24568fcbb3ab65a500494f7b8c3e97739f2b" +checksum = "d2153edc6955a6c354fad8f5efd38b6a8769bdccf9fe50f8e1329f81b0baa5d7" dependencies = [ "indexmap 2.14.0", "toml_datetime", @@ -6281,7 +6473,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb30dbbd9036155e74adad6812e9898d03ec374946234fbcebd5dfc7b9187b90" dependencies = [ - "rustc-hash 2.1.2", + "rustc-hash 2.1.3", ] [[package]] @@ -6292,9 +6484,9 @@ checksum = "bc7d623258602320d5c55d1bc22793b57daff0ec7efc270ea7d55ce1d5f5471c" [[package]] name = "typenum" -version = "1.20.0" +version = "1.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ce102ab67701b8526c123c1bab5cbe42d7040ccfd0f64af1a385808d2f43de" +checksum = "b6f5e870be6c3b371b77fe0ee0bafb859fa4964b4404c27de1d380043c4dda20" [[package]] name = "udev" @@ -6397,9 +6589,9 @@ checksum = "383ad40bb927465ec0ce7720e033cb4ca06912855fc35db31b5755d0de75b1ee" [[package]] name = "unicode-segmentation" -version = "1.13.2" +version = "1.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9629274872b2bfaf8d66f5f15725007f635594914870f65218920345aa11aa8c" +checksum = "c6f5d3c3b1bf09027a88a6bc961fc00497d651009560b5463668dc81b0fa87a8" [[package]] name = "unicode-vo" @@ -6413,12 +6605,6 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254" -[[package]] -name = "unicode-xid" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" - [[package]] name = "upower_dbus" version = "0.3.2" @@ -6489,11 +6675,11 @@ checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" [[package]] name = "uuid" -version = "1.24.0" +version = "1.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf3923a6f5c4c6382e0b653c4117f48d631ea17f38ed86e2a828e6f7412f5239" +checksum = "bf80a72845275afea99e7f2b434723d3bc7e38470fcd1c7ed39a599c73319a53" dependencies = [ - "getrandom 0.4.2", + "getrandom 0.4.3", "js-sys", "serde_core", "sha1_smol", @@ -6530,27 +6716,18 @@ checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" [[package]] name = "wasip2" -version = "1.0.3+wasi-0.2.9" +version = "1.0.4+wasi-0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20064672db26d7cdc89c7798c48a0fdfac8213434a1186e5ef29fd560ae223d6" +checksum = "b67efb37e106e55ce722a510d6b5f9c17f083e5fc79afc2badeb12cc313d9487" dependencies = [ - "wit-bindgen 0.57.1", -] - -[[package]] -name = "wasip3" -version = "0.4.0+wasi-0.3.0-rc-2026-01-06" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5" -dependencies = [ - "wit-bindgen 0.51.0", + "wit-bindgen", ] [[package]] name = "wasm-bindgen" -version = "0.2.121" +version = "0.2.126" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49ace1d07c165b0864824eee619580c4689389afa9dc9ed3a4c75040d82e6790" +checksum = "4b067c0c11094aef6b7a801c1e34a26affafdf3d051dba08456b868789aaf9a4" dependencies = [ "cfg-if", "once_cell", @@ -6561,9 +6738,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.71" +version = "0.4.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96492d0d3ffba25305a7dc88720d250b1401d7edca02cc3bcd50633b424673b8" +checksum = "c62df1340f32221cb9c54d6a27b030e3dba64361d4a95bed55f9aacb44da291d" dependencies = [ "js-sys", "wasm-bindgen", @@ -6571,9 +6748,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.121" +version = "0.2.126" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e68e6f4afd367a562002c05637acb8578ff2dea1943df76afb9e83d177c8578" +checksum = "167ce5e579f6bcf889c4f7175a8a5a585de84e8ff93976ce393efa5f2837aab1" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -6581,9 +6758,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.121" +version = "0.2.126" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d95a9ec35c64b2a7cb35d3fead40c4238d0940c86d107136999567a4703259f2" +checksum = "f3997c7839262f4ef12cf90b818d6340c18e80f263f1a94bf157d0ec4420380e" dependencies = [ "bumpalo", "proc-macro2", @@ -6594,47 +6771,13 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.121" +version = "0.2.126" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4e0100b01e9f0d03189a92b96772a1fb998639d981193d7dbab487302513441" +checksum = "dc1b4cb0cc549fcf58d7dfc081778139b3d283a081644e833e84682ad71cea24" dependencies = [ "unicode-ident", ] -[[package]] -name = "wasm-encoder" -version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "990065f2fe63003fe337b932cfb5e3b80e0b4d0f5ff650e6985b1048f62c8319" -dependencies = [ - "leb128fmt", - "wasmparser", -] - -[[package]] -name = "wasm-metadata" -version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909" -dependencies = [ - "anyhow", - "indexmap 2.14.0", - "wasm-encoder", - "wasmparser", -] - -[[package]] -name = "wasmparser" -version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe" -dependencies = [ - "bitflags 2.13.1", - "hashbrown 0.15.5", - "indexmap 2.14.0", - "semver", -] - [[package]] name = "wasmtimer" version = "0.4.3" @@ -6669,7 +6812,7 @@ version = "0.31.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "645c7c96bb74690c3189b5c9cb4ca1627062bb23693a4fad9d8c3de958260144" dependencies = [ - "bitflags 2.13.1", + "bitflags 2.13.0", "rustix 1.1.4", "wayland-backend", "wayland-scanner", @@ -6681,7 +6824,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e" dependencies = [ - "bitflags 2.13.1", + "bitflags 2.13.0", "cursor-icon", "wayland-backend", ] @@ -6699,11 +6842,11 @@ dependencies = [ [[package]] name = "wayland-protocols" -version = "0.32.12" +version = "0.32.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "563a85523cade2429938e790815fd7319062103b9f4a2dc806e9b53b95982d8f" +checksum = "23d0c813de3daa2ed6520af85a3bd49b0e722a3078506899aa9686fea58dc4b6" dependencies = [ - "bitflags 2.13.1", + "bitflags 2.13.0", "wayland-backend", "wayland-client", "wayland-scanner", @@ -6716,7 +6859,7 @@ version = "20250721.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40a1f863128dcaaec790d7b4b396cc9b9a7a079e878e18c47e6c2d2c5a8dcbb1" dependencies = [ - "bitflags 2.13.1", + "bitflags 2.13.0", "wayland-backend", "wayland-client", "wayland-protocols", @@ -6729,7 +6872,7 @@ version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e9567599ef23e09b8dad6e429e5738d4509dfc46b3b21f32841a304d16b29c8" dependencies = [ - "bitflags 2.13.1", + "bitflags 2.13.0", "wayland-backend", "wayland-client", "wayland-protocols", @@ -6742,7 +6885,7 @@ version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b6d8cf1eb2c1c31ed1f5643c88a6e53538129d4af80030c8cabd1f9fa884d91" dependencies = [ - "bitflags 2.13.1", + "bitflags 2.13.0", "wayland-backend", "wayland-client", "wayland-protocols", @@ -6755,7 +6898,7 @@ version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eb04e52f7836d7c7976c78ca0250d61e33873c34156a2a1fc9474828ec268234" dependencies = [ - "bitflags 2.13.1", + "bitflags 2.13.0", "wayland-backend", "wayland-client", "wayland-protocols", @@ -6780,7 +6923,7 @@ version = "0.31.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cc1846eb04c49182e04f4a099e2a830a2b745610bbc1d61246e206f29c7000a0" dependencies = [ - "bitflags 2.13.1", + "bitflags 2.13.0", "downcast-rs", "rustix 1.1.4", "wayland-backend", @@ -6801,9 +6944,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.98" +version = "0.3.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b572dff8bcf38bad0fa19729c89bb5748b2b9b1d8be70cf90df697e3a8f32aa" +checksum = "8622dcb61c0bcc9fffa6938bed81210af2da9a7e4a1a834b2e37a59b6dfb6141" dependencies = [ "js-sys", "wasm-bindgen", @@ -6832,7 +6975,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9cb534d5ffd109c7d1135f34cdae29e60eab94855a625dcfe1705f8bc7ad79f" dependencies = [ "arrayvec", - "bitflags 2.13.1", + "bitflags 2.13.0", "bytemuck", "cfg-if", "cfg_aliases", @@ -6864,7 +7007,7 @@ dependencies = [ "arrayvec", "bit-set", "bit-vec", - "bitflags 2.13.1", + "bitflags 2.13.0", "bytemuck", "cfg_aliases", "document-features", @@ -6924,7 +7067,7 @@ dependencies = [ "arrayvec", "ash", "bit-set", - "bitflags 2.13.1", + "bitflags 2.13.0", "block", "bytemuck", "cfg-if", @@ -6968,7 +7111,7 @@ version = "28.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e18308757e594ed2cd27dddbb16a139c42a683819d32a2e0b1b0167552f5840c" dependencies = [ - "bitflags 2.13.1", + "bitflags 2.13.0", "bytemuck", "js-sys", "log", @@ -7009,10 +7152,12 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "window_clipboard" version = "0.4.1" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=sctk-0.20#f68595ee0e62fbd6589f4709b5aaa5c3c7ea5f6c" dependencies = [ "clipboard-win", "clipboard_macos", "clipboard_wayland", + "clipboard_x11", "dnd", "mime 0.1.0", "raw-window-handle", @@ -7452,8 +7597,9 @@ checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" [[package]] name = "winit" version = "0.31.0-beta.2" +source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#71ce08c043814514a8fd92d9d0599f115ae854e8" dependencies = [ - "bitflags 2.13.1", + "bitflags 2.13.0", "cfg_aliases", "cursor-icon", "dpi", @@ -7471,14 +7617,16 @@ dependencies = [ "winit-wayland", "winit-web", "winit-win32", + "winit-x11", ] [[package]] name = "winit-android" version = "0.31.0-beta.2" +source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#71ce08c043814514a8fd92d9d0599f115ae854e8" dependencies = [ "android-activity", - "bitflags 2.13.1", + "bitflags 2.13.0", "dpi", "ndk", "raw-window-handle", @@ -7490,8 +7638,9 @@ dependencies = [ [[package]] name = "winit-appkit" version = "0.31.0-beta.2" +source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#71ce08c043814514a8fd92d9d0599f115ae854e8" dependencies = [ - "bitflags 2.13.1", + "bitflags 2.13.0", "block2 0.6.2", "dispatch2", "dpi", @@ -7511,21 +7660,24 @@ dependencies = [ [[package]] name = "winit-common" version = "0.31.0-beta.2" +source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#71ce08c043814514a8fd92d9d0599f115ae854e8" dependencies = [ - "memmap2 0.9.10", + "memmap2 0.9.11", "objc2 0.6.4", "objc2-core-foundation", "smol_str", "tracing", "winit-core", + "x11-dl", "xkbcommon-dl", ] [[package]] name = "winit-core" version = "0.31.0-beta.2" +source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#71ce08c043814514a8fd92d9d0599f115ae854e8" dependencies = [ - "bitflags 2.13.1", + "bitflags 2.13.0", "cursor-icon", "dpi", "keyboard-types", @@ -7537,8 +7689,9 @@ dependencies = [ [[package]] name = "winit-orbital" version = "0.31.0-beta.2" +source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#71ce08c043814514a8fd92d9d0599f115ae854e8" dependencies = [ - "bitflags 2.13.1", + "bitflags 2.13.0", "dpi", "libredox", "orbclient", @@ -7552,8 +7705,9 @@ dependencies = [ [[package]] name = "winit-uikit" version = "0.31.0-beta.2" +source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#71ce08c043814514a8fd92d9d0599f115ae854e8" dependencies = [ - "bitflags 2.13.1", + "bitflags 2.13.0", "block2 0.6.2", "dispatch2", "dpi", @@ -7571,14 +7725,15 @@ dependencies = [ [[package]] name = "winit-wayland" version = "0.31.0-beta.2" +source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#71ce08c043814514a8fd92d9d0599f115ae854e8" dependencies = [ "ahash", - "bitflags 2.13.1", + "bitflags 2.13.0", "calloop", "cursor-icon", "dpi", "libc", - "memmap2 0.9.10", + "memmap2 0.9.11", "raw-window-handle", "rustix 1.1.4", "sctk-adwaita", @@ -7596,9 +7751,10 @@ dependencies = [ [[package]] name = "winit-web" version = "0.31.0-beta.2" +source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#71ce08c043814514a8fd92d9d0599f115ae854e8" dependencies = [ "atomic-waker", - "bitflags 2.13.1", + "bitflags 2.13.0", "concurrent-queue", "cursor-icon", "dpi", @@ -7617,8 +7773,9 @@ dependencies = [ [[package]] name = "winit-win32" version = "0.31.0-beta.2" +source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#71ce08c043814514a8fd92d9d0599f115ae854e8" dependencies = [ - "bitflags 2.13.1", + "bitflags 2.13.0", "cursor-icon", "dpi", "raw-window-handle", @@ -7629,6 +7786,29 @@ dependencies = [ "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#71ce08c043814514a8fd92d9d0599f115ae854e8" +dependencies = [ + "bitflags 2.13.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]] name = "winnow" version = "1.0.3" @@ -7638,100 +7818,12 @@ dependencies = [ "memchr", ] -[[package]] -name = "wit-bindgen" -version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5" -dependencies = [ - "wit-bindgen-rust-macro", -] - [[package]] name = "wit-bindgen" version = "0.57.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e" -[[package]] -name = "wit-bindgen-core" -version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea61de684c3ea68cb082b7a88508a8b27fcc8b797d738bfc99a82facf1d752dc" -dependencies = [ - "anyhow", - "heck 0.5.0", - "wit-parser", -] - -[[package]] -name = "wit-bindgen-rust" -version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21" -dependencies = [ - "anyhow", - "heck 0.5.0", - "indexmap 2.14.0", - "prettyplease", - "syn", - "wasm-metadata", - "wit-bindgen-core", - "wit-component", -] - -[[package]] -name = "wit-bindgen-rust-macro" -version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c0f9bfd77e6a48eccf51359e3ae77140a7f50b1e2ebfe62422d8afdaffab17a" -dependencies = [ - "anyhow", - "prettyplease", - "proc-macro2", - "quote", - "syn", - "wit-bindgen-core", - "wit-bindgen-rust", -] - -[[package]] -name = "wit-component" -version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2" -dependencies = [ - "anyhow", - "bitflags 2.13.1", - "indexmap 2.14.0", - "log", - "serde", - "serde_derive", - "serde_json", - "wasm-encoder", - "wasm-metadata", - "wasmparser", - "wit-parser", -] - -[[package]] -name = "wit-parser" -version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736" -dependencies = [ - "anyhow", - "id-arena", - "indexmap 2.14.0", - "log", - "semver", - "serde", - "serde_derive", - "serde_json", - "unicode-xid", - "wasmparser", -] - [[package]] name = "write16" version = "1.0.0" @@ -7747,6 +7839,39 @@ dependencies = [ "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]] name = "xcursor" version = "0.3.10" @@ -7761,7 +7886,8 @@ checksum = "2fb433233f2df9344722454bc7e96465c9d03bff9d77c248f9e7523fe79585b5" [[package]] name = "xdg-shell-wrapper-config" -version = "1.3.0" +version = "0.1.0" +source = "git+https://github.com/pop-os/cosmic-panel#d520b1e9ef2c990cbb57a8c5838ce94b7d75530a" dependencies = [ "serde", "wayland-protocols-wlr", @@ -7807,7 +7933,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d66ca9352cbd4eecbbc40871d8a11b4ac8107cfc528a6e14d7c19c69d0e1ac9" dependencies = [ "libc", - "memmap2 0.9.10", + "memmap2 0.9.11", "xkeysym", ] @@ -7818,7 +7944,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7a974f48060a14e95705c01f24ad9c3345022f4d97441b8a36beb7ed5c4a02d" dependencies = [ "libc", - "memmap2 0.9.10", + "memmap2 0.9.11", "xkeysym", ] @@ -7828,7 +7954,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5" dependencies = [ - "bitflags 2.13.1", + "bitflags 2.13.0", "dlib", "log", "once_cell", @@ -7885,9 +8011,9 @@ checksum = "e01738255b5a16e78bbb83e7fbba0a1e7dd506905cfc53f4622d89015a03fbb5" [[package]] name = "yoke" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abe8c5fda708d9ca3df187cae8bfb9ceda00dd96231bed36e445a1a48e66f9ca" +checksum = "709fe23a0424b6a435d82152b1bd3fdfb0833487d5fa90d05d42762a9891fef5" dependencies = [ "stable_deref_trait", "yoke-derive", @@ -7908,9 +8034,9 @@ dependencies = [ [[package]] name = "zbus" -version = "5.18.0" +version = "5.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe18fb60dc696039e738717b76eaea21e7a4489bbb1885020b43c94236d7e98a" +checksum = "a28b97f866896a4be7aefd2b5a8e01bb6773d19a775d54ab28b4d094b9a4480e" dependencies = [ "async-broadcast", "async-executor", @@ -7968,9 +8094,9 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "5.18.0" +version = "5.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe96480bed92df2b442a1a30df364e12d08eed03aeb061f2b8dc6afb2be91119" +checksum = "5e05ad887425eecf5e8384dc2406a4a9313eb73468712fc1cdea362eb4fe0469" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -7983,9 +8109,9 @@ dependencies = [ [[package]] name = "zbus_names" -version = "4.3.4" +version = "4.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8bf88b4a3ff53e883001e0e0115b297a9d53c31b9c1edd2bfdd853e3428624e" +checksum = "1039ca249fee9559680f3a9f05b55e0761fee51af4f6c1e7d8c1f31e549721d2" dependencies = [ "serde", "winnow", @@ -7994,12 +8120,12 @@ dependencies = [ [[package]] name = "zbus_xml" -version = "5.1.1" +version = "5.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8067892e940ed1727dea64690378601603b31d62dfde019a5335fbb7c0e0ed9" +checksum = "59ab0513c0a66a60a8718d5ad712a5094845a20d95b5c1c81e2bd8e904a52b4f" dependencies = [ - "quick-xml", "serde", + "winnow", "zbus_names", "zvariant", ] @@ -8012,18 +8138,18 @@ checksum = "6df3dc4292935e51816d896edcd52aa30bc297907c26167fec31e2b0c6a32524" [[package]] name = "zerocopy" -version = "0.8.48" +version = "0.8.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eed437bf9d6692032087e337407a86f04cd8d6a16a37199ed57949d415bd68e9" +checksum = "b7cbbc0a705a0fd05cc3676525980d2bf5a9bc4adac6d6475209a7887cf59d19" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.8.48" +version = "0.8.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70e3cd084b1788766f53af483dd21f93881ff30d7320490ec3ef7526d203bad4" +checksum = "e2e817b7b52d0c7358d3246da9d69935ebb18116b2b102b4230dac079b4862f5" dependencies = [ "proc-macro2", "quote", @@ -8053,9 +8179,9 @@ dependencies = [ [[package]] name = "zeroize" -version = "1.8.2" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0" +checksum = "e13c156562582aa81c60cb29407084cdb54c4164760106ab78e6c5b0858cf64e" [[package]] name = "zerotrie" @@ -8197,9 +8323,9 @@ dependencies = [ [[package]] name = "zvariant" -version = "5.13.1" +version = "5.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bee2a0bcd2a907786a456fff45aaaaf54c9ba5f50b71ae9ec1a4edd200c94911" +checksum = "7cf057bb00bf5c9ad77abb6147b0ca4818236a1858416e9d988e40d6322fefa7" dependencies = [ "endi", "enumflags2", @@ -8212,9 +8338,9 @@ dependencies = [ [[package]] name = "zvariant_derive" -version = "5.13.1" +version = "5.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38a708216a18780796770bfe3f4739c7c83a3e8f789b755534bbbc06e4e23e12" +checksum = "8118ca6bda77bfc0ab51d660db0c955f2505eef854c9a449435bccb616933b31" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -8235,11 +8361,3 @@ dependencies = [ "syn", "winnow", ] - -[[patch.unused]] -name = "cosmic-settings-airplane-mode-subscription" -version = "1.0.7" - -[[patch.unused]] -name = "winit-x11" -version = "0.31.0-beta.2" diff --git a/Cargo.toml b/Cargo.toml index ccbe504a..0e75c5bc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -75,13 +75,9 @@ ignored = ["libcosmic"] # cosmic-config = { path = "../libcosmic/cosmic-config" } # libcosmic = { path = "../libcosmic" } # iced_futures = { path = "../libcosmic/iced/futures" } -# cosmic-config = { git = "https://github.com/pop-os/libcosmic//" } -# libcosmic = { git = "https://github.com/pop-os/libcosmic//" } -# iced_futures = { git = "https://github.com/pop-os/libcosmic//" } - -# [patch."https://github.com/pop-os/winit.git"] -# winit = { git = "https://github.com/rust-windowing/winit.git", rev = "241b7a80bba96c91fa3901729cd5dec66abb9be4" } -# winit = { path = "../winit" } +# cosmic-config = { git = "https://github.com/pop-os/libcosmic//", branch = "theme-v2" } +# libcosmic = { git = "https://github.com/pop-os/libcosmic//", branch = "theme-v2" } +# iced_futures = { git = "https://github.com/pop-os/libcosmic//", branch = "theme-v2" } [patch."https://github.com/pop-os/libcosmic"] cosmic-config = { path = "/home/lionel/Projets/COSMIC/libcosmic/cosmic-config" } diff --git a/cosmic-app-list/i18n/ar/cosmic_app_list.ftl b/cosmic-app-list/i18n/ar/cosmic_app_list.ftl index 1e4d25cc..f7aae84b 100644 --- a/cosmic-app-list/i18n/ar/cosmic_app_list.ftl +++ b/cosmic-app-list/i18n/ar/cosmic_app_list.ftl @@ -1,6 +1,6 @@ cosmic-app-list = دُرج التطبيقات pin = ثبِّت في درج التطبيقات -quit = أنهِ +quit = إنهِ quit-all = أنهِ الكل new-window = نافذة جديدة run = شغِّل diff --git a/cosmic-app-list/i18n/cs/cosmic_app_list.ftl b/cosmic-app-list/i18n/cs/cosmic_app_list.ftl index ad5b9257..5534149f 100644 --- a/cosmic-app-list/i18n/cs/cosmic_app_list.ftl +++ b/cosmic-app-list/i18n/cs/cosmic_app_list.ftl @@ -1,5 +1,5 @@ -cosmic-app-list = Panel aplikací -pin = Připnout do panelu aplikací +cosmic-app-list = Oblast aplikací +pin = Připnout do oblasti aplikací quit = Ukončit quit-all = Ukončit vše new-window = Nové okno diff --git a/cosmic-app-list/i18n/da/cosmic_app_list.ftl b/cosmic-app-list/i18n/da/cosmic_app_list.ftl index e69de29b..3396ed61 100644 --- a/cosmic-app-list/i18n/da/cosmic_app_list.ftl +++ b/cosmic-app-list/i18n/da/cosmic_app_list.ftl @@ -0,0 +1,8 @@ +run = Kør +run-on = Kør på { $gpu } +run-on-default = (Standard) +cosmic-app-list = Programbakke +new-window = Nyt Vindue +quit = Afslut +quit-all = Forlad Alle +pin = Fastgør til app-skuffe diff --git a/cosmic-app-list/i18n/el/cosmic_app_list.ftl b/cosmic-app-list/i18n/el/cosmic_app_list.ftl index e77f522a..0b8a7fb6 100644 --- a/cosmic-app-list/i18n/el/cosmic_app_list.ftl +++ b/cosmic-app-list/i18n/el/cosmic_app_list.ftl @@ -1,5 +1,5 @@ new-window = Νέο παράθυρο -quit = Έξοδος +quit = Τερματισμός cosmic-app-list = Περιοχή εφαρμογών run = Εκτέλεση run-on = Εκτέλεση με { $gpu } diff --git a/cosmic-app-list/i18n/en-GB/cosmic_app_list.ftl b/cosmic-app-list/i18n/en-GB/cosmic_app_list.ftl index e69de29b..f3afe950 100644 --- a/cosmic-app-list/i18n/en-GB/cosmic_app_list.ftl +++ b/cosmic-app-list/i18n/en-GB/cosmic_app_list.ftl @@ -0,0 +1,8 @@ +cosmic-app-list = App Tray +new-window = New Window +quit = Quit +run = Run +run-on = Run on { $gpu } +quit-all = Quit All +run-on-default = (Default) +pin = Pin to app tray diff --git a/cosmic-app-list/i18n/fa/cosmic_app_list.ftl b/cosmic-app-list/i18n/fa/cosmic_app_list.ftl index be2d279a..8d098db3 100644 --- a/cosmic-app-list/i18n/fa/cosmic_app_list.ftl +++ b/cosmic-app-list/i18n/fa/cosmic_app_list.ftl @@ -1,8 +1,8 @@ -cosmic-app-list = سینی برنامه‌ها -pin = سنجاق کردن به سینی برنامه‌ها -quit = بستن -quit-all = بستن همه +cosmic-app-list = نوار برنامه‌ها +pin = افزودن به نوار برنامه‌ها +quit = خروج +quit-all = خروج از همه new-window = پنجره جدید run = اجرا -run-on = اجرا روی {$gpu} -run-on-default = (پیش‌فرض) \ No newline at end of file +run-on = اجرا با { $gpu } +run-on-default = (پیش‌فرض) diff --git a/cosmic-app-list/i18n/gl/cosmic_app_list.ftl b/cosmic-app-list/i18n/gl/cosmic_app_list.ftl new file mode 100644 index 00000000..4fa947a7 --- /dev/null +++ b/cosmic-app-list/i18n/gl/cosmic_app_list.ftl @@ -0,0 +1,8 @@ +quit = Pechar +run = Executar +cosmic-app-list = Bandexa de aplicacións +pin = Fixar na bandexa de aplicacións +quit-all = Quitar todo +new-window = Nova Xanela +run-on = Executar en { $gpu } +run-on-default = (Por defecto) diff --git a/cosmic-app-list/i18n/hi/cosmic_app_list.ftl b/cosmic-app-list/i18n/hi/cosmic_app_list.ftl index 88138ea6..2c6b12a3 100644 --- a/cosmic-app-list/i18n/hi/cosmic_app_list.ftl +++ b/cosmic-app-list/i18n/hi/cosmic_app_list.ftl @@ -1,8 +1,8 @@ cosmic-app-list = ऐप ट्रे pin = ऐप ट्रे में पिन करें -quit = बंद करें +quit = बाहर जाएँ quit-all = सभी बंद करें new-window = नई विंडो run = चलाएँ -run-on = {$gpu} पर चलाएँ +run-on = { $gpu } पर चलाएँ run-on-default = (डिफ़ॉल्ट) diff --git a/cosmic-app-list/i18n/it/cosmic_app_list.ftl b/cosmic-app-list/i18n/it/cosmic_app_list.ftl index 96a5b575..b65b4e23 100644 --- a/cosmic-app-list/i18n/it/cosmic_app_list.ftl +++ b/cosmic-app-list/i18n/it/cosmic_app_list.ftl @@ -1,8 +1,8 @@ -cosmic-app-list = Barra applicazioni +cosmic-app-list = Area applicazioni pin = Fissa nella barra delle applicazioni quit = Esci quit-all = Chiudi tutto new-window = Nuova finestra run = Esegui -run-on = Esegui usando la GPU: { $gpu } -run-on-default = (default) +run-on = Esegui su { $gpu } +run-on-default = (Predefinito) diff --git a/cosmic-app-list/i18n/lt/cosmic_app_list.ftl b/cosmic-app-list/i18n/lt/cosmic_app_list.ftl index c86f45a1..25dd5990 100644 --- a/cosmic-app-list/i18n/lt/cosmic_app_list.ftl +++ b/cosmic-app-list/i18n/lt/cosmic_app_list.ftl @@ -1,5 +1,5 @@ new-window = Naujas Langas -quit = Išeiti +quit = Išjungti run = Paleisti run-on = Paleisti naudojantis { $gpu } run-on-default = (Numatytas) diff --git a/cosmic-app-list/i18n/oc/cosmic_app_list.ftl b/cosmic-app-list/i18n/oc/cosmic_app_list.ftl index e69de29b..9129b9b4 100644 --- a/cosmic-app-list/i18n/oc/cosmic_app_list.ftl +++ b/cosmic-app-list/i18n/oc/cosmic_app_list.ftl @@ -0,0 +1 @@ +cosmic-app-list = Cinta d’aplicacions diff --git a/cosmic-app-list/i18n/pa/cosmic_app_list.ftl b/cosmic-app-list/i18n/pa/cosmic_app_list.ftl index ab835da6..cb202e4b 100644 --- a/cosmic-app-list/i18n/pa/cosmic_app_list.ftl +++ b/cosmic-app-list/i18n/pa/cosmic_app_list.ftl @@ -1,4 +1,4 @@ -quit = ਬਾਹਰ +quit = ਸਮਾਪਤ cosmic-app-list = ਐਪ ਟਰੇ pin = ਐਪ ਟਰੇ ਵਿੱਚ ਟੰਗੋ quit-all = ਸਭ ਵਿੱਚੋਂ ਬਾਹਰ diff --git a/cosmic-app-list/i18n/pl/cosmic_app_list.ftl b/cosmic-app-list/i18n/pl/cosmic_app_list.ftl index aaedc5f0..d619a422 100644 --- a/cosmic-app-list/i18n/pl/cosmic_app_list.ftl +++ b/cosmic-app-list/i18n/pl/cosmic_app_list.ftl @@ -1,6 +1,6 @@ cosmic-app-list = Zasobnik aplikacji pin = Przypnij do zasobnika aplikacji -quit = Zamknij +quit = Zakończ quit-all = Zamknij wszystkie new-window = Nowe okno run = Uruchom diff --git a/cosmic-app-list/i18n/pt-BR/cosmic_app_list.ftl b/cosmic-app-list/i18n/pt-BR/cosmic_app_list.ftl index 2b94e0e9..0a28b697 100644 --- a/cosmic-app-list/i18n/pt-BR/cosmic_app_list.ftl +++ b/cosmic-app-list/i18n/pt-BR/cosmic_app_list.ftl @@ -1,6 +1,6 @@ cosmic-app-list = Bandeja de aplicativos pin = Fixar na bandeja de aplicativos -quit = Sair +quit = Encerrar quit-all = Sair de Todos new-window = Nova Janela run = Executar diff --git a/cosmic-app-list/i18n/ru/cosmic_app_list.ftl b/cosmic-app-list/i18n/ru/cosmic_app_list.ftl index c1195520..2b3631e9 100644 --- a/cosmic-app-list/i18n/ru/cosmic_app_list.ftl +++ b/cosmic-app-list/i18n/ru/cosmic_app_list.ftl @@ -1,6 +1,6 @@ cosmic-app-list = Область приложений pin = Закрепить на панели приложений -quit = Выйти +quit = Завершить quit-all = Завершить все new-window = Новое окно run = Выполнить diff --git a/cosmic-app-list/i18n/sat/cosmic_app_list.ftl b/cosmic-app-list/i18n/sat/cosmic_app_list.ftl new file mode 100644 index 00000000..32be0db1 --- /dev/null +++ b/cosmic-app-list/i18n/sat/cosmic_app_list.ftl @@ -0,0 +1,2 @@ +run-on = { $gpu } ᱨᱮ ᱫᱟᱹᱲ ᱟᱭ +run-on-default = (ᱢᱩᱞ) diff --git a/cosmic-app-list/i18n/uk/cosmic_app_list.ftl b/cosmic-app-list/i18n/uk/cosmic_app_list.ftl index ec1833cd..b6aea1f1 100644 --- a/cosmic-app-list/i18n/uk/cosmic_app_list.ftl +++ b/cosmic-app-list/i18n/uk/cosmic_app_list.ftl @@ -1,6 +1,6 @@ cosmic-app-list = Панель застосунків pin = Закріпити -quit = Вийти +quit = Завершити quit-all = Закрити всі new-window = Нове вікно run = Виконати diff --git a/cosmic-app-list/i18n/zh-TW/cosmic_app_list.ftl b/cosmic-app-list/i18n/zh-TW/cosmic_app_list.ftl index 9595d3b0..c29bd8a5 100644 --- a/cosmic-app-list/i18n/zh-TW/cosmic_app_list.ftl +++ b/cosmic-app-list/i18n/zh-TW/cosmic_app_list.ftl @@ -1,8 +1,8 @@ -cosmic-app-list = 應用程式匣盤 -pin = 釘選至應用程式匣盤 -quit = 退出 +cosmic-app-list = 應用程式托盤 +pin = 釘選至應用程式托盤 +quit = 結束 quit-all = 全部退出 -new-window = 新建視窗 +new-window = 新增視窗 run = 執行 run-on = 在 { $gpu } 上執行 run-on-default = (預設) diff --git a/cosmic-app-list/src/app.rs b/cosmic-app-list/src/app.rs index 55d815b8..77a0acb0 100755 --- a/cosmic-app-list/src/app.rs +++ b/cosmic-app-list/src/app.rs @@ -28,25 +28,28 @@ use cosmic::{ }, cosmic_config::{Config, CosmicConfigEntry}, desktop::IconSourceExt, - iced::runtime::{core::event, dnd::peek_dnd}, iced::{ self, Alignment, Background, Border, Length, Limits, Padding, Subscription, advanced::text::{Ellipsize, EllipsizeHeightLimit}, clipboard::mime::{AllowedMimeTypes, AsMimeTypes}, event::listen_with, platform_specific::shell::commands::popup::{destroy_popup, get_popup}, + runtime::{core::event, dnd::peek_dnd, platform_specific::wayland::CornerRadius}, widget::{ - Column, Row, column, mouse_area, row, rule::vertical as vertical_rule, - space::horizontal as horizontal_space, space::vertical as vertical_space, stack, + Column, Row, column, mouse_area, row, + rule::vertical as vertical_rule, + space::{horizontal as horizontal_space, vertical as vertical_space}, + stack, }, window, }, - surface, + surface::{self, action::LiveSettings}, theme::{self, Button, Container}, widget::{ DndDestination, Image, button, container, divider, dnd_source, grid, icon::{self, from_name}, image::Handle, + menu, rectangle_tracker::{RectangleTracker, RectangleUpdate, rectangle_tracker_subscription}, scrollable, svg, text, text_input, }, @@ -1249,44 +1252,54 @@ impl cosmic::Application for CosmicAppList { .iter() .chain(self.pinned_list.iter()) .find(|t| t.id == id) + .cloned() { - let Some(rectangle) = self.rectangles.get(&toplevel_group.id.into()) else { + let Some(rectangle) = self.rectangles.get(&toplevel_group.id.into()).copied() + else { tracing::error!("No rectangle found for toplevel group"); return Task::none(); }; + let corners = self.core.system_theme().cosmic().corner_radii.radius_s; + let popup_task = + cosmic::surface::surface_task(cosmic::surface::action::app_popup( + move |_| LiveSettings::default(), + move |app: &mut Self| { + let new_id = window::Id::unique(); + app.popup = Some(Popup { + parent: parent_window_id, + id: new_id, + dock_item: toplevel_group.clone(), + popup_type: PopupType::RightClickMenu, + }); - let new_id = window::Id::unique(); - self.popup = Some(Popup { - parent: parent_window_id, - id: new_id, - dock_item: toplevel_group.clone(), - popup_type: PopupType::RightClickMenu, - }); - - let mut popup_settings = self.core.applet.get_popup_settings( - parent_window_id, - new_id, - None, - None, - None, - ); - let iced::Rectangle { - x, - y, - width, - height, - } = *rectangle; - popup_settings.positioner.anchor_rect = iced::Rectangle:: { - x: x as i32, - y: y as i32, - width: width as i32, - height: height as i32, - }; + let mut popup_settings = app.core.applet.get_popup_settings( + parent_window_id, + new_id, + None, + None, + None, + ); + let iced::Rectangle { + x, + y, + width, + height, + } = rectangle; + popup_settings.positioner.anchor_rect = iced::Rectangle:: { + x: x as i32, + y: y as i32, + width: width as i32, + height: height as i32, + }; + popup_settings + }, + None, + )); let gpu_update = Task::perform(try_get_gpus(), |gpus| { cosmic::Action::App(Message::GpuRequest(gpus)) }); - return Task::batch([gpu_update, get_popup(popup_settings)]); + return Task::batch([gpu_update, popup_task]); } } Message::ToplevelListPopup(id, parent_window_id) => { @@ -1317,10 +1330,10 @@ impl cosmic::Application for CosmicAppList { } } - let Some(rectangle) = self.rectangles.get(&toplevel_group.id.into()) else { + let Some(rectangle) = self.rectangles.get(&toplevel_group.id.into()).copied() + else { return Task::none(); }; - let new_id = window::Id::unique(); self.popup = Some(Popup { parent: parent_window_id, @@ -1328,48 +1341,56 @@ impl cosmic::Application for CosmicAppList { dock_item: toplevel_group.clone(), popup_type: PopupType::ToplevelList, }); + let popup_task = + cosmic::surface::surface_task(cosmic::surface::action::app_popup( + |_| Default::default(), + move |app: &mut Self| { + let mut popup_settings = app.core.applet.get_popup_settings( + parent_window_id, + new_id, + None, + None, + None, + ); + let iced::Rectangle { + x, + y, + width, + height, + } = rectangle; + popup_settings.positioner.anchor_rect = iced::Rectangle:: { + x: x as i32, + y: y as i32, + width: width as i32, + height: height as i32, + }; + let max_windows = 7.0; + let window_spacing = 8.0; + popup_settings.positioner.size_limits = match app.core.applet.anchor + { + PanelAnchor::Right | PanelAnchor::Left => Limits::NONE + .min_width(100.0) + .min_height(30.0) + .max_width(window_spacing * 2.0 + TOPLEVEL_BUTTON_WIDTH) + .max_height( + TOPLEVEL_BUTTON_HEIGHT * max_windows + + window_spacing * (max_windows + 1.0), + ), + PanelAnchor::Bottom | PanelAnchor::Top => Limits::NONE + .min_width(30.0) + .min_height(100.0) + .max_width( + TOPLEVEL_BUTTON_WIDTH * max_windows + + window_spacing * (max_windows + 1.0), + ) + .max_height(window_spacing * 2.0 + TOPLEVEL_BUTTON_HEIGHT), + }; + popup_settings + }, + None, + )); - let mut popup_settings = self.core.applet.get_popup_settings( - parent_window_id, - new_id, - None, - None, - None, - ); - let iced::Rectangle { - x, - y, - width, - height, - } = *rectangle; - popup_settings.positioner.anchor_rect = iced::Rectangle:: { - x: x as i32, - y: y as i32, - width: width as i32, - height: height as i32, - }; - let max_windows = 7.0; - let window_spacing = 8.0; - popup_settings.positioner.size_limits = match self.core.applet.anchor { - PanelAnchor::Right | PanelAnchor::Left => Limits::NONE - .min_width(100.0) - .min_height(30.0) - .max_width(window_spacing * 2.0 + TOPLEVEL_BUTTON_WIDTH) - .max_height( - TOPLEVEL_BUTTON_HEIGHT * max_windows - + window_spacing * (max_windows + 1.0), - ), - PanelAnchor::Bottom | PanelAnchor::Top => Limits::NONE - .min_width(30.0) - .min_height(100.0) - .max_width( - TOPLEVEL_BUTTON_WIDTH * max_windows - + window_spacing * (max_windows + 1.0), - ) - .max_height(window_spacing * 2.0 + TOPLEVEL_BUTTON_HEIGHT), - }; - - return get_popup(popup_settings); + return popup_task; } } Message::ToplevelHoverChanged(handle, entering) => { @@ -2148,52 +2169,63 @@ impl cosmic::Application for CosmicAppList { if create_new { let new_id = window::Id::unique(); self.overflow_active_popup = Some(new_id); - let rectangle = self.rectangles.get(&DockItemId::ActiveOverflow); - let mut popup_settings = self.core.applet.get_popup_settings( - self.core.main_window_id().unwrap(), - new_id, - None, - None, - None, - ); - if let Some(iced::Rectangle { + let Some(iced::Rectangle { x, y, width, height, - }) = rectangle - { - popup_settings.positioner.anchor_rect = iced::Rectangle:: { - x: *x as i32, - y: *y as i32, - width: *width as i32, - height: *height as i32, - }; - } - let applet_suggested_size = self.core.applet.suggested_size(false).0 - + 2 * self.core.applet.suggested_padding(false).0; - let (_favorite_popup_cutoff, active_popup_cutoff) = - self.panel_overflow_lengths(); - let popup_applet_count = - self.active_list.len().saturating_sub( - (active_popup_cutoff.unwrap_or_default()).saturating_sub(1), - ) as f32; - let popup_applet_size = applet_suggested_size as f32 * popup_applet_count - + 4.0 * (popup_applet_count - 1.); - let (max_width, max_height) = match self.core.applet.anchor { - PanelAnchor::Top | PanelAnchor::Bottom => { - (popup_applet_size, applet_suggested_size as f32) - } - PanelAnchor::Left | PanelAnchor::Right => { - (applet_suggested_size as f32, popup_applet_size) - } + }) = self.rectangles.get(&DockItemId::ActiveOverflow).copied() + else { + return Task::none(); }; - popup_settings.positioner.size_limits = Limits::NONE - .max_width(max_width) - .min_width(1.) - .max_height(max_height) - .min_height(1.); - cmds.push(get_popup(popup_settings)); + + let popup_task = + cosmic::surface::surface_task(cosmic::surface::action::app_popup( + |_| Default::default(), + move |app: &mut Self| { + let mut popup_settings = app.core.applet.get_popup_settings( + app.core.main_window_id().unwrap(), + new_id, + None, + None, + None, + ); + + popup_settings.positioner.anchor_rect = iced::Rectangle:: { + x: x as i32, + y: y as i32, + width: width as i32, + height: height as i32, + }; + + let applet_suggested_size = app.core.applet.suggested_size(false).0 + + 2 * app.core.applet.suggested_padding(false).0; + let (_favorite_popup_cutoff, active_popup_cutoff) = + app.panel_overflow_lengths(); + let popup_applet_count = app.active_list.len().saturating_sub( + (active_popup_cutoff.unwrap_or_default()).saturating_sub(1), + ) as f32; + let popup_applet_size = applet_suggested_size as f32 + * popup_applet_count + + 4.0 * (popup_applet_count - 1.); + let (max_width, max_height) = match app.core.applet.anchor { + PanelAnchor::Top | PanelAnchor::Bottom => { + (popup_applet_size, applet_suggested_size as f32) + } + PanelAnchor::Left | PanelAnchor::Right => { + (applet_suggested_size as f32, popup_applet_size) + } + }; + popup_settings.positioner.size_limits = Limits::NONE + .max_width(max_width) + .min_width(1.) + .max_height(max_height) + .min_height(1.); + popup_settings + }, + None, + )); + cmds.push(popup_task); } return Task::batch(cmds); } @@ -2205,52 +2237,63 @@ impl cosmic::Application for CosmicAppList { if create_new { let new_id = window::Id::unique(); self.overflow_favorites_popup = Some(new_id); - let rectangle = self.rectangles.get(&DockItemId::FavoritesOverflow); - let mut popup_settings = self.core.applet.get_popup_settings( - self.core.main_window_id().unwrap(), - new_id, - None, - None, - None, - ); - if let Some(iced::Rectangle { + let Some(iced::Rectangle { x, y, width, height, - }) = rectangle - { - popup_settings.positioner.anchor_rect = iced::Rectangle:: { - x: *x as i32, - y: *y as i32, - width: *width as i32, - height: *height as i32, - }; - } - let applet_suggested_size = self.core.applet.suggested_size(false).0 - + 2 * self.core.applet.suggested_padding(false).0; - let (favorite_popup_cutoff, _active_popup_cutoff) = - self.panel_overflow_lengths(); - let popup_applet_count = - self.pinned_list.len().saturating_sub( - favorite_popup_cutoff.unwrap_or_default().saturating_sub(1), - ) as f32; - let popup_applet_size = applet_suggested_size as f32 * popup_applet_count - + 4.0 * (popup_applet_count - 1.); - let (max_width, max_height) = match self.core.applet.anchor { - PanelAnchor::Top | PanelAnchor::Bottom => { - (popup_applet_size, applet_suggested_size as f32) - } - PanelAnchor::Left | PanelAnchor::Right => { - (applet_suggested_size as f32, popup_applet_size) - } + }) = self.rectangles.get(&DockItemId::FavoritesOverflow).copied() + else { + return Task::none(); }; - popup_settings.positioner.size_limits = Limits::NONE - .max_width(max_width) - .min_width(1.) - .max_height(max_height) - .min_height(1.); - cmds.push(get_popup(popup_settings)); + + let popup_task = + cosmic::surface::surface_task(cosmic::surface::action::app_popup( + |_| Default::default(), + move |app: &mut Self| { + let mut popup_settings = app.core.applet.get_popup_settings( + app.core.main_window_id().unwrap(), + new_id, + None, + None, + None, + ); + + popup_settings.positioner.anchor_rect = iced::Rectangle:: { + x: x as i32, + y: y as i32, + width: width as i32, + height: height as i32, + }; + + let applet_suggested_size = app.core.applet.suggested_size(false).0 + + 2 * app.core.applet.suggested_padding(false).0; + let (favorite_popup_cutoff, _active_popup_cutoff) = + app.panel_overflow_lengths(); + let popup_applet_count = app.pinned_list.len().saturating_sub( + favorite_popup_cutoff.unwrap_or_default().saturating_sub(1), + ) as f32; + let popup_applet_size = applet_suggested_size as f32 + * popup_applet_count + + 4.0 * (popup_applet_count - 1.); + let (max_width, max_height) = match app.core.applet.anchor { + PanelAnchor::Top | PanelAnchor::Bottom => { + (popup_applet_size, applet_suggested_size as f32) + } + PanelAnchor::Left | PanelAnchor::Right => { + (applet_suggested_size as f32, popup_applet_size) + } + }; + popup_settings.positioner.size_limits = Limits::NONE + .max_width(max_width) + .min_width(1.) + .max_height(max_height) + .min_height(1.); + popup_settings + }, + None, + )); + cmds.push(popup_task); } return Task::batch(cmds); } @@ -2660,7 +2703,8 @@ impl cosmic::Application for CosmicAppList { .width(Length::Fill) } - let mut content = column![].align_x(Alignment::Center); + let mut content = + menu::menu_column::MenuColumn::with_capacity(4).align_x(Alignment::Center); if let Some(exec) = desktop_info.exec() { if !toplevels.is_empty() { @@ -2784,22 +2828,6 @@ impl cosmic::Application for CosmicAppList { .popup_container( container(content) .padding(1) - //TODO: move style to libcosmic - .class(theme::Container::custom(|theme| { - let cosmic = theme.cosmic(); - let component = &cosmic.background(false).component; - container::Style { - icon_color: Some(component.on.into()), - text_color: Some(component.on.into()), - background: Some(Background::Color(component.base.into())), - border: Border { - radius: cosmic.radius_s().into(), - width: 1.0, - color: component.divider.into(), - }, - ..Default::default() - } - })) .height(Length::Shrink) .width(Length::Fill), ) diff --git a/cosmic-applet-a11y/i18n/ca/cosmic_applet_a11y.ftl b/cosmic-applet-a11y/i18n/ca/cosmic_applet_a11y.ftl index e69de29b..25383cbe 100644 --- a/cosmic-applet-a11y/i18n/ca/cosmic_applet_a11y.ftl +++ b/cosmic-applet-a11y/i18n/ca/cosmic_applet_a11y.ftl @@ -0,0 +1,6 @@ +magnifier = Lupa +screen-reader = Narrador +invert-colors = Colors invertits +settings = Configuració d'accessibilitat... +filter-colors = Filtres de colors +high-contrast = Mode d'alt contrast diff --git a/cosmic-applet-a11y/i18n/da/cosmic_applet_a11y.ftl b/cosmic-applet-a11y/i18n/da/cosmic_applet_a11y.ftl index e69de29b..85729331 100644 --- a/cosmic-applet-a11y/i18n/da/cosmic_applet_a11y.ftl +++ b/cosmic-applet-a11y/i18n/da/cosmic_applet_a11y.ftl @@ -0,0 +1,6 @@ +screen-reader = Skærmlæser +invert-colors = Invertér farver +high-contrast = Høj kontrast +filter-colors = Filtrér farver +settings = Tilgængelighedsindstillinger... +magnifier = Forstørrelsesglas diff --git a/cosmic-applet-a11y/i18n/de/cosmic_applet_a11y.ftl b/cosmic-applet-a11y/i18n/de/cosmic_applet_a11y.ftl index 84e24922..0a5413a5 100644 --- a/cosmic-applet-a11y/i18n/de/cosmic_applet_a11y.ftl +++ b/cosmic-applet-a11y/i18n/de/cosmic_applet_a11y.ftl @@ -1,6 +1,6 @@ screen-reader = Bildschirmleser magnifier = Vergrößerungsglas invert-colors = Farben invertieren -settings = Barrierefreiheitseinstellungen… +settings = Barrierefreiheitseinstellungen ... filter-colors = Farben filtern high-contrast = Hoher Kontrast diff --git a/cosmic-applet-a11y/i18n/en-GB/cosmic_applet_a11y.ftl b/cosmic-applet-a11y/i18n/en-GB/cosmic_applet_a11y.ftl index e69de29b..b504adf2 100644 --- a/cosmic-applet-a11y/i18n/en-GB/cosmic_applet_a11y.ftl +++ b/cosmic-applet-a11y/i18n/en-GB/cosmic_applet_a11y.ftl @@ -0,0 +1,6 @@ +screen-reader = Screen reader +invert-colors = Invert colours +high-contrast = High contrast +filter-colors = Filter colours +settings = Accessibility settings... +magnifier = Magnifier diff --git a/cosmic-applet-a11y/i18n/fa/cosmic_applet_a11y.ftl b/cosmic-applet-a11y/i18n/fa/cosmic_applet_a11y.ftl index e43e3a1d..66820364 100644 --- a/cosmic-applet-a11y/i18n/fa/cosmic_applet_a11y.ftl +++ b/cosmic-applet-a11y/i18n/fa/cosmic_applet_a11y.ftl @@ -1,6 +1,6 @@ screen-reader = صفحه‌خوان magnifier = ذره‌بین -invert-colors = وارونه‌سازی رنگ‌ها +invert-colors = وارونه کردن رنگ‌ها settings = تنظیمات دسترسی‌پذیری... filter-colors = فیلتر رنگ‌ها high-contrast = کنتراست بالا diff --git a/cosmic-applet-a11y/i18n/gl/cosmic_applet_a11y.ftl b/cosmic-applet-a11y/i18n/gl/cosmic_applet_a11y.ftl new file mode 100644 index 00000000..d0da1ab5 --- /dev/null +++ b/cosmic-applet-a11y/i18n/gl/cosmic_applet_a11y.ftl @@ -0,0 +1,6 @@ +screen-reader = Lector de pantalla +magnifier = Lupa +invert-colors = Invertir cores +settings = Configuración de accesibilidade... +filter-colors = Filtro de cores +high-contrast = Alto contraste diff --git a/cosmic-applet-a11y/i18n/hi/cosmic_applet_a11y.ftl b/cosmic-applet-a11y/i18n/hi/cosmic_applet_a11y.ftl index a43e2110..97aace4d 100644 --- a/cosmic-applet-a11y/i18n/hi/cosmic_applet_a11y.ftl +++ b/cosmic-applet-a11y/i18n/hi/cosmic_applet_a11y.ftl @@ -1,4 +1,6 @@ screen-reader = स्क्रीन रीडर -filter-colors = रंग फ़िल्टर -settings = सुलभता सेटिंग..। -magnifier = आवर्धक +filter-colors = रंग फ़िल्टर करें +settings = एक्सेसिबिलिटी सेटिंग्स..। +magnifier = मैग्नीफायर +high-contrast = उच्च कंट्रास्ट +invert-colors = रंग उल्टे करें diff --git a/cosmic-applet-a11y/i18n/it/cosmic_applet_a11y.ftl b/cosmic-applet-a11y/i18n/it/cosmic_applet_a11y.ftl index 2902795c..11e6a115 100644 --- a/cosmic-applet-a11y/i18n/it/cosmic_applet_a11y.ftl +++ b/cosmic-applet-a11y/i18n/it/cosmic_applet_a11y.ftl @@ -2,5 +2,5 @@ screen-reader = Lettore dello schermo magnifier = Lente di ingrandimento invert-colors = Inverti colori settings = Impostazioni accessibilità... -filter-colors = Filtra colori +filter-colors = Filtri colore high-contrast = Contrasto elevato diff --git a/cosmic-applet-a11y/i18n/sat/cosmic_applet_a11y.ftl b/cosmic-applet-a11y/i18n/sat/cosmic_applet_a11y.ftl new file mode 100644 index 00000000..8c46d41c --- /dev/null +++ b/cosmic-applet-a11y/i18n/sat/cosmic_applet_a11y.ftl @@ -0,0 +1,2 @@ +screen-reader = ᱥᱠᱨᱤᱱ ᱨᱤᱰᱟᱨ +invert-colors = ᱨᱚᱝ ᱩᱞᱴᱟᱹ ᱪᱷᱚ diff --git a/cosmic-applet-a11y/src/app.rs b/cosmic-applet-a11y/src/app.rs index 6a328339..652f3b24 100644 --- a/cosmic-applet-a11y/src/app.rs +++ b/cosmic-applet-a11y/src/app.rs @@ -133,20 +133,27 @@ impl cosmic::Application for CosmicA11yApplet { } Message::TogglePopup => { if let Some(p) = self.popup.take() { - return destroy_popup(p); + return cosmic::surface::surface_task(cosmic::surface::action::destroy_popup( + p, + )); } else { - let new_id = window::Id::unique(); - self.popup.replace(new_id); + return cosmic::surface::surface_task(cosmic::surface::action::app_popup( + |_| Default::default(), + |app: &mut CosmicA11yApplet| { + let new_id = window::Id::unique(); + app.popup.replace(new_id); - let popup_settings = self.core.applet.get_popup_settings( - self.core.main_window_id().unwrap(), - new_id, - Some((1, 1)), + let popup_settings = app.core.applet.get_popup_settings( + app.core.main_window_id().unwrap(), + new_id, + Some((1, 1)), + None, + None, + ); + popup_settings + }, None, - None, - ); - - return get_popup(popup_settings); + )); } } Message::CloseRequested(id) => { diff --git a/cosmic-applet-audio/i18n/ca/cosmic_applet_audio.ftl b/cosmic-applet-audio/i18n/ca/cosmic_applet_audio.ftl index e69de29b..0bbe1d5f 100644 --- a/cosmic-applet-audio/i18n/ca/cosmic_applet_audio.ftl +++ b/cosmic-applet-audio/i18n/ca/cosmic_applet_audio.ftl @@ -0,0 +1,7 @@ +output = Sortida +show-media-controls = Mostra els controls multimèdia a la barra +disconnected = PulseAudio desconnectat +no-device = No s'ha seleccionat cap dispositiu +input = Entrada +unknown-artist = Desconegut +sound-settings = Configuració de so... diff --git a/cosmic-applet-audio/i18n/da/cosmic_applet_audio.ftl b/cosmic-applet-audio/i18n/da/cosmic_applet_audio.ftl index e69de29b..7cdb3d06 100644 --- a/cosmic-applet-audio/i18n/da/cosmic_applet_audio.ftl +++ b/cosmic-applet-audio/i18n/da/cosmic_applet_audio.ftl @@ -0,0 +1,7 @@ +show-media-controls = Vis mediekontrol på panel +disconnected = PulseAudio Afbrudt +no-device = Ingen enhed valgt +input = Indgang +output = Udgang +unknown-artist = Ukendt +sound-settings = Lydindstillinger... diff --git a/cosmic-applet-audio/i18n/de/cosmic_applet_audio.ftl b/cosmic-applet-audio/i18n/de/cosmic_applet_audio.ftl index a0128f53..1b535907 100644 --- a/cosmic-applet-audio/i18n/de/cosmic_applet_audio.ftl +++ b/cosmic-applet-audio/i18n/de/cosmic_applet_audio.ftl @@ -1,7 +1,7 @@ output = Ausgabe input = Eingabe show-media-controls = Mediensteuerung im Panel anzeigen -sound-settings = Klang-Einstellungen... +sound-settings = Klang-Einstellungen ... disconnected = PulseAudio getrennt no-device = Kein Gerät ausgewählt unknown-artist = Unbekannt diff --git a/cosmic-applet-audio/i18n/en-GB/cosmic_applet_audio.ftl b/cosmic-applet-audio/i18n/en-GB/cosmic_applet_audio.ftl index e69de29b..cb19412d 100644 --- a/cosmic-applet-audio/i18n/en-GB/cosmic_applet_audio.ftl +++ b/cosmic-applet-audio/i18n/en-GB/cosmic_applet_audio.ftl @@ -0,0 +1,7 @@ +show-media-controls = Show media controls on panel +disconnected = PulseAudio Disconnected +no-device = No device selected +input = Input +output = Output +unknown-artist = Unknown +sound-settings = Sound Settings... diff --git a/cosmic-applet-audio/i18n/gl/cosmic_applet_audio.ftl b/cosmic-applet-audio/i18n/gl/cosmic_applet_audio.ftl new file mode 100644 index 00000000..c0a90f1e --- /dev/null +++ b/cosmic-applet-audio/i18n/gl/cosmic_applet_audio.ftl @@ -0,0 +1,7 @@ +output = Saída +input = Entrada +show-media-controls = Mostrar os controis multimedia no panel +sound-settings = Axustes do son... +disconnected = PulseAudio Desconectado +no-device = Ningún dipositivo seleccionado +unknown-artist = Descoñecido diff --git a/cosmic-applet-audio/i18n/it/cosmic_applet_audio.ftl b/cosmic-applet-audio/i18n/it/cosmic_applet_audio.ftl index f48e0ac2..46f61b33 100644 --- a/cosmic-applet-audio/i18n/it/cosmic_applet_audio.ftl +++ b/cosmic-applet-audio/i18n/it/cosmic_applet_audio.ftl @@ -4,4 +4,4 @@ show-media-controls = Mostra controlli multimediali nel pannello in alto sound-settings = Impostazioni audio... disconnected = PulseAudio Disconnesso no-device = Nessun dispositivo selezionato -unknown-artist = Sconosciuto \ No newline at end of file +unknown-artist = Sconosciuto diff --git a/cosmic-applet-audio/i18n/lt/cosmic_applet_audio.ftl b/cosmic-applet-audio/i18n/lt/cosmic_applet_audio.ftl index 4e96ec80..3152f388 100644 --- a/cosmic-applet-audio/i18n/lt/cosmic_applet_audio.ftl +++ b/cosmic-applet-audio/i18n/lt/cosmic_applet_audio.ftl @@ -4,4 +4,4 @@ no-device = Nepasirinktas įrenginys input = Įvestis output = Išvestis unknown-artist = Nežinomas atlikėjas -sound-settings = Garso Nustatymai... +sound-settings = Garso Nuostatos... diff --git a/cosmic-applet-audio/i18n/sat/cosmic_applet_audio.ftl b/cosmic-applet-audio/i18n/sat/cosmic_applet_audio.ftl new file mode 100644 index 00000000..b248256d --- /dev/null +++ b/cosmic-applet-audio/i18n/sat/cosmic_applet_audio.ftl @@ -0,0 +1 @@ +output = ᱟᱨᱡᱟᱣ diff --git a/cosmic-applet-audio/src/lib.rs b/cosmic-applet-audio/src/lib.rs index 7647100d..95a0e84c 100644 --- a/cosmic-applet-audio/src/lib.rs +++ b/cosmic-applet-audio/src/lib.rs @@ -33,10 +33,15 @@ use cosmic::{ }; use cosmic_settings_audio_client::{self as audio_client, CosmicAudioProxy}; use futures::SinkExt; -use iced::platform_specific::shell::wayland::commands::popup::{destroy_popup, get_popup}; use mpris_subscription::{MprisRequest, MprisUpdate}; use mpris2_zbus::player::PlaybackStatus; -use std::{cell::RefCell, rc::Rc, sync::Arc}; +use std::{ + sync::{ + Arc, + atomic::{self, AtomicU32}, + }, + time::Duration, +}; mod config; mod mpris_subscription; @@ -58,11 +63,15 @@ pub struct Audio { /// Track the applet's popup window. popup: Option, /// Varlink connection to `com.system76.CosmicSettings.Audio`. - audio_client: Option>>, + audio_client: Option, /// Known audio device state model: model::Model, /// Whether to expand the revealer of a source or sink device. is_open: IsOpen, + /// Used to debounce sink volume updates. + applied_sink_volume: Arc, + /// Used to deboune source volume updates. + applied_source_volume: Arc, /// Max slider volume for the sink device, as determined by the amplification property. max_sink_volume: u32, /// Max slider volume for the source device, as determined by the amplification property. @@ -140,26 +149,27 @@ enum IsOpen { pub enum Message { /// Connection to `com.system76.CosmicSettings`. Client(Arc), - Ignore, - SetSinkVolume(u32), - SetSourceVolume(u32), - ToggleSinkMute, - ToggleSourceMute, - SetDefaultSink(usize), - SetDefaultSource(usize), - OutputToggle, - InputToggle, - TogglePopup, CloseRequested(window::Id), - ToggleMediaControlsInTopPanel(bool), ConfigChanged(AudioAppletConfig), + Ignore, + InputToggle, Mpris(mpris_subscription::MprisUpdate), MprisRequest(MprisRequest), - Token(TokenUpdate), OpenSettings, + OutputToggle, + ReattachClient(Arc), + Rectangle(RectangleUpdate), + SetDefaultSink(usize), + SetDefaultSource(usize), + SetSinkVolume(u32), + SetSourceVolume(u32), Subscription(audio_client::Event), Surface(surface::Action), - Rectangle(RectangleUpdate), + ToggleMediaControlsInTopPanel(bool), + TogglePopup, + ToggleSinkMute, + ToggleSourceMute, + Token(TokenUpdate), } // TODO @@ -302,32 +312,45 @@ impl cosmic::Application for Audio { self.rectangle_tracker.replace(tracker); } }, + Message::ReattachClient(client) => { + if let Some(client) = Arc::into_inner(client) { + self.audio_client = Some(client); + } + } Message::Ignore => {} Message::TogglePopup => { if let Some(p) = self.popup.take() { - return destroy_popup(p); + return cosmic::surface::surface_task(cosmic::surface::action::destroy_popup( + p, + )); } else { - let new_id = window::Id::unique(); - self.popup.replace(new_id); + return cosmic::surface::surface_task(cosmic::surface::action::app_popup( + |_| Default::default(), + |app: &mut Self| { + let new_id = window::Id::unique(); + app.popup.replace(new_id); self.refresh_volume_limits(); - let mut popup_settings = self.core.applet.get_popup_settings( - self.core.main_window_id().unwrap(), - new_id, + let mut popup_settings = app.core.applet.get_popup_settings( + app.core.main_window_id().unwrap(), + new_id, + None, + None, + None, + ); + if let Some(r) = app.rectangle { + popup_settings.positioner.anchor_rect = Rectangle { + x: r.x as i32, + y: r.y as i32, + width: r.width as i32, + height: r.height as i32, + }; + } + popup_settings + }, None, - None, - None, - ); - if let Some(r) = self.rectangle { - popup_settings.positioner.anchor_rect = Rectangle { - x: r.x as i32, - y: r.y as i32, - width: r.width as i32, - height: r.height as i32, - }; - } - return get_popup(popup_settings); + )); } } @@ -355,7 +378,7 @@ impl cosmic::Application for Audio { && let Some(client) = self.audio_client.as_mut() { futures::executor::block_on(async { - _ = client.borrow_mut().conn.set_default(node_id, true).await; + _ = client.conn.set_default(node_id, true).await; }); } } @@ -366,7 +389,7 @@ impl cosmic::Application for Audio { && let Some(client) = self.audio_client.as_mut() { futures::executor::block_on(async { - _ = client.borrow_mut().conn.set_default(node_id, true).await; + _ = client.conn.set_default(node_id, true).await; }); } } @@ -374,7 +397,7 @@ impl cosmic::Application for Audio { Message::ToggleSinkMute => { if let Some(ref mut client) = self.audio_client { futures::executor::block_on(async { - _ = client.borrow_mut().conn.sink_mute_toggle().await; + _ = client.conn.sink_mute_toggle().await; }); } } @@ -382,27 +405,43 @@ impl cosmic::Application for Audio { Message::ToggleSourceMute => { if let Some(ref mut client) = self.audio_client { futures::executor::block_on(async { - _ = client.borrow_mut().conn.source_mute_toggle().await; + _ = client.conn.source_mute_toggle().await; }); } } Message::SetSinkVolume(volume) => { - if let Some(ref mut client) = self.audio_client { - self.model.active_sink.volume = volume; - self.model.active_sink.volume_text = volume.to_string(); - futures::executor::block_on(async { - _ = client.borrow_mut().conn.set_sink_volume(volume).await; + self.applied_sink_volume + .store(volume, atomic::Ordering::Relaxed); + self.model.active_sink.volume = volume; + self.model.active_sink.volume_text = volume.to_string(); + if let Some(mut client) = self.audio_client.take() { + let volume = Arc::clone(&self.applied_sink_volume); + return cosmic::Task::future(async move { + tokio::time::sleep(Duration::from_millis(128)).await; + _ = client + .conn + .set_sink_volume(volume.load(atomic::Ordering::Relaxed)) + .await; + Message::ReattachClient(Arc::new(client)).into() }); } } Message::SetSourceVolume(volume) => { - if let Some(ref mut client) = self.audio_client { - self.model.active_source.volume = volume; - self.model.active_source.volume_text = volume.to_string(); - futures::executor::block_on(async { - _ = client.borrow_mut().conn.set_source_volume(volume).await; + self.applied_source_volume + .store(volume, atomic::Ordering::Relaxed); + self.model.active_source.volume = volume; + self.model.active_source.volume_text = volume.to_string(); + if let Some(mut client) = self.audio_client.take() { + let volume = Arc::clone(&self.applied_source_volume); + return cosmic::Task::future(async move { + tokio::time::sleep(Duration::from_millis(128)).await; + _ = client + .conn + .set_sink_volume(volume.load(atomic::Ordering::Relaxed)) + .await; + Message::ReattachClient(Arc::new(client)).into() }); } } @@ -513,7 +552,7 @@ impl cosmic::Application for Audio { } Message::Client(client) => { if let Some(client) = Arc::into_inner(client) { - self.audio_client = Some(Rc::new(RefCell::new(client))); + self.audio_client = Some(client); self.model = model::Model::default(); } } diff --git a/cosmic-applet-battery/i18n/da/cosmic_applet_battery.ftl b/cosmic-applet-battery/i18n/da/cosmic_applet_battery.ftl index e69de29b..28cf327a 100644 --- a/cosmic-applet-battery/i18n/da/cosmic_applet_battery.ftl +++ b/cosmic-applet-battery/i18n/da/cosmic_applet_battery.ftl @@ -0,0 +1,14 @@ +power-settings = Strøm- og Batteriindstillinger... +hours = t +until-empty = indtil tom +battery-desc = Reduceret strømforbrug og ydeevne. +max-charge = Forøg dit batteris levetid, ved at angive en maksimal opladningsværdi på 80% +balanced = Balanceret +battery = Batteri +seconds = s +dgpu-running = Diskret GPU er aktiv og kan reducere batterilevetiden +performance = Høj Ydeevne +performance-desc = Høj ydeevne og strømforbrug. +minutes = m +balanced-desc = Standard ydeevne og batteriforbrug. +dgpu-applications = Applikationer som bruger { $gpu_name } diskret GPU diff --git a/cosmic-applet-battery/i18n/de/cosmic_applet_battery.ftl b/cosmic-applet-battery/i18n/de/cosmic_applet_battery.ftl index ec518e5f..283930e2 100644 --- a/cosmic-applet-battery/i18n/de/cosmic_applet_battery.ftl +++ b/cosmic-applet-battery/i18n/de/cosmic_applet_battery.ftl @@ -9,6 +9,6 @@ seconds = s minutes = m hours = h until-empty = bis leer -power-settings = Energie- und Akkueinstellungen... +power-settings = Energie- und Akkueinstellungen ... dgpu-running = Dedizierte GPU ist aktiv und kann die Akkulaufzeit reduzieren dgpu-applications = Anwendungen, welche die dedizierte GPU { $gpu_name } nutzen diff --git a/cosmic-applet-battery/i18n/en-GB/cosmic_applet_battery.ftl b/cosmic-applet-battery/i18n/en-GB/cosmic_applet_battery.ftl index e69de29b..11833e03 100644 --- a/cosmic-applet-battery/i18n/en-GB/cosmic_applet_battery.ftl +++ b/cosmic-applet-battery/i18n/en-GB/cosmic_applet_battery.ftl @@ -0,0 +1,14 @@ +power-settings = Power & Battery settings... +hours = h +until-empty = until empty +battery-desc = Reduced power usage and performance. +max-charge = Increase the lifespan of your battery by setting a maximum charge value of 80% +balanced = Balanced +battery = Battery +seconds = s +dgpu-running = Discrete GPU is active and can reduce battery life +performance = High Performance +performance-desc = High performance and power usage. +minutes = m +balanced-desc = Standard performance and battery usage. +dgpu-applications = Applications using { $gpu_name } discrete GPU diff --git a/cosmic-applet-battery/i18n/gl/cosmic_applet_battery.ftl b/cosmic-applet-battery/i18n/gl/cosmic_applet_battery.ftl new file mode 100644 index 00000000..0146556a --- /dev/null +++ b/cosmic-applet-battery/i18n/gl/cosmic_applet_battery.ftl @@ -0,0 +1,14 @@ +battery = Batería +battery-desc = Reduce o consumo de enerxía e o rendemento. +balanced = Balanceado +balanced-desc = Rendemento e consumo de batería estándar. +performance = Alto rendemento +performance-desc = Alto rendemento e maior consumo de enerxía. +max-charge = Aumenta a vida útil da batería limitando a carga máxima ao 80 % +seconds = s +minutes = m +hours = h +until-empty = ata baleirar +power-settings = Axustes de enexía e batería... +dgpu-running = A GPU dedicada está activa e pode reducir a duración da batería +dgpu-applications = Aplicacións que están a usar a GPU dedicada { $gpu_name } diff --git a/cosmic-applet-battery/i18n/it/cosmic_applet_battery.ftl b/cosmic-applet-battery/i18n/it/cosmic_applet_battery.ftl index 6f3bbd9c..375e29e0 100644 --- a/cosmic-applet-battery/i18n/it/cosmic_applet_battery.ftl +++ b/cosmic-applet-battery/i18n/it/cosmic_applet_battery.ftl @@ -1,14 +1,14 @@ -battery = Risparmio energetico -battery-desc = Consumi minimi, performance ridotta. -balanced = Bilanciato -balanced-desc = Consumi bilanciati, performance dinamica. -performance = Performance -performance-desc = Consumi alti, performance massima. -max-charge = Migliora la durata di vita della batteria caricandola fino all'80% +battery = Batteria +battery-desc = Prestazioni e consumo energetico ridotti. +balanced = Equilibrato +balanced-desc = Prestazioni e consumo energetico normali. +performance = Prestazioni elevate +performance-desc = Prestazioni elevate e consumo energetico. +max-charge = Aumenta la durata della batteria impostando un valore massimo di carica dell’80% seconds = s minutes = m hours = h -until-empty = fino alla scarica +until-empty = finché non è vuoto 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 } diff --git a/cosmic-applet-battery/i18n/kmr/cosmic_applet_battery.ftl b/cosmic-applet-battery/i18n/kmr/cosmic_applet_battery.ftl index 8c0d92d1..4f531fec 100644 --- a/cosmic-applet-battery/i18n/kmr/cosmic_applet_battery.ftl +++ b/cosmic-applet-battery/i18n/kmr/cosmic_applet_battery.ftl @@ -2,7 +2,7 @@ battery = Betarî seconds = ç minutes = x hours = d -until-empty = Heya vala dibe +until-empty = heya vala dibe power-settings = Sazkariyên hêz û betariyê... battery-desc = Bikaranîna hêzê kêmkirî û performans. balanced = Hevseng 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 e5a72d03..49565b54 100644 --- a/cosmic-applet-battery/i18n/pt-BR/cosmic_applet_battery.ftl +++ b/cosmic-applet-battery/i18n/pt-BR/cosmic_applet_battery.ftl @@ -1,14 +1,14 @@ -battery = Bateria +battery = Economia de energia battery-desc = Uso reduzido de energia e desempenho limitado. balanced = Balanceado balanced-desc = Desempenho padrão e uso de bateria moderado. -performance = Alto Desempenho +performance = Alto desempenho performance-desc = Máximo desempenho e alto uso de energia. max-charge = Aumente a vida útil da sua bateria definindo um valor máximo de carga de 80% seconds = s minutes = m hours = h -until-empty = até esvaziar +until-empty = até ficar descarregada power-settings = Configurações de energia e bateria... -dgpu-running = GPU discreta está ativa e pode reduzir a vida útil da bateria -dgpu-applications = Aplicativos usando GPU discreta { $gpu_name } +dgpu-running = A GPU dedicada está ativa e pode reduzir a vida útil da bateria +dgpu-applications = Aplicativos usando a GPU dedicada { $gpu_name } diff --git a/cosmic-applet-battery/i18n/sat/cosmic_applet_battery.ftl b/cosmic-applet-battery/i18n/sat/cosmic_applet_battery.ftl new file mode 100644 index 00000000..e69de29b diff --git a/cosmic-applet-battery/i18n/zh-TW/cosmic_applet_battery.ftl b/cosmic-applet-battery/i18n/zh-TW/cosmic_applet_battery.ftl index f5378e27..13f245e7 100644 --- a/cosmic-applet-battery/i18n/zh-TW/cosmic_applet_battery.ftl +++ b/cosmic-applet-battery/i18n/zh-TW/cosmic_applet_battery.ftl @@ -6,9 +6,9 @@ performance = 高效能 performance-desc = 高效能與高耗電量。 max-charge = 將電池充電上限設定為 80%,以延長電池使用壽命 seconds = 秒 -minutes = 分 -hours = 時 +minutes = 分鍾 +hours = 小時 until-empty = 直到電量耗盡 power-settings = 電源與電池設定… dgpu-running = 獨立顯示卡已啟用,可能會縮短電池續航力 -dgpu-applications = 使用 { $gpu_name } 獨立顯示卡的應用程式 +dgpu-applications = 使用獨立顯示卡 { $gpu_name } 的應用程式 diff --git a/cosmic-applet-battery/src/app.rs b/cosmic-applet-battery/src/app.rs index 22d9e6cc..a8936c42 100644 --- a/cosmic-applet-battery/src/app.rs +++ b/cosmic-applet-battery/src/app.rs @@ -366,23 +366,31 @@ impl cosmic::Application for CosmicBatteryApplet { let _ = tx.send(KeyboardBacklightRequest::Get); } - let new_id = window::Id::unique(); - self.popup.replace(new_id); - - let popup_settings = self.core.applet.get_popup_settings( - self.core.main_window_id().unwrap(), - new_id, - Some((1, 1)), - None, - None, - ); if let Some(tx) = self.power_profile_sender.as_ref() { let _ = tx.send(PowerProfileRequest::Get); } if let Some(tx) = self.update_trigger.as_ref() { let _ = tx.send(()); } - let mut tasks = vec![get_popup(popup_settings)]; + let mut tasks = vec![cosmic::surface::surface_task( + cosmic::surface::action::app_popup( + |_| Default::default(), + |app: &mut Self| { + let new_id = window::Id::unique(); + app.popup.replace(new_id); + + let popup_settings = app.core.applet.get_popup_settings( + app.core.main_window_id().unwrap(), + new_id, + Some((1, 1)), + None, + None, + ); + popup_settings + }, + None, + ), + )]; if let Some(tx) = &self.settings_daemon_sender { let _ = tx.send(settings_daemon::Request::GetDisplayBrightness); let _ = tx.send(settings_daemon::Request::GetMaxDisplayBrightness); diff --git a/cosmic-applet-bluetooth/i18n/da/cosmic_applet_bluetooth.ftl b/cosmic-applet-bluetooth/i18n/da/cosmic_applet_bluetooth.ftl index e69de29b..f95158bb 100644 --- a/cosmic-applet-bluetooth/i18n/da/cosmic_applet_bluetooth.ftl +++ b/cosmic-applet-bluetooth/i18n/da/cosmic_applet_bluetooth.ftl @@ -0,0 +1,12 @@ +cancel = Annuller +confirm-pin = Bekræft venligst, at følgende pinkode matcher den, der vises på { $deviceName } +bluetooth = Bluetooth +unsuccessful = Parring Mislykkedes +pairable = Parbare +try-again = Prøv Igen +check-device = Sørg for, at { $deviceName } er slået til, inden for rækkevidde og klar til parring. +other-devices = Andre Bluetooth-enheder +connected = Forbundet +confirm = Bekræft +settings = Bluetooth-indstillinger... +discoverable = Synlig diff --git a/cosmic-applet-bluetooth/i18n/de/cosmic_applet_bluetooth.ftl b/cosmic-applet-bluetooth/i18n/de/cosmic_applet_bluetooth.ftl index 1fa64ced..79e52b06 100644 --- a/cosmic-applet-bluetooth/i18n/de/cosmic_applet_bluetooth.ftl +++ b/cosmic-applet-bluetooth/i18n/de/cosmic_applet_bluetooth.ftl @@ -1,6 +1,6 @@ bluetooth = Bluetooth other-devices = Andere Bluetooth-Geräte -settings = Bluetooth-Einstellungen... +settings = Bluetooth-Einstellungen ... connected = Verbunden confirm-pin = Bitte bestätige, dass die folgende PIN mit der auf { $deviceName } angezeigten PIN übereinstimmt confirm = Bestätigen diff --git a/cosmic-applet-bluetooth/i18n/en-GB/cosmic_applet_bluetooth.ftl b/cosmic-applet-bluetooth/i18n/en-GB/cosmic_applet_bluetooth.ftl index e69de29b..9d6e5223 100644 --- a/cosmic-applet-bluetooth/i18n/en-GB/cosmic_applet_bluetooth.ftl +++ b/cosmic-applet-bluetooth/i18n/en-GB/cosmic_applet_bluetooth.ftl @@ -0,0 +1,12 @@ +cancel = Cancel +confirm-pin = Please confirm that the following PIN matches the one displayed on { $deviceName } +bluetooth = Bluetooth +unsuccessful = Pairing Unsuccessful +pairable = Pairable +try-again = Try Again +check-device = Make sure { $deviceName } is turned on, in range, and is ready to pair. +other-devices = Other Bluetooth devices +connected = Connected +confirm = Confirm +settings = Bluetooth settings... +discoverable = Discoverable diff --git a/cosmic-applet-bluetooth/i18n/fa/cosmic_applet_bluetooth.ftl b/cosmic-applet-bluetooth/i18n/fa/cosmic_applet_bluetooth.ftl index 01262e21..76ff0338 100644 --- a/cosmic-applet-bluetooth/i18n/fa/cosmic_applet_bluetooth.ftl +++ b/cosmic-applet-bluetooth/i18n/fa/cosmic_applet_bluetooth.ftl @@ -2,11 +2,11 @@ bluetooth = بلوتوث other-devices = سایر دستگاه‌های بلوتوث settings = تنظیمات بلوتوث... connected = متصل -confirm-pin = لطفاً تأیید کنید که پین زیر با پین نمایش داده شده در {$deviceName} یکسان است. +confirm-pin = لطفاً تأیید کنید که پین زیر با پین نمایش داده شده در { $deviceName } یکسان است. confirm = تأیید cancel = لغو unsuccessful = جفت‌سازی ناموفق بود -check-device = مطمئن شوید که {$deviceName} روشن، در محدوده و آماده جفت‌سازی است. +check-device = مطمئن شوید که { $deviceName } روشن، در محدوده و آماده جفت‌سازی است. try-again = تلاش دوباره discoverable = قابل شناسایی pairable = قابل جفت‌سازی diff --git a/cosmic-applet-bluetooth/i18n/gl/cosmic_applet_bluetooth.ftl b/cosmic-applet-bluetooth/i18n/gl/cosmic_applet_bluetooth.ftl new file mode 100644 index 00000000..c2424610 --- /dev/null +++ b/cosmic-applet-bluetooth/i18n/gl/cosmic_applet_bluetooth.ftl @@ -0,0 +1,12 @@ +cancel = Cancelar +bluetooth = Bluetooth +other-devices = Outros dispositivos Bluetooth +settings = Axustes Bluetooth… +connected = Conectado +confirm-pin = Por favor, confirme que o seguinte PIN coincide co que se mostra en{ $deviceName } +confirm = Confirmar +unsuccessful = Enparellamento non exitoso +check-device = Asegurate de que { $deviceName } está acendido, dentro do alcance e listo para emparellar. +try-again = Reintentar +discoverable = Atopable +pairable = Emparellable diff --git a/cosmic-applet-bluetooth/i18n/hi/cosmic_applet_bluetooth.ftl b/cosmic-applet-bluetooth/i18n/hi/cosmic_applet_bluetooth.ftl index ca46bd08..f568bb11 100644 --- a/cosmic-applet-bluetooth/i18n/hi/cosmic_applet_bluetooth.ftl +++ b/cosmic-applet-bluetooth/i18n/hi/cosmic_applet_bluetooth.ftl @@ -2,11 +2,11 @@ bluetooth = ब्लूटूथ other-devices = अन्य ब्लूटूथ उपकरण settings = ब्लूटूथ सेटिंग्स... connected = जुड़े हुए -confirm-pin = कृपया सुनिश्चित करें कि निम्नलिखित PIN {$deviceName} पर प्रदर्शित PIN से मेल खाता है +confirm-pin = कृपया सुनिश्चित करें कि निम्नलिखित PIN { $deviceName } पर प्रदर्शित PIN से मेल खाता है confirm = पुष्टि करें cancel = रद्द करें unsuccessful = पेयरिंग असफल -check-device = सुनिश्चित करें कि {$deviceName} चालू है, रेंज में है, और पेयर करने के लिए तैयार है। +check-device = सुनिश्चित करें कि { $deviceName } चालू है, रेंज में है, और पेयर करने के लिए तैयार है। try-again = फिर से प्रयास करें discoverable = खोजने योग्य pairable = पेयर करने योग्य diff --git a/cosmic-applet-bluetooth/i18n/it/cosmic_applet_bluetooth.ftl b/cosmic-applet-bluetooth/i18n/it/cosmic_applet_bluetooth.ftl index f1ac3a22..4e3d7233 100644 --- a/cosmic-applet-bluetooth/i18n/it/cosmic_applet_bluetooth.ftl +++ b/cosmic-applet-bluetooth/i18n/it/cosmic_applet_bluetooth.ftl @@ -2,11 +2,11 @@ bluetooth = Bluetooth other-devices = Altri dispositivi Bluetooth settings = Impostazioni Bluetooth... connected = Connesso -confirm-pin = Per favore conferma che il seguente PIN corrisponda a quello visualizzato nel dispositivo {$deviceName} +confirm-pin = Per favore conferma che il seguente PIN corrisponda a quello visualizzato nel dispositivo { $deviceName } confirm = Conferma cancel = Annulla unsuccessful = Accoppiamento fallito -check-device = Assicurati che il dispositivo {$deviceName} sia acceso, a portata e pronto per l'accoppiamento. +check-device = Assicurati che il dispositivo { $deviceName } sia acceso, a portata e pronto per l'accoppiamento. try-again = Riprova discoverable = Visibile -pairable = Accoppiabile \ No newline at end of file +pairable = Accoppiabile diff --git a/cosmic-applet-bluetooth/i18n/sat/cosmic_applet_bluetooth.ftl b/cosmic-applet-bluetooth/i18n/sat/cosmic_applet_bluetooth.ftl new file mode 100644 index 00000000..67f522ad --- /dev/null +++ b/cosmic-applet-bluetooth/i18n/sat/cosmic_applet_bluetooth.ftl @@ -0,0 +1 @@ +cancel = ᱵᱟᱹᱛᱤᱞ diff --git a/cosmic-applet-bluetooth/i18n/zh-TW/cosmic_applet_bluetooth.ftl b/cosmic-applet-bluetooth/i18n/zh-TW/cosmic_applet_bluetooth.ftl index fa1426a5..781a39ec 100644 --- a/cosmic-applet-bluetooth/i18n/zh-TW/cosmic_applet_bluetooth.ftl +++ b/cosmic-applet-bluetooth/i18n/zh-TW/cosmic_applet_bluetooth.ftl @@ -1,7 +1,7 @@ bluetooth = 藍牙 other-devices = 其他藍牙裝置 settings = 藍牙設定… -connected = 已經連線 +connected = 已連線 confirm-pin = 請確認此 PIN 碼與 { $deviceName } 上顯示的是否相符 confirm = 確認 cancel = 取消 diff --git a/cosmic-applet-bluetooth/src/app.rs b/cosmic-applet-bluetooth/src/app.rs index 484b8bf3..816c73c3 100644 --- a/cosmic-applet-bluetooth/src/app.rs +++ b/cosmic-applet-bluetooth/src/app.rs @@ -121,20 +121,25 @@ impl cosmic::Application for CosmicBluetoothApplet { } else { set_discovery(true); - // TODO request update of state maybe - let new_id = window::Id::unique(); - self.popup.replace(new_id); - - let popup_settings = self.core.applet.get_popup_settings( - self.core.main_window_id().unwrap(), - new_id, - None, - None, - None, - ); + let get_popup_task = + cosmic::surface::surface_task(cosmic::surface::action::app_popup( + |_| Default::default(), + move |app: &mut Self| { + let new_id = window::Id::unique(); + app.popup.replace(new_id); + app.core.applet.get_popup_settings( + app.core.main_window_id().unwrap(), + new_id, + None, + None, + None, + ) + }, + None, + )); return Task::batch([ - get_popup(popup_settings), + get_popup_task, cosmic::task::future(set_tick(Duration::from_secs(3))) .map(|()| cosmic::Action::App(Message::Ignore)), ]); diff --git a/cosmic-applet-input-sources/Cargo.toml b/cosmic-applet-input-sources/Cargo.toml index fdc1ea24..c8c49af5 100644 --- a/cosmic-applet-input-sources/Cargo.toml +++ b/cosmic-applet-input-sources/Cargo.toml @@ -5,7 +5,9 @@ edition = "2024" license = "GPL-3.0-only" [dependencies] +cctk.workspace = true cosmic-comp-config.workspace = true +futures.workspace = true i18n-embed-fl.workspace = true i18n-embed.workspace = true cosmic.workspace = true diff --git a/cosmic-applet-input-sources/data/com.system76.CosmicAppletInputSources.desktop b/cosmic-applet-input-sources/data/com.system76.CosmicAppletInputSources.desktop index ea0f667b..73aeccf0 100644 --- a/cosmic-applet-input-sources/data/com.system76.CosmicAppletInputSources.desktop +++ b/cosmic-applet-input-sources/data/com.system76.CosmicAppletInputSources.desktop @@ -12,4 +12,5 @@ NoDisplay=true X-CosmicApplet=true X-CosmicShrinkable=true X-CosmicHoverPopup=Auto +X-HostWaylandDisplay=true X-OverflowPriority=10 diff --git a/cosmic-applet-input-sources/i18n/ca/cosmic_applet_input_sources.ftl b/cosmic-applet-input-sources/i18n/ca/cosmic_applet_input_sources.ftl index e69de29b..12a2de28 100644 --- a/cosmic-applet-input-sources/i18n/ca/cosmic_applet_input_sources.ftl +++ b/cosmic-applet-input-sources/i18n/ca/cosmic_applet_input_sources.ftl @@ -0,0 +1,2 @@ +show-keyboard-layout = Mostra la disposició de teclat... +keyboard-settings = Configuració de teclat... diff --git a/cosmic-applet-input-sources/i18n/da/cosmic_applet_input_sources.ftl b/cosmic-applet-input-sources/i18n/da/cosmic_applet_input_sources.ftl index e69de29b..9759ea2a 100644 --- a/cosmic-applet-input-sources/i18n/da/cosmic_applet_input_sources.ftl +++ b/cosmic-applet-input-sources/i18n/da/cosmic_applet_input_sources.ftl @@ -0,0 +1,2 @@ +show-keyboard-layout = Vis Tastaturopsætning... +keyboard-settings = Tastaturindstillinger... diff --git a/cosmic-applet-input-sources/i18n/de/cosmic_applet_input_sources.ftl b/cosmic-applet-input-sources/i18n/de/cosmic_applet_input_sources.ftl index 6be93fc6..ddc457d7 100644 --- a/cosmic-applet-input-sources/i18n/de/cosmic_applet_input_sources.ftl +++ b/cosmic-applet-input-sources/i18n/de/cosmic_applet_input_sources.ftl @@ -1,2 +1,2 @@ -show-keyboard-layout = Tastaturbelegung anzeigen... -keyboard-settings = Tastatureinstellungen... +show-keyboard-layout = Tastaturbelegung anzeigen ... +keyboard-settings = Tastatureinstellungen ... diff --git a/cosmic-applet-input-sources/i18n/gl/cosmic_applet_input_sources.ftl b/cosmic-applet-input-sources/i18n/gl/cosmic_applet_input_sources.ftl new file mode 100644 index 00000000..85e8072c --- /dev/null +++ b/cosmic-applet-input-sources/i18n/gl/cosmic_applet_input_sources.ftl @@ -0,0 +1,2 @@ +show-keyboard-layout = Mostrar a disposición do teclado... +keyboard-settings = Axustes do teclado... diff --git a/cosmic-applet-input-sources/i18n/sat/cosmic_applet_input_sources.ftl b/cosmic-applet-input-sources/i18n/sat/cosmic_applet_input_sources.ftl new file mode 100644 index 00000000..e69de29b diff --git a/cosmic-applet-input-sources/src/lib.rs b/cosmic-applet-input-sources/src/lib.rs index 2c845de1..3109c888 100644 --- a/cosmic-applet-input-sources/src/lib.rs +++ b/cosmic-applet-input-sources/src/lib.rs @@ -3,19 +3,23 @@ mod localize; +use cctk::{ + cosmic_protocols::keyboard_layout::v1::client::zcosmic_keyboard_layout_v1::ZcosmicKeyboardLayoutV1, + wayland_client::{Connection, Proxy, backend::Backend}, +}; use cosmic::{ app, app::Core, applet::{self}, - cosmic_config::{self, ConfigSet, CosmicConfigEntry}, cosmic_theme::Spacing, iced::Subscription, + iced::core::window, iced::{ - Rectangle, Task, + self, Rectangle, Task, + event::wayland::{Event as WaylandEvent, OutputEvent}, platform_specific::shell::commands::popup::{destroy_popup, get_popup}, window::Id, }, - iced::core::window, prelude::*, surface, theme, widget::{ @@ -23,14 +27,35 @@ use cosmic::{ rectangle_tracker::{RectangleTracker, RectangleUpdate, rectangle_tracker_subscription}, }, }; -use cosmic_comp_config::CosmicCompConfig; -use std::sync::LazyLock; +use cosmic_comp_config::{CosmicCompConfig, XkbConfig}; +use std::{ + os::unix::{ + io::{FromRawFd, RawFd}, + net::UnixStream, + }, + sync::LazyLock, +}; use xkb_data::KeyboardLayout; +mod wayland; + static AUTOSIZE_MAIN_ID: LazyLock = LazyLock::new(|| widget::Id::new("autosize-main")); pub const ID: &str = "com.system76.CosmicAppletInputSources"; pub fn run() -> cosmic::iced::Result { + let socket = std::env::var("X_PRIVILEGED_WAYLAND_SOCKET") + .ok() + .and_then(|fd| { + fd.parse::() + .ok() + .map(|fd| unsafe { UnixStream::from_raw_fd(fd) }) + }); + let wayland_connection = if let Some(socket) = socket { + Some(Connection::from_socket(socket).unwrap()) + } else { + None + }; + localize::localize(); let layouts = match xkb_data::all_keyboard_layouts() { @@ -41,27 +66,8 @@ pub fn run() -> cosmic::iced::Result { } }; - let (comp_config_handler, comp_config) = - match cosmic_config::Config::new("com.system76.CosmicComp", CosmicCompConfig::VERSION) { - Ok(config_handler) => { - let config = match CosmicCompConfig::get_entry(&config_handler) { - Ok(ok) => ok, - Err((errs, config)) => { - tracing::error!("errors loading config: {:?}", errs); - config - } - }; - (Some(config_handler), config) - } - Err(err) => { - tracing::error!("failed to create config handler: {}", err); - (None, CosmicCompConfig::default()) - } - }; - cosmic::applet::run::(Flags { - comp_config, - comp_config_handler, + wayland_connection, layouts: layouts.layout_list.layout, }) } @@ -76,12 +82,13 @@ pub struct ActiveLayout { pub struct Window { core: Core, popup: Option, - comp_config: CosmicCompConfig, - comp_config_handler: Option, layouts: Vec, active_layouts: Vec, rectangle_tracker: Option>, rectangle: Rectangle, + wayland_connection: Option, + keyboard_layout: Option, + current_layout: usize, } #[derive(Clone, Debug)] @@ -93,12 +100,13 @@ pub enum Message { KeyboardSettings, Surface(surface::Action), Rectangle(RectangleUpdate), + WaylandConnection(Backend), + Wayland(wayland::Event), } #[derive(Debug)] pub struct Flags { - pub comp_config: CosmicCompConfig, - pub comp_config_handler: Option, + wayland_connection: Option, pub layouts: Vec, } @@ -119,14 +127,15 @@ impl cosmic::Application for Window { fn init(core: Core, flags: Self::Flags) -> (Self, app::Task) { let window = Window { - comp_config_handler: flags.comp_config_handler, layouts: flags.layouts, core, popup: None, - comp_config: flags.comp_config, active_layouts: Vec::new(), rectangle_tracker: None, rectangle: Rectangle::default(), + wayland_connection: flags.wayland_connection, + keyboard_layout: None, + current_layout: 0, }; (window, Task::none()) } @@ -139,19 +148,24 @@ impl cosmic::Application for Window { match message { Message::TogglePopup => { return if let Some(p) = self.popup.take() { - destroy_popup(p) + return crate::surface::surface_task(crate::surface::action::destroy_popup(p)); } else { - let new_id = Id::unique(); - self.popup.replace(new_id); - let popup_settings = self.core.applet.get_popup_settings( - self.core.main_window_id().unwrap(), - new_id, + return crate::surface::surface_task(crate::surface::action::app_popup( + |_| Default::default(), + |app: &mut Window| { + let new_id = Id::unique(); + app.popup.replace(new_id); + let popup_settings = app.core.applet.get_popup_settings( + app.core.main_window_id().unwrap(), + new_id, + None, + None, + None, + ); + popup_settings + }, None, - None, - None, - ); - - get_popup(popup_settings) + )); }; } Message::PopupClosed(id) => { @@ -160,8 +174,7 @@ impl cosmic::Application for Window { } } Message::CompConfig(config) => { - self.comp_config = *config; - self.active_layouts = self.update_xkb(); + self.active_layouts = self.update_xkb(&config.xkb_config); } Message::KeyboardSettings => { let mut cmd = std::process::Command::new("cosmic-settings"); @@ -169,31 +182,10 @@ impl cosmic::Application for Window { tokio::spawn(cosmic::process::spawn(cmd)); } Message::SetActiveLayout(pos) => { - if pos == 0 { - return Task::none(); - } - - self.active_layouts.swap(0, pos); - let mut new_layout = String::new(); - let mut new_variant = String::new(); - - for layout in &self.active_layouts { - new_layout.push_str(&layout.layout); - new_layout.push(','); - new_variant.push_str(&layout.variant); - new_variant.push(','); - } - - let _excess_comma = new_layout.pop(); - let _excess_comma = new_variant.pop(); - - self.comp_config.xkb_config.layout = new_layout; - self.comp_config.xkb_config.variant = new_variant; - if let Some(comp_config_handler) = &self.comp_config_handler { - if let Err(err) = - comp_config_handler.set("xkb_config", &self.comp_config.xkb_config) - { - tracing::error!("Failed to set config 'xkb_config' {err}"); + if let Some(keyboard_layout) = &self.keyboard_layout { + keyboard_layout.set_group(pos as u32); + if let Some(backend) = keyboard_layout.backend().upgrade() { + let _ = backend.flush(); } } } @@ -210,13 +202,26 @@ impl cosmic::Application for Window { self.rectangle_tracker = Some(tracker); } }, + Message::WaylandConnection(backend) => { + if self.wayland_connection.is_none() { + self.wayland_connection = Some(Connection::from_backend(backend)); + } + } + Message::Wayland(w) => match w { + wayland::Event::KeyboardLayout(keyboard_layout) => { + self.keyboard_layout = Some(keyboard_layout); + } + wayland::Event::Group(group) => { + self.current_layout = group as usize; + } + }, } Task::none() } fn view(&self) -> Element<'_, Self::Message> { - let applet_text = if let Some(l) = self.active_layouts.first() { + let applet_text = if let Some(l) = self.active_layouts.get(self.current_layout) { if !l.variant.is_empty() { format!("{} ({})", l.layout, l.variant) } else { @@ -249,8 +254,13 @@ impl cosmic::Application for Window { let mut content_list = widget::column::with_capacity(4 + self.active_layouts.len()).padding([8, 0]); for (id, layout) in self.active_layouts.iter().enumerate() { + let font = if id == self.current_layout { + cosmic::font::bold() + } else { + cosmic::font::default() + }; let group = widget::column::with_capacity(2) - .push(widget::text::body(layout.description.as_str())) + .push(widget::text::body(layout.description.as_str()).font(font)) .push(widget::text::caption(layout.layout.as_str())); content_list = content_list .push(applet::menu_button(group).on_press(Message::SetActiveLayout(id))); @@ -271,7 +281,7 @@ impl cosmic::Application for Window { } fn subscription(&self) -> Subscription { - Subscription::batch(vec![ + let mut subscriptions = vec![ rectangle_tracker_subscription(0).map(|e| Message::Rectangle(e.1)), self.core .watch_config("com.system76.CosmicComp") @@ -285,7 +295,23 @@ impl cosmic::Application for Window { } Message::CompConfig(Box::new(update.config)) }), - ]) + ]; + subscriptions.push(if let Some(connection) = &self.wayland_connection { + wayland::subscription(connection.clone()).map(Message::Wayland) + } else { + iced::event::listen_with(|evt, _, _| match evt { + iced::Event::PlatformSpecific(iced::event::PlatformSpecific::Wayland(evt)) => { + if let WaylandEvent::Output(OutputEvent::Created(_), output) = evt { + if let Some(backend) = output.backend().upgrade() { + return Some(Message::WaylandConnection(backend)); + } + } + None + } + _ => None, + }) + }); + Subscription::batch(subscriptions) } fn style(&self) -> Option { @@ -293,9 +319,8 @@ impl cosmic::Application for Window { } } impl Window { - fn update_xkb(&self) -> Vec { + fn update_xkb(&self, xkb: &XkbConfig) -> Vec { let mut active_layouts = Vec::new(); - let xkb = &self.comp_config.xkb_config; let layouts = xkb.layout.split_terminator(','); diff --git a/cosmic-applet-input-sources/src/wayland.rs b/cosmic-applet-input-sources/src/wayland.rs new file mode 100644 index 00000000..7bee2245 --- /dev/null +++ b/cosmic-applet-input-sources/src/wayland.rs @@ -0,0 +1,157 @@ +use cctk::{ + cosmic_protocols::keyboard_layout::v1::client::zcosmic_keyboard_layout_v1::ZcosmicKeyboardLayoutV1, + keyboard_layout::{KeyboardLayoutHandler, KeyboardLayoutState}, + sctk::{ + self, + registry::{ProvidesRegistryState, RegistryState}, + seat::{Capability, SeatHandler, SeatState}, + }, + wayland_client::{ + Connection, QueueHandle, delegate_noop, + globals::registry_queue_init, + protocol::{wl_keyboard, wl_seat}, + }, +}; +use cosmic::iced; +use futures::{SinkExt, channel::mpsc, executor::block_on}; +use std::{hash::Hash, thread}; + +#[derive(Clone, Debug)] +pub enum Event { + KeyboardLayout(ZcosmicKeyboardLayoutV1), + Group(usize), +} + +pub fn subscription(connection: Connection) -> iced::Subscription { + #[derive(Clone)] + struct WaylandSubscription(Connection); + impl Hash for WaylandSubscription { + fn hash(&self, state: &mut H) { + self.0.backend().display_id().hash(state); + } + } + iced::Subscription::run_with( + WaylandSubscription(connection), + |WaylandSubscription(connection)| { + let connection = connection.clone(); + iced::stream::channel(8, move |sender| async move { + thread::spawn(move || thread(connection, sender)); + }) + }, + ) +} + +struct Keyboard { + seat: wl_seat::WlSeat, + keyboard_layout: ZcosmicKeyboardLayoutV1, +} + +impl Drop for Keyboard { + fn drop(&mut self) { + self.keyboard_layout.destroy(); + } +} + +struct AppData { + seat_state: SeatState, + registry_state: RegistryState, + keyboard_layout_state: KeyboardLayoutState, + keyboard: Option, + sender: mpsc::Sender, +} + +impl KeyboardLayoutHandler for AppData { + fn group( + &mut self, + _conn: &Connection, + _qh: &QueueHandle, + _keyboard: &wl_keyboard::WlKeyboard, + _keyboard_layout: &ZcosmicKeyboardLayoutV1, + group: u32, + ) { + let _ = block_on(self.sender.send(Event::Group(group as usize))); + } +} + +impl ProvidesRegistryState for AppData { + fn registry(&mut self) -> &mut RegistryState { + &mut self.registry_state + } + + sctk::registry_handlers![SeatState,]; +} + +impl SeatHandler for AppData { + fn seat_state(&mut self) -> &mut SeatState { + &mut self.seat_state + } + + fn new_seat(&mut self, _: &Connection, _: &QueueHandle, _: wl_seat::WlSeat) {} + + fn new_capability( + &mut self, + _conn: &Connection, + qh: &QueueHandle, + seat: wl_seat::WlSeat, + capability: Capability, + ) { + if capability == Capability::Keyboard && self.keyboard.is_none() { + let keyboard = seat.get_keyboard(qh, ()); + let keyboard_layout = self + .keyboard_layout_state + .get_keyboard_layout(&keyboard, qh); + keyboard.release(); + + if let Some(keyboard_layout) = keyboard_layout { + let _ = block_on( + self.sender + .send(Event::KeyboardLayout(keyboard_layout.clone())), + ); + self.keyboard = Some(Keyboard { + seat, + keyboard_layout, + }); + } else { + keyboard.release(); + } + } + } + + fn remove_capability( + &mut self, + _conn: &Connection, + _: &QueueHandle, + seat: wl_seat::WlSeat, + _capability: Capability, + ) { + self.keyboard.take_if(|x| x.seat == seat); + } + + fn remove_seat(&mut self, _: &Connection, _: &QueueHandle, seat: wl_seat::WlSeat) { + self.keyboard.take_if(|x| x.seat == seat); + } +} + +fn thread(conn: Connection, sender: mpsc::Sender) { + let (globals, mut event_queue) = registry_queue_init(&conn).unwrap(); + let qh = event_queue.handle(); + let registry_state = RegistryState::new(&globals); + let seat_state = SeatState::new(&globals, &qh); + let keyboard_layout_state = KeyboardLayoutState::new(®istry_state, &qh); + + let mut app_data = AppData { + seat_state, + registry_state, + keyboard_layout_state, + keyboard: None, + sender, + }; + loop { + event_queue.blocking_dispatch(&mut app_data).unwrap(); + } +} + +sctk::delegate_registry!(AppData); +sctk::delegate_seat!(AppData); +cctk::delegate_keyboard_layout!(AppData); +delegate_noop!(AppData: ignore wl_keyboard::WlKeyboard); diff --git a/cosmic-applet-minimize/src/lib.rs b/cosmic-applet-minimize/src/lib.rs index 307762b5..089cc67e 100644 --- a/cosmic-applet-minimize/src/lib.rs +++ b/cosmic-applet-minimize/src/lib.rs @@ -248,40 +248,48 @@ impl cosmic::Application for Minimize { } Message::OpenOverflowPopup => { if let Some(id) = self.overflow_popup.take() { - return destroy_popup(id); + return cosmic::surface::surface_task(cosmic::surface::action::destroy_popup( + id, + )); } else { - let new_id = window::Id::unique(); - let pos = self.max_icon_count().unwrap_or_default(); + return cosmic::surface::surface_task(cosmic::surface::action::app_popup( + |_| Default::default(), + |app: &mut Self| { + let new_id = window::Id::unique(); + let pos = app.max_icon_count().unwrap_or_default(); - self.overflow_popup = Some(new_id); - let icon_size = self.core.applet.suggested_size(true).0 as u32 - + 2 * self.core.applet.suggested_padding(true).1 as u32; - let spacing = self.core.system_theme().cosmic().space_xxs() as u32; - let major_axis_len = (icon_size + spacing) * (pos.saturating_sub(1) as u32); - let rectangle = match self.core.applet.anchor { - PanelAnchor::Top | PanelAnchor::Bottom => iced::Rectangle { - x: major_axis_len as i32, - y: 0, - width: icon_size as i32, - height: icon_size as i32, + app.overflow_popup = Some(new_id); + let icon_size = app.core.applet.suggested_size(true).0 as u32 + + 2 * app.core.applet.suggested_padding(true).1 as u32; + let spacing = app.core.system_theme().cosmic().space_xxs() as u32; + let major_axis_len = + (icon_size + spacing) * (pos.saturating_sub(1) as u32); + let rectangle = match app.core.applet.anchor { + PanelAnchor::Top | PanelAnchor::Bottom => iced::Rectangle { + x: major_axis_len as i32, + y: 0, + width: icon_size as i32, + height: icon_size as i32, + }, + PanelAnchor::Left | PanelAnchor::Right => iced::Rectangle { + x: 0, + y: major_axis_len as i32, + width: icon_size as i32, + height: icon_size as i32, + }, + }; + let mut popup_settings = app.core.applet.get_popup_settings( + app.core.main_window_id().unwrap(), + new_id, + None, + None, + None, + ); + popup_settings.positioner.anchor_rect = rectangle; + popup_settings }, - PanelAnchor::Left | PanelAnchor::Right => iced::Rectangle { - x: 0, - y: major_axis_len as i32, - width: icon_size as i32, - height: icon_size as i32, - }, - }; - let mut popup_settings = self.core.applet.get_popup_settings( - self.core.main_window_id().unwrap(), - new_id, None, - None, - None, - ); - popup_settings.positioner.anchor_rect = rectangle; - - return get_popup(popup_settings); + )); } } Message::CloseOverflowPopup => todo!(), diff --git a/cosmic-applet-network/i18n/da/cosmic_applet_network.ftl b/cosmic-applet-network/i18n/da/cosmic_applet_network.ftl index e69de29b..23aecd3d 100644 --- a/cosmic-applet-network/i18n/da/cosmic_applet_network.ftl +++ b/cosmic-applet-network/i18n/da/cosmic_applet_network.ftl @@ -0,0 +1,6 @@ +cancel = Annuller +connected = Forbundet +connect = Opret forbindelse +wifi = Wi-Fi +identity = Identitet +network = Netværk diff --git a/cosmic-applet-network/i18n/de/cosmic_applet_network.ftl b/cosmic-applet-network/i18n/de/cosmic_applet_network.ftl index 0a913c0b..fe267462 100644 --- a/cosmic-applet-network/i18n/de/cosmic_applet_network.ftl +++ b/cosmic-applet-network/i18n/de/cosmic_applet_network.ftl @@ -12,7 +12,7 @@ connected = Verbunden connecting = Wird verbunden connect = Verbinden cancel = Abbrechen -settings = Netzwerkeinstellungen... +settings = Netzwerkeinstellungen ... visible-wireless-networks = Sichtbare Drahtlosnetzwerke enter-password = Gib das Passwort oder den Verschlüsselungsschlüssel ein router-wps-button = Du kannst dich auch verbinden, indem du die Taste „WPS” am Router drückst diff --git a/cosmic-applet-network/i18n/en-GB/cosmic_applet_network.ftl b/cosmic-applet-network/i18n/en-GB/cosmic_applet_network.ftl index e69de29b..72b1d8d4 100644 --- a/cosmic-applet-network/i18n/en-GB/cosmic_applet_network.ftl +++ b/cosmic-applet-network/i18n/en-GB/cosmic_applet_network.ftl @@ -0,0 +1,2 @@ +cancel = Cancel +connected = Connected diff --git a/cosmic-applet-network/i18n/fr/cosmic_applet_network.ftl b/cosmic-applet-network/i18n/fr/cosmic_applet_network.ftl index f2c0025d..427f8e96 100644 --- a/cosmic-applet-network/i18n/fr/cosmic_applet_network.ftl +++ b/cosmic-applet-network/i18n/fr/cosmic_applet_network.ftl @@ -9,7 +9,7 @@ mac = MAC megabits-per-second = Mbps connected = Connecté connecting = Connexion -connect = Connecter +connect = Se connecter cancel = Annuler settings = Paramètres réseaux... visible-wireless-networks = Réseaux Wi-Fi disponibles diff --git a/cosmic-applet-network/i18n/gl/cosmic_applet_network.ftl b/cosmic-applet-network/i18n/gl/cosmic_applet_network.ftl new file mode 100644 index 00000000..33d76626 --- /dev/null +++ b/cosmic-applet-network/i18n/gl/cosmic_applet_network.ftl @@ -0,0 +1,24 @@ +cancel = Cancelar +connected = Conectado +connect = Conectar +identity = Identidade +wifi = Wi-Fi +network = Rede +airplane-mode = Modo avión +airplane-mode-on = O modo avión está activo +turn-off-airplane-mode = Desactívao para activar a wifi, o Bluetooth e a banda larga móbil. +ipv4 = Dirección IPv4 +ipv6 = Dirección IPv6 +mac = MAC +megabits-per-second = Mbps +gigabits-per-second = Gbps +terabits-per-second = Tbps +connecting = Conectando +settings = Axustes da rede... +visible-wireless-networks = Redes sen fíos visibles +vpn-connections = Conexións VPN +enter-password = Introduce o contrasinal ou a chave de cifrado +router-wps-button = Tamén podes conectarte premendo o botón "WPS" do router +unable-to-connect = Non se puido conectar á rede +check-wifi-connection = Asegúrate de que a wifi está conectada a Internet e de que o contrasinal é correcto +reset = Restablecer diff --git a/cosmic-applet-network/i18n/sat/cosmic_applet_network.ftl b/cosmic-applet-network/i18n/sat/cosmic_applet_network.ftl new file mode 100644 index 00000000..67f522ad --- /dev/null +++ b/cosmic-applet-network/i18n/sat/cosmic_applet_network.ftl @@ -0,0 +1 @@ +cancel = ᱵᱟᱹᱛᱤᱞ diff --git a/cosmic-applet-network/i18n/zh-TW/cosmic_applet_network.ftl b/cosmic-applet-network/i18n/zh-TW/cosmic_applet_network.ftl index 23234d4d..fb7946e6 100644 --- a/cosmic-applet-network/i18n/zh-TW/cosmic_applet_network.ftl +++ b/cosmic-applet-network/i18n/zh-TW/cosmic_applet_network.ftl @@ -8,7 +8,7 @@ ipv4 = IPv4 位址 ipv6 = IPv6 位址 mac = MAC megabits-per-second = Mbps -connected = 已經連線 +connected = 已連線 connecting = 連線中 connect = 連線 cancel = 取消 diff --git a/cosmic-applet-notifications/i18n/de/cosmic_applet_notifications.ftl b/cosmic-applet-notifications/i18n/de/cosmic_applet_notifications.ftl index 6f103ed6..e40af6aa 100644 --- a/cosmic-applet-notifications/i18n/de/cosmic_applet_notifications.ftl +++ b/cosmic-applet-notifications/i18n/de/cosmic_applet_notifications.ftl @@ -15,5 +15,5 @@ show-more = { $more } weitere anzeigen clear-group = Gruppe leeren clear-all = Alle Benachrichtigungen leeren do-not-disturb = Nicht stören -notification-settings = Benachrichtigungseinstellungen... +notification-settings = Benachrichtigungseinstellungen ... no-notifications = Keine Benachrichtigungen diff --git a/cosmic-applet-notifications/i18n/gl/cosmic_applet_notifications.ftl b/cosmic-applet-notifications/i18n/gl/cosmic_applet_notifications.ftl new file mode 100644 index 00000000..411d92c1 --- /dev/null +++ b/cosmic-applet-notifications/i18n/gl/cosmic_applet_notifications.ftl @@ -0,0 +1,19 @@ +hours-ago = + { $duration -> + [0] Xusto agora + [one] Hai 1 hora + *[other] Hai { $duration } horas + } +minutes-ago = + { $duration -> + [0] Xusto agora + [one] Hai 1 minuto + *[other] Hai { $duration } minutos + } +show-less = Mostrar menos +show-more = Mostrar { $more } máis +clear-group = Limpar grupo +clear-all = Limpar todas as notificacións +do-not-disturb = Non Molestar +notification-settings = Configuración das notificacións... +no-notifications = Sen notificacións diff --git a/cosmic-applet-notifications/i18n/sat/cosmic_applet_notifications.ftl b/cosmic-applet-notifications/i18n/sat/cosmic_applet_notifications.ftl new file mode 100644 index 00000000..e69de29b diff --git a/cosmic-applet-notifications/src/lib.rs b/cosmic-applet-notifications/src/lib.rs index 438696b9..720f8d63 100644 --- a/cosmic-applet-notifications/src/lib.rs +++ b/cosmic-applet-notifications/src/lib.rs @@ -157,18 +157,23 @@ impl cosmic::Application for Notifications { if let Some(p) = self.popup.take() { return destroy_popup(p); } else { - let new_id = window::Id::unique(); - self.popup.replace(new_id); + return cosmic::surface::surface_task(cosmic::surface::action::app_popup( + |_| Default::default(), + |app: &mut Self| { + let new_id = window::Id::unique(); + app.popup.replace(new_id); - let popup_settings = self.core.applet.get_popup_settings( - self.core.main_window_id().unwrap(), - new_id, + let popup_settings = app.core.applet.get_popup_settings( + app.core.main_window_id().unwrap(), + new_id, + None, + None, + None, + ); + popup_settings + }, None, - None, - None, - ); - - return get_popup(popup_settings); + )); } } Message::DoNotDisturb(b) => { diff --git a/cosmic-applet-power/i18n/ca/cosmic_applet_power.ftl b/cosmic-applet-power/i18n/ca/cosmic_applet_power.ftl index c1084630..8fcd19ec 100644 --- a/cosmic-applet-power/i18n/ca/cosmic_applet_power.ftl +++ b/cosmic-applet-power/i18n/ca/cosmic_applet_power.ftl @@ -2,3 +2,35 @@ cancel = Cancel·lar confirm = Confirmar restart = Reinicia suspend = Suspèn +confirm-button = + { $action -> + [restart] { restart } + [suspend] { suspend } + [shutdown] Apaga + [log-out] { log-out } + *[other] { confirm } + } +power = Energia +confirm-body = + { $action -> + [restart] L'ordinador es reiniciarà + [suspend] L'ordinador se suspendrà + [shutdown] L'ordinador s'apagarà + [lock-screen] La pantalla es bloquejarà + [log-out] La sessió es tancarà + *[other] L'acció seleccionada es durà a terme + } automàticament d'aquí a { $countdown } segons. +lock-screen = Bloqueja la pantalla +shutdown = Apaga +log-out = Tanca la sessió +log-out-shortcut = Súper + Majús + Esc +settings = Configuració... +lock-screen-shortcut = Súper + Esc +confirm-title = + ¿{ $action -> + [restart] { restart } + [suspend] { suspend } + [shutdown] { shutdown } + [log-out] Voleu tancar totes les aplicacions i tancar la sessió + *[other] Voleu dur a terme l'acció seleccionada + }? diff --git a/cosmic-applet-power/i18n/de/cosmic_applet_power.ftl b/cosmic-applet-power/i18n/de/cosmic_applet_power.ftl index 652e2f9b..f630d8e4 100644 --- a/cosmic-applet-power/i18n/de/cosmic_applet_power.ftl +++ b/cosmic-applet-power/i18n/de/cosmic_applet_power.ftl @@ -1,5 +1,5 @@ power = Energie -settings = Einstellungen... +settings = Einstellungen ... lock-screen = Sperrbildschirm lock-screen-shortcut = Super + Esc log-out = Abmelden diff --git a/cosmic-applet-power/i18n/gl/cosmic_applet_power.ftl b/cosmic-applet-power/i18n/gl/cosmic_applet_power.ftl new file mode 100644 index 00000000..50aff75b --- /dev/null +++ b/cosmic-applet-power/i18n/gl/cosmic_applet_power.ftl @@ -0,0 +1,36 @@ +power = Enerxía +settings = Axustes... +lock-screen = Pantalla de Bloqueo +lock-screen-shortcut = Super + Esc +log-out = Pechar Sesión +log-out-shortcut = Super + Maiús + Esc +suspend = Suspender +restart = Reiniciar +shutdown = Apagar +confirm = Confirmar +cancel = Cancelar +confirm-button = + { $action -> + [restart] { restart } + [suspend] { suspend } + [shutdown] Apagar + [log-out] { log-out } + *[other] { confirm } + } +confirm-title = + { $action -> + [restart] { restart } agora? + [suspend] { suspend } agora? + [shutdown] { shutdown } agora? + [log-out] Pechar todas as aplicacións e pechar a sesión agora? + *[other] Aplicar a acción seleccionada agora + } +confirm-body = + O sistema { $action -> + [restart] reiniciarase + [suspend] suspenderase + [shutdown] apagarase + [lock-screen] bloqueará a pantalla + [log-out] pechará a sesión + *[other] aplicará a acción seleccionada + } automaticamente en { $countdown } segundos. diff --git a/cosmic-applet-power/i18n/sat/cosmic_applet_power.ftl b/cosmic-applet-power/i18n/sat/cosmic_applet_power.ftl new file mode 100644 index 00000000..e69de29b diff --git a/cosmic-applet-power/src/lib.rs b/cosmic-applet-power/src/lib.rs index 4a5829df..aa07ff3b 100644 --- a/cosmic-applet-power/src/lib.rs +++ b/cosmic-applet-power/src/lib.rs @@ -115,20 +115,27 @@ impl cosmic::Application for Power { match message { Message::TogglePopup => { if let Some(p) = self.popup.take() { - return destroy_popup(p); + return cosmic::surface::surface_task(cosmic::surface::action::destroy_popup( + p, + )); } else { - let new_id = window::Id::unique(); - self.popup.replace(new_id); + return cosmic::surface::surface_task(cosmic::surface::action::app_popup( + |_| Default::default(), + |app: &mut Power| { + let new_id = window::Id::unique(); + app.popup.replace(new_id); - let popup_settings = self.core.applet.get_popup_settings( - self.core.main_window_id().unwrap(), - new_id, + let popup_settings = app.core.applet.get_popup_settings( + app.core.main_window_id().unwrap(), + new_id, + None, + None, + None, + ); + popup_settings + }, None, - None, - None, - ); - - return get_popup(popup_settings); + )); } } Message::OpenSettings => { diff --git a/cosmic-applet-status-area/src/components/app.rs b/cosmic-applet-status-area/src/components/app.rs index 7bedc653..d98cc117 100644 --- a/cosmic-applet-status-area/src/components/app.rs +++ b/cosmic-applet-status-area/src/components/app.rs @@ -246,38 +246,49 @@ impl cosmic::Application for App { if let Some(popup_id) = self.popup.take() { cmds.push(destroy_popup(popup_id)); } - let popup_id = self.next_popup_id(); - let i = self.menus.keys().position(|&i| i == id).unwrap(); - let (i, parent) = self - .overflow_index() - .and_then(|overflow_i| { - if overflow_i <= i { - Some(i - overflow_i).zip(self.overflow_popup) - } else { - Some((i, self.core.main_window_id().unwrap())) - } - }) - .unwrap_or((i, self.core.main_window_id().unwrap())); - let mut popup_settings = self - .core - .applet - .get_popup_settings(parent, popup_id, None, None, None); - self.popup = Some(popup_id); + let popup_task = + cosmic::surface::surface_task(cosmic::surface::action::app_popup( + |_| Default::default(), + move |app: &mut Self| { + let popup_id = app.next_popup_id(); + let i = app.menus.keys().position(|&i| i == id).unwrap(); + let (i, parent) = app + .overflow_index() + .and_then(|overflow_i| { + if overflow_i <= i { + Some(i - overflow_i).zip(app.overflow_popup) + } else { + Some((i, app.core.main_window_id().unwrap())) + } + }) + .unwrap_or((i, app.core.main_window_id().unwrap())); - if matches!( - self.core.applet.anchor, - PanelAnchor::Left | PanelAnchor::Right - ) { - let suggested_size = self.core.applet.suggested_size(false).1 - + 2 * self.core.applet.suggested_padding(false).1; - popup_settings.positioner.anchor_rect.y = i as i32 * suggested_size as i32; - } else { - let suggested_size = self.core.applet.suggested_size(false).0 - + 2 * self.core.applet.suggested_padding(false).1; - popup_settings.positioner.anchor_rect.x = i as i32 * suggested_size as i32; - } - cmds.push(get_popup(popup_settings)); + let mut popup_settings = app + .core + .applet + .get_popup_settings(parent, popup_id, None, None, None); + app.popup = Some(popup_id); + + if matches!( + app.core.applet.anchor, + PanelAnchor::Left | PanelAnchor::Right + ) { + let suggested_size = app.core.applet.suggested_size(false).1 + + 2 * app.core.applet.suggested_padding(false).1; + popup_settings.positioner.anchor_rect.y = + i as i32 * suggested_size as i32; + } else { + let suggested_size = app.core.applet.suggested_size(false).0 + + 2 * app.core.applet.suggested_padding(false).1; + popup_settings.positioner.anchor_rect.x = + i as i32 * suggested_size as i32; + } + popup_settings + }, + None, + )); + cmds.push(popup_task); return app::Task::batch(cmds); } else if let Some(popup_id) = self.popup { self.menus[&id].closed(); @@ -339,39 +350,49 @@ impl cosmic::Application for App { } else { return Task::none(); } - let popup_id = self.next_popup_id(); - let i = self.menus.keys().position(|&i| i == id).unwrap(); + let popup_task = cosmic::surface::surface_task(cosmic::surface::action::app_popup( + |_| Default::default(), + move |app: &mut Self| { + let popup_id = app.next_popup_id(); + let i = app.menus.keys().position(|&i| i == id).unwrap(); - let (i, parent) = self - .overflow_index() - .and_then(|overflow_i| { - if overflow_i <= i { - Some(i - overflow_i).zip(self.overflow_popup) + let (i, parent) = app + .overflow_index() + .and_then(|overflow_i| { + if overflow_i <= i { + Some(i - overflow_i).zip(app.overflow_popup) + } else { + Some((i, app.core.main_window_id().unwrap())) + } + }) + .unwrap_or((i, app.core.main_window_id().unwrap())); + + let mut popup_settings = app + .core + .applet + .get_popup_settings(parent, popup_id, None, None, None); + app.popup = Some(popup_id); + + if matches!( + app.core.applet.anchor, + PanelAnchor::Left | PanelAnchor::Right + ) { + let suggested_size = app.core.applet.suggested_size(true).1 + + 2 * app.core.applet.suggested_padding(true).1; + popup_settings.positioner.anchor_rect.y = + i as i32 * suggested_size as i32; } else { - Some((i, self.core.main_window_id().unwrap())) + let suggested_size = app.core.applet.suggested_size(true).0 + + 2 * app.core.applet.suggested_padding(true).0; + popup_settings.positioner.anchor_rect.x = + i as i32 * suggested_size as i32; } - }) - .unwrap_or((i, self.core.main_window_id().unwrap())); + popup_settings + }, + None, + )); + cmds.push(popup_task); - let mut popup_settings = self - .core - .applet - .get_popup_settings(parent, popup_id, None, None, None); - self.popup = Some(popup_id); - - if matches!( - self.core.applet.anchor, - PanelAnchor::Left | PanelAnchor::Right - ) { - let suggested_size = self.core.applet.suggested_size(true).1 - + 2 * self.core.applet.suggested_padding(true).1; - popup_settings.positioner.anchor_rect.y = i as i32 * suggested_size as i32; - } else { - let suggested_size = self.core.applet.suggested_size(true).0 - + 2 * self.core.applet.suggested_padding(true).0; - popup_settings.positioner.anchor_rect.x = i as i32 * suggested_size as i32; - } - cmds.push(get_popup(popup_settings)); Task::batch(cmds) } Msg::WheelScrolled(delta) => { @@ -399,33 +420,41 @@ impl cosmic::Application for App { return destroy_popup(popup_id); } else if let Some(overflow_index) = self.overflow_index() { // If we don't have an overflow, create it - let popup_id = self.next_popup_id(); - let mut popup_settings = self.core.applet.get_popup_settings( - self.core.main_window_id().unwrap(), - popup_id, - None, - None, - None, - ); - popup_settings.close_with_children = false; + let popup_task = + cosmic::surface::surface_task(cosmic::surface::action::app_popup( + |_| Default::default(), + move |app: &mut Self| { + let popup_id = app.next_popup_id(); + let mut popup_settings = app.core.applet.get_popup_settings( + app.core.main_window_id().unwrap(), + popup_id, + None, + None, + None, + ); + popup_settings.close_with_children = false; - if matches!( - self.core.applet.anchor, - PanelAnchor::Left | PanelAnchor::Right - ) { - let suggested_size = self.core.applet.suggested_size(true).1 - + 2 * self.core.applet.suggested_padding(true).1; - popup_settings.positioner.anchor_rect.y = - overflow_index as i32 * suggested_size as i32; - } else { - let suggested_size = self.core.applet.suggested_size(true).0 - + 2 * self.core.applet.suggested_padding(true).0; - popup_settings.positioner.anchor_rect.x = - overflow_index as i32 * suggested_size as i32; - } + if matches!( + app.core.applet.anchor, + PanelAnchor::Left | PanelAnchor::Right + ) { + let suggested_size = app.core.applet.suggested_size(true).1 + + 2 * app.core.applet.suggested_padding(true).1; + popup_settings.positioner.anchor_rect.y = + overflow_index as i32 * suggested_size as i32; + } else { + let suggested_size = app.core.applet.suggested_size(true).0 + + 2 * app.core.applet.suggested_padding(true).0; + popup_settings.positioner.anchor_rect.x = + overflow_index as i32 * suggested_size as i32; + } - self.overflow_popup = Some(popup_id); - return get_popup(popup_settings); + app.overflow_popup = Some(popup_id); + popup_settings + }, + None, + )); + return popup_task; } else { return Task::none(); } @@ -444,34 +473,41 @@ impl cosmic::Application for App { } else { return Task::none(); } - - let popup_id = self.next_popup_id(); - let mut popup_settings = self.core.applet.get_popup_settings( - self.core.main_window_id().unwrap(), - popup_id, - None, - None, - None, - ); - self.popup = Some(popup_id); - let Some(i) = self.overflow_index() else { return Task::batch(cmds); }; + let popup_task = cosmic::surface::surface_task(cosmic::surface::action::app_popup( + |_| Default::default(), + move |app: &mut Self| { + let popup_id = app.next_popup_id(); + let mut popup_settings = app.core.applet.get_popup_settings( + app.core.main_window_id().unwrap(), + popup_id, + None, + None, + None, + ); + app.popup = Some(popup_id); - if matches!( - self.core.applet.anchor, - PanelAnchor::Left | PanelAnchor::Right - ) { - let suggested_size = self.core.applet.suggested_size(false).1 - + 2 * self.core.applet.suggested_padding(false).1; - popup_settings.positioner.anchor_rect.y = i as i32 * suggested_size as i32; - } else { - let suggested_size = self.core.applet.suggested_size(false).0 - + 2 * self.core.applet.suggested_padding(false).1; - popup_settings.positioner.anchor_rect.x = i as i32 * suggested_size as i32; - } - cmds.push(get_popup(popup_settings)); + if matches!( + app.core.applet.anchor, + PanelAnchor::Left | PanelAnchor::Right + ) { + let suggested_size = app.core.applet.suggested_size(false).1 + + 2 * app.core.applet.suggested_padding(false).1; + popup_settings.positioner.anchor_rect.y = + i as i32 * suggested_size as i32; + } else { + let suggested_size = app.core.applet.suggested_size(false).0 + + 2 * app.core.applet.suggested_padding(false).1; + popup_settings.positioner.anchor_rect.x = + i as i32 * suggested_size as i32; + } + popup_settings + }, + None, + )); + cmds.push(popup_task); Task::batch(cmds) } } @@ -656,7 +692,7 @@ fn menu_icon_button<'a>( .class(if symbolic { cosmic::theme::Svg::Custom(std::rc::Rc::new(|theme| { cosmic::iced::widget::svg::Style { - color: Some(theme.cosmic().background(false).on.into()), + color: Some(theme.cosmic().background(theme.transparent).on.into()), } })) } else { diff --git a/cosmic-applet-status-area/src/components/status_menu.rs b/cosmic-applet-status-area/src/components/status_menu.rs index e706f37b..a228d745 100644 --- a/cosmic-applet-status-area/src/components/status_menu.rs +++ b/cosmic-applet-status-area/src/components/status_menu.rs @@ -232,7 +232,11 @@ fn layout_view(layout: &Layout, expanded: Option) -> cosmic::Element<'_, Ms } if let Some(icon_data) = i.icon_data() { let handle = iced::widget::image::Handle::from_bytes(icon_data.to_vec()); - children.insert(0, iced::widget::Image::new(handle).into()); + let icon = iced::widget::Image::new(handle) + .width(iced::Length::Fixed(14.0)) + .height(iced::Length::Fixed(14.0)) + .content_fit(iced::core::ContentFit::Contain); + children.insert(0, icon.into()); } else if let Some(icon_name) = i.icon_name() { let icon = cosmic::widget::icon::from_name(icon_name) .size(14) diff --git a/cosmic-applet-tiling/i18n/ca/cosmic_applet_tiling.ftl b/cosmic-applet-tiling/i18n/ca/cosmic_applet_tiling.ftl index e69de29b..4160088d 100644 --- a/cosmic-applet-tiling/i18n/ca/cosmic_applet_tiling.ftl +++ b/cosmic-applet-tiling/i18n/ca/cosmic_applet_tiling.ftl @@ -0,0 +1,2 @@ +tile-windows = Organitza les finestres en mosaic automàticament +shortcuts = Dreceres diff --git a/cosmic-applet-tiling/i18n/de/cosmic_applet_tiling.ftl b/cosmic-applet-tiling/i18n/de/cosmic_applet_tiling.ftl index 2f41f75e..4e367370 100644 --- a/cosmic-applet-tiling/i18n/de/cosmic_applet_tiling.ftl +++ b/cosmic-applet-tiling/i18n/de/cosmic_applet_tiling.ftl @@ -4,11 +4,11 @@ shortcuts = Tastenkombinationen navigate-windows = Fenster navigieren move-window = Fenster verschieben toggle-floating-window = Schwebendes Fenster umschalten -view-all-shortcuts = Alle Tastenkombinationen ansehen... +view-all-shortcuts = Alle Tastenkombinationen ansehen ... active-hint = Aktiv-Hinweis gaps = Lücken -floating-window-exceptions = Ausnahmen für schwebende Fenster... -window-management-settings = Einstellungen für die Fensterverwaltung... +floating-window-exceptions = Ausnahmen für schwebende Fenster ... +window-management-settings = Einstellungen für die Fensterverwaltung ... all-workspaces = Alle Arbeitsflächen per-workspace = Pro Arbeitsfläche super = Super diff --git a/cosmic-applet-tiling/i18n/gl/cosmic_applet_tiling.ftl b/cosmic-applet-tiling/i18n/gl/cosmic_applet_tiling.ftl new file mode 100644 index 00000000..1bd9f731 --- /dev/null +++ b/cosmic-applet-tiling/i18n/gl/cosmic_applet_tiling.ftl @@ -0,0 +1,20 @@ +tile-windows = Dispoñer as xanelas en mosaico automaticamente +tile-current = Dispoñer en mosaico o espazo de traballo actual +shortcuts = Atallos +navigate-windows = Navergar polas xanelas +move-window = Mover a xanela +toggle-floating-window = Alternar xanela flotante +view-all-shortcuts = Ver todos os atallos... +active-hint = Indicador de foco activo +gaps = Espazos +floating-window-exceptions = Excepcións de xanelas flotantes... +window-management-settings = Axustes da xestión de xanelas... +all-workspaces = Todos os espazos de traballo +per-workspace = Por espazo de traballo +super = Super +shift = Maiús +arrow-keys = frechas +tiled = En mosaico +floating = Flotante +autotile-behavior = Organizar as xanelas en mosaico nos espazos de traballo +new-workspace = Comportamento dos novos espazos de traballo diff --git a/cosmic-applet-tiling/i18n/nl/cosmic_applet_tiling.ftl b/cosmic-applet-tiling/i18n/nl/cosmic_applet_tiling.ftl index fcae7910..9b2c50bf 100644 --- a/cosmic-applet-tiling/i18n/nl/cosmic_applet_tiling.ftl +++ b/cosmic-applet-tiling/i18n/nl/cosmic_applet_tiling.ftl @@ -3,9 +3,9 @@ tile-current = Huidig werkblad tegelen shortcuts = Sneltoetsen navigate-windows = Tussen vensters schakelen move-window = Venster verplaatsen -toggle-floating-window = Zet zwevende vensters aan/uit +toggle-floating-window = Zweven aan- of uitzetten voor venster view-all-shortcuts = Alle sneltoetsen bekijken… -active-hint = Visuele hint actief venster +active-hint = Vensterfocus-aanduiding gaps = Ruimte rond getegelde vensters floating-window-exceptions = Uitzonderingen voor zwevende vensters… window-management-settings = Instellingen voor vensterbeheer… diff --git a/cosmic-applet-tiling/i18n/sat/cosmic_applet_tiling.ftl b/cosmic-applet-tiling/i18n/sat/cosmic_applet_tiling.ftl new file mode 100644 index 00000000..e69de29b diff --git a/cosmic-applet-tiling/src/window.rs b/cosmic-applet-tiling/src/window.rs index 7da430e3..912b3059 100644 --- a/cosmic-applet-tiling/src/window.rs +++ b/cosmic-applet-tiling/src/window.rs @@ -147,17 +147,22 @@ impl cosmic::Application for Window { return if let Some(p) = self.popup.take() { destroy_popup(p) } else { - let new_id = Id::unique(); - self.popup = Some(new_id); - let popup_settings = self.core.applet.get_popup_settings( - self.core.main_window_id().unwrap(), - new_id, - Some((1, 1)), + return cosmic::surface::surface_task(cosmic::surface::action::app_popup( + |_| Default::default(), + |app: &mut Self| { + let new_id = Id::unique(); + app.popup = Some(new_id); + let popup_settings = app.core.applet.get_popup_settings( + app.core.main_window_id().unwrap(), + new_id, + Some((1, 1)), + None, + None, + ); + popup_settings + }, None, - None, - ); - - get_popup(popup_settings) + )); }; } Message::PopupClosed(id) => { diff --git a/cosmic-applet-time/i18n/ca/cosmic_applet_time.ftl b/cosmic-applet-time/i18n/ca/cosmic_applet_time.ftl index e69de29b..daed32e1 100644 --- a/cosmic-applet-time/i18n/ca/cosmic_applet_time.ftl +++ b/cosmic-applet-time/i18n/ca/cosmic_applet_time.ftl @@ -0,0 +1 @@ +datetime-settings = Configuració de data, hora i calendari... diff --git a/cosmic-applet-time/i18n/de/cosmic_applet_time.ftl b/cosmic-applet-time/i18n/de/cosmic_applet_time.ftl index e08a855a..e4e6c44a 100644 --- a/cosmic-applet-time/i18n/de/cosmic_applet_time.ftl +++ b/cosmic-applet-time/i18n/de/cosmic_applet_time.ftl @@ -1 +1 @@ -datetime-settings = Datum, Uhrzeit und Kalendereinstellungen... +datetime-settings = Datum, Uhrzeit und Kalendereinstellungen ... diff --git a/cosmic-applet-time/i18n/gl/cosmic_applet_time.ftl b/cosmic-applet-time/i18n/gl/cosmic_applet_time.ftl new file mode 100644 index 00000000..d00079ad --- /dev/null +++ b/cosmic-applet-time/i18n/gl/cosmic_applet_time.ftl @@ -0,0 +1 @@ +datetime-settings = Axustes de data, hora e calendario... diff --git a/cosmic-applet-time/i18n/sat/cosmic_applet_time.ftl b/cosmic-applet-time/i18n/sat/cosmic_applet_time.ftl new file mode 100644 index 00000000..e69de29b diff --git a/cosmic-applet-time/src/window.rs b/cosmic-applet-time/src/window.rs index ddd37d31..e103498b 100644 --- a/cosmic-applet-time/src/window.rs +++ b/cosmic-applet-time/src/window.rs @@ -521,35 +521,40 @@ impl cosmic::Application for Window { if let Some(p) = self.popup.take() { destroy_popup(p) } else { - self.date_today = self.now.date(); - self.date_selected = self.date_today; + return cosmic::surface::surface_task(cosmic::surface::action::app_popup( + |_| Default::default(), + |app: &mut Self| { + app.date_today = app.now.date(); + app.date_selected = app.date_today; - let new_id = window::Id::unique(); - self.popup = Some(new_id); + let new_id = window::Id::unique(); + app.popup = Some(new_id); - let mut popup_settings = self.core.applet.get_popup_settings( - self.core.main_window_id().unwrap(), - new_id, + let mut popup_settings = app.core.applet.get_popup_settings( + app.core.main_window_id().unwrap(), + new_id, + None, + None, + None, + ); + let Rectangle { + x, + y, + width, + height, + } = app.rectangle; + popup_settings.positioner.anchor_rect = Rectangle:: { + x: x.max(1.) as i32, + y: y.max(1.) as i32, + width: width.max(1.) as i32, + height: height.max(1.) as i32, + }; + + popup_settings.positioner.size = None; + popup_settings + }, None, - None, - None, - ); - let Rectangle { - x, - y, - width, - height, - } = self.rectangle; - popup_settings.positioner.anchor_rect = Rectangle:: { - x: x.max(1.) as i32, - y: y.max(1.) as i32, - width: width.max(1.) as i32, - height: height.max(1.) as i32, - }; - - popup_settings.positioner.size = None; - - get_popup(popup_settings) + )); } } Message::Tick => { diff --git a/cosmic-applet-workspaces/i18n/ca/cosmic_applet_workspaces.ftl b/cosmic-applet-workspaces/i18n/ca/cosmic_applet_workspaces.ftl index e69de29b..3844b7a8 100644 --- a/cosmic-applet-workspaces/i18n/ca/cosmic_applet_workspaces.ftl +++ b/cosmic-applet-workspaces/i18n/ca/cosmic_applet_workspaces.ftl @@ -0,0 +1 @@ +cosmic-applet-workspaces = Espais de treball del COSMIC diff --git a/cosmic-applet-workspaces/i18n/gl/cosmic_applet_workspaces.ftl b/cosmic-applet-workspaces/i18n/gl/cosmic_applet_workspaces.ftl new file mode 100644 index 00000000..a56114fd --- /dev/null +++ b/cosmic-applet-workspaces/i18n/gl/cosmic_applet_workspaces.ftl @@ -0,0 +1 @@ +cosmic-applet-workspaces = Espazos de traballo de COSMIC diff --git a/cosmic-applet-workspaces/i18n/sat/cosmic_applet_workspaces.ftl b/cosmic-applet-workspaces/i18n/sat/cosmic_applet_workspaces.ftl new file mode 100644 index 00000000..e69de29b diff --git a/cosmic-applet-workspaces/src/components/app.rs b/cosmic-applet-workspaces/src/components/app.rs index a9bafb79..ddfcca20 100644 --- a/cosmic-applet-workspaces/src/components/app.rs +++ b/cosmic-applet-workspaces/src/components/app.rs @@ -203,24 +203,20 @@ impl cosmic::Application for IcedWorkspacesApplet { let content = column!(content, space::horizontal().width(Length::Fixed(width))) .align_x(Alignment::Center); - let btn = button( - container(content) - .align_x(Alignment::Center) - .align_y(Alignment::Center), - ) - .padding(if horizontal { - [0, self.core.applet.suggested_padding(true).1] - } else { - [self.core.applet.suggested_padding(true).1, 0] - }) - .on_press( - if w.state.contains(ext_workspace_handle_v1::State::Active) { - Message::WorkspaceOverview + let btn = button(content) + .padding(if horizontal { + [0, self.core.applet.suggested_padding(true).1] } else { - Message::WorkspacePressed(w.handle.clone()) - }, - ) - .padding(0); + [self.core.applet.suggested_padding(true).1, 0] + }) + .on_press( + if w.state.contains(ext_workspace_handle_v1::State::Active) { + Message::WorkspaceOverview + } else { + Message::WorkspacePressed(w.handle.clone()) + }, + ) + .padding(0); btn.class( if w.state.contains(ext_workspace_handle_v1::State::Active) { diff --git a/cosmic-panel-button/src/lib.rs b/cosmic-panel-button/src/lib.rs index 5c875719..609fe096 100644 --- a/cosmic-panel-button/src/lib.rs +++ b/cosmic-panel-button/src/lib.rs @@ -66,7 +66,7 @@ impl Button { .class(if symbolic { cosmic::theme::Svg::Custom(std::rc::Rc::new(|theme| { cosmic::iced::widget::svg::Style { - color: Some(theme.cosmic().background(false).on.into()), + color: Some(theme.cosmic().background(theme.transparent).on.into()), } })) } else { diff --git a/i18n/ca/desktop_entries.ftl b/i18n/ca/desktop_entries.ftl index 8e680471..167c3614 100644 --- a/i18n/ca/desktop_entries.ftl +++ b/i18n/ca/desktop_entries.ftl @@ -1 +1,2 @@ cosmic-app-list = Safata d'Aplicacions +cosmic-app-list-comment = Inicieu aplicacions ancorades i gestioneu les finestres obertes diff --git a/i18n/cs/desktop_entries.ftl b/i18n/cs/desktop_entries.ftl index 44354f34..fc451530 100644 --- a/i18n/cs/desktop_entries.ftl +++ b/i18n/cs/desktop_entries.ftl @@ -1,4 +1,4 @@ -cosmic-app-list = Panel aplikací +cosmic-app-list = Oblast aplikací cosmic-applet-a11y = Přístupnost cosmic-applet-audio = Zvuk cosmic-applet-battery = Napájení a baterie @@ -8,7 +8,7 @@ cosmic-applet-minimize = Minimalizovaná okna cosmic-applet-network = Síť cosmic-applet-notifications = Centrum oznámení cosmic-applet-power = Uživatelská relace -cosmic-applet-status-area = Panel oznámení +cosmic-applet-status-area = Oznamovací oblast cosmic-applet-tiling = Dlaždicový režim oken cosmic-applet-time = Datum, čas a kalendář cosmic-applet-workspaces = Číslované pracovní plochy @@ -26,9 +26,9 @@ cosmic-applet-network-comment = Správa síťových připojení cosmic-applet-network-keywords = COSMIC;Applet;Síť; cosmic-applet-notifications-comment = Správa oznámení a režimu Nerušit cosmic-applet-notifications-keywords = COSMIC;Applet;Oznámení; -cosmic-applet-status-area-keywords = COSMIC;Applet;Aplikace;Indikátory;Oznámení;Notifikace;Panel;Status;Stav; +cosmic-applet-status-area-keywords = COSMIC;Applet;Aplikace;Indikátory;Oznámení;Notifikace;Oblast;Status;Stav; cosmic-app-list-comment = Správa otevřených oken a spouštění připnutých aplikací -cosmic-app-list-keywords = COSMIC;Applet;Aplikace;Panel;Seznam;Úloha;Úlohy;Lišta; +cosmic-app-list-keywords = COSMIC;Applet;Aplikace;Oblast;Seznam;Úloha;Úlohy;Lišta; cosmic-applet-a11y-comment = Konfigurace nastavení přístupnosti z panelu cosmic-applet-a11y-keywords = COSMIC;Applet;Přístupnost;A11y;Obrazovka;Obrazovky;Čtečka;Lupa;Kontrast;Barva;Barvy; cosmic-applet-audio-comment = Výběr zvukového zařízení, ovládání hlasitosti a ovládání médií MPRIS @@ -43,9 +43,9 @@ cosmic-applet-time-keywords = COSMIC;Applet;Datumy;Časy;Kalendář;Hodiny; cosmic-applet-workspaces-comment = Přepínání mezi číslovanými pracovními plochami v panelu cosmic-applet-workspaces-keywords = COSMIC;Applet;Pracovní;Plocha;Plochy; cosmic-panel-app-button-comment = Přístup ke knihovně pro spouštění nainstalovaných aplikací -cosmic-panel-app-button-keywords = COSMIC;Applet;Aplikace;Knihovna;Panel;Spuštění;Spouštění; +cosmic-panel-app-button-keywords = COSMIC;Applet;Aplikace;Knihovna;Oblast;Spuštění;Spouštění; cosmic-panel-launcher-button-comment = Přístup ke spouštěči pro vyhledávání aplikací a spouštění příkazů cosmic-panel-launcher-button-keywords = COSMIC;Applet;Spouštěč;Vyhledávání;Příkazy; cosmic-panel-workspaces-button-comment = Přístup k přehledu pracovních ploch pro jejich správu a přepínání cosmic-panel-workspaces-button-keywords = COSMIC;Applet;Pracovní;Plocha;Plochy;Přehled; -cosmic-applet-status-area-comment = Indikátory aplikací, které mohou exportovat menu do panelu +cosmic-applet-status-area-comment = Ikony aplikací, které mohou zobrazovat nabídky na panelu diff --git a/i18n/da/desktop_entries.ftl b/i18n/da/desktop_entries.ftl index e69de29b..6026b028 100644 --- a/i18n/da/desktop_entries.ftl +++ b/i18n/da/desktop_entries.ftl @@ -0,0 +1,51 @@ +cosmic-app-list = Programbakke +cosmic-app-list-comment = Start fastgjorte apps og håndter åbne vinduer +cosmic-app-list-keywords = COSMIC;Applet;App;Statusområde;Liste;Opgave;Bjælke; +cosmic-applet-a11y = Tilgængelighed +cosmic-applet-a11y-comment = Konfigurer tilgængelighedsindstillinger fra panelet +cosmic-applet-a11y-keywords = COSMIC;Applet;Tilgængelighed;A11y;Skærm;Skærmlæser;Forstørrelsesglas;Kontrast;Farve; +cosmic-applet-audio = Lyd +cosmic-applet-audio-comment = Valg af lydenhed, lydstyrkekontrol og MPRIS-mediekontrol +cosmic-applet-audio-keywords = COSMIC;Applet;Lyd;Lyd;MPRIS; +cosmic-applet-battery = Strøm og batteri +cosmic-applet-battery-comment = Strømtilstande og strømspareindstillinger +cosmic-applet-battery-keywords = COSMIC;Applet;Strøm;Batteri; +cosmic-applet-bluetooth = Bluetooth +cosmic-applet-bluetooth-comment = Administrer Bluetooth-enheder +cosmic-applet-bluetooth-keywords = COSMIC;Applet;Bluetooth; +cosmic-applet-input-sources = Inputkilder +cosmic-applet-input-sources-comment = Skift mellem inputkilder +cosmic-applet-input-sources-keywords = COSMIC;Applet;Input;Kilde; +cosmic-applet-minimize = Minimerede vinduer +cosmic-applet-minimize-comment = Administrer minimerede vinduer +cosmic-applet-minimize-keywords = COSMIC;Applet;Minimer; +cosmic-applet-network = Netværk +cosmic-applet-network-comment = Administrer netværksforbindelser +cosmic-applet-network-keywords = COSMIC;Applet;Netværk; +cosmic-applet-notifications = Notifikationscenter +cosmic-applet-notifications-comment = Administrer notifikationer og Forstyr ikke +cosmic-applet-notifications-keywords = COSMIC;Applet;Notifikation; +cosmic-applet-power = Brugersession +cosmic-applet-power-comment = Låseskærm, log ud, dvale, genstart og luk ned +cosmic-applet-power-keywords = COSMIC;Applet;Bruger;Session;Lås;Log;Genstart;Luk ned;Dvale; +cosmic-applet-status-area = Notifikationsområde +cosmic-applet-status-area-comment = Programindikatorer, som kan eksportere menuer til panelet +cosmic-applet-status-area-keywords = COSMIC;Applet;App;Indikator;Notifikation;Statusområde;Status; +cosmic-applet-tiling = Opdeling +cosmic-applet-tiling-comment = Administrer aktiv hint samt automatisk opdeling for aktuelt og pr. arbejdsområde +cosmic-applet-tiling-keywords = COSMIC;Applet;Opdeling;Hint;Arbejdsområde; +cosmic-applet-time = Dato, tid og kalender +cosmic-applet-time-comment = Vis den aktuelle tid i panelet med en kalenderpopup +cosmic-applet-time-keywords = COSMIC;Applet;Dato;Tid;Kalender; +cosmic-applet-workspaces = Nummererede arbejdsområder +cosmic-applet-workspaces-comment = Skift mellem nummererede arbejdsområder i panelet +cosmic-applet-workspaces-keywords = COSMIC;Applet;Arbejdsområde; +cosmic-panel-app-button = Appbibliotek-knap +cosmic-panel-app-button-comment = Åbn applikationsbiblioteket for at starte installerede programmer +cosmic-panel-app-button-keywords = COSMIC;Applet;App;Bibliotek;Statusområde; +cosmic-panel-launcher-button = Starterknap +cosmic-panel-launcher-button-keywords = COSMIC;Applet;Starter;Kører; +cosmic-panel-workspaces-button = Arbejdsområdeknap +cosmic-panel-workspaces-button-comment = Åbn oversigten over arbejdsområder for at administrere og skifte mellem arbejdsområder +cosmic-panel-workspaces-button-keywords = COSMIC;Applet;Arbejdsområde;Oversigt; +cosmic-panel-launcher-button-comment = Åbn starteren for at søge efter programmer og køre kommandoer diff --git a/i18n/de/desktop_entries.ftl b/i18n/de/desktop_entries.ftl index 6cb50a22..fd41e5be 100644 --- a/i18n/de/desktop_entries.ftl +++ b/i18n/de/desktop_entries.ftl @@ -37,7 +37,7 @@ cosmic-app-list-comment = Angeheftete Apps starten und geöffnete Fenster verwal cosmic-applet-a11y-comment = Einstellungen für Barrierefreiheit über das Panel konfigurieren cosmic-applet-power-comment = Bildschirm sperren, abmelden, anhalten, neu starten und herunterfahren cosmic-applet-status-area = Benachrichtigungsübersicht -cosmic-applet-time-comment = Aktuelle Uhrzeit im Fenster mit einem Kalender-Popup anzeigen +cosmic-applet-time-comment = Aktuelle Uhrzeit im Panel mit einem Kalender-Popup anzeigen cosmic-panel-app-button-comment = Öffne die Anwendungsbibliothek, um installierte Anwendungen zu starten cosmic-panel-launcher-button-comment = Öffne den Starter, um nach Anwendungen zu suchen und Befehle auszuführen cosmic-panel-workspaces-button-comment = Öffne die Arbeitsflächenübersicht, um Arbeitsflächen zu verwalten und zwischen ihnen zu wechseln diff --git a/i18n/en-GB/desktop_entries.ftl b/i18n/en-GB/desktop_entries.ftl index e69de29b..87f50a21 100644 --- a/i18n/en-GB/desktop_entries.ftl +++ b/i18n/en-GB/desktop_entries.ftl @@ -0,0 +1,51 @@ +cosmic-app-list = App Tray +cosmic-app-list-comment = Launch pinned apps and manage open windows +cosmic-app-list-keywords = COSMIC;Applet;App;Tray;List;Task;Bar; +cosmic-applet-a11y = Accessibility +cosmic-applet-a11y-comment = Configure accessibility settings from the panel +cosmic-applet-a11y-keywords = COSMIC;Applet;Accessibility;A11y;Screen;Reader;Magnifier;Contrast;Colour; +cosmic-applet-audio = Sound +cosmic-applet-audio-comment = Audio device selection, volume control, and MPRIS media controls +cosmic-applet-audio-keywords = COSMIC;Applet;Sound;Audio;MPRIS; +cosmic-applet-battery = Power & Battery +cosmic-applet-battery-comment = Power modes and power saving options +cosmic-applet-battery-keywords = COSMIC;Applet;Power;Battery; +cosmic-applet-bluetooth = Bluetooth +cosmic-applet-bluetooth-comment = Manage Bluetooth devices +cosmic-applet-bluetooth-keywords = COSMIC;Applet;Bluetooth; +cosmic-applet-input-sources = Input Sources +cosmic-applet-input-sources-comment = Switch between input sources +cosmic-applet-input-sources-keywords = COSMIC;Applet;Input;Source; +cosmic-applet-minimize = Minimised Windows +cosmic-applet-minimize-comment = Manage minimised windows +cosmic-applet-minimize-keywords = COSMIC;Applet;Minimise; +cosmic-applet-network = Network +cosmic-applet-network-comment = Manage network connections +cosmic-applet-network-keywords = COSMIC;Applet;Network; +cosmic-applet-notifications = Notifications Centre +cosmic-applet-notifications-comment = Manage notifications and Do Not Disturb +cosmic-applet-notifications-keywords = COSMIC;Applet;Notification; +cosmic-applet-power = User Session +cosmic-applet-power-comment = Lock screen, log out, suspend, reboot, and shutdown +cosmic-applet-power-keywords = COSMIC;Applet;User;Session;Lock;Log out;Reboot;Shutdown;Suspend; +cosmic-applet-status-area = Notifications Tray +cosmic-applet-status-area-comment = Application indicators which may export menus to the panel +cosmic-applet-status-area-keywords = COSMIC;Applet;App;Indicator;Notification;Tray;Status; +cosmic-applet-tiling = Tiling +cosmic-applet-tiling-comment = Manage the active hint, current & per-workspace auto-tiling +cosmic-applet-tiling-keywords = COSMIC;Applet;Tiling;Hint;Workspace; +cosmic-applet-time = Date, Time & Calendar +cosmic-applet-time-comment = Display the current time in the panel with a calendar popup +cosmic-applet-time-keywords = COSMIC;Applet;Date;Time;Calendar; +cosmic-applet-workspaces = Numbered Workspaces +cosmic-applet-workspaces-comment = Switch between numbered workspaces in the panel +cosmic-applet-workspaces-keywords = COSMIC;Applet;Workspace; +cosmic-panel-app-button = App Library Button +cosmic-panel-app-button-comment = Open the application library for launching installed applications +cosmic-panel-app-button-keywords = COSMIC;Applet;App;Library;Tray; +cosmic-panel-launcher-button = Launcher Button +cosmic-panel-launcher-button-comment = Open the launcher to search applications and run commands +cosmic-panel-launcher-button-keywords = COSMIC;Applet;Launcher;Runner; +cosmic-panel-workspaces-button = Workspaces Button +cosmic-panel-workspaces-button-comment = Open the workspaces overview to manage and switch workspaces +cosmic-panel-workspaces-button-keywords = COSMIC;Applet;Workspace;Overview; diff --git a/i18n/fa/desktop_entries.ftl b/i18n/fa/desktop_entries.ftl index e69de29b..91683d53 100644 --- a/i18n/fa/desktop_entries.ftl +++ b/i18n/fa/desktop_entries.ftl @@ -0,0 +1,5 @@ +cosmic-app-list = نوار برنامه‌ها +cosmic-applet-a11y = دسترسی‌پذیری +cosmic-applet-audio = صدا +cosmic-applet-bluetooth = بلوتوث +cosmic-applet-bluetooth-comment = مدیریت دستگاه‌های بلوتوث diff --git a/i18n/gl/desktop_entries.ftl b/i18n/gl/desktop_entries.ftl new file mode 100644 index 00000000..01a642f4 --- /dev/null +++ b/i18n/gl/desktop_entries.ftl @@ -0,0 +1,51 @@ +cosmic-app-list = Bandexa de aplicacións +cosmic-app-list-comment = Inicia as aplicacións fixadas e xestiona as xanelas abertas +cosmic-app-list-keywords = COSMIC;Miniaplicación;Aplicación;Bandexa;Lista;Tarefa;Barra; +cosmic-applet-a11y = Accesibilidade +cosmic-applet-a11y-comment = Configurar os axustes de accesibilidade dende o panel +cosmic-applet-a11y-keywords = COSMIC;Miniaplicación;Accesibilidade;A11y;Pantalla;Lector;Lupa;Contraste;Cor; +cosmic-applet-audio = Son +cosmic-applet-audio-comment = Selección do dispositivo de son, control do volume e controis multimedia MPRIS +cosmic-applet-audio-keywords = COSMIC;Miniaplicación;Son;Audio;MPRIS; +cosmic-applet-battery = Enerxía e Batería +cosmic-applet-battery-comment = Modos de enerxía e opcións de aforro enerxético +cosmic-applet-battery-keywords = COSMIC;Miniaplicación;Enerxía;Batería; +cosmic-applet-bluetooth = Bluetooth +cosmic-applet-bluetooth-comment = Xestionar dispositivos Bluetooth +cosmic-applet-bluetooth-keywords = COSMIC;Miniaplicación;Bluetooth; +cosmic-applet-input-sources = Fontes de Entrada +cosmic-applet-input-sources-comment = Cambiar entre fontes de entrada +cosmic-applet-input-sources-keywords = COSMIC;Miniaplicación;Entrada;Fonte; +cosmic-applet-minimize = Xanelas minimizadas +cosmic-applet-minimize-comment = Xestionar xanelas minimizadas +cosmic-applet-minimize-keywords = COSMIC;Miniaplicación;Minimizar; +cosmic-applet-network = Rede +cosmic-applet-network-comment = Xestionar as conexións de rede +cosmic-applet-network-keywords = COSMIC;Miniaplicación;Rede; +cosmic-applet-notifications = Centro de notificacións +cosmic-applet-notifications-comment = Xestionar as notificacións e o modo Non molestar +cosmic-applet-notifications-keywords = COSMIC;Miniaplicación;Notificación; +cosmic-applet-power = Sesión de usuario +cosmic-applet-power-comment = Bloquear a pantalla, pechar a sesión, suspender, reiniciar e apagar +cosmic-applet-power-keywords = COSMIC;Miniaplicación;Usuario;Sesión;Bloquear;Pechar sesión;Reiniciar;Apagar;Suspender; +cosmic-applet-status-area = Bandexa de Notificacións +cosmic-applet-status-area-comment = Indicadores de aplicación que poden exportar menús ao panel +cosmic-applet-status-area-keywords = COSMIC;Miniaplicación;Aplicación;Indicador;Notificación;Bandexa;Estado; +cosmic-applet-tiling = Mosaico +cosmic-applet-tiling-comment = Xestiona a indicación activa e o mosaico automático actual e por espazo de traballo +cosmic-applet-tiling-keywords = COSMIC;Miniaplicación;Mosaico;Indicación;Espazo de traballo; +cosmic-applet-time = Data, hora e calendario +cosmic-applet-time-comment = Mostra a hora actual no panel cun calendario emerxente +cosmic-applet-time-keywords = COSMIC;Miniaplicación;Data;Hora;Calendario; +cosmic-applet-workspaces = Espazos de traballo numerados +cosmic-applet-workspaces-comment = Cambia entre os espazos de traballo numerados desde o panel +cosmic-applet-workspaces-keywords = COSMIC;Miniaplicación;Espazo de traballo; +cosmic-panel-app-button = Botón da biblioteca de aplicacións +cosmic-panel-app-button-comment = Abre a biblioteca de aplicacións para iniciar as aplicacións instaladas +cosmic-panel-app-button-keywords = COSMIC;Miniaplicación;Aplicación;Biblioteca;Bandexa; +cosmic-panel-launcher-button = Botón do lanzador +cosmic-panel-launcher-button-comment = Abre o lanzador para buscar aplicacións e executar ordes +cosmic-panel-launcher-button-keywords = COSMIC;Miniaplicación;Lanzador;Executor de ordes; +cosmic-panel-workspaces-button = Botón dos espazos de traballo +cosmic-panel-workspaces-button-comment = Abre a vista xeral dos espazos de traballo para xestionalos e cambiar entre eles +cosmic-panel-workspaces-button-keywords = COSMIC;Miniaplicación;Espazo de traballo;Vista xeral; diff --git a/i18n/hi/desktop_entries.ftl b/i18n/hi/desktop_entries.ftl index e69de29b..3ece3b53 100644 --- a/i18n/hi/desktop_entries.ftl +++ b/i18n/hi/desktop_entries.ftl @@ -0,0 +1,34 @@ +cosmic-applet-a11y = अभिगम्यता +cosmic-applet-a11y-comment = पैनल से अभिगम्यता सेटिंग्स विन्यस्त करें +cosmic-applet-audio = ध्वनि +cosmic-applet-audio-comment = ऑडियो उपकरण चयन, ध्वनि स्तर नियंत्रण और MPRIS मीडिया नियंत्रण +cosmic-applet-battery = पावर और बैटरी +cosmic-applet-battery-comment = पावर मोड और ऊर्जा बचत विकल्प +cosmic-applet-battery-keywords = COSMIC;ऐपलेट;पावर;बैटरी +cosmic-applet-bluetooth = ब्लूटूथ +cosmic-applet-bluetooth-comment = ब्लूटूथ डिवाइस प्रबंधित करें +cosmic-applet-input-sources = इनपुट स्रोत +cosmic-applet-input-sources-comment = इनपुट स्रोतों के बीच स्विच करें +cosmic-applet-input-sources-keywords = COSMIC; Applet; इनपुट; स्रोत; +cosmic-applet-minimize = न्यूनतम की गई विंडोज़ +cosmic-applet-minimize-comment = न्यूनतम की गई विंडोज़ प्रबंधित करें +cosmic-applet-network = नेटवर्क +cosmic-applet-network-comment = नेटवर्क कनेक्शन प्रबंधित करें +cosmic-applet-notifications = नोटिफ़िकेशन सेंटर +cosmic-applet-notifications-comment = नोटिफ़िकेशन और डु नॉट डिस्टर्ब प्रबंधित करें +cosmic-applet-power = यूज़र सेशन +cosmic-applet-power-comment = स्क्रीन लॉक करें, लॉग आउट करें, सस्पेंड करें, रीबूट करें और शटडाउन करें +cosmic-applet-status-area = नोटिफ़िकेशन ट्रे +cosmic-applet-status-area-comment = एप्लिकेशन इंडिकेटर जो पैनल में मेनू एक्सपोर्ट कर सकते हैं +cosmic-applet-tiling = टाइलिंग +cosmic-applet-tiling-comment = सक्रिय हिंट, वर्तमान और प्रति-वर्कस्पेस ऑटो-टाइलिंग प्रबंधित करें +cosmic-applet-time = दिनांक, समय और कैलेंडर +cosmic-applet-time-comment = पैनल में कैलेंडर पॉपअप के साथ वर्तमान समय प्रदर्शित करें +cosmic-applet-workspaces = क्रमांकित वर्कस्पेस +cosmic-applet-workspaces-comment = पैनल में क्रमांकित वर्कस्पेस के बीच स्विच करें +cosmic-panel-app-button = ऐप लाइब्रेरी बटन +cosmic-panel-app-button-comment = इंस्टॉल किए गए एप्लिकेशन लॉन्च करने के लिए ऐप लाइब्रेरी खोलें +cosmic-panel-launcher-button = लॉन्चर बटन +cosmic-panel-launcher-button-comment = एप्लिकेशन खोजने और कमांड चलाने के लिए लॉन्चर खोलें +cosmic-panel-workspaces-button = वर्कस्पेस बटन +cosmic-panel-workspaces-button-comment = वर्कस्पेस प्रबंधित करने और उनके बीच स्विच करने के लिए वर्कस्पेस ओवरव्यू खोलें diff --git a/i18n/hu/desktop_entries.ftl b/i18n/hu/desktop_entries.ftl index 82b4bfdb..1799fcb4 100644 --- a/i18n/hu/desktop_entries.ftl +++ b/i18n/hu/desktop_entries.ftl @@ -1,16 +1,16 @@ cosmic-app-list = Alkalmazástálca cosmic-applet-a11y = Akadálymentesség cosmic-applet-audio = Hang -cosmic-applet-battery = Energia és Akkumulátor +cosmic-applet-battery = Energia és akkumulátor cosmic-applet-bluetooth = Bluetooth -cosmic-applet-input-sources = Beviteli Források +cosmic-applet-input-sources = Beviteli források cosmic-applet-minimize = Minimalizált ablakok cosmic-applet-network = Hálózat cosmic-applet-notifications = Értesítési központ -cosmic-applet-power = Felhasználói Munkamenet +cosmic-applet-power = Felhasználói munkamenet cosmic-applet-status-area = Értesítési terület cosmic-applet-tiling = Csempézés -cosmic-applet-time = Dátum, Idő és Naptár +cosmic-applet-time = Dátum, idő és naptár cosmic-applet-workspaces = Számozott Munkaterületek cosmic-panel-app-button = Alkalmazáskönyvtár gomb cosmic-panel-launcher-button = Indító gomb @@ -21,7 +21,7 @@ cosmic-applet-audio-keywords = COSMIC;kisalkalmazás;hang;MPRIS; cosmic-applet-battery-keywords = COSMIC;kisalkalmazás;energia;akkumulátor; cosmic-applet-bluetooth-comment = Bluetooth-eszközök kezelése cosmic-applet-bluetooth-keywords = COSMIC;kisalkalmazás;bluetooth; -cosmic-applet-input-sources-keywords = COSMIC;kisalkalmazás;beviteli forrás; +cosmic-applet-input-sources-keywords = COSMIC;kisalkalmazás;beviteli;forrás; cosmic-applet-minimize-keywords = COSMIC;kisalkalmazás;minimizálás; cosmic-applet-network-keywords = COSMIC;kisalkalmazás;hálózat;internet; cosmic-applet-notifications-keywords = COSMIC;kisalkalmazás;értesítések; diff --git a/i18n/it/desktop_entries.ftl b/i18n/it/desktop_entries.ftl index d7ca6b16..e15f8291 100644 --- a/i18n/it/desktop_entries.ftl +++ b/i18n/it/desktop_entries.ftl @@ -1,16 +1,50 @@ cosmic-app-list = Area applicazioni cosmic-applet-a11y = Accessibilità -cosmic-applet-audio = Audio -cosmic-applet-battery = Alimentazione e batteria +cosmic-applet-audio = Suono +cosmic-applet-battery = Potenza e batteria cosmic-applet-bluetooth = Bluetooth -cosmic-applet-input-sources = Sorgenti di immissione +cosmic-applet-input-sources = Sorgenti di input cosmic-applet-minimize = Finestre minimizzate cosmic-applet-network = Rete cosmic-applet-notifications = Centro notifiche cosmic-applet-power = Sessione utente cosmic-applet-status-area = Area notifiche -cosmic-applet-tiling = Tiling +cosmic-applet-tiling = Affiancamento finestre cosmic-applet-time = Data, ora e calendario -cosmic-applet-workspaces = Spazi di lavoro numerati -cosmic-panel-launcher-button = Tasto Launcher -cosmic-panel-workspaces-button = Tasto Spazi di lavoro +cosmic-applet-workspaces = Aree di lavoro numerate +cosmic-panel-launcher-button = Pulsante del launcher +cosmic-panel-workspaces-button = Pulsante aree di lavoro +cosmic-app-list-comment = Avvia le app fissate e gestisci le finestre aperte +cosmic-applet-a11y-comment = Configura le impostazioni di accessibilità dal pannello +cosmic-applet-audio-comment = Selezione dispositivi audio, controllo del volume e controlli multimediali MPRIS +cosmic-applet-battery-comment = Modalità di alimentazione e opzioni di risparmio energetico +cosmic-applet-bluetooth-comment = Gestione di dispositivi Bluetooth +cosmic-applet-input-sources-comment = Passa da una sorgente di input all’altra +cosmic-applet-minimize-comment = Gestisci le finestre minimizzate +cosmic-applet-network-comment = Gestisci le connessioni di rete +cosmic-applet-notifications-comment = Gestisci le notifiche e “Non disturbare” +cosmic-applet-power-comment = Blocca lo schermo, termina la sessione, sospendi, riavvia e spegni +cosmic-applet-status-area-comment = Indicatori di applicazioni che possono esportare menu nel pannello +cosmic-applet-tiling-comment = Gestisci il suggerimento attivo e l’affiancamento automatico corrente e per aree di lavoro +cosmic-applet-time-comment = Mostra l’ora corrente nel pannello con popup del calendario +cosmic-applet-workspaces-comment = Passa tra aree di lavoro numerate nel pannello +cosmic-panel-app-button = Pulsante della libreria delle applicazioni +cosmic-panel-app-button-comment = Apri la libreria delle applicazioni per avviare le applicazioni installate +cosmic-panel-launcher-button-comment = Apri il launcher per cercare applicazioni ed eseguire comandi +cosmic-panel-workspaces-button-comment = Apri la panoramica delle aree di lavoro per gestirle e passare da una all’altra +cosmic-app-list-keywords = COSMIC;Applet;Applicazione;Area di notifica;Elenco;Attività;Barra; +cosmic-applet-a11y-keywords = COSMIC;Applet;Accessibilità;A11y;Lettore di schermo;Lente d'ingrandimento;Contrasto;Colore; +cosmic-applet-audio-keywords = COSMIC;Applet;Suono;Audio;MPRIS; +cosmic-applet-battery-keywords = COSMIC;Applet;Potenza;Batteria; +cosmic-applet-bluetooth-keywords = COSMIC;Applet; Bluetooth; +cosmic-applet-input-sources-keywords = COSMIC;Applet;Input;Sorgente; +cosmic-applet-minimize-keywords = COSMIC;Applet;Minimizzare; +cosmic-applet-network-keywords = COSMIC;Applet;Rete; +cosmic-applet-notifications-keywords = COSMIC;Applet;Notifiche; +cosmic-applet-power-keywords = COSMIC;Applet;Utente;Sessione;Blocca;Termina sessione;Riavvia;Spegni;Sospendi; +cosmic-applet-status-area-keywords = COSMIC;Applet;Applicazione;Indicatore;Notifiche;Area;Stato; +cosmic-applet-tiling-keywords = COSMIC;Applet;Affiancamento;Suggerimento;Area di lavoro; +cosmic-applet-time-keywords = COSMIC;Applet;Data;Ora;Calendario; +cosmic-applet-workspaces-keywords = COSMIC;Applet;Area di lavoro; +cosmic-panel-app-button-keywords = COSMIC;Applet;App;Libreria;Tray; +cosmic-panel-launcher-button-keywords = COSMIC;Applet;Launcher;Runner; diff --git a/i18n/nl/desktop_entries.ftl b/i18n/nl/desktop_entries.ftl index 6a65d46b..aee16383 100644 --- a/i18n/nl/desktop_entries.ftl +++ b/i18n/nl/desktop_entries.ftl @@ -8,10 +8,44 @@ cosmic-applet-minimize = Geminimaliseerde vensters cosmic-applet-network = Netwerk cosmic-applet-notifications = Meldingscentrum cosmic-applet-power = Gebruikerssessie -cosmic-applet-status-area = Meldingsvlak +cosmic-applet-status-area = Statusvak cosmic-applet-tiling = Vensters tegelen -cosmic-applet-time = Datum, tijd en agenda +cosmic-applet-time = Datum, tijd, en agenda cosmic-applet-workspaces = Genummerde werkbladen -cosmic-panel-app-button = Knop appbibliotheek -cosmic-panel-launcher-button = Knop snelstarter -cosmic-panel-workspaces-button = Knop werkbladenoverzicht +cosmic-panel-app-button = Toepassingskiezersknop +cosmic-panel-launcher-button = Snelstarterknop +cosmic-panel-workspaces-button = Werkbladoverzichtsknop +cosmic-applet-battery-comment = Instellingen voor prestaties en energieverbruik +cosmic-applet-a11y-comment = Pas toegankelijkheidsinstellingen aan via het paneel +cosmic-applet-input-sources-comment = Schakel tussen invoerbronnen +cosmic-applet-workspaces-comment = Schakel tussen genummerde werkbladen via het paneel +cosmic-app-list-comment = Start vastgemaakte toepassingen en beheer openstaande vensters +cosmic-applet-audio-comment = Beheer audioapparaten, volume-instellingen, en mediaspelers +cosmic-applet-audio-keywords = COSMIC;Applet;Geluid;Audio;MPRIS; +cosmic-applet-battery-keywords = COSMIC;Applet;Energie;Verbruik;Energieverbruik;Batterij;Stroom; +cosmic-applet-bluetooth-comment = Beheer Bluetooth-apparaten +cosmic-applet-bluetooth-keywords = COSMIC;Applet;Bluetooth; +cosmic-applet-input-sources-keywords = COSMIC;Applet;Invoer;Bron;Methode;Invoerbron;Invoermethode; +cosmic-applet-minimize-comment = Beheer geminimaliseerde vensters +cosmic-applet-network-comment = Beheer netwerkverbindingen +cosmic-applet-network-keywords = COSMIC;Applet;Netwerk; +cosmic-applet-notifications-comment = Beheer meldingen en niet storen +cosmic-applet-notifications-keywords = COSMIC;Applet;Melding; +cosmic-applet-power-comment = Vergrendel scherm, afmelden, slaapstand, herstarten, en afsluiten +cosmic-app-list-keywords = COSMIC;Applet;Toepassing;Taakbalk;Lijst;Taken;Balk; +cosmic-applet-a11y-keywords = COSMIC;Applets;Toegankelijkheid;A11y;Schermlezer;Vergrootglas;Contrast;Kleur; +cosmic-applet-minimize-keywords = COSMIC;Applet;Minimaliseer;Geminimaliseerd; +cosmic-applet-power-keywords = COSMIC;Applet;Gebruiker;Sessie;Vergrendelen;Afmelden;Opnieuw;Opstarten;Herstarten;Afsluiten;Slaapstand; +cosmic-applet-status-area-comment = Statusindicators met contextmenu's van toepassingen +cosmic-applet-tiling-comment = Beheer de vensterfocus-aanduiding en tegelen voor huidige en nieuwe werkbladen +cosmic-applet-tiling-keywords = COSMIC;Applet;Tegelen;Venster;Focus;Aanduiding;Werkblad; +cosmic-applet-time-comment = Toon de huidige datum en tijd met een pop-upagenda in het paneel +cosmic-applet-time-keywords = COSMIC;Applet;Datum;Tijd;Agenda; +cosmic-applet-workspaces-keywords = COSMIC;Applet;Werkblad; +cosmic-panel-app-button-comment = Open de toepassingskiezer om geïnstalleerde toepassingen te starten +cosmic-panel-app-button-keywords = COSMIC;Applet;Toepassing;Kiezer;Toepassingskiezer; +cosmic-panel-launcher-button-comment = Open de snelstarter om toepassingen te zoeken en commando's uit te voeren +cosmic-panel-launcher-button-keywords = COSMIC;Applet;Snelstarter;Uitvoeren; +cosmic-panel-workspaces-button-comment = Open het werkbladoverzicht om tussen werkbladen te schakelen en ze te beheren +cosmic-panel-workspaces-button-keywords = COSMIC;Applet;Werkblad;Overzicht;Werkbladoverzicht; +cosmic-applet-status-area-keywords = COSMIC;Applet;Toepassing;Indicator;Status;Vak; diff --git a/i18n/oc/desktop_entries.ftl b/i18n/oc/desktop_entries.ftl index e69de29b..894d5e1d 100644 --- a/i18n/oc/desktop_entries.ftl +++ b/i18n/oc/desktop_entries.ftl @@ -0,0 +1,19 @@ +cosmic-app-list = Cinta d’aplicacions +cosmic-app-list-comment = Lançar d’aplicacions penjadas e gerir las fenèstras dobèrtas +cosmic-app-list-keywords = COSMIC;Applet;Ajuston;Microaplicacion;Miniaplicacion;App;Aplicacion;Cinta;Lista;Prètzfach;Prètzfait;Barra; +cosmic-applet-a11y = Accessibilitat +cosmic-applet-a11y-comment = Configurar los paramètres d’accessibilitat del panèl estant +cosmic-applet-audio = Son +cosmic-applet-battery = Energia e batariá +cosmic-applet-battery-comment = Mòdes d’energia e opcions d’estalvi d’energia +cosmic-applet-bluetooth = Bluetooth +cosmic-applet-bluetooth-comment = Gerir los aparelhs Bluetooth +cosmic-applet-input-sources = Fonts d’entrada +cosmic-applet-network = Ret +cosmic-applet-network-comment = Gerir las connexion ret +cosmic-applet-notifications = Centre de notificacions +cosmic-applet-notifications-comment = Gerir las notificacions e lo mòde Destorbar pas +cosmic-applet-power = Session utilizaire +cosmic-applet-status-area = Cinta de notificacions +cosmic-applet-time = Data, ora e calendièr +cosmic-applet-workspaces = Espacis de trabalha numerotats diff --git a/i18n/pt/desktop_entries.ftl b/i18n/pt/desktop_entries.ftl index 1fe912c3..68cc145a 100644 --- a/i18n/pt/desktop_entries.ftl +++ b/i18n/pt/desktop_entries.ftl @@ -21,7 +21,7 @@ cosmic-applet-workspaces-keywords = COSMIC;Miniaplicação;Applet;Área;Trabalho cosmic-panel-workspaces-button-comment = Abrir a visão geral das áreas de trabalho para gerir e alternar entre elas cosmic-panel-workspaces-button-keywords = COSMIC;Miniaplicação;Applet;Área;Trabalho;Visão;Geral; cosmic-applet-a11y-comment = Configurar definições de acessibilidade a partir do painel -cosmic-applet-battery = Energia e Bateria +cosmic-applet-battery = Energia e bateria cosmic-app-list-keywords = COSMIC;Miniaplicação;Applet;Aplicação;Bandeja;Lista;Tarefa;Barra; cosmic-applet-a11y-keywords = COSMIC;Miniaplicação;Applet;Acessibilidade;A11y;Ecrã;Leitor;Lupa;Ampliador;Contraste;Cor; cosmic-applet-audio-keywords = COSMIC;Miniaplicação;Applet;Som;Áudio;MPRIS; diff --git a/i18n/sat/desktop_entries.ftl b/i18n/sat/desktop_entries.ftl new file mode 100644 index 00000000..3bef0114 --- /dev/null +++ b/i18n/sat/desktop_entries.ftl @@ -0,0 +1,10 @@ +cosmic-applet-a11y-keywords = COSMIC; ᱮᱯᱞᱮᱴ; ᱮᱠᱥᱮᱥᱤᱵᱤᱞᱤᱴᱤ; A11y; ᱥᱠᱨᱤᱱ; ᱨᱤᱰᱟᱨ; ᱢᱮᱜᱽᱱᱤᱯᱷᱟᱭᱟᱨ; ᱠᱚᱱᱴᱨᱟᱥᱴ; ᱨᱚᱝ; +cosmic-applet-bluetooth-comment = ᱵᱞᱩᱴᱩᱛᱷ ᱥᱟᱫᱷᱚᱱ ᱠᱚ ᱥᱚᱢᱵᱷᱲᱟᱣ ᱢᱮ +cosmic-applet-input-sources-comment = ᱤᱱᱯᱩᱴ ᱥᱚᱨᱥ ᱠᱚ ᱛᱟᱞᱟ ᱨᱮ ᱵᱚᱫᱚᱞ ᱢᱮ +cosmic-applet-input-sources-keywords = ᱠᱚᱥᱢᱤᱠ; ᱮᱯᱞᱮᱴ; ᱤᱱᱯᱩᱴ; ᱥᱨᱚᱛ; +cosmic-applet-minimize = ᱦᱩᱰᱤᱧ ᱟᱠᱟᱱ ᱡᱟᱨᱞᱟ +cosmic-applet-status-area = ᱱᱚᱴᱤᱯᱷᱤᱠᱮᱥᱚᱱ ᱴᱨᱮ +cosmic-applet-status-area-comment = ᱮᱯᱞᱤᱠᱮᱥᱚᱱ ᱤᱱᱰᱤᱠᱮᱴᱚᱨ ᱚᱠᱟ ᱫᱚ ᱯᱮᱱᱮᱞ ᱨᱮ ᱢᱮᱱᱭᱩᱥ ᱮ ᱮᱠᱥᱯᱚᱨᱴ ᱫᱟᱲᱮᱭᱟᱜᱼᱟ +cosmic-applet-status-area-keywords = ᱠᱚᱥᱢᱤᱠ; ᱮᱯᱞᱮᱴ; ᱮᱯ; ᱤᱱᱰᱤᱠᱮᱴᱚᱨ; ᱱᱚᱴᱤᱯᱷᱤᱠᱮᱥᱚᱱ; ᱴᱨᱮ; ᱥᱴᱮᱴᱟᱥ; +cosmic-applet-time = ᱢᱟᱦᱟᱸ, ᱚᱠᱛᱚ ᱟᱨ ᱠᱮᱞᱮᱱᱰᱟᱨ +cosmic-panel-launcher-button = ᱞᱚᱱᱪᱟᱨ ᱵᱩᱛᱟᱢ diff --git a/i18n/zh-Hant/desktop_entries.ftl b/i18n/zh-Hant/desktop_entries.ftl index 7bac138d..ef886f04 100644 --- a/i18n/zh-Hant/desktop_entries.ftl +++ b/i18n/zh-Hant/desktop_entries.ftl @@ -1,31 +1,31 @@ -cosmic-applet-a11y-keywords = COSMIC;工具程式;無障礙;螢幕;閱讀器;放大鏡;對比;顏色; -cosmic-applet-audio-keywords = COSMIC;工具程式;音響;音頻;MPRIS; -cosmic-applet-battery-keywords = COSMIC;工具程式;電源;電池; -cosmic-applet-bluetooth-keywords = COSMIC;工具程式;藍牙; -cosmic-applet-input-sources-keywords = COSMIC;工具程式;輸入;輸入源; -cosmic-applet-minimize-keywords = COSMIC;工具程式;最小化; +cosmic-applet-a11y-keywords = COSMIC;小程式;無障礙;螢幕;閱讀器;放大鏡;對比;顏色; +cosmic-applet-audio-keywords = COSMIC;小程式;音效;音訊;MPRIS; +cosmic-applet-battery-keywords = COSMIC;小程式;電源;電池; +cosmic-applet-bluetooth-keywords = COSMIC;小程式;藍牙; +cosmic-applet-input-sources-keywords = COSMIC;小程式;輸入;輸入源; +cosmic-applet-minimize-keywords = COSMIC;小程式;最小化; cosmic-applet-network-keywords = COSMIC;工具程式;網路; cosmic-applet-notifications-keywords = COSMIC;工具程式;通知; cosmic-applet-power-keywords = COSMIC;工具程式;使用者;工作階段;鎖定;登入;登出;重新啟動;關閉電源;休眠; -cosmic-app-list = 應用程式匣盤 -cosmic-applet-status-area = 通知匣盤 -cosmic-applet-status-area-keywords = COSMIC;工具程式;应用;應用程式;指示器;通知;匣盤;狀態; +cosmic-app-list = 應用程式托盤 +cosmic-applet-status-area = 通知托盤 +cosmic-applet-status-area-keywords = COSMIC;小程式;應用程式;指示器;通知;托盤;狀態; cosmic-applet-status-area-comment = 可能在面板上顯示的應用指示器 -cosmic-panel-app-button-keywords = COSMIC;工具程式;應用;應用程式;庫;匣盤; +cosmic-panel-app-button-keywords = COSMIC;小程式;應用;應用程式;庫;托盤; cosmic-panel-workspaces-button = 工作區按鈕 cosmic-applet-tiling-comment = 管理啟用提示、當前和每個工作區自動視窗平鋪 -cosmic-applet-tiling-keywords = COSMIC;工具程式;平鋪;提示;工作區; +cosmic-applet-tiling-keywords = COSMIC;小程式;平鋪;提示;工作區; cosmic-applet-time = 日期、時間與行事曆 -cosmic-applet-time-comment = 在面板上顯示時間以及彈出日曆 -cosmic-applet-time-keywords = COSMIC;工具程式;日期;時間;日曆;行事曆; +cosmic-applet-time-comment = 在面板上顯示目前時間,並附帶彈出式日曆視窗 +cosmic-applet-time-keywords = COSMIC;小程式;日期;時間;日曆;行事曆; cosmic-applet-workspaces = 工作區編號 cosmic-applet-workspaces-comment = 在面板上切換帶有編號的工作區 -cosmic-applet-workspaces-keywords = COSMIC;工具程式;工作區; +cosmic-applet-workspaces-keywords = COSMIC;小程式;工作區; cosmic-panel-app-button = 應用程式庫按鈕 cosmic-panel-app-button-comment = 啟動應用程式庫來啟動已安裝的應用程式 cosmic-panel-launcher-button = 啟動器按鈕 cosmic-panel-launcher-button-comment = 開啟啟動器以搜尋應用程式以及執行命令 -cosmic-panel-launcher-button-keywords = COSMIC;工具程式;啟動器; +cosmic-panel-launcher-button-keywords = COSMIC;小程式;啟動器; cosmic-applet-notifications-comment = 管理通知和勿擾模式 cosmic-applet-a11y = 無障礙 cosmic-applet-bluetooth-comment = 管理藍牙裝置 @@ -35,11 +35,11 @@ cosmic-applet-notifications = 通知中心 cosmic-applet-network-comment = 管理網路連接 cosmic-applet-minimize-comment = 管理最小化的視窗 cosmic-applet-bluetooth = 藍牙 -cosmic-applet-audio = 音響 +cosmic-applet-audio = 音效 cosmic-applet-minimize = 最小化視窗 cosmic-app-list-comment = 啟動釘板的應用程式並管理開啟視窗 -cosmic-app-list-keywords = COSMIC;工具程式;應用程式;匣盤;列表;任務;列; -cosmic-applet-a11y-comment = 從面板調設無障礙設定 +cosmic-app-list-keywords = COSMIC;小程式;應用程式;匣盤;列表;任務;列; +cosmic-applet-a11y-comment = 從面板設定無障礙功能 cosmic-applet-audio-comment = 音訊裝置選擇、音量控制及 MPRIS 媒體控制 cosmic-applet-input-sources = 輸入來源 cosmic-applet-input-sources-comment = 切換各輸入來源 @@ -48,4 +48,4 @@ cosmic-applet-power = 使用者工作階段 cosmic-applet-power-comment = 鎖定畫面、登出、休眠、重新啟動及關機 cosmic-applet-tiling = 平鋪 cosmic-panel-workspaces-button-comment = 啟動工作區總覽以管理和切換工作區 -cosmic-panel-workspaces-button-keywords = COSMIC;工具程式;工作區;總覽; +cosmic-panel-workspaces-button-keywords = COSMIC;小程式;工作區;總覽;