diff --git a/gui/Cargo.lock b/gui/Cargo.lock index 42f4120c5..2bede4f68 100644 --- a/gui/Cargo.lock +++ b/gui/Cargo.lock @@ -23,12 +23,6 @@ dependencies = [ "mach 0.1.2", ] -[[package]] -name = "Inflector" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3" - [[package]] name = "ab_glyph" version = "0.2.20" @@ -193,12 +187,6 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" -[[package]] -name = "arrayvec" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" - [[package]] name = "arrayvec" version = "0.7.4" @@ -551,15 +539,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" -[[package]] -name = "cgl" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ced0551234e87afee12411d535648dd89d2e7f34c78b753395567aff3d447ff" -dependencies = [ - "libc", -] - [[package]] name = "chacha20" version = "0.9.1" @@ -657,15 +636,6 @@ dependencies = [ "x11rb 0.9.0", ] -[[package]] -name = "cmake" -version = "0.1.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130" -dependencies = [ - "cc", -] - [[package]] name = "cocoa" version = "0.24.1" @@ -677,7 +647,7 @@ dependencies = [ "cocoa-foundation", "core-foundation", "core-graphics", - "foreign-types 0.3.2", + "foreign-types", "libc", "objc", ] @@ -692,7 +662,7 @@ dependencies = [ "block", "core-foundation", "core-graphics-types", - "foreign-types 0.3.2", + "foreign-types", "libc", "objc", ] @@ -741,12 +711,6 @@ dependencies = [ "tiny-keccak", ] -[[package]] -name = "const_panic" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58baae561b85ca19b3122a9ddd35c8ec40c3bcd14fe89921824eae73f7baffbf" - [[package]] name = "core-foundation" version = "0.9.3" @@ -772,7 +736,7 @@ dependencies = [ "bitflags 1.3.2", "core-foundation", "core-graphics-types", - "foreign-types 0.3.2", + "foreign-types", "libc", ] @@ -784,19 +748,7 @@ checksum = "3a68b68b3446082644c91ac778bf50cd4104bfb002b5a6a7c44cca5a2c70788b" dependencies = [ "bitflags 1.3.2", "core-foundation", - "foreign-types 0.3.2", - "libc", -] - -[[package]] -name = "core-text" -version = "19.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99d74ada66e07c1cefa18f8abfba765b486f250de2e4a999e5727fc0dd4b4a25" -dependencies = [ - "core-foundation", - "core-graphics", - "foreign-types 0.3.2", + "foreign-types", "libc", ] @@ -816,7 +768,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b0b68966c2543609f8d92f9d33ac3b719b2a67529b0c6c0b3e025637b477eef9" dependencies = [ "aliasable", - "fontdb 0.14.1", + "fontdb", "libm", "log", "rangemap", @@ -890,29 +842,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "crossfont" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21fd3add36ea31aba1520aa5288714dd63be506106753226d0eb387a93bc9c45" -dependencies = [ - "cocoa", - "core-foundation", - "core-foundation-sys", - "core-graphics", - "core-text", - "dwrote", - "foreign-types 0.5.0", - "freetype-rs", - "libc", - "log", - "objc", - "once_cell", - "pkg-config", - "servo-fontconfig", - "winapi", -] - [[package]] name = "crunchy" version = "0.2.2" @@ -938,12 +867,6 @@ dependencies = [ "cipher", ] -[[package]] -name = "cty" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35" - [[package]] name = "curve25519-dalek" version = "4.1.1" @@ -1026,41 +949,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "darling" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim", - "syn 1.0.109", -] - -[[package]] -name = "darling_macro" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" -dependencies = [ - "darling_core", - "quote", - "syn 1.0.109", -] - [[package]] name = "data-url" version = "0.2.0" @@ -1154,58 +1042,12 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" -[[package]] -name = "dwrote" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439a1c2ba5611ad3ed731280541d36d2e9c4ac5e7fb818a27b604bdc5a6aa65b" -dependencies = [ - "lazy_static", - "libc", - "serde", - "serde_derive", - "winapi", - "wio", -] - [[package]] name = "either" version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" -[[package]] -name = "encase" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a516181e9a36e8982cb37933c5e7dba638c42938cacde46ee4e5b4156f881b9" -dependencies = [ - "const_panic", - "encase_derive", - "glam 0.21.3", - "thiserror", -] - -[[package]] -name = "encase_derive" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5b802412eea315f29f2bb2da3a5963cd6121f56eaa06aebcdc0c54eea578f22" -dependencies = [ - "encase_derive_impl", -] - -[[package]] -name = "encase_derive_impl" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f2f4de457d974f548d2c2a16f709ebd81013579e543bd1a9b19ced88132c2cf" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "encoding_rs" version = "0.8.33" @@ -1271,16 +1113,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "expat-sys" -version = "2.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658f19728920138342f68408b7cf7644d90d4784353d8ebc32e7e8663dbe45fa" -dependencies = [ - "cmake", - "pkg-config", -] - [[package]] name = "exr" version = "1.6.3" @@ -1351,15 +1183,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "find-crate" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59a98bbaacea1c0eb6a0876280051b892eb73594fd90cf3b20e9c817029c57d2" -dependencies = [ - "toml", -] - [[package]] name = "fixedbitset" version = "0.4.2" @@ -1419,18 +1242,6 @@ dependencies = [ "roxmltree", ] -[[package]] -name = "fontdb" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff20bef7942a72af07104346154a70a70b089c572e454b41bef6eb6cb10e9c06" -dependencies = [ - "fontconfig-parser", - "log", - "memmap2 0.5.10", - "ttf-parser 0.18.1", -] - [[package]] name = "fontdb" version = "0.14.1" @@ -1451,28 +1262,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" dependencies = [ - "foreign-types-shared 0.1.1", -] - -[[package]] -name = "foreign-types" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" -dependencies = [ - "foreign-types-macros", - "foreign-types-shared 0.3.1", -] - -[[package]] -name = "foreign-types-macros" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.43", + "foreign-types-shared", ] [[package]] @@ -1481,12 +1271,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" -[[package]] -name = "foreign-types-shared" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" - [[package]] name = "form_urlencoded" version = "1.1.0" @@ -1496,28 +1280,6 @@ dependencies = [ "percent-encoding", ] -[[package]] -name = "freetype-rs" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74eadec9d0a5c28c54bb9882e54787275152a4e36ce206b45d7451384e5bf5fb" -dependencies = [ - "bitflags 1.3.2", - "freetype-sys", - "libc", -] - -[[package]] -name = "freetype-sys" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a37d4011c0cc628dfa766fcc195454f4b068d7afdc2adfd28861191d866e731a" -dependencies = [ - "cmake", - "libc", - "pkg-config", -] - [[package]] name = "futures" version = "0.3.28" @@ -1608,15 +1370,6 @@ dependencies = [ "slab", ] -[[package]] -name = "fxhash" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" -dependencies = [ - "byteorder", -] - [[package]] name = "generic-array" version = "0.14.7" @@ -1676,41 +1429,12 @@ version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" -[[package]] -name = "gl_generator" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a95dfc23a2b4a9a2f5ab41d194f8bfda3cabec42af4e39f08c339eb2a0c124d" -dependencies = [ - "khronos_api", - "log", - "xml-rs", -] - -[[package]] -name = "glam" -version = "0.21.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "518faa5064866338b013ff9b2350dc318e14cc4fcd6cb8206d7e7c9886c98815" - [[package]] name = "glam" version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945" -[[package]] -name = "glow" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8bd5877156a19b8ac83a29b2306fe20537429d318f3ff0a1a2119f8d9c61919" -dependencies = [ - "js-sys", - "slotmap", - "wasm-bindgen", - "web-sys", -] - [[package]] name = "glow" version = "0.12.1" @@ -1723,121 +1447,6 @@ dependencies = [ "web-sys", ] -[[package]] -name = "glow_glyph" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f4e62c64947b9a24fe20e2bba9ad819ecb506ef5c8df7ffc4737464c6df9510" -dependencies = [ - "bytemuck", - "glow 0.11.2", - "glyph_brush", - "log", -] - -[[package]] -name = "glutin" -version = "0.29.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "444c9ad294fdcaf20ccf6726b78f380b5450275540c9b68ab62f49726ad1c713" -dependencies = [ - "cgl", - "cocoa", - "core-foundation", - "glutin_egl_sys", - "glutin_gles2_sys", - "glutin_glx_sys", - "glutin_wgl_sys", - "libloading 0.7.4", - "log", - "objc", - "once_cell", - "osmesa-sys", - "parking_lot 0.12.1", - "raw-window-handle 0.5.2", - "wayland-client 0.29.5", - "wayland-egl", - "winapi", - "winit 0.27.5", -] - -[[package]] -name = "glutin_egl_sys" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68900f84b471f31ea1d1355567eb865a2cf446294f06cef8d653ed7bcf5f013d" -dependencies = [ - "gl_generator", - "winapi", -] - -[[package]] -name = "glutin_gles2_sys" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8094e708b730a7c8a1954f4f8a31880af00eb8a1c5b5bf85d28a0a3c6d69103" -dependencies = [ - "gl_generator", - "objc", -] - -[[package]] -name = "glutin_glx_sys" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d93d0575865098580c5b3a423188cd959419912ea60b1e48e8b3b526f6d02468" -dependencies = [ - "gl_generator", - "x11-dl", -] - -[[package]] -name = "glutin_wgl_sys" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3da5951a1569dbab865c6f2a863efafff193a93caf05538d193e9e3816d21696" -dependencies = [ - "gl_generator", -] - -[[package]] -name = "glyph_brush" -version = "0.7.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4edefd123f28a0b1d41ec4a489c2b43020b369180800977801611084f342978d" -dependencies = [ - "glyph_brush_draw_cache", - "glyph_brush_layout", - "ordered-float", - "rustc-hash", - "twox-hash", -] - -[[package]] -name = "glyph_brush_draw_cache" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6010675390f6889e09a21e2c8b575b3ee25667ea8237a8d59423f73cb8c28610" -dependencies = [ - "ab_glyph", - "crossbeam-channel", - "crossbeam-deque", - "linked-hash-map", - "rayon", - "rustc-hash", -] - -[[package]] -name = "glyph_brush_layout" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc32c2334f00ca5ac3695c5009ae35da21da8c62d255b5b96d56e2597a637a38" -dependencies = [ - "ab_glyph", - "approx", - "xi-unicode", -] - [[package]] name = "glyphon" version = "0.3.0" @@ -1847,7 +1456,7 @@ dependencies = [ "cosmic-text", "etagere", "lru", - "wgpu 0.16.3", + "wgpu", ] [[package]] @@ -1983,21 +1592,6 @@ dependencies = [ "hashbrown 0.11.2", ] -[[package]] -name = "hassle-rs" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90601c6189668c7345fc53842cb3f3a3d872203d523be1b3cb44a36a3e62fb85" -dependencies = [ - "bitflags 1.3.2", - "com-rs", - "libc", - "libloading 0.7.4", - "thiserror", - "widestring 0.5.1", - "winapi", -] - [[package]] name = "hassle-rs" version = "0.10.0" @@ -2009,7 +1603,7 @@ dependencies = [ "libc", "libloading 0.7.4", "thiserror", - "widestring 1.0.2", + "widestring", "winapi", ] @@ -2160,50 +1754,21 @@ dependencies = [ "cxx-build", ] -[[package]] -name = "iced" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efbddf356d01e9d41cd394a9d04d62bfd89650a30f12fda5839cabb8c4591c88" -dependencies = [ - "iced_core 0.9.0", - "iced_futures 0.6.0", - "iced_glow", - "iced_glutin", - "iced_graphics 0.8.0", - "iced_native", - "iced_wgpu 0.10.0", - "iced_winit 0.9.1", - "image", - "thiserror", -] - [[package]] name = "iced" version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c708807ec86f99dd729dc4d42db5239acf118cec14d3c5f57679dcfdbbc472b1" dependencies = [ - "iced_core 0.10.0", - "iced_futures 0.7.0", + "iced_core", + "iced_futures", "iced_renderer", "iced_widget", - "iced_winit 0.10.1", + "iced_winit", "image", "thiserror", ] -[[package]] -name = "iced_core" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11e1942e28dedee756cc27e67e7a838cdc1e59fb6bf9627ec9f709ab3b135782" -dependencies = [ - "bitflags 1.3.2", - "instant", - "palette 0.6.1", -] - [[package]] name = "iced_core" version = "0.10.0" @@ -2213,84 +1778,23 @@ dependencies = [ "bitflags 1.3.2", "instant", "log", - "palette 0.7.3", + "palette", "thiserror", "twox-hash", ] [[package]] name = "iced_futures" -version = "0.6.0" -source = "git+https://github.com/edouardparis/iced?branch=fix-futures-recipe#2d8318b13bdf8aaf31bc6d5a72b22313ed2d10cf" -dependencies = [ - "futures", - "log", - "tokio", - "wasm-bindgen-futures", - "wasm-timer", -] - -[[package]] -name = "iced_futures" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14dab0054a9c7a1cbce227a8cd9ee4a094497b3d06094551ac6c1488d563802e" -dependencies = [ - "futures", - "iced_core 0.10.0", - "log", - "wasm-bindgen-futures", - "wasm-timer", -] - -[[package]] -name = "iced_glow" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adc5b081015f5c75777c96ad75e2288916e7d444c97396d6d136517877ef9129" -dependencies = [ - "bytemuck", - "euclid", - "glow 0.11.2", - "glow_glyph", - "glyph_brush", - "iced_graphics 0.8.0", - "iced_native", - "log", -] - -[[package]] -name = "iced_glutin" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c427ca018d29508512581d832fbaa7b6c8ec34c39d438f35f59e363a6419953" -dependencies = [ - "glutin", - "iced_graphics 0.8.0", - "iced_native", - "iced_winit 0.9.1", - "log", -] - -[[package]] -name = "iced_graphics" -version = "0.8.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "338a6aff7db906537074ad0fe8b720cfdb9512cdfea43c628c76bd1cf50fdcc0" +checksum = "14dab0054a9c7a1cbce227a8cd9ee4a094497b3d06094551ac6c1488d563802e" dependencies = [ - "bitflags 1.3.2", - "bytemuck", - "glam 0.21.3", - "iced_native", - "iced_style 0.8.0", - "image", - "kamadak-exif", + "futures", + "iced_core", "log", - "lyon", - "qrcode", - "raw-window-handle 0.5.2", - "resvg 0.29.0", - "thiserror", + "tokio", + "wasm-bindgen-futures", + "wasm-timer", ] [[package]] @@ -2301,39 +1805,15 @@ checksum = "67ff14447a221e9e9205a13d84d7bbdf0636a3b1daa02cfca690ed09689c4d2b" dependencies = [ "bitflags 1.3.2", "bytemuck", - "glam 0.24.2", + "glam", "half", - "iced_core 0.10.0", + "iced_core", "image", "kamadak-exif", "log", - "raw-window-handle 0.5.2", - "thiserror", -] - -[[package]] -name = "iced_lazy" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdf1cb6b8cd90488d3a03fbf438ad42038cb83c81a0d61f3692c51875efdb818" -dependencies = [ - "iced_native", - "ouroboros 0.13.0", -] - -[[package]] -name = "iced_native" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d012eb06da490fe46a695b39721c20da9643f35cf2ecb9d30618fdeb96170616" -dependencies = [ - "iced_core 0.9.0", - "iced_futures 0.6.0", - "iced_style 0.8.0", - "num-traits", + "lyon_path", + "raw-window-handle", "thiserror", - "twox-hash", - "unicode-segmentation", ] [[package]] @@ -2342,11 +1822,11 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1033385b0db0099a0d13178c9ff93c1ce11e7d0177522acf578bf79febdb2af8" dependencies = [ - "iced_graphics 0.9.0", + "iced_graphics", "iced_tiny_skia", - "iced_wgpu 0.11.1", + "iced_wgpu", "log", - "raw-window-handle 0.5.2", + "raw-window-handle", "thiserror", ] @@ -2356,31 +1836,20 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c6c89853e1250c6fac82c5015fa2144517be9b33d4b8e456f10e198b23e28bd" dependencies = [ - "iced_core 0.10.0", - "iced_futures 0.7.0", + "iced_core", + "iced_futures", "thiserror", ] -[[package]] -name = "iced_style" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e37333dc2991201140302cd0d4cea051bd37ca3671d5008ec85df86d232ff30" -dependencies = [ - "iced_core 0.9.0", - "once_cell", - "palette 0.6.1", -] - [[package]] name = "iced_style" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d85c47d9d13e2281f75ddf98c865daf2101632bd2b855c401dd0b1c8b81a31a0" dependencies = [ - "iced_core 0.10.0", + "iced_core", "once_cell", - "palette 0.7.3", + "palette", ] [[package]] @@ -2391,38 +1860,17 @@ checksum = "c7715f6222c9470bbbd75a39f70478fa0d1bdfb81a377a34fd1b090ffccc480b" dependencies = [ "bytemuck", "cosmic-text", - "iced_graphics 0.9.0", - "kurbo 0.9.4", + "iced_graphics", + "kurbo", "log", - "raw-window-handle 0.5.2", - "resvg 0.35.0", + "raw-window-handle", + "resvg", "rustc-hash", "softbuffer", "tiny-skia 0.10.0", "twox-hash", ] -[[package]] -name = "iced_wgpu" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478803c56061f567ce5ddf223b20d11d3c118cc46bb0d0552370dc65cdc4cb9c" -dependencies = [ - "bitflags 1.3.2", - "bytemuck", - "encase", - "futures", - "glam 0.21.3", - "glyph_brush", - "guillotiere", - "iced_graphics 0.8.0", - "iced_native", - "log", - "raw-window-handle 0.5.2", - "wgpu 0.15.1", - "wgpu_glyph", -] - [[package]] name = "iced_wgpu" version = "0.11.1" @@ -2432,17 +1880,18 @@ dependencies = [ "bitflags 1.3.2", "bytemuck", "futures", - "glam 0.24.2", + "glam", "glyphon", "guillotiere", - "iced_graphics 0.9.0", + "iced_graphics", "log", + "lyon", "once_cell", - "raw-window-handle 0.5.2", - "resvg 0.35.0", + "raw-window-handle", + "resvg", "rustc-hash", "twox-hash", - "wgpu 0.16.3", + "wgpu", ] [[package]] @@ -2453,54 +1902,32 @@ checksum = "a177219ae51c3ba08f228ab932354b360cc669e94aec50c01e7c9b675f074c7c" dependencies = [ "iced_renderer", "iced_runtime", - "iced_style 0.9.0", + "iced_style", "num-traits", - "ouroboros 0.17.2", + "ouroboros", + "qrcode", "thiserror", "unicode-segmentation", ] -[[package]] -name = "iced_winit" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a59ea3a85149a6a1f9e92b6c740ce90f04e5c7d848cfd05742336863fceb955" -dependencies = [ - "iced_futures 0.6.0", - "iced_graphics 0.8.0", - "iced_native", - "log", - "thiserror", - "web-sys", - "winapi", - "window_clipboard 0.2.4", - "winit 0.27.5", -] - [[package]] name = "iced_winit" version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad0c884bcb14722a57192b40a5ef6b5e170fa2f01fe2ff28d6cdd9efe37acf70" dependencies = [ - "iced_graphics 0.9.0", + "iced_graphics", "iced_runtime", - "iced_style 0.9.0", + "iced_style", "log", - "raw-window-handle 0.5.2", + "raw-window-handle", "thiserror", "web-sys", "winapi", - "window_clipboard 0.3.0", - "winit 0.28.7", + "window_clipboard", + "winit", ] -[[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - [[package]] name = "idna" version = "0.3.0" @@ -2530,12 +1957,6 @@ dependencies = [ "tiff", ] -[[package]] -name = "imagesize" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b72ad49b554c1728b1e83254a1b1565aea4161e28dabbfa171fc15fe62299caf" - [[package]] name = "imagesize" version = "0.12.0" @@ -2692,28 +2113,13 @@ dependencies = [ "pkg-config", ] -[[package]] -name = "khronos_api" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" - -[[package]] -name = "kurbo" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb348d766edbac91ba1eb83020d96f4f8867924d194393083c15a51f185e6a82" -dependencies = [ - "arrayvec 0.5.2", -] - [[package]] name = "kurbo" version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d676038719d1c892f91e6e85121550143c75880b42f7feff6d413a078cf91fb3" dependencies = [ - "arrayvec 0.7.4", + "arrayvec", ] [[package]] @@ -2809,9 +2215,8 @@ dependencies = [ "dirs 3.0.2", "flate2", "hex", - "iced 0.9.0", - "iced_lazy", - "iced_native", + "iced", + "iced_runtime", "jsonrpc 0.12.1", "liana", "liana_ui", @@ -2834,7 +2239,7 @@ version = "0.1.0" dependencies = [ "bitcoin", "chrono", - "iced 0.10.0", + "iced", ] [[package]] @@ -2920,12 +2325,6 @@ dependencies = [ "cc", ] -[[package]] -name = "linked-hash-map" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" - [[package]] name = "linux-raw-sys" version = "0.3.8" @@ -2986,7 +2385,7 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74df1ff0a0147282eb10699537a03baa7d31972b58984a1d44ce0624043fe8ad" dependencies = [ - "arrayvec 0.7.4", + "arrayvec", "euclid", "num-traits", ] @@ -3099,7 +2498,7 @@ dependencies = [ "bitflags 1.3.2", "block", "core-graphics-types", - "foreign-types 0.3.2", + "foreign-types", "log", "objc", ] @@ -3185,26 +2584,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16cf681a23b4d0a43fc35024c176437f9dcd818db34e0f42ab456a0ee5ad497b" -[[package]] -name = "naga" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eafe22a23b797c9bc227c6c896419b26b5bb88fa903417a3adaed08778850d5" -dependencies = [ - "bit-set", - "bitflags 1.3.2", - "codespan-reporting", - "hexf-parse", - "indexmap 1.9.3", - "log", - "num-traits", - "rustc-hash", - "spirv", - "termcolor", - "thiserror", - "unicode-xid", -] - [[package]] name = "naga" version = "0.12.3" @@ -3244,7 +2623,7 @@ dependencies = [ "jni-sys", "ndk-sys", "num_enum 0.5.11", - "raw-window-handle 0.5.2", + "raw-window-handle", "thiserror", ] @@ -3254,35 +2633,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" -[[package]] -name = "ndk-glue" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0434fabdd2c15e0aab768ca31d5b7b333717f03cf02037d5a0a3ff3c278ed67f" -dependencies = [ - "libc", - "log", - "ndk", - "ndk-context", - "ndk-macro", - "ndk-sys", - "once_cell", - "parking_lot 0.12.1", -] - -[[package]] -name = "ndk-macro" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0df7ac00c4672f9d5aece54ee3347520b7e20f158656c7db2e6de01902eb7a6c" -dependencies = [ - "darling", - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "ndk-sys" version = "0.4.1+23.1.7779620" @@ -3356,7 +2706,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2473d39689a839f5a363aaef7d99f76d5611bf352286682b25a6644fec18b1d3" dependencies = [ - "arrayvec 0.7.4", + "arrayvec", ] [[package]] @@ -3583,15 +2933,6 @@ dependencies = [ "libredox", ] -[[package]] -name = "ordered-float" -version = "3.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13a384337e997e6860ffbaa83708b2ef329fd8c54cb67a5f64d421e0f943254f" -dependencies = [ - "num-traits", -] - [[package]] name = "ordered-multimap" version = "0.6.0" @@ -3602,26 +2943,6 @@ dependencies = [ "hashbrown 0.13.2", ] -[[package]] -name = "osmesa-sys" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88cfece6e95d2e717e0872a7f53a8684712ad13822a7979bc760b9c77ec0013b" -dependencies = [ - "shared_library", -] - -[[package]] -name = "ouroboros" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f357ef82d1b4db66fbed0b8d542cbd3c22d0bf5b393b3c257b9ba4568e70c9c3" -dependencies = [ - "aliasable", - "ouroboros_macro 0.13.0", - "stable_deref_trait", -] - [[package]] name = "ouroboros" version = "0.17.2" @@ -3629,23 +2950,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2ba07320d39dfea882faa70554b4bd342a5f273ed59ba7c1c6b4c840492c954" dependencies = [ "aliasable", - "ouroboros_macro 0.17.2", + "ouroboros_macro", "static_assertions", ] -[[package]] -name = "ouroboros_macro" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44a0b52c2cbaef7dffa5fec1a43274afe8bd2a644fa9fc50a9ef4ff0269b1257" -dependencies = [ - "Inflector", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "ouroboros_macro" version = "0.17.2" @@ -3674,18 +2982,6 @@ dependencies = [ "ttf-parser 0.18.1", ] -[[package]] -name = "palette" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f9cd68f7112581033f157e56c77ac4a5538ec5836a2e39284e65bd7d7275e49" -dependencies = [ - "approx", - "num-traits", - "palette_derive 0.6.1", - "phf", -] - [[package]] name = "palette" version = "0.7.3" @@ -3694,22 +2990,10 @@ checksum = "b2e2f34147767aa758aa649415b50a69eeb46a67f9dc7db8011eeb3d84b351dc" dependencies = [ "approx", "fast-srgb8", - "palette_derive 0.7.3", + "palette_derive", "phf", ] -[[package]] -name = "palette_derive" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05eedf46a8e7c27f74af0c9cfcdb004ceca158cb1b918c6f68f8d7a549b3e427" -dependencies = [ - "find-crate", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "palette_derive" version = "0.7.3" @@ -4138,25 +3422,6 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "977b1e897f9d764566891689e642653e5ed90c6895106acd005eb4c1d0203991" -[[package]] -name = "raw-window-handle" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28f55143d0548dad60bb4fbdc835a3d7ac6acc3324506450c5fdd6e42903a76" -dependencies = [ - "libc", - "raw-window-handle 0.4.3", -] - -[[package]] -name = "raw-window-handle" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b800beb9b6e7d2df1fe337c9e3d04e3af22a124460fb4c30fcc22c9117cefb41" -dependencies = [ - "cty", -] - [[package]] name = "raw-window-handle" version = "0.5.2" @@ -4255,12 +3520,6 @@ version = "0.6.29" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" -[[package]] -name = "renderdoc-sys" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1382d1f0a252c4bf97dc20d979a2fdd05b024acd7c2ed0f7595d7817666a157" - [[package]] name = "renderdoc-sys" version = "1.0.0" @@ -4306,25 +3565,6 @@ dependencies = [ "winreg", ] -[[package]] -name = "resvg" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76888219c0881e22b0ceab06fddcfe83163cd81642bd60c7842387f9c968a72e" -dependencies = [ - "gif", - "jpeg-decoder", - "log", - "pico-args", - "png", - "rgb", - "svgfilters", - "svgtypes 0.10.0", - "tiny-skia 0.8.4", - "usvg 0.29.0", - "usvg-text-layout 0.29.0", -] - [[package]] name = "resvg" version = "0.35.0" @@ -4337,9 +3577,9 @@ dependencies = [ "pico-args", "png", "rgb", - "svgtypes 0.11.0", + "svgtypes", "tiny-skia 0.10.0", - "usvg 0.35.0", + "usvg", ] [[package]] @@ -4366,19 +3606,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "rosvgtree" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdc23d1ace03d6b8153c7d16f0708cd80b61ee8e80304954803354e67e40d150" -dependencies = [ - "log", - "roxmltree", - "simplecss", - "siphasher", - "svgtypes 0.9.0", -] - [[package]] name = "roxmltree" version = "0.18.0" @@ -4518,15 +3745,6 @@ version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" -[[package]] -name = "safe_arch" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1ff3d6d9696af502cc3110dacce942840fb06ff4514cad92236ecc455f2ce05" -dependencies = [ - "bytemuck", -] - [[package]] name = "scoped-tls" version = "1.0.1" @@ -4555,18 +3773,6 @@ dependencies = [ "untrusted", ] -[[package]] -name = "sctk-adwaita" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61270629cc6b4d77ec1907db1033d5c2e1a404c412743621981a871dc9c12339" -dependencies = [ - "crossfont", - "log", - "smithay-client-toolkit", - "tiny-skia 0.7.0", -] - [[package]] name = "sctk-adwaita" version = "0.5.4" @@ -4658,33 +3864,12 @@ dependencies = [ "CoreFoundation-sys", "IOKit-sys", "bitflags 1.3.2", - "cfg-if", - "libudev", - "mach 0.3.2", - "nix 0.24.3", - "regex", - "winapi", -] - -[[package]] -name = "servo-fontconfig" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7e3e22fe5fd73d04ebf0daa049d3efe3eae55369ce38ab16d07ddd9ac5c217c" -dependencies = [ - "libc", - "servo-fontconfig-sys", -] - -[[package]] -name = "servo-fontconfig-sys" -version = "5.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36b879db9892dfa40f95da1c38a835d41634b825fbd8c4c418093d53c24b388" -dependencies = [ - "expat-sys", - "freetype-sys", - "pkg-config", + "cfg-if", + "libudev", + "mach 0.3.2", + "nix 0.24.3", + "regex", + "winapi", ] [[package]] @@ -4707,16 +3892,6 @@ dependencies = [ "lazy_static", ] -[[package]] -name = "shared_library" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a9e7e0f2bfae24d8a5b5a66c5b257a83c7412304311512a0c054cd5e619da11" -dependencies = [ - "lazy_static", - "libc", -] - [[package]] name = "signal-hook-registry" version = "1.4.1" @@ -4843,11 +4018,11 @@ dependencies = [ "cocoa", "core-graphics", "fastrand", - "foreign-types 0.3.2", + "foreign-types", "log", "nix 0.26.2", "objc", - "raw-window-handle 0.5.2", + "raw-window-handle", "redox_syscall 0.3.5", "thiserror", "wasm-bindgen", @@ -4885,12 +4060,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "stable_deref_trait" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" - [[package]] name = "static_assertions" version = "1.1.0" @@ -4912,12 +4081,6 @@ dependencies = [ "float-cmp", ] -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - [[package]] name = "subtle" version = "2.4.1" @@ -4930,43 +4093,13 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8fb1df15f412ee2e9dfc1c504260fa695c1c3f10fe9f4a6ee2d2184d7d6450e2" -[[package]] -name = "svgfilters" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "639abcebc15fdc2df179f37d6f5463d660c1c79cd552c12343a4600827a04bce" -dependencies = [ - "float-cmp", - "rgb", -] - -[[package]] -name = "svgtypes" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9ee29c1407a5b18ccfe5f6ac82ac11bab3b14407e09c209a6c1a32098b19734" -dependencies = [ - "kurbo 0.8.0", - "siphasher", -] - -[[package]] -name = "svgtypes" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98ffacedcdcf1da6579c907279b4f3c5492fbce99fbbf227f5ed270a589c2765" -dependencies = [ - "kurbo 0.9.4", - "siphasher", -] - [[package]] name = "svgtypes" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed4b0611e7f3277f68c0fa18e385d9e2d26923691379690039548f867cef02a7" dependencies = [ - "kurbo 0.9.4", + "kurbo", "siphasher", ] @@ -5105,21 +4238,6 @@ dependencies = [ "crunchy", ] -[[package]] -name = "tiny-skia" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "642680569bb895b16e4b9d181c60be1ed136fa0c9c7f11d004daf053ba89bf82" -dependencies = [ - "arrayref", - "arrayvec 0.5.2", - "bytemuck", - "cfg-if", - "png", - "safe_arch", - "tiny-skia-path 0.7.0", -] - [[package]] name = "tiny-skia" version = "0.8.4" @@ -5127,7 +4245,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df8493a203431061e901613751931f047d1971337153f96d0e5e363d6dbf6a67" dependencies = [ "arrayref", - "arrayvec 0.7.4", + "arrayvec", "bytemuck", "cfg-if", "png", @@ -5141,7 +4259,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7db11798945fa5c3e5490c794ccca7c6de86d3afdd54b4eb324109939c6f37bc" dependencies = [ "arrayref", - "arrayvec 0.7.4", + "arrayvec", "bytemuck", "cfg-if", "log", @@ -5149,16 +4267,6 @@ dependencies = [ "tiny-skia-path 0.10.0", ] -[[package]] -name = "tiny-skia-path" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c114d32f0c2ee43d585367cb013dfaba967ab9f62b90d9af0d696e955e70fa6c" -dependencies = [ - "arrayref", - "bytemuck", -] - [[package]] name = "tiny-skia-path" version = "0.8.4" @@ -5489,23 +4597,6 @@ dependencies = [ "percent-encoding", ] -[[package]] -name = "usvg" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63b6bb4e62619d9f68aa2d8a823fea2bff302340a1f2d45c264d5b0be170832e" -dependencies = [ - "base64 0.21.0", - "data-url", - "flate2", - "imagesize 0.11.0", - "kurbo 0.9.4", - "log", - "rctree", - "rosvgtree", - "strict-num", -] - [[package]] name = "usvg" version = "0.35.0" @@ -5516,7 +4607,7 @@ dependencies = [ "log", "pico-args", "usvg-parser", - "usvg-text-layout 0.35.0", + "usvg-text-layout", "usvg-tree", "xmlwriter", ] @@ -5529,40 +4620,24 @@ checksum = "d19bf93d230813599927d88557014e0908ecc3531666d47c634c6838bc8db408" dependencies = [ "data-url", "flate2", - "imagesize 0.12.0", - "kurbo 0.9.4", + "imagesize", + "kurbo", "log", "roxmltree", "simplecss", "siphasher", - "svgtypes 0.11.0", + "svgtypes", "usvg-tree", ] -[[package]] -name = "usvg-text-layout" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "195386e01bc35f860db024de275a76e7a31afdf975d18beb6d0e44764118b4db" -dependencies = [ - "fontdb 0.12.0", - "kurbo 0.9.4", - "log", - "rustybuzz 0.7.0", - "unicode-bidi", - "unicode-script", - "unicode-vo", - "usvg 0.29.0", -] - [[package]] name = "usvg-text-layout" version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "035044604e89652c0a2959b8b356946997a52649ba6cade45928c2842376feb4" dependencies = [ - "fontdb 0.14.1", - "kurbo 0.9.4", + "fontdb", + "kurbo", "log", "rustybuzz 0.7.0", "unicode-bidi", @@ -5579,7 +4654,7 @@ checksum = "7939a7e4ed21cadb5d311d6339730681c3e24c3e81d60065be80e485d3fc8b92" dependencies = [ "rctree", "strict-num", - "svgtypes 0.11.0", + "svgtypes", "tiny-skia-path 0.10.0", ] @@ -5775,16 +4850,6 @@ dependencies = [ "xcursor", ] -[[package]] -name = "wayland-egl" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "402de949f81a012926d821a2d659f930694257e76dd92b6e0042ceb27be4107d" -dependencies = [ - "wayland-client 0.29.5", - "wayland-sys 0.29.5", -] - [[package]] name = "wayland-protocols" version = "0.29.5" @@ -5864,75 +4929,28 @@ version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" -[[package]] -name = "wgpu" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d745a1b6d91d85c33defbb29f0eee0450e1d2614d987e14bf6baf26009d132d7" -dependencies = [ - "arrayvec 0.7.4", - "cfg-if", - "js-sys", - "log", - "naga 0.11.0", - "parking_lot 0.12.1", - "profiling", - "raw-window-handle 0.5.2", - "smallvec", - "static_assertions", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "wgpu-core 0.15.1", - "wgpu-hal 0.15.4", - "wgpu-types 0.15.2", -] - [[package]] name = "wgpu" version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "480c965c9306872eb6255fa55e4b4953be55a8b64d57e61d7ff840d3dcc051cd" dependencies = [ - "arrayvec 0.7.4", + "arrayvec", "cfg-if", "js-sys", "log", - "naga 0.12.3", + "naga", "parking_lot 0.12.1", "profiling", - "raw-window-handle 0.5.2", + "raw-window-handle", "smallvec", "static_assertions", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "wgpu-core 0.16.1", - "wgpu-hal 0.16.2", - "wgpu-types 0.16.1", -] - -[[package]] -name = "wgpu-core" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7131408d940e335792645a98f03639573b0480e9e2e7cddbbab74f7c6d9f3fff" -dependencies = [ - "arrayvec 0.7.4", - "bit-vec", - "bitflags 1.3.2", - "codespan-reporting", - "fxhash", - "log", - "naga 0.11.0", - "parking_lot 0.12.1", - "profiling", - "raw-window-handle 0.5.2", - "smallvec", - "thiserror", - "web-sys", - "wgpu-hal 0.15.4", - "wgpu-types 0.15.2", + "wgpu-core", + "wgpu-hal", + "wgpu-types", ] [[package]] @@ -5941,63 +4959,21 @@ version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f478237b4bf0d5b70a39898a66fa67ca3a007d79f2520485b8b0c3dfc46f8c2" dependencies = [ - "arrayvec 0.7.4", + "arrayvec", "bit-vec", "bitflags 2.4.1", "codespan-reporting", "log", - "naga 0.12.3", + "naga", "parking_lot 0.12.1", "profiling", - "raw-window-handle 0.5.2", + "raw-window-handle", "rustc-hash", "smallvec", "thiserror", "web-sys", - "wgpu-hal 0.16.2", - "wgpu-types 0.16.1", -] - -[[package]] -name = "wgpu-hal" -version = "0.15.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdcf61a283adc744bb5453dd88ea91f3f86d5ca6b027661c6c73c7734ae0288b" -dependencies = [ - "android_system_properties", - "arrayvec 0.7.4", - "ash", - "bit-set", - "bitflags 1.3.2", - "block", - "core-graphics-types", - "d3d12", - "foreign-types 0.3.2", - "fxhash", - "glow 0.12.1", - "gpu-alloc", - "gpu-allocator", - "gpu-descriptor", - "hassle-rs 0.9.0", - "js-sys", - "khronos-egl", - "libc", - "libloading 0.7.4", - "log", - "metal", - "naga 0.11.0", - "objc", - "parking_lot 0.12.1", - "profiling", - "range-alloc", - "raw-window-handle 0.5.2", - "renderdoc-sys 0.7.1", - "smallvec", - "thiserror", - "wasm-bindgen", - "web-sys", - "wgpu-types 0.15.2", - "winapi", + "wgpu-hal", + "wgpu-types", ] [[package]] @@ -6007,52 +4983,41 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ecb3258078e936deee14fd4e0febe1cfe9bbb5ffef165cb60218d2ee5eb4448" dependencies = [ "android_system_properties", - "arrayvec 0.7.4", + "arrayvec", "ash", "bit-set", "bitflags 2.4.1", "block", "core-graphics-types", "d3d12", - "foreign-types 0.3.2", - "glow 0.12.1", + "foreign-types", + "glow", "gpu-alloc", "gpu-allocator", "gpu-descriptor", - "hassle-rs 0.10.0", + "hassle-rs", "js-sys", "khronos-egl", "libc", "libloading 0.8.1", "log", "metal", - "naga 0.12.3", + "naga", "objc", "parking_lot 0.12.1", "profiling", "range-alloc", - "raw-window-handle 0.5.2", - "renderdoc-sys 1.0.0", + "raw-window-handle", + "renderdoc-sys", "rustc-hash", "smallvec", "thiserror", "wasm-bindgen", "web-sys", - "wgpu-types 0.16.1", + "wgpu-types", "winapi", ] -[[package]] -name = "wgpu-types" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32444e121b0bd00cb02c0de32fde457a9491bd44e03e7a5db6df9b1da2f6f110" -dependencies = [ - "bitflags 1.3.2", - "js-sys", - "web-sys", -] - [[package]] name = "wgpu-types" version = "0.16.1" @@ -6064,18 +5029,6 @@ dependencies = [ "web-sys", ] -[[package]] -name = "wgpu_glyph" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e25440d5f32ec39de49c57c15c2d3f9133a7939b069b5ad07e5afd8b78fb8adc" -dependencies = [ - "bytemuck", - "glyph_brush", - "log", - "wgpu 0.15.1", -] - [[package]] name = "which" version = "4.4.0" @@ -6087,12 +5040,6 @@ dependencies = [ "once_cell", ] -[[package]] -name = "widestring" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17882f045410753661207383517a6f62ec3dbeb6a4ed2acce01f0728238d1983" - [[package]] name = "widestring" version = "1.0.2" @@ -6139,20 +5086,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -[[package]] -name = "window_clipboard" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "015dd4474dc6aa96fe19aae3a24587a088bd90331dba5a5cc60fb3a180234c4d" -dependencies = [ - "clipboard-win", - "clipboard_macos", - "clipboard_wayland", - "clipboard_x11", - "raw-window-handle 0.3.4", - "thiserror", -] - [[package]] name = "window_clipboard" version = "0.3.0" @@ -6163,7 +5096,7 @@ dependencies = [ "clipboard_macos", "clipboard_wayland", "clipboard_x11", - "raw-window-handle 0.5.2", + "raw-window-handle", "thiserror", ] @@ -6185,19 +5118,6 @@ dependencies = [ "windows-targets 0.48.0", ] -[[package]] -name = "windows-sys" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" -dependencies = [ - "windows_aarch64_msvc 0.36.1", - "windows_i686_gnu 0.36.1", - "windows_i686_msvc 0.36.1", - "windows_x86_64_gnu 0.36.1", - "windows_x86_64_msvc 0.36.1", -] - [[package]] name = "windows-sys" version = "0.45.0" @@ -6258,12 +5178,6 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" -[[package]] -name = "windows_aarch64_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" - [[package]] name = "windows_aarch64_msvc" version = "0.42.2" @@ -6276,12 +5190,6 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" -[[package]] -name = "windows_i686_gnu" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" - [[package]] name = "windows_i686_gnu" version = "0.42.2" @@ -6294,12 +5202,6 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" -[[package]] -name = "windows_i686_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" - [[package]] name = "windows_i686_msvc" version = "0.42.2" @@ -6312,12 +5214,6 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" -[[package]] -name = "windows_x86_64_gnu" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" - [[package]] name = "windows_x86_64_gnu" version = "0.42.2" @@ -6342,12 +5238,6 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" -[[package]] -name = "windows_x86_64_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" - [[package]] name = "windows_x86_64_msvc" version = "0.42.2" @@ -6360,39 +5250,6 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" -[[package]] -name = "winit" -version = "0.27.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb796d6fbd86b2fd896c9471e6f04d39d750076ebe5680a3958f00f5ab97657c" -dependencies = [ - "bitflags 1.3.2", - "cocoa", - "core-foundation", - "core-graphics", - "dispatch", - "instant", - "libc", - "log", - "mio", - "ndk", - "ndk-glue", - "objc", - "once_cell", - "parking_lot 0.12.1", - "percent-encoding", - "raw-window-handle 0.4.3", - "raw-window-handle 0.5.2", - "sctk-adwaita 0.4.3", - "smithay-client-toolkit", - "wasm-bindgen", - "wayland-client 0.29.5", - "wayland-protocols", - "web-sys", - "windows-sys 0.36.1", - "x11-dl", -] - [[package]] name = "winit" version = "0.28.7" @@ -6414,9 +5271,9 @@ dependencies = [ "once_cell", "orbclient", "percent-encoding", - "raw-window-handle 0.5.2", + "raw-window-handle", "redox_syscall 0.3.5", - "sctk-adwaita 0.5.4", + "sctk-adwaita", "smithay-client-toolkit", "wasm-bindgen", "wayland-client 0.29.5", @@ -6447,15 +5304,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "wio" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d129932f4644ac2396cb456385cbf9e63b5b30c6e8dc4820bdca4eb082037a5" -dependencies = [ - "winapi", -] - [[package]] name = "x11-dl" version = "2.21.0" @@ -6524,12 +5372,6 @@ dependencies = [ "nom", ] -[[package]] -name = "xi-unicode" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a67300977d3dc3f8034dae89778f502b6ba20b269527b3223ba59c0cf393bb8a" - [[package]] name = "xml-rs" version = "0.8.4" diff --git a/gui/Cargo.toml b/gui/Cargo.toml index 7831f6333..6408526df 100644 --- a/gui/Cargo.toml +++ b/gui/Cargo.toml @@ -21,9 +21,8 @@ backtrace = "0.3" base64 = "0.13" hex = "0.4.3" -iced = { version = "0.9", default-features= false, features = ["tokio", "glow", "svg", "qr_code", "image"] } -iced_native = "0.10" -iced_lazy = { version = "0.6"} +iced = { version = "0.10", default-features = false, features = ["tokio", "svg", "qr_code", "image", "lazy"] } +iced_runtime = "0.1.1" tokio = {version = "1.21.0", features = ["signal"]} serde = { version = "1.0", features = ["derive"] } @@ -47,9 +46,6 @@ bitcoin_hashes = "0.12" reqwest = { version = "0.11", default-features=false, features = ["rustls-tls"] } rust-ini = "0.19.0" -[patch.crates-io] -iced_futures = { git = "https://github.com/edouardparis/iced", branch = "fix-futures-recipe"} - [target.'cfg(windows)'.dependencies] zip = { version = "0.6", default-features=false, features = ["bzip2", "deflate"] } diff --git a/gui/src/app/view/psbt.rs b/gui/src/app/view/psbt.rs index d0a8d76b6..e861c7b97 100644 --- a/gui/src/app/view/psbt.rs +++ b/gui/src/app/view/psbt.rs @@ -375,7 +375,9 @@ pub fn signatures<'a>( }, )), ) - .horizontal_scroll(scrollable::Properties::new().width(2).scroller_width(2)), + .direction(scrollable::Direction::Horizontal( + scrollable::Properties::new().width(2).scroller_width(2), + )), ) .padding(15) } else { @@ -530,7 +532,9 @@ pub fn path_view<'a>( ) .push(row_signed), ) - .horizontal_scroll(scrollable::Properties::new().width(2).scroller_width(2)) + .direction(scrollable::Direction::Horizontal( + scrollable::Properties::new().width(2).scroller_width(2), + )) .into() } diff --git a/gui/src/app/view/receive.rs b/gui/src/app/view/receive.rs index 508b145c9..55865e7ba 100644 --- a/gui/src/app/view/receive.rs +++ b/gui/src/app/view/receive.rs @@ -94,10 +94,11 @@ pub fn receive<'a>( Length::Fixed(10.0), )), ) - .horizontal_scroll( + .direction(scrollable::Direction::Horizontal( scrollable::Properties::new() - .scroller_width(5), - ), + .width(2) + .scroller_width(2), + )), ) .width(Length::Fill), ) diff --git a/gui/src/app/view/settings.rs b/gui/src/app/view/settings.rs index 4618ad4b0..87e763c8f 100644 --- a/gui/src/app/view/settings.rs +++ b/gui/src/app/view/settings.rs @@ -621,9 +621,9 @@ pub fn wallet_settings<'a>( .push(text(descriptor.to_owned()).small()) .push(Space::with_height(Length::Fixed(5.0))), ) - .horizontal_scroll( + .direction(scrollable::Direction::Horizontal( scrollable::Properties::new().width(5).scroller_width(5), - ), + )), ) .push( Row::new() diff --git a/gui/src/installer/step/descriptor.rs b/gui/src/installer/step/descriptor.rs index 7816c4d53..7b422b61c 100644 --- a/gui/src/installer/step/descriptor.rs +++ b/gui/src/installer/step/descriptor.rs @@ -1527,7 +1527,7 @@ impl From for Box { #[cfg(test)] mod tests { use super::*; - use iced_native::command::Action; + use iced_runtime::command::Action; use std::sync::{Arc, Mutex}; pub struct Sandbox { diff --git a/gui/src/installer/view.rs b/gui/src/installer/view.rs index 6ed49ad71..d085caa12 100644 --- a/gui/src/installer/view.rs +++ b/gui/src/installer/view.rs @@ -254,7 +254,9 @@ pub fn define_descriptor<'a>( ) .padding(5), ) - .horizontal_scroll(Properties::new().width(3).scroller_width(3)), + .direction(scrollable::Direction::Horizontal( + Properties::new().width(3).scroller_width(3), + )), ), )) .spacing(10); @@ -349,7 +351,9 @@ pub fn recovery_path_view( ) .padding(5), ) - .horizontal_scroll(Properties::new().width(3).scroller_width(3)), + .direction(scrollable::Direction::Horizontal( + Properties::new().width(3).scroller_width(3), + )), ), ), ) @@ -464,9 +468,9 @@ pub fn signer_xpubs(xpubs: &Vec) -> Element { .push( Container::new( scrollable(Container::new(text(xpub).small()).padding(10)) - .horizontal_scroll( + .direction(scrollable::Direction::Horizontal( Properties::new().width(5).scroller_width(5), - ), + )), ) .width(Length::Fill), ) @@ -537,9 +541,9 @@ pub fn hardware_wallet_xpubs<'a>( .push( Container::new( scrollable(Container::new(text(xpub).small()).padding(10)) - .horizontal_scroll( + .direction(scrollable::Direction::Horizontal( Properties::new().width(5).scroller_width(5), - ), + )), ) .width(Length::Fill), ) @@ -1292,7 +1296,9 @@ pub fn defined_descriptor_key<'a>( .push(text(name).bold()) .push(Space::with_height(Length::Fixed(5.0))), ) - .horizontal_scroll(Properties::new().width(5).scroller_width(5)), + .direction(scrollable::Direction::Horizontal( + Properties::new().width(5).scroller_width(5), + )), ) .push(image::success_mark_icon().width(Length::Fixed(50.0))) .push(Space::with_width(Length::Fixed(1.0))), @@ -1850,8 +1856,8 @@ fn layout<'a>( mod threshsold_input { use iced::alignment::{self, Alignment}; + use iced::widget::{component, Component}; use iced::Length; - use iced_lazy::{self, Component}; use liana_ui::{component::text::*, icon, theme, widget::*}; pub struct ThresholdInput { @@ -1938,7 +1944,7 @@ mod threshsold_input { Message: 'a, { fn from(numeric_input: ThresholdInput) -> Self { - iced_lazy::component(numeric_input) + component(numeric_input) } } } diff --git a/gui/src/launcher.rs b/gui/src/launcher.rs index 032d719b9..781901510 100644 --- a/gui/src/launcher.rs +++ b/gui/src/launcher.rs @@ -1,6 +1,7 @@ use std::path::PathBuf; use iced::{ + alignment::Horizontal, widget::{tooltip, Space}, Alignment, Command, Length, Subscription, }; @@ -330,7 +331,7 @@ impl DeleteWalletModal { .push(icon::circle_check_icon().style(color::GREEN)) .push(text("Wallet successfully deleted").style(color::GREEN)) }) - .align_x(iced_native::alignment::Horizontal::Center) + .align_x(Horizontal::Center) .width(Length::Fill), ), ) diff --git a/gui/src/main.rs b/gui/src/main.rs index 8413d87a9..49132f5b5 100644 --- a/gui/src/main.rs +++ b/gui/src/main.rs @@ -71,11 +71,18 @@ enum State { #[derive(Debug)] pub enum Message { CtrlC, + FontLoaded(Result<(), iced::font::Error>), Launch(Box), Install(Box), Load(Box), Run(Box), - Event(iced_native::Event), + Event(iced::Event), +} + +impl From> for Message { + fn from(value: Result<(), iced::font::Error>) -> Self { + Self::FontLoaded(value) + } } async fn ctrl_c() -> Result<(), ()> { @@ -101,17 +108,12 @@ impl Application for GUI { fn new((config, log_level): (Config, Option)) -> (GUI, Command) { let logger = Logger::setup(log_level.unwrap_or(LevelFilter::INFO)); - match config { + let mut cmds = font::loads(); + cmds.push(Command::perform(ctrl_c(), |_| Message::CtrlC)); + let state = match config { Config::Launcher(datadir_path) => { let launcher = Launcher::new(datadir_path); - ( - Self { - state: State::Launcher(Box::new(launcher)), - logger, - log_level, - }, - Command::perform(ctrl_c(), |_| Message::CtrlC), - ) + State::Launcher(Box::new(launcher)) } Config::Install(datadir_path, network) => { if !datadir_path.exists() { @@ -131,17 +133,8 @@ impl Application for GUI { log_level.unwrap_or(LevelFilter::INFO), ); let (install, command) = Installer::new(datadir_path, network); - ( - Self { - state: State::Installer(Box::new(install)), - logger, - log_level, - }, - Command::batch(vec![ - command.map(|msg| Message::Install(Box::new(msg))), - Command::perform(ctrl_c(), |_| Message::CtrlC), - ]), - ) + cmds.push(command.map(|msg| Message::Install(Box::new(msg)))); + State::Installer(Box::new(install)) } Config::Run(datadir_path, cfg, network) => { logger.set_running_mode( @@ -150,30 +143,24 @@ impl Application for GUI { log_level.unwrap_or_else(|| cfg.log_level().unwrap_or(LevelFilter::INFO)), ); let (loader, command) = Loader::new(datadir_path, cfg, network, None); - ( - Self { - state: State::Loader(Box::new(loader)), - logger, - log_level, - }, - Command::batch(vec![ - command.map(|msg| Message::Load(Box::new(msg))), - Command::perform(ctrl_c(), |_| Message::CtrlC), - ]), - ) + cmds.push(command.map(|msg| Message::Load(Box::new(msg)))); + State::Loader(Box::new(loader)) } - } + }; + ( + Self { + state, + logger, + log_level, + }, + Command::batch(cmds), + ) } fn update(&mut self, message: Self::Message) -> Command { match (&mut self.state, message) { (_, Message::CtrlC) - | ( - _, - Message::Event(iced_native::Event::Window( - iced_native::window::Event::CloseRequested, - )), - ) => { + | (_, Message::Event(iced::Event::Window(iced::window::Event::CloseRequested))) => { match &mut self.state { State::Loader(s) => s.stop(), State::Launcher(s) => s.stop(), @@ -271,14 +258,8 @@ impl Application for GUI { State::App(v) => v.subscription().map(|msg| Message::Run(Box::new(msg))), State::Launcher(v) => v.subscription().map(|msg| Message::Launch(Box::new(msg))), }, - iced_native::subscription::events().map(Self::Message::Event), + iced::subscription::events().map(Self::Message::Event), ]) - .with_filter(|(event, _status)| { - matches!( - event, - iced::Event::Window(iced_native::window::Event::CloseRequested) - ) - }) } fn view(&self) -> Element { @@ -408,7 +389,7 @@ fn main() -> Result<(), Box> { settings.id = Some("liana-gui".to_string()); settings.window.icon = Some(image::liana_app_icon()); settings.default_text_size = text::P1_SIZE.into(); - settings.default_font = Some(font::REGULAR_BYTES); + settings.default_font = liana_ui::font::REGULAR; settings.exit_on_close_request = false; if let Err(e) = GUI::run(settings) { diff --git a/gui/src/utils/sandbox.rs b/gui/src/utils/sandbox.rs index 7a408e0d6..31e0fdb4a 100644 --- a/gui/src/utils/sandbox.rs +++ b/gui/src/utils/sandbox.rs @@ -1,6 +1,6 @@ use std::sync::Arc; -use iced_native::command::Action; +use iced_runtime::command::Action; use crate::{ app::{cache::Cache, message::Message, state::State}, diff --git a/gui/ui/Cargo.toml b/gui/ui/Cargo.toml index d039a8338..c9b7bdf32 100644 --- a/gui/ui/Cargo.toml +++ b/gui/ui/Cargo.toml @@ -6,6 +6,6 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -iced = { version = "0.10", default_features = false, features = ["svg", "image", "lazy", "advanced"] } +iced = { version = "0.10", default-features = false, features = ["svg", "image", "lazy", "advanced"] } bitcoin = "0.30" chrono = "0.4"