diff --git a/Cargo.lock b/Cargo.lock index 02a0107a..dd77eb75 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -327,7 +327,7 @@ checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -568,7 +568,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -603,7 +603,7 @@ checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -679,7 +679,7 @@ dependencies = [ "derive_utils", "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -759,7 +759,7 @@ dependencies = [ "regex", "rustc-hash 1.1.0", "shlex", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -913,7 +913,7 @@ dependencies = [ "proc-macro-crate 3.4.0", "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -1005,7 +1005,7 @@ checksum = "f9abbd1bc6865053c427f7198e6af43bfdedc55ab791faed4fbd361d789575ff" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -1218,7 +1218,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -1515,7 +1515,7 @@ dependencies = [ [[package]] name = "cosmic-comp-config" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-comp#6e4164643ea81d3a2c3b40ffc441950722a61bfb" +source = "git+https://github.com/pop-os/cosmic-comp#e55d16b87bc00d24b03a0d3924e04125f0ae6be1" dependencies = [ "cosmic-config", "input", @@ -1527,12 +1527,12 @@ dependencies = [ [[package]] name = "cosmic-config" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#d2f7fdea6d24e70b54e017e89973b8a5a44b4e54" +source = "git+https://github.com/pop-os/libcosmic#6439507aa2d8d7e6a89c0fc016895dc0ab9252d4" dependencies = [ "atomicwrites", "cosmic-config-derive", "cosmic-settings-daemon", - "dirs 6.0.0", + "dirs", "futures-util", "iced_futures", "known-folders", @@ -1541,17 +1541,17 @@ dependencies = [ "serde", "tokio", "tracing", - "xdg 3.0.0", + "xdg", "zbus 5.12.0", ] [[package]] name = "cosmic-config-derive" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#d2f7fdea6d24e70b54e017e89973b8a5a44b4e54" +source = "git+https://github.com/pop-os/libcosmic#6439507aa2d8d7e6a89c0fc016895dc0ab9252d4" dependencies = [ "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -1577,15 +1577,15 @@ dependencies = [ [[package]] name = "cosmic-freedesktop-icons" -version = "0.3.0" -source = "git+https://github.com/pop-os/freedesktop-icons#8a05c322c482ff3c69cf34bacfee98907ac45307" +version = "0.4.0" +source = "git+https://github.com/pop-os/freedesktop-icons#689c60d428f46dc59316eafa22297e196afa4b15" dependencies = [ - "dirs 5.0.1", + "dirs", "ini_core", "memmap2 0.9.9", "thiserror 2.0.17", "tracing", - "xdg 2.5.2", + "xdg", ] [[package]] @@ -1600,12 +1600,12 @@ dependencies = [ [[package]] name = "cosmic-mime-apps" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-mime-apps#24ee9e9a743c570437875b9d2066bda0ef7dba98" +source = "git+https://github.com/pop-os/cosmic-mime-apps#1ccb8f635ce1ead1f40564c2a158e1d6c06d25fb" dependencies = [ "freedesktop-desktop-entry", "mime 0.3.17", - "quick-xml", - "xdg 2.5.2", + "quick-xml 0.38.3", + "xdg", ] [[package]] @@ -1698,7 +1698,7 @@ dependencies = [ "cosmic-settings-upower-subscription", "cosmic-settings-wallpaper", "derive_setters", - "dirs 6.0.0", + "dirs", "eyre", "fontdb 0.23.0", "freedesktop-desktop-entry", @@ -1910,7 +1910,7 @@ version = "0.1.0" dependencies = [ "cosmic-bg-config", "cosmic-randr-shell", - "dirs 6.0.0", + "dirs", "eyre", "fast_image_resize", "futures-lite 2.6.1", @@ -1949,12 +1949,12 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#d2f7fdea6d24e70b54e017e89973b8a5a44b4e54" +source = "git+https://github.com/pop-os/libcosmic#6439507aa2d8d7e6a89c0fc016895dc0ab9252d4" dependencies = [ "almost", "cosmic-config", "csscolorparser", - "dirs 6.0.0", + "dirs", "palette", "ron", "serde", @@ -2110,7 +2110,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -2124,7 +2124,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -2135,7 +2135,7 @@ checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead" dependencies = [ "darling_core 0.20.11", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -2146,7 +2146,7 @@ checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81" dependencies = [ "darling_core 0.21.3", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -2194,7 +2194,7 @@ dependencies = [ "darling 0.20.11", "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -2204,7 +2204,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c" dependencies = [ "derive_builder_core", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -2216,7 +2216,7 @@ dependencies = [ "darling 0.20.11", "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -2227,7 +2227,7 @@ checksum = "ccfae181bab5ab6c5478b2ccb69e4c68a02f8c3ec72f6616bfec9dbc599d2ee0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -2259,34 +2259,13 @@ dependencies = [ "crypto-common", ] -[[package]] -name = "dirs" -version = "5.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" -dependencies = [ - "dirs-sys 0.4.1", -] - [[package]] name = "dirs" version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3e8aa94d75141228480295a7d0e7feb620b1a5ad9f12bc40be62411e38cce4e" dependencies = [ - "dirs-sys 0.5.0", -] - -[[package]] -name = "dirs-sys" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" -dependencies = [ - "libc", - "option-ext", - "redox_users 0.4.6", - "windows-sys 0.48.0", + "dirs-sys", ] [[package]] @@ -2297,7 +2276,7 @@ checksum = "e01a3366d27ee9890022452ee61b2b63a67e6f13f58900b651ff5665f0bb1fab" dependencies = [ "libc", "option-ext", - "redox_users 0.5.2", + "redox_users", "windows-sys 0.61.2", ] @@ -2327,7 +2306,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -2452,7 +2431,7 @@ checksum = "67c78a4d8fdf9953a5c9d458f9efe940fd97a0cab0941c075a813ac594733827" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -2472,7 +2451,7 @@ checksum = "44f23cf4b44bfce11a86ace86f8a73ffdec849c9fd00a386a53d278bd9e81fb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -2630,7 +2609,7 @@ checksum = "a0aca10fb742cb43f9e7bb8467c91aa9bcb8e3ffbc6a6f7389bb93ffc920577d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -2823,7 +2802,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -2853,7 +2832,7 @@ dependencies = [ "memchr", "thiserror 2.0.17", "unicase", - "xdg 3.0.0", + "xdg", ] [[package]] @@ -2966,7 +2945,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -3376,7 +3355,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.108", + "syn 2.0.109", "unic-langid", ] @@ -3390,7 +3369,7 @@ dependencies = [ "i18n-config", "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -3420,7 +3399,7 @@ dependencies = [ [[package]] name = "iced" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#d2f7fdea6d24e70b54e017e89973b8a5a44b4e54" +source = "git+https://github.com/pop-os/libcosmic#6439507aa2d8d7e6a89c0fc016895dc0ab9252d4" dependencies = [ "dnd", "iced_accessibility", @@ -3438,7 +3417,7 @@ dependencies = [ [[package]] name = "iced_accessibility" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#d2f7fdea6d24e70b54e017e89973b8a5a44b4e54" +source = "git+https://github.com/pop-os/libcosmic#6439507aa2d8d7e6a89c0fc016895dc0ab9252d4" dependencies = [ "accesskit", "accesskit_winit", @@ -3447,7 +3426,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#d2f7fdea6d24e70b54e017e89973b8a5a44b4e54" +source = "git+https://github.com/pop-os/libcosmic#6439507aa2d8d7e6a89c0fc016895dc0ab9252d4" dependencies = [ "bitflags 2.10.0", "bytes", @@ -3472,7 +3451,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#d2f7fdea6d24e70b54e017e89973b8a5a44b4e54" +source = "git+https://github.com/pop-os/libcosmic#6439507aa2d8d7e6a89c0fc016895dc0ab9252d4" dependencies = [ "futures", "iced_core", @@ -3498,7 +3477,7 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#d2f7fdea6d24e70b54e017e89973b8a5a44b4e54" +source = "git+https://github.com/pop-os/libcosmic#6439507aa2d8d7e6a89c0fc016895dc0ab9252d4" dependencies = [ "bitflags 2.10.0", "bytemuck", @@ -3520,7 +3499,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#d2f7fdea6d24e70b54e017e89973b8a5a44b4e54" +source = "git+https://github.com/pop-os/libcosmic#6439507aa2d8d7e6a89c0fc016895dc0ab9252d4" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -3532,7 +3511,7 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#d2f7fdea6d24e70b54e017e89973b8a5a44b4e54" +source = "git+https://github.com/pop-os/libcosmic#6439507aa2d8d7e6a89c0fc016895dc0ab9252d4" dependencies = [ "bytes", "cosmic-client-toolkit", @@ -3548,7 +3527,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#d2f7fdea6d24e70b54e017e89973b8a5a44b4e54" +source = "git+https://github.com/pop-os/libcosmic#6439507aa2d8d7e6a89c0fc016895dc0ab9252d4" dependencies = [ "bytemuck", "cosmic-text", @@ -3564,7 +3543,7 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#d2f7fdea6d24e70b54e017e89973b8a5a44b4e54" +source = "git+https://github.com/pop-os/libcosmic#6439507aa2d8d7e6a89c0fc016895dc0ab9252d4" dependencies = [ "as-raw-xcb-connection", "bitflags 2.10.0", @@ -3595,7 +3574,7 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#d2f7fdea6d24e70b54e017e89973b8a5a44b4e54" +source = "git+https://github.com/pop-os/libcosmic#6439507aa2d8d7e6a89c0fc016895dc0ab9252d4" dependencies = [ "cosmic-client-toolkit", "dnd", @@ -3615,7 +3594,7 @@ dependencies = [ [[package]] name = "iced_winit" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#d2f7fdea6d24e70b54e017e89973b8a5a44b4e54" +source = "git+https://github.com/pop-os/libcosmic#6439507aa2d8d7e6a89c0fc016895dc0ab9252d4" dependencies = [ "cosmic-client-toolkit", "dnd", @@ -4233,7 +4212,7 @@ checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -4644,7 +4623,7 @@ checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976" [[package]] name = "libcosmic" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#d2f7fdea6d24e70b54e017e89973b8a5a44b4e54" +source = "git+https://github.com/pop-os/libcosmic#6439507aa2d8d7e6a89c0fc016895dc0ab9252d4" dependencies = [ "apply", "ashpd 0.12.0", @@ -5369,7 +5348,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -5442,7 +5421,7 @@ dependencies = [ "proc-macro-crate 3.4.0", "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -5765,9 +5744,9 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] name = "orbclient" -version = "0.3.48" +version = "0.3.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba0b26cec2e24f08ed8bb31519a9333140a6599b867dac464bb150bdb796fd43" +checksum = "247ad146e19b9437f8604c21f8652423595cf710ad108af40e77d3ae6e96b827" dependencies = [ "libredox", ] @@ -5803,7 +5782,7 @@ dependencies = [ "proc-macro2", "proc-macro2-diagnostics", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -5843,7 +5822,7 @@ dependencies = [ "by_address", "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -5942,7 +5921,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -5977,7 +5956,7 @@ checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -6169,7 +6148,7 @@ dependencies = [ "proc-macro-error-attr2", "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -6189,7 +6168,7 @@ checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", "version_check", "yansi", ] @@ -6231,7 +6210,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52717f9a02b6965224f95ca2a81e2e0c5c43baacd28ca057577988930b6c3d5b" dependencies = [ "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -6302,6 +6281,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "quick-xml" +version = "0.38.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42a232e7487fc2ef313d96dde7948e7a3c05101870d8985e4fd8d26aedd27b89" +dependencies = [ + "memchr", +] + [[package]] name = "quote" version = "1.0.41" @@ -6499,17 +6487,6 @@ dependencies = [ "bitflags 2.10.0", ] -[[package]] -name = "redox_users" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" -dependencies = [ - "getrandom 0.2.16", - "libredox", - "thiserror 1.0.69", -] - [[package]] name = "redox_users" version = "0.5.2" @@ -6538,7 +6515,7 @@ checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -6702,7 +6679,7 @@ dependencies = [ "proc-macro2", "quote", "rust-embed-utils", - "syn 2.0.108", + "syn 2.0.109", "walkdir", ] @@ -6841,9 +6818,9 @@ dependencies = [ [[package]] name = "schemars" -version = "1.0.5" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1317c3bf3e7df961da95b0a56a172a02abead31276215a0497241a7624b487ce" +checksum = "9558e172d4e8533736ba97870c4b2cd63f84b382a3d6eb063da41b91cce17289" dependencies = [ "dyn-clone", "ref-cast", @@ -6937,7 +6914,7 @@ checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -6962,7 +6939,7 @@ checksum = "175ee3e80ae9982737ca543e96133087cbd9a485eecc3bc4de9c1a37b47ea59c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -6986,7 +6963,7 @@ dependencies = [ "indexmap 1.9.3", "indexmap 2.12.0", "schemars 0.9.0", - "schemars 1.0.5", + "schemars 1.1.0", "serde_core", "serde_json", "serde_with_macros", @@ -7002,7 +6979,7 @@ dependencies = [ "darling 0.21.3", "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -7388,9 +7365,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.108" +version = "2.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da58917d35242480a05c2897064da0a80589a2a0476c9a3f2fdc83b53502e917" +checksum = "2f17c7e013e88258aa9543dcbe81aca68a667a9ac37cd69c9fbc07858bfe0e2f" dependencies = [ "proc-macro2", "quote", @@ -7405,7 +7382,7 @@ checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -7535,7 +7512,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -7546,7 +7523,7 @@ checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -7701,7 +7678,7 @@ checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -7819,7 +7796,7 @@ checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -8210,7 +8187,7 @@ dependencies = [ "bumpalo", "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", "wasm-bindgen-shared", ] @@ -8359,7 +8336,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "54cb1e9dc49da91950bdfd8b848c49330536d9d1fb03d4bfec8cae50caa50ae3" dependencies = [ "proc-macro2", - "quick-xml", + "quick-xml 0.37.5", "quote", ] @@ -8689,7 +8666,7 @@ checksum = "942ac266be9249c84ca862f0a164a39533dc2f6f33dc98ec89c8da99b82ea0bd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -8700,7 +8677,7 @@ checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -8711,7 +8688,7 @@ checksum = "da33557140a288fae4e1d5f8873aaf9eb6613a9cf82c3e070223ff177f598b60" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -8722,7 +8699,7 @@ checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -9245,12 +9222,6 @@ version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bec9e4a500ca8864c5b47b8b482a73d62e4237670e5b5f1d6b9e3cae50f28f2b" -[[package]] -name = "xdg" -version = "2.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546" - [[package]] name = "xdg" version = "3.0.0" @@ -9393,7 +9364,7 @@ checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", "synstructure", ] @@ -9491,7 +9462,7 @@ dependencies = [ "proc-macro-crate 3.4.0", "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", "zbus_names 4.2.0", "zvariant 5.8.0", "zvariant_utils 3.2.1", @@ -9556,7 +9527,7 @@ checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -9576,7 +9547,7 @@ checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", "synstructure", ] @@ -9617,7 +9588,7 @@ checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", ] [[package]] @@ -9695,7 +9666,7 @@ dependencies = [ "proc-macro-crate 3.4.0", "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.109", "zvariant_utils 3.2.1", ] @@ -9719,6 +9690,6 @@ dependencies = [ "proc-macro2", "quote", "serde", - "syn 2.0.108", + "syn 2.0.109", "winnow 0.7.13", ] diff --git a/cosmic-settings/src/pages/desktop/appearance/drawer.rs b/cosmic-settings/src/pages/desktop/appearance/drawer.rs index 9dfe89da..a086800e 100644 --- a/cosmic-settings/src/pages/desktop/appearance/drawer.rs +++ b/cosmic-settings/src/pages/desktop/appearance/drawer.rs @@ -332,7 +332,7 @@ impl Content { .map(crate::pages::Message::Appearance), crate::pages::Message::CloseContextDrawer, ) - .header(text::title4(fl!("window-hint-accent"))), + .title(fl!("window-hint-accent")), ContextView::ApplicationBackground => context_drawer( color_picker_context_view( @@ -344,7 +344,7 @@ impl Content { .map(crate::pages::Message::Appearance), crate::pages::Message::CloseContextDrawer, ) - .header(text::title4(fl!("app-background"))), + .title(fl!("app-background")), ContextView::ContainerBackground => context_drawer( color_picker_context_view( @@ -356,7 +356,7 @@ impl Content { .map(crate::pages::Message::Appearance), crate::pages::Message::CloseContextDrawer, ) - .header(text::title4(fl!("container-background"))), + .title(fl!("container-background")), ContextView::ControlComponent => context_drawer( color_picker_context_view( @@ -368,7 +368,7 @@ impl Content { .map(crate::pages::Message::Appearance), crate::pages::Message::CloseContextDrawer, ) - .header(text::title4(fl!("control-tint"))), + .title(fl!("control-tint")), ContextView::CustomAccent => context_drawer( color_picker_context_view( @@ -380,7 +380,7 @@ impl Content { .map(crate::pages::Message::Appearance), crate::pages::Message::CloseContextDrawer, ) - .header(text::title4(fl!("accent-color"))), + .title(fl!("accent-color")), ContextView::InterfaceText => context_drawer( color_picker_context_view( @@ -392,7 +392,7 @@ impl Content { .map(crate::pages::Message::Appearance), crate::pages::Message::CloseContextDrawer, ) - .header(text::title4(fl!("text-tint"))), + .title(fl!("text-tint")), ContextView::SystemFont => context_drawer( self.font_config diff --git a/cosmic-settings/src/pages/input/keyboard/mod.rs b/cosmic-settings/src/pages/input/keyboard/mod.rs index ac9e6300..47475103 100644 --- a/cosmic-settings/src/pages/input/keyboard/mod.rs +++ b/cosmic-settings/src/pages/input/keyboard/mod.rs @@ -602,10 +602,13 @@ impl Page { } fn special_character_key_view(&self, special_key: SpecialKey) -> cosmic::Element<'_, Message> { - let options = match special_key { - SpecialKey::Compose => COMPOSE_OPTIONS, - SpecialKey::AlternateCharacters => ALTERNATE_CHARACTER_OPTIONS, - SpecialKey::CapsLock => CAPS_LOCK_OPTIONS, + let (options, description) = match special_key { + SpecialKey::Compose => ( + COMPOSE_OPTIONS, + Some(fl!("keyboard-special-char", "compose-desc")), + ), + SpecialKey::AlternateCharacters => (ALTERNATE_CHARACTER_OPTIONS, None), + SpecialKey::CapsLock => (CAPS_LOCK_OPTIONS, None), }; let prefix = special_key.prefix(); let current = self @@ -615,7 +618,7 @@ impl Page { .flat_map(|x| x.split(',')) .find(|x| x.starts_with(prefix)); - // TODO description, layout default + // TODO layout default let mut list = cosmic::widget::list_column(); @@ -630,7 +633,11 @@ impl Page { .map(|(desc, id)| special_char_radio_row(desc, Some(id), current)) .fold(list, ListColumn::add); - cosmic::widget::container(list).padding(24).into() + widget::column::with_capacity(2) + .spacing(theme::spacing().space_m) + .push_maybe(description.map(widget::text::body)) + .push(list) + .into() } fn numlock_state_view(&self) -> cosmic::Element<'_, Message> { @@ -658,7 +665,7 @@ impl Page { ])); } - cosmic::widget::container(list).padding(24).into() + list.into() } fn update_xkb_config(&mut self) { diff --git a/i18n/en/cosmic_settings.ftl b/i18n/en/cosmic_settings.ftl index 51df9691..93f12856 100644 --- a/i18n/en/cosmic_settings.ftl +++ b/i18n/en/cosmic_settings.ftl @@ -570,6 +570,7 @@ keyboard-sources = Input Sources keyboard-special-char = Special Character Entry .alternate = Alternate characters key .compose = Compose key + .compose-desc = The compose key allows a wide variety of characters to be entered. To use it, press compose and then a sequence of characters. For example, compose key followed by C and o will enter ©, while compose key followed by a and ‘ will enter á. .caps = Caps Lock key keyboard-typing-assist = Typing diff --git a/i18n/sr-Cyrl/cosmic_settings.ftl b/i18n/sr-Cyrl/cosmic_settings.ftl index f5774514..e4bfb121 100644 --- a/i18n/sr-Cyrl/cosmic_settings.ftl +++ b/i18n/sr-Cyrl/cosmic_settings.ftl @@ -513,6 +513,7 @@ keyboard-sources = Језик уноса keyboard-special-char = Уношење специјалних знакова .alternate = Тастер за алтернативне знакове .compose = Compose тастер + .compose-desc = Compose тастер омогућава унос широког спектра знакова. Да бисте га користили, притисните Compose, а затим секвенцу знакова. На пример, Compose тастер праћен тастерима C и o уноси ©, док праћен тастерима а и ‘ уноси á. .caps = Caps Lock тастер keyboard-typing-assist = Куцање .repeat-rate = Стопа понављања diff --git a/i18n/sr-Latn/cosmic_settings.ftl b/i18n/sr-Latn/cosmic_settings.ftl index 256da542..09ba8200 100644 --- a/i18n/sr-Latn/cosmic_settings.ftl +++ b/i18n/sr-Latn/cosmic_settings.ftl @@ -513,6 +513,7 @@ keyboard-sources = Jezik unosa keyboard-special-char = Unošenje specijalnih znakova .alternate = Taster za alternativne znakove .compose = Compose taster + .compose-desc = Compose taster omogućava unos širokog spektra znakova. Da biste ga koristili, pritisnite Compose, a zatim sekvencu znakova. Na primer, Compose taster praćen tasterima C i o unosi ©, dok praćen tasterima a i ‘ unosi á. .caps = Caps Lock taster keyboard-typing-assist = Kucanje .repeat-rate = Stopa ponavljanja