leyoda/cosmic-settings
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: update lock

Browse source
This commit is contained in:
Ashley Wulber 2023-12-11 14:46:22 -05:00 • committed by Michael Murphy
parent 13cc6b9f7c
commit d31359e8c6
7 changed files with 154 additions and 173 deletions
Download patch file Download diff file Expand all files Collapse all files

231
Cargo.lock generated
View file

@ -106,9 +106,9 @@ dependencies = [
[[package]] [[package]]
name = "anstream" name = "anstream"
version = "0.6.4" version = "0.6.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" checksum = "d664a92ecae85fd0a7392615844904654d1d5f5514837f471ddef4a057aba1b6"
dependencies = [ dependencies = [
"anstyle", "anstyle",
"anstyle-parse", "anstyle-parse",
@ -135,9 +135,9 @@ dependencies = [
[[package]] [[package]]
name = "anstyle-query" name = "anstyle-query"
version = "1.0.1" version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a3a318f1f38d2418400f8209655bfd825785afd25aa30bb7ba6cc792e4596748" checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648"
dependencies = [ dependencies = [
"windows-sys 0.52.0", "windows-sys 0.52.0",
] ]
@ -307,13 +307,13 @@ dependencies = [
[[package]] [[package]]
name = "async-global-executor" name = "async-global-executor"
version = "2.4.0" version = "2.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9b4353121d5644cdf2beb5726ab752e79a8db1ebb52031770ec47db31d245526" checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c"
dependencies = [ dependencies = [
"async-channel 2.1.1", "async-channel 2.1.1",
"async-executor", "async-executor",
"async-io 2.2.1", "async-io 2.2.2",
"async-lock 3.2.0", "async-lock 3.2.0",
"blocking", "blocking",
"futures-lite 2.1.0", "futures-lite 2.1.0",
@ -342,9 +342,9 @@ dependencies = [
[[package]] [[package]]
name = "async-io" name = "async-io"
version = "2.2.1" version = "2.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d6d3b15875ba253d1110c740755e246537483f152fa334f91abd7fe84c88b3ff" checksum = "6afaa937395a620e33dc6a742c593c01aced20aa376ffb0f628121198578ccc7"
dependencies = [ dependencies = [
"async-lock 3.2.0", "async-lock 3.2.0",
"cfg-if", "cfg-if",
@ -353,7 +353,7 @@ dependencies = [
"futures-lite 2.1.0", "futures-lite 2.1.0",
"parking", "parking",
"polling 3.3.1", "polling 3.3.1",
"rustix 0.38.26", "rustix 0.38.28",
"slab", "slab",
"tracing", "tracing",
"windows-sys 0.52.0", "windows-sys 0.52.0",
@ -392,7 +392,7 @@ dependencies = [
"cfg-if", "cfg-if",
"event-listener 3.1.0", "event-listener 3.1.0",
"futures-lite 1.13.0", "futures-lite 1.13.0",
"rustix 0.38.26", "rustix 0.38.28",
"windows-sys 0.48.0", "windows-sys 0.48.0",
] ]
@ -404,7 +404,7 @@ checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.39", "syn 2.0.40",
] ]
[[package]] [[package]]
@ -413,13 +413,13 @@ version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5"
dependencies = [ dependencies = [
"async-io 2.2.1", "async-io 2.2.2",
"async-lock 2.8.0", "async-lock 2.8.0",
"atomic-waker", "atomic-waker",
"cfg-if", "cfg-if",
"futures-core", "futures-core",
"futures-io", "futures-io",
"rustix 0.38.26", "rustix 0.38.28",
"signal-hook-registry", "signal-hook-registry",
"slab", "slab",
"windows-sys 0.48.0", "windows-sys 0.48.0",
@ -465,7 +465,7 @@ checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.39", "syn 2.0.40",
] ]
[[package]] [[package]]
@ -479,7 +479,7 @@ name = "atomicwrites"
version = "0.4.2" version = "0.4.2"
source = "git+https://github.com/jackpot51/rust-atomicwrites#043ab4859d53ffd3d55334685303d8df39c9f768" source = "git+https://github.com/jackpot51/rust-atomicwrites#043ab4859d53ffd3d55334685303d8df39c9f768"
dependencies = [ dependencies = [
"rustix 0.38.26", "rustix 0.38.28",
"tempfile", "tempfile",
"windows-sys 0.48.0", "windows-sys 0.48.0",
] ]
@ -637,7 +637,7 @@ checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.39", "syn 2.0.40",
] ]
[[package]] [[package]]
@ -671,7 +671,7 @@ dependencies = [
"bitflags 2.4.1", "bitflags 2.4.1",
"log", "log",
"polling 3.3.1", "polling 3.3.1",
"rustix 0.38.26", "rustix 0.38.28",
"slab", "slab",
"thiserror", "thiserror",
] ]
@ -683,7 +683,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02" checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02"
dependencies = [ dependencies = [
"calloop", "calloop",
"rustix 0.38.26", "rustix 0.38.28",
"wayland-backend 0.3.2", "wayland-backend 0.3.2",
"wayland-client 0.31.1", "wayland-client 0.31.1",
] ]
@ -740,7 +740,7 @@ dependencies = [
"heck", "heck",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.39", "syn 2.0.40",
] ]
[[package]] [[package]]
@ -963,7 +963,7 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-config" name = "cosmic-config"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic#cda781cb96875c1c3b9cf648393ae4f325a1d34d" source = "git+https://github.com/pop-os/libcosmic#493bf6c47a46e735bbb91a2ee06629839bfca911"
dependencies = [ dependencies = [
"atomicwrites", "atomicwrites",
"calloop", "calloop",
@ -978,7 +978,7 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-config-derive" name = "cosmic-config-derive"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic#cda781cb96875c1c3b9cf648393ae4f325a1d34d" source = "git+https://github.com/pop-os/libcosmic#493bf6c47a46e735bbb91a2ee06629839bfca911"
dependencies = [ dependencies = [
"quote", "quote",
"syn 1.0.109", "syn 1.0.109",
@ -1129,7 +1129,7 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-theme" name = "cosmic-theme"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic#cda781cb96875c1c3b9cf648393ae4f325a1d34d" source = "git+https://github.com/pop-os/libcosmic#493bf6c47a46e735bbb91a2ee06629839bfca911"
dependencies = [ dependencies = [
"almost", "almost",
"cosmic-config", "cosmic-config",
@ -1240,7 +1240,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "37e366bff8cd32dd8754b0991fb66b279dc48f598c3a18914852a6673deef583" checksum = "37e366bff8cd32dd8754b0991fb66b279dc48f598c3a18914852a6673deef583"
dependencies = [ dependencies = [
"quote", "quote",
"syn 2.0.39", "syn 2.0.40",
] ]
[[package]] [[package]]
@ -1281,7 +1281,7 @@ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"strsim", "strsim",
"syn 2.0.39", "syn 2.0.40",
] ]
[[package]] [[package]]
@ -1292,7 +1292,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5"
dependencies = [ dependencies = [
"darling_core", "darling_core",
"quote", "quote",
"syn 2.0.39", "syn 2.0.40",
] ]
[[package]] [[package]]
@ -1334,7 +1334,7 @@ dependencies = [
"darling", "darling",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.39", "syn 2.0.40",
] ]
[[package]] [[package]]
@ -1405,7 +1405,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.39", "syn 2.0.40",
] ]
[[package]] [[package]]
@ -1499,7 +1499,7 @@ checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.39", "syn 2.0.40",
] ]
[[package]] [[package]]
@ -1593,9 +1593,9 @@ dependencies = [
[[package]] [[package]]
name = "eyre" name = "eyre"
version = "0.6.9" version = "0.6.10"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "80f656be11ddf91bd709454d15d5bd896fbaf4cc3314e69349e4d1569f5b46cd" checksum = "8bbb8258be8305fb0237d7b295f47bb24ff1b136a535f473baf40e70468515aa"
dependencies = [ dependencies = [
"indenter", "indenter",
"once_cell", "once_cell",
@ -1633,14 +1633,14 @@ dependencies = [
[[package]] [[package]]
name = "filetime" name = "filetime"
version = "0.2.22" version = "0.2.23"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"libc", "libc",
"redox_syscall 0.3.5", "redox_syscall 0.4.1",
"windows-sys 0.48.0", "windows-sys 0.52.0",
] ]
[[package]] [[package]]
@ -1793,7 +1793,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.39", "syn 2.0.40",
] ]
[[package]] [[package]]
@ -1941,7 +1941,7 @@ checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.39", "syn 2.0.40",
] ]
[[package]] [[package]]
@ -2307,7 +2307,7 @@ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"strsim", "strsim",
"syn 2.0.39", "syn 2.0.40",
"unic-langid", "unic-langid",
] ]
@ -2321,13 +2321,13 @@ dependencies = [
"i18n-config", "i18n-config",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.39", "syn 2.0.40",
] ]
[[package]] [[package]]
name = "iced" name = "iced"
version = "0.12.0" version = "0.12.0"
source = "git+https://github.com/pop-os/libcosmic#cda781cb96875c1c3b9cf648393ae4f325a1d34d" source = "git+https://github.com/pop-os/libcosmic#493bf6c47a46e735bbb91a2ee06629839bfca911"
dependencies = [ dependencies = [
"iced_accessibility", "iced_accessibility",
"iced_core", "iced_core",
@ -2342,7 +2342,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_accessibility" name = "iced_accessibility"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic#cda781cb96875c1c3b9cf648393ae4f325a1d34d" source = "git+https://github.com/pop-os/libcosmic#493bf6c47a46e735bbb91a2ee06629839bfca911"
dependencies = [ dependencies = [
"accesskit", "accesskit",
"accesskit_unix", "accesskit_unix",
@ -2351,7 +2351,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_core" name = "iced_core"
version = "0.12.0" version = "0.12.0"
source = "git+https://github.com/pop-os/libcosmic#cda781cb96875c1c3b9cf648393ae4f325a1d34d" source = "git+https://github.com/pop-os/libcosmic#493bf6c47a46e735bbb91a2ee06629839bfca911"
dependencies = [ dependencies = [
"bitflags 1.3.2", "bitflags 1.3.2",
"iced_accessibility", "iced_accessibility",
@ -2359,6 +2359,7 @@ dependencies = [
"log", "log",
"num-traits", "num-traits",
"palette", "palette",
"raw-window-handle",
"serde", "serde",
"smithay-client-toolkit 0.18.0", "smithay-client-toolkit 0.18.0",
"thiserror", "thiserror",
@ -2368,7 +2369,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_futures" name = "iced_futures"
version = "0.12.0" version = "0.12.0"
source = "git+https://github.com/pop-os/libcosmic#cda781cb96875c1c3b9cf648393ae4f325a1d34d" source = "git+https://github.com/pop-os/libcosmic#493bf6c47a46e735bbb91a2ee06629839bfca911"
dependencies = [ dependencies = [
"futures", "futures",
"iced_core", "iced_core",
@ -2381,7 +2382,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_graphics" name = "iced_graphics"
version = "0.12.0" version = "0.12.0"
source = "git+https://github.com/pop-os/libcosmic#cda781cb96875c1c3b9cf648393ae4f325a1d34d" source = "git+https://github.com/pop-os/libcosmic#493bf6c47a46e735bbb91a2ee06629839bfca911"
dependencies = [ dependencies = [
"bitflags 1.3.2", "bitflags 1.3.2",
"bytemuck", "bytemuck",
@ -2404,7 +2405,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_renderer" name = "iced_renderer"
version = "0.12.0" version = "0.12.0"
source = "git+https://github.com/pop-os/libcosmic#cda781cb96875c1c3b9cf648393ae4f325a1d34d" source = "git+https://github.com/pop-os/libcosmic#493bf6c47a46e735bbb91a2ee06629839bfca911"
dependencies = [ dependencies = [
"iced_graphics", "iced_graphics",
"iced_tiny_skia", "iced_tiny_skia",
@ -2417,7 +2418,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_runtime" name = "iced_runtime"
version = "0.12.0" version = "0.12.0"
source = "git+https://github.com/pop-os/libcosmic#cda781cb96875c1c3b9cf648393ae4f325a1d34d" source = "git+https://github.com/pop-os/libcosmic#493bf6c47a46e735bbb91a2ee06629839bfca911"
dependencies = [ dependencies = [
"iced_accessibility", "iced_accessibility",
"iced_core", "iced_core",
@ -2429,7 +2430,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_sctk" name = "iced_sctk"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic#cda781cb96875c1c3b9cf648393ae4f325a1d34d" source = "git+https://github.com/pop-os/libcosmic#493bf6c47a46e735bbb91a2ee06629839bfca911"
dependencies = [ dependencies = [
"enum-repr", "enum-repr",
"float-cmp", "float-cmp",
@ -2453,7 +2454,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_style" name = "iced_style"
version = "0.12.0" version = "0.12.0"
source = "git+https://github.com/pop-os/libcosmic#cda781cb96875c1c3b9cf648393ae4f325a1d34d" source = "git+https://github.com/pop-os/libcosmic#493bf6c47a46e735bbb91a2ee06629839bfca911"
dependencies = [ dependencies = [
"iced_core", "iced_core",
"once_cell", "once_cell",
@ -2463,7 +2464,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_tiny_skia" name = "iced_tiny_skia"
version = "0.12.0" version = "0.12.0"
source = "git+https://github.com/pop-os/libcosmic#cda781cb96875c1c3b9cf648393ae4f325a1d34d" source = "git+https://github.com/pop-os/libcosmic#493bf6c47a46e735bbb91a2ee06629839bfca911"
dependencies = [ dependencies = [
"bytemuck", "bytemuck",
"cosmic-text", "cosmic-text",
@ -2481,7 +2482,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_wgpu" name = "iced_wgpu"
version = "0.12.0" version = "0.12.0"
source = "git+https://github.com/pop-os/libcosmic#cda781cb96875c1c3b9cf648393ae4f325a1d34d" source = "git+https://github.com/pop-os/libcosmic#493bf6c47a46e735bbb91a2ee06629839bfca911"
dependencies = [ dependencies = [
"bitflags 1.3.2", "bitflags 1.3.2",
"bytemuck", "bytemuck",
@ -2501,7 +2502,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_widget" name = "iced_widget"
version = "0.12.0" version = "0.12.0"
source = "git+https://github.com/pop-os/libcosmic#cda781cb96875c1c3b9cf648393ae4f325a1d34d" source = "git+https://github.com/pop-os/libcosmic#493bf6c47a46e735bbb91a2ee06629839bfca911"
dependencies = [ dependencies = [
"iced_renderer", "iced_renderer",
"iced_runtime", "iced_runtime",
@ -2594,7 +2595,7 @@ checksum = "d2abdd3a62551e8337af119c5899e600ca0c88ec8f23a46c60ba216c803dcf1a"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.39", "syn 2.0.40",
] ]
[[package]] [[package]]
@ -2878,14 +2879,14 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8"
[[package]] [[package]]
name = "libc" name = "libc"
version = "0.2.150" version = "0.2.151"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4"
[[package]] [[package]]
name = "libcosmic" name = "libcosmic"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic#cda781cb96875c1c3b9cf648393ae4f325a1d34d" source = "git+https://github.com/pop-os/libcosmic#493bf6c47a46e735bbb91a2ee06629839bfca911"
dependencies = [ dependencies = [
"apply", "apply",
"ashpd 0.5.0", "ashpd 0.5.0",
@ -3068,9 +3069,9 @@ dependencies = [
[[package]] [[package]]
name = "lyon_tessellation" name = "lyon_tessellation"
version = "1.0.11" version = "1.0.12"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "23bcac20d47825850fabf1e869bf7c2bbe2daefa0776c3cd2eb7cb74635f6e4a" checksum = "1f5bcf02928361d18e6edb8ad3bc5b93cba8aa57e2508deb072c2d2ade8bbd0d"
dependencies = [ dependencies = [
"float_next_after", "float_next_after",
"lyon_path", "lyon_path",
@ -3161,12 +3162,6 @@ dependencies = [
"paste", "paste",
] ]
[[package]]
name = "minimal-lexical"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
[[package]] [[package]]
name = "miniz_oxide" name = "miniz_oxide"
version = "0.7.1" version = "0.7.1"
@ -3179,9 +3174,9 @@ dependencies = [
[[package]] [[package]]
name = "mio" name = "mio"
version = "0.8.9" version = "0.8.10"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09"
dependencies = [ dependencies = [
"libc", "libc",
"log", "log",
@ -3197,9 +3192,9 @@ checksum = "16cf681a23b4d0a43fc35024c176437f9dcd818db34e0f42ab456a0ee5ad497b"
[[package]] [[package]]
name = "naga" name = "naga"
version = "0.14.1" version = "0.14.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6cd05939c491da968a42986204b7431678be21fdcd4b10cc84997ba130ada5a4" checksum = "ae585df4b6514cf8842ac0f1ab4992edc975892704835b549cf818dc0191249e"
dependencies = [ dependencies = [
"bit-set", "bit-set",
"bitflags 2.4.1", "bitflags 2.4.1",
@ -3259,16 +3254,6 @@ dependencies = [
"libc", "libc",
] ]
[[package]]
name = "nom"
version = "7.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
dependencies = [
"memchr",
"minimal-lexical",
]
[[package]] [[package]]
name = "notify" name = "notify"
version = "6.1.1" version = "6.1.1"
@ -3444,9 +3429,9 @@ dependencies = [
[[package]] [[package]]
name = "once_cell" name = "once_cell"
version = "1.18.0" version = "1.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
[[package]] [[package]]
name = "option-ext" name = "option-ext"
@ -3495,7 +3480,7 @@ dependencies = [
"proc-macro-error", "proc-macro-error",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.39", "syn 2.0.40",
] ]
[[package]] [[package]]
@ -3531,7 +3516,7 @@ checksum = "b7db010ec5ff3d4385e4f133916faacd9dad0f6a09394c92d825b3aed310fa0a"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.39", "syn 2.0.40",
] ]
[[package]] [[package]]
@ -3630,7 +3615,7 @@ dependencies = [
"phf_shared", "phf_shared",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.39", "syn 2.0.40",
] ]
[[package]] [[package]]
@ -3665,7 +3650,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.39", "syn 2.0.40",
] ]
[[package]] [[package]]
@ -3735,7 +3720,7 @@ dependencies = [
"cfg-if", "cfg-if",
"concurrent-queue", "concurrent-queue",
"pin-project-lite", "pin-project-lite",
"rustix 0.38.26", "rustix 0.38.28",
"tracing", "tracing",
"windows-sys 0.52.0", "windows-sys 0.52.0",
] ]
@ -3797,9 +3782,9 @@ dependencies = [
[[package]] [[package]]
name = "profiling" name = "profiling"
version = "1.0.11" version = "1.0.12"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f89dff0959d98c9758c88826cc002e2c3d0b9dfac4139711d1f30de442f1139b" checksum = "1de09527cd2ea2c2d59fb6c2f8c1ab8c71709ed9d1b6d60b0e1c9fbb6fdcb33c"
[[package]] [[package]]
name = "qoi" name = "qoi"
@ -3920,15 +3905,6 @@ dependencies = [
"bitflags 1.3.2", "bitflags 1.3.2",
] ]
[[package]]
name = "redox_syscall"
version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
dependencies = [
"bitflags 1.3.2",
]
[[package]] [[package]]
name = "redox_syscall" name = "redox_syscall"
version = "0.4.1" version = "0.4.1"
@ -4051,7 +4027,7 @@ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"rust-embed-utils", "rust-embed-utils",
"syn 2.0.39", "syn 2.0.40",
"walkdir", "walkdir",
] ]
@ -4103,9 +4079,9 @@ dependencies = [
[[package]] [[package]]
name = "rustix" name = "rustix"
version = "0.38.26" version = "0.38.28"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9470c4bf8246c8daf25f9598dca807fb6510347b1e1cfa55749113850c79d88a" checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316"
dependencies = [ dependencies = [
"bitflags 2.4.1", "bitflags 2.4.1",
"errno", "errno",
@ -4206,7 +4182,7 @@ checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.39", "syn 2.0.40",
] ]
[[package]] [[package]]
@ -4217,7 +4193,7 @@ checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.39", "syn 2.0.40",
] ]
[[package]] [[package]]
@ -4346,7 +4322,7 @@ dependencies = [
"log", "log",
"memmap2 0.9.0", "memmap2 0.9.0",
"pkg-config", "pkg-config",
"rustix 0.38.26", "rustix 0.38.28",
"thiserror", "thiserror",
"wayland-backend 0.3.2", "wayland-backend 0.3.2",
"wayland-client 0.31.1", "wayland-client 0.31.1",
@ -4408,7 +4384,7 @@ dependencies = [
"objc", "objc",
"raw-window-handle", "raw-window-handle",
"redox_syscall 0.4.1", "redox_syscall 0.4.1",
"rustix 0.38.26", "rustix 0.38.28",
"tiny-xlib", "tiny-xlib",
"wasm-bindgen", "wasm-bindgen",
"wayland-backend 0.3.2", "wayland-backend 0.3.2",
@ -4532,9 +4508,9 @@ dependencies = [
[[package]] [[package]]
name = "syn" name = "syn"
version = "2.0.39" version = "2.0.40"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" checksum = "13fa70a4ee923979ffb522cacce59d34421ebdea5625e1073c4326ef9d2dd42e"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -4549,7 +4525,7 @@ checksum = "285ba80e733fac80aa4270fbcdf83772a79b80aa35c97075320abfee4a915b06"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.39", "syn 2.0.40",
"unicode-xid", "unicode-xid",
] ]
@ -4603,7 +4579,7 @@ dependencies = [
"cfg-if", "cfg-if",
"fastrand 2.0.1", "fastrand 2.0.1",
"redox_syscall 0.4.1", "redox_syscall 0.4.1",
"rustix 0.38.26", "rustix 0.38.28",
"windows-sys 0.48.0", "windows-sys 0.48.0",
] ]
@ -4633,7 +4609,7 @@ checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.39", "syn 2.0.40",
] ]
[[package]] [[package]]
@ -4731,9 +4707,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
[[package]] [[package]]
name = "tokio" name = "tokio"
version = "1.34.0" version = "1.35.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9" checksum = "841d45b238a16291a4e1584e61820b8ae57d696cc5015c459c229ccc6990cc1c"
dependencies = [ dependencies = [
"backtrace", "backtrace",
"bytes", "bytes",
@ -4820,7 +4796,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.39", "syn 2.0.40",
] ]
[[package]] [[package]]
@ -4937,9 +4913,9 @@ dependencies = [
[[package]] [[package]]
name = "unicode-bidi" name = "unicode-bidi"
version = "0.3.13" version = "0.3.14"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416"
[[package]] [[package]]
name = "unicode-bidi-mirroring" name = "unicode-bidi-mirroring"
@ -5156,7 +5132,7 @@ dependencies = [
"once_cell", "once_cell",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.39", "syn 2.0.40",
"wasm-bindgen-shared", "wasm-bindgen-shared",
] ]
@ -5190,7 +5166,7 @@ checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.39", "syn 2.0.40",
"wasm-bindgen-backend", "wasm-bindgen-backend",
"wasm-bindgen-shared", "wasm-bindgen-shared",
] ]
@ -5788,9 +5764,9 @@ checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
[[package]] [[package]]
name = "winnow" name = "winnow"
version = "0.5.23" version = "0.5.27"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "38cf28f534400ca4195b18033e02c5dd7c36b1138a56f2cfebca48112b528f63" checksum = "cb877ca3232bec99a6472ed63f7241de2a250165260908b2d24c09d867907a85"
dependencies = [ dependencies = [
"memchr", "memchr",
] ]
@ -5829,12 +5805,9 @@ dependencies = [
[[package]] [[package]]
name = "xcursor" name = "xcursor"
version = "0.3.4" version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "463705a63313cd4301184381c5e8042f0a7e9b4bb63653f216311d4ae74690b7" checksum = "6a0ccd7b4a5345edfcd0c3535718a4e9ff7798ffc536bb5b5a0e26ff84732911"
dependencies = [
"nom",
]
[[package]] [[package]]
name = "xdg" name = "xdg"
@ -5931,7 +5904,7 @@ checksum = "9e6936f0cce458098a201c245a11bef556c6a0181129c7034d10d76d1ec3a2b8"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.39", "syn 2.0.40",
"synstructure", "synstructure",
] ]
@ -6010,22 +5983,22 @@ checksum = "dd15f8e0dbb966fd9245e7498c7e9e5055d9e5c8b676b95bd67091cd11a1e697"
[[package]] [[package]]
name = "zerocopy" name = "zerocopy"
version = "0.7.28" version = "0.7.30"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7d6f15f7ade05d2a4935e34a457b936c23dc70a05cc1d97133dc99e7a3fe0f0e" checksum = "306dca4455518f1f31635ec308b6b3e4eb1b11758cefafc782827d0aa7acb5c7"
dependencies = [ dependencies = [
"zerocopy-derive", "zerocopy-derive",
] ]
[[package]] [[package]]
name = "zerocopy-derive" name = "zerocopy-derive"
version = "0.7.28" version = "0.7.30"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dbbad221e3f78500350ecbd7dfa4e63ef945c05f4c61cb7f4d3f84cd0bba649b" checksum = "be912bf68235a88fbefd1b73415cb218405958d1655b2ece9035a19920bdf6ba"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.39", "syn 2.0.40",
] ]
[[package]] [[package]]
@ -6045,7 +6018,7 @@ checksum = "e6a647510471d372f2e6c2e6b7219e44d8c574d24fdc11c610a61455782f18c3"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.39", "syn 2.0.40",
"synstructure", "synstructure",
] ]
@ -6079,7 +6052,7 @@ checksum = "7b4e5997cbf58990550ef1f0e5124a05e47e1ebd33a84af25739be6031a62c20"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.39", "syn 2.0.40",
] ]
[[package]] [[package]]

37
app/src/app.rs
View file

@ -130,15 +130,15 @@ impl cosmic::Application for SettingsApp {
} }
fn on_close_requested(&self, id: window::Id) -> Option<Self::Message> { fn on_close_requested(&self, id: window::Id) -> Option<Self::Message> {
let message = if id == applets_inner::ADD_PANEL_APPLET_DIALOGUE_ID { let message = if id == *applets_inner::ADD_PANEL_APPLET_DIALOGUE_ID {
Message::PageMessage(crate::pages::Message::PanelApplet( Message::PageMessage(crate::pages::Message::PanelApplet(
applets_inner::Message::ClosedAppletDialogue, applets_inner::Message::ClosedAppletDialogue,
)) ))
} else if id == ADD_DOCK_APPLET_DIALOGUE_ID { } else if id == *ADD_DOCK_APPLET_DIALOGUE_ID {
Message::PageMessage(crate::pages::Message::DockApplet(dock::applets::Message( Message::PageMessage(crate::pages::Message::DockApplet(dock::applets::Message(
applets_inner::Message::ClosedAppletDialogue, applets_inner::Message::ClosedAppletDialogue,
))) )))
} else if id == COLOR_PICKER_DIALOG_ID { } else if id == *COLOR_PICKER_DIALOG_ID {
Message::PageMessage(crate::pages::Message::Appearance( Message::PageMessage(crate::pages::Message::Appearance(
appearance::Message::CloseRequested, appearance::Message::CloseRequested,
)) ))
@ -264,7 +264,7 @@ impl cosmic::Application for SettingsApp {
crate::pages::Message::PanelApplet(message) => { crate::pages::Message::PanelApplet(message) => {
if let Some(page) = self.pages.page_mut::<applets_inner::Page>() { if let Some(page) = self.pages.page_mut::<applets_inner::Page>() {
return page return page
.update(message, applets_inner::ADD_PANEL_APPLET_DIALOGUE_ID) .update(message, *applets_inner::ADD_PANEL_APPLET_DIALOGUE_ID)
.map(cosmic::app::Message::App); .map(cosmic::app::Message::App);
} }
} }
@ -295,7 +295,7 @@ impl cosmic::Application for SettingsApp {
return page return page
.update( .update(
applets_inner::Message::PanelConfig(config), applets_inner::Message::PanelConfig(config),
applets_inner::ADD_PANEL_APPLET_DIALOGUE_ID, *applets_inner::ADD_PANEL_APPLET_DIALOGUE_ID,
) )
.map(cosmic::app::Message::App); .map(cosmic::app::Message::App);
} }
@ -330,7 +330,7 @@ impl cosmic::Application for SettingsApp {
return page return page
.update( .update(
applets_inner::Message::Applets(info_list), applets_inner::Message::Applets(info_list),
applets_inner::ADD_PANEL_APPLET_DIALOGUE_ID, *applets_inner::ADD_PANEL_APPLET_DIALOGUE_ID,
) )
.map(cosmic::app::Message::App); .map(cosmic::app::Message::App);
} }
@ -390,33 +390,33 @@ impl cosmic::Application for SettingsApp {
#[allow(clippy::too_many_lines)] #[allow(clippy::too_many_lines)]
fn view_window(&self, id: window::Id) -> Element<Message> { fn view_window(&self, id: window::Id) -> Element<Message> {
if let Some(Some(page)) = if let Some(Some(page)) =
(id == APPLET_DND_ICON_ID).then(|| self.pages.page::<applets_inner::Page>()) (id == *APPLET_DND_ICON_ID).then(|| self.pages.page::<applets_inner::Page>())
{ {
return page.dnd_icon(); return page.dnd_icon();
} }
if let Some(Some(page)) = (id == applets_inner::ADD_PANEL_APPLET_DIALOGUE_ID) if let Some(Some(page)) = (id == *applets_inner::ADD_PANEL_APPLET_DIALOGUE_ID)
.then(|| self.pages.page::<applets_inner::Page>()) .then(|| self.pages.page::<applets_inner::Page>())
{ {
return page.add_applet_view(crate::pages::Message::PanelApplet); return page.add_applet_view(crate::pages::Message::PanelApplet);
} }
if let Some(Some(page)) = (id == appearance::COLOR_PICKER_DIALOG_ID) if let Some(Some(page)) = (id == *appearance::COLOR_PICKER_DIALOG_ID)
.then(|| self.pages.page::<appearance::Page>()) .then(|| self.pages.page::<appearance::Page>())
{ {
return page.color_picker_view(); return page.color_picker_view();
} }
if let Some(Some(page)) = if let Some(Some(page)) =
(id == ADD_DOCK_APPLET_DIALOGUE_ID).then(|| self.pages.page::<dock::applets::Page>()) (id == *ADD_DOCK_APPLET_DIALOGUE_ID).then(|| self.pages.page::<dock::applets::Page>())
{ {
return page.inner().add_applet_view(|msg| { return page.inner().add_applet_view(|msg| {
crate::pages::Message::DockApplet(dock::applets::Message(msg)) crate::pages::Message::DockApplet(dock::applets::Message(msg))
}); });
} }
if let Some(Some(page)) = if let Some(Some(page)) = (id == *keyboard::ADD_INPUT_SOURCE_DIALOGUE_ID)
(id == keyboard::ADD_INPUT_SOURCE_DIALOGUE_ID).then(|| self.pages.page::<input::Page>()) .then(|| self.pages.page::<input::Page>())
{ {
return page.add_input_source_view(); return page.add_input_source_view();
} }
if let Some(Some(page)) = (id == keyboard::SPECIAL_CHARACTER_DIALOGUE_ID) if let Some(Some(page)) = (id == *keyboard::SPECIAL_CHARACTER_DIALOGUE_ID)
.then(|| self.pages.page::<input::Page>()) .then(|| self.pages.page::<input::Page>())
{ {
return page.special_character_key_view(); return page.special_character_key_view();
@ -478,10 +478,13 @@ impl SettingsApp {
} }
fn set_title(&mut self) -> Command<crate::Message> { fn set_title(&mut self) -> Command<crate::Message> {
self.set_window_title(format!( self.set_window_title(
"{} - COSMIC Settings", format!(
self.pages.info[self.active_page].title "{} - COSMIC Settings",
)) self.pages.info[self.active_page].title
),
window::Id::MAIN,
)
} }
/// Activates the navbar item associated with a page. /// Activates the navbar item associated with a page.

30
app/src/pages/desktop/appearance.rs
View file

@ -23,6 +23,7 @@ use cosmic::{Command, Element};
use cosmic_settings_desktop::wallpaper; use cosmic_settings_desktop::wallpaper;
use cosmic_settings_page::Section; use cosmic_settings_page::Section;
use cosmic_settings_page::{self as page, section}; use cosmic_settings_page::{self as page, section};
use once_cell::sync::Lazy;
use ron::ser::PrettyConfig; use ron::ser::PrettyConfig;
use slotmap::SlotMap; use slotmap::SlotMap;
use tracing::warn; use tracing::warn;
@ -30,7 +31,8 @@ use tracing::warn;
use crate::app; use crate::app;
use super::wallpaper::widgets::color_image; use super::wallpaper::widgets::color_image;
pub const COLOR_PICKER_DIALOG_ID: window::Id = window::Id(1003);
pub static COLOR_PICKER_DIALOG_ID: Lazy<window::Id> = Lazy::new(|| window::Id::unique());
enum NamedColorPicker { enum NamedColorPicker {
CustomAccent, CustomAccent,
@ -316,7 +318,7 @@ impl Page {
// apply changes // apply changes
theme_builder_needs_update = true; theme_builder_needs_update = true;
self.active_dialog = None; self.active_dialog = None;
close_window::<app::Message>(COLOR_PICKER_DIALOG_ID) close_window::<app::Message>(*COLOR_PICKER_DIALOG_ID)
} }
// TODO apply changes // TODO apply changes
ColorPickerUpdate::ActionFinished => { ColorPickerUpdate::ActionFinished => {
@ -329,7 +331,7 @@ impl Page {
ColorPickerUpdate::Cancel => { ColorPickerUpdate::Cancel => {
// close the color picker dialog // close the color picker dialog
self.active_dialog = None; self.active_dialog = None;
close_window(COLOR_PICKER_DIALOG_ID) close_window(*COLOR_PICKER_DIALOG_ID)
} }
ColorPickerUpdate::ToggleColorPicker => { ColorPickerUpdate::ToggleColorPicker => {
let prev = self let prev = self
@ -377,7 +379,7 @@ impl Page {
// apply changes // apply changes
theme_builder_needs_update = true; theme_builder_needs_update = true;
self.active_dialog = None; self.active_dialog = None;
close_window::<app::Message>(COLOR_PICKER_DIALOG_ID) close_window::<app::Message>(*COLOR_PICKER_DIALOG_ID)
} }
// TODO apply changes // TODO apply changes
ColorPickerUpdate::ActionFinished => { ColorPickerUpdate::ActionFinished => {
@ -390,7 +392,7 @@ impl Page {
ColorPickerUpdate::Cancel => { ColorPickerUpdate::Cancel => {
// close the color picker dialog // close the color picker dialog
self.active_dialog = None; self.active_dialog = None;
close_window(COLOR_PICKER_DIALOG_ID) close_window(*COLOR_PICKER_DIALOG_ID)
} }
ColorPickerUpdate::ToggleColorPicker => { ColorPickerUpdate::ToggleColorPicker => {
let prev = self let prev = self
@ -442,7 +444,7 @@ impl Page {
// apply changes // apply changes
theme_builder_needs_update = true; theme_builder_needs_update = true;
self.active_dialog = None; self.active_dialog = None;
close_window::<app::Message>(COLOR_PICKER_DIALOG_ID) close_window::<app::Message>(*COLOR_PICKER_DIALOG_ID)
} }
// TODO apply changes // TODO apply changes
ColorPickerUpdate::ActionFinished => { ColorPickerUpdate::ActionFinished => {
@ -455,7 +457,7 @@ impl Page {
ColorPickerUpdate::Cancel => { ColorPickerUpdate::Cancel => {
// close the color picker dialog // close the color picker dialog
self.active_dialog = None; self.active_dialog = None;
close_window(COLOR_PICKER_DIALOG_ID) close_window(*COLOR_PICKER_DIALOG_ID)
} }
ColorPickerUpdate::ToggleColorPicker => { ColorPickerUpdate::ToggleColorPicker => {
let prev = self.active_dialog.replace(NamedColorPicker::CustomAccent); let prev = self.active_dialog.replace(NamedColorPicker::CustomAccent);
@ -479,7 +481,7 @@ impl Page {
// apply changes // apply changes
theme_builder_needs_update = true; theme_builder_needs_update = true;
self.active_dialog = None; self.active_dialog = None;
close_window::<app::Message>(COLOR_PICKER_DIALOG_ID) close_window::<app::Message>(*COLOR_PICKER_DIALOG_ID)
} }
// TODO apply changes // TODO apply changes
ColorPickerUpdate::ActionFinished => { ColorPickerUpdate::ActionFinished => {
@ -492,7 +494,7 @@ impl Page {
ColorPickerUpdate::Cancel => { ColorPickerUpdate::Cancel => {
// close the color picker dialog // close the color picker dialog
self.active_dialog = None; self.active_dialog = None;
close_window(COLOR_PICKER_DIALOG_ID) close_window(*COLOR_PICKER_DIALOG_ID)
} }
ColorPickerUpdate::ToggleColorPicker => { ColorPickerUpdate::ToggleColorPicker => {
let prev = self.active_dialog.replace(NamedColorPicker::InterfaceText); let prev = self.active_dialog.replace(NamedColorPicker::InterfaceText);
@ -513,7 +515,7 @@ impl Page {
// apply changes // apply changes
theme_builder_needs_update = true; theme_builder_needs_update = true;
self.active_dialog = None; self.active_dialog = None;
close_window::<app::Message>(COLOR_PICKER_DIALOG_ID) close_window::<app::Message>(*COLOR_PICKER_DIALOG_ID)
} }
// TODO apply changes // TODO apply changes
ColorPickerUpdate::ActionFinished => { ColorPickerUpdate::ActionFinished => {
@ -526,7 +528,7 @@ impl Page {
ColorPickerUpdate::Cancel => { ColorPickerUpdate::Cancel => {
// close the color picker dialog // close the color picker dialog
self.active_dialog = None; self.active_dialog = None;
close_window(COLOR_PICKER_DIALOG_ID) close_window(*COLOR_PICKER_DIALOG_ID)
} }
ColorPickerUpdate::ToggleColorPicker => { ColorPickerUpdate::ToggleColorPicker => {
let prev = self let prev = self
@ -806,7 +808,7 @@ impl Page {
Command::none() Command::none()
} }
Message::DragColorPicker => { Message::DragColorPicker => {
cosmic::iced_sctk::commands::window::start_drag_window(COLOR_PICKER_DIALOG_ID) cosmic::iced_sctk::commands::window::start_drag_window(*COLOR_PICKER_DIALOG_ID)
} }
}; };
@ -1397,10 +1399,10 @@ impl page::AutoBind<crate::pages::Message> for Page {}
fn color_picker_window_settings() -> SctkWindowSettings { fn color_picker_window_settings() -> SctkWindowSettings {
SctkWindowSettings { SctkWindowSettings {
window_id: COLOR_PICKER_DIALOG_ID, window_id: *COLOR_PICKER_DIALOG_ID,
app_id: Some("com.system76.CosmicSettings".to_string()), app_id: Some("com.system76.CosmicSettings".to_string()),
title: Some(fl!("color-picker")), title: Some(fl!("color-picker")),
parent: Some(window::Id(0)), parent: Some(window::Id::MAIN),
autosize: false, autosize: false,
size_limits: layout::Limits::NONE size_limits: layout::Limits::NONE
.min_width(300.0) .min_width(300.0)

5
app/src/pages/desktop/dock/applets.rs
View file

@ -1,6 +1,7 @@
use cosmic::{cosmic_config::CosmicConfigEntry, iced::window, iced_runtime::Command}; use cosmic::{cosmic_config::CosmicConfigEntry, iced::window, iced_runtime::Command};
use cosmic_panel_config::CosmicPanelConfig; use cosmic_panel_config::CosmicPanelConfig;
use cosmic_settings_page::{self as page, section, Section}; use cosmic_settings_page::{self as page, section, Section};
use once_cell::sync::Lazy;
use slotmap::SlotMap; use slotmap::SlotMap;
use std::borrow::Cow; use std::borrow::Cow;
@ -12,7 +13,7 @@ use crate::{
}, },
}; };
pub const ADD_DOCK_APPLET_DIALOGUE_ID: window::Id = window::Id(1002); pub static ADD_DOCK_APPLET_DIALOGUE_ID: Lazy<window::Id> = Lazy::new(|| window::Id::unique());
pub(crate) struct Page { pub(crate) struct Page {
inner: applets_inner::Page, inner: applets_inner::Page,
@ -58,7 +59,7 @@ pub struct Message(pub applets_inner::Message);
impl Page { impl Page {
pub fn update(&mut self, message: Message) -> Command<app::Message> { pub fn update(&mut self, message: Message) -> Command<app::Message> {
self.inner.update(message.0, ADD_DOCK_APPLET_DIALOGUE_ID) self.inner.update(message.0, *ADD_DOCK_APPLET_DIALOGUE_ID)
} }
} }

13
app/src/pages/desktop/panel/applets_inner.rs
View file

@ -36,6 +36,7 @@ use cosmic::{
}, },
theme, Apply, Element, theme, Apply, Element,
}; };
use once_cell::sync::Lazy;
use std::{ use std::{
borrow::{Borrow, Cow}, borrow::{Borrow, Cow},
@ -67,8 +68,8 @@ const SPACING: f32 = 8.0;
// radius is 8.0 // radius is 8.0
const DRAG_START_DISTANCE_SQUARED: f32 = 64.0; const DRAG_START_DISTANCE_SQUARED: f32 = 64.0;
pub const APPLET_DND_ICON_ID: window::Id = window::Id(1000); pub static APPLET_DND_ICON_ID: Lazy<window::Id> = Lazy::new(|| window::Id::unique());
pub const ADD_PANEL_APPLET_DIALOGUE_ID: window::Id = window::Id(1001); pub static ADD_PANEL_APPLET_DIALOGUE_ID: Lazy<window::Id> = Lazy::new(|| window::Id::unique());
pub struct Page { pub struct Page {
pub(crate) available_entries: Vec<Applet<'static>>, pub(crate) available_entries: Vec<Applet<'static>>,
@ -463,7 +464,7 @@ impl Page {
window_id, window_id,
app_id: Some("com.system76.CosmicSettings".to_string()), app_id: Some("com.system76.CosmicSettings".to_string()),
title: Some(fl!("add-applet")), title: Some(fl!("add-applet")),
parent: Some(window::Id(0)), parent: Some(window::Id::MAIN),
autosize: false, autosize: false,
size_limits: layout::Limits::NONE size_limits: layout::Limits::NONE
.min_width(300.0) .min_width(300.0)
@ -539,7 +540,7 @@ pub fn lists<
.collect() .collect()
}) })
.unwrap_or_default(), .unwrap_or_default(),
Some((window::Id(0), APPLET_DND_ICON_ID)), Some((window::Id::MAIN, *APPLET_DND_ICON_ID)),
Message::StartDnd, Message::StartDnd,
|a| Message::DnDCommand(Arc::new(a)), |a| Message::DnDCommand(Arc::new(a)),
Message::RemoveStart, Message::RemoveStart,
@ -570,7 +571,7 @@ pub fn lists<
.collect() .collect()
}) })
.unwrap_or_default(), .unwrap_or_default(),
Some((window::Id(0), APPLET_DND_ICON_ID)), Some((window::Id::MAIN, *APPLET_DND_ICON_ID)),
Message::StartDnd, Message::StartDnd,
|a| Message::DnDCommand(Arc::new(a)), |a| Message::DnDCommand(Arc::new(a)),
Message::RemoveCenter, Message::RemoveCenter,
@ -602,7 +603,7 @@ pub fn lists<
.collect() .collect()
}) })
.unwrap_or_default(), .unwrap_or_default(),
Some((window::Id(0), APPLET_DND_ICON_ID)), Some((window::Id::MAIN, *APPLET_DND_ICON_ID)),
Message::StartDnd, Message::StartDnd,
|a| Message::DnDCommand(Arc::new(a)), |a| Message::DnDCommand(Arc::new(a)),
Message::RemoveEnd, Message::RemoveEnd,

5
app/src/pages/input/keyboard/mod.rs
View file

@ -9,12 +9,13 @@ use cosmic::{
widget::{button, container, icon, radio, settings}, widget::{button, container, icon, radio, settings},
}; };
use cosmic_settings_page::{self as page, section, Section}; use cosmic_settings_page::{self as page, section, Section};
use once_cell::sync::Lazy;
use slotmap::SlotMap; use slotmap::SlotMap;
use super::Message; use super::Message;
pub const ADD_INPUT_SOURCE_DIALOGUE_ID: window::Id = window::Id(2000); pub static ADD_INPUT_SOURCE_DIALOGUE_ID: Lazy<window::Id> = Lazy::new(|| window::Id::unique());
pub const SPECIAL_CHARACTER_DIALOGUE_ID: window::Id = window::Id(2001); pub static SPECIAL_CHARACTER_DIALOGUE_ID: Lazy<window::Id> = Lazy::new(|| window::Id::unique());
static COMPOSE_OPTIONS: &[(&str, &str)] = &[ static COMPOSE_OPTIONS: &[(&str, &str)] = &[
// ("Left Alt", "compose:lalt"), XXX? // ("Left Alt", "compose:lalt"), XXX?

6
app/src/pages/input/mod.rs
View file

@ -162,10 +162,10 @@ impl Page {
Message::OpenSpecialCharacterDialog(special_key) => { Message::OpenSpecialCharacterDialog(special_key) => {
self.special_character_dialog = Some(special_key); self.special_character_dialog = Some(special_key);
let window_settings = SctkWindowSettings { let window_settings = SctkWindowSettings {
window_id: keyboard::SPECIAL_CHARACTER_DIALOGUE_ID, window_id: *keyboard::SPECIAL_CHARACTER_DIALOGUE_ID,
app_id: Some("com.system76.CosmicSettings".to_string()), app_id: Some("com.system76.CosmicSettings".to_string()),
title: Some(special_key.title()), title: Some(special_key.title()),
parent: Some(window::Id(0)), parent: Some(window::Id::MAIN),
autosize: false, autosize: false,
size_limits: layout::Limits::NONE size_limits: layout::Limits::NONE
.min_width(300.0) .min_width(300.0)
@ -182,7 +182,7 @@ impl Page {
} }
Message::CloseSpecialCharacterDialog => { Message::CloseSpecialCharacterDialog => {
self.special_character_dialog = None; self.special_character_dialog = None;
return commands::window::close_window(keyboard::SPECIAL_CHARACTER_DIALOGUE_ID); return commands::window::close_window(*keyboard::SPECIAL_CHARACTER_DIALOGUE_ID);
} }
Message::SpecialCharacterSelect(id) => { Message::SpecialCharacterSelect(id) => {
if let Some(special_key) = self.special_character_dialog { if let Some(special_key) = self.special_character_dialog {