diff --git a/Cargo.lock b/Cargo.lock
index 703444aad9c349ab7d39f0da578064e5f1394607..ab71c23c95e753270f57bfda328bf0d150b70fff 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -76,6 +76,7 @@ dependencies = [
"hashbrown 0.14.2",
"iced",
"iced_aw",
+ "image",
"lektor_lib",
"lektor_mpris",
"lektor_payloads",
@@ -390,6 +391,12 @@ version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
+[[package]]
+name = "bit_field"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61"
+
[[package]]
name = "bitflags"
version = "1.3.2"
@@ -667,6 +674,12 @@ dependencies = [
"unicode-width",
]
+[[package]]
+name = "color_quant"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
+
[[package]]
name = "com-rs"
version = "0.2.1"
@@ -981,6 +994,22 @@ dependencies = [
"pin-project-lite",
]
+[[package]]
+name = "exr"
+version = "1.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "279d3efcc55e19917fff7ab3ddd6c14afb6a90881a0078465196fe2f99d08c56"
+dependencies = [
+ "bit_field",
+ "flume",
+ "half",
+ "lebe",
+ "miniz_oxide",
+ "rayon-core",
+ "smallvec",
+ "zune-inflate",
+]
+
[[package]]
name = "fast-srgb8"
version = "1.0.0"
@@ -1021,6 +1050,19 @@ dependencies = [
"miniz_oxide",
]
+[[package]]
+name = "flume"
+version = "0.10.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577"
+dependencies = [
+ "futures-core",
+ "futures-sink",
+ "nanorand",
+ "pin-project",
+ "spin 0.9.8",
+]
+
[[package]]
name = "fnv"
version = "1.0.7"
@@ -1196,8 +1238,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427"
dependencies = [
"cfg-if",
+ "js-sys",
"libc",
"wasi",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "gif"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045"
+dependencies = [
+ "color_quant",
+ "weezl",
]
[[package]]
@@ -1489,6 +1543,7 @@ dependencies = [
"iced_renderer",
"iced_widget",
"iced_winit",
+ "image",
"thiserror",
]
@@ -1540,6 +1595,8 @@ dependencies = [
"glam",
"half",
"iced_core",
+ "image",
+ "kamadak-exif",
"log",
"raw-window-handle",
"thiserror",
@@ -1663,6 +1720,25 @@ dependencies = [
"unicode-normalization",
]
+[[package]]
+name = "image"
+version = "0.24.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711"
+dependencies = [
+ "bytemuck",
+ "byteorder",
+ "color_quant",
+ "exr",
+ "gif",
+ "jpeg-decoder",
+ "num-rational",
+ "num-traits",
+ "png",
+ "qoi",
+ "tiff",
+]
+
[[package]]
name = "indexmap"
version = "1.9.3"
@@ -1733,6 +1809,15 @@ dependencies = [
"libc",
]
+[[package]]
+name = "jpeg-decoder"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e"
+dependencies = [
+ "rayon",
+]
+
[[package]]
name = "js-sys"
version = "0.3.64"
@@ -1742,6 +1827,15 @@ dependencies = [
"wasm-bindgen",
]
+[[package]]
+name = "kamadak-exif"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef4fc70d0ab7e5b6bafa30216a6b48705ea964cdfc29c050f2412295eba58077"
+dependencies = [
+ "mutate_once",
+]
+
[[package]]
name = "khronos-egl"
version = "4.1.0"
@@ -1779,6 +1873,12 @@ version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+[[package]]
+name = "lebe"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8"
+
[[package]]
name = "lektor_lib"
version = "3.0.1"
@@ -2107,6 +2207,12 @@ dependencies = [
"windows-sys 0.48.0",
]
+[[package]]
+name = "mutate_once"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16cf681a23b4d0a43fc35024c176437f9dcd818db34e0f42ab456a0ee5ad497b"
+
[[package]]
name = "naga"
version = "0.12.3"
@@ -2127,6 +2233,15 @@ dependencies = [
"unicode-xid",
]
+[[package]]
+name = "nanorand"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3"
+dependencies = [
+ "getrandom",
+]
+
[[package]]
name = "ndk"
version = "0.7.0"
@@ -2226,6 +2341,27 @@ dependencies = [
"winapi",
]
+[[package]]
+name = "num-integer"
+version = "0.1.45"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
+dependencies = [
+ "autocfg",
+ "num-traits",
+]
+
+[[package]]
+name = "num-rational"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0"
+dependencies = [
+ "autocfg",
+ "num-integer",
+ "num-traits",
+]
+
[[package]]
name = "num-traits"
version = "0.2.17"
@@ -2658,6 +2794,15 @@ version = "1.0.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f89dff0959d98c9758c88826cc002e2c3d0b9dfac4139711d1f30de442f1139b"
+[[package]]
+name = "qoi"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001"
+dependencies = [
+ "bytemuck",
+]
+
[[package]]
name = "quick-xml"
version = "0.28.2"
@@ -2866,7 +3011,7 @@ dependencies = [
"cc",
"libc",
"once_cell",
- "spin",
+ "spin 0.5.2",
"untrusted",
"web-sys",
"winapi",
@@ -3249,6 +3394,15 @@ version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
+[[package]]
+name = "spin"
+version = "0.9.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
+dependencies = [
+ "lock_api",
+]
+
[[package]]
name = "spirv"
version = "0.2.0+1.5.4"
@@ -3418,6 +3572,17 @@ dependencies = [
"syn 2.0.38",
]
+[[package]]
+name = "tiff"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d172b0f4d3fba17ba89811858b9d3d97f928aece846475bbda076ca46736211"
+dependencies = [
+ "flate2",
+ "jpeg-decoder",
+ "weezl",
+]
+
[[package]]
name = "tiny-skia"
version = "0.8.4"
@@ -4031,6 +4196,12 @@ version = "0.25.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc"
+[[package]]
+name = "weezl"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb"
+
[[package]]
name = "wgpu"
version = "0.16.3"
@@ -4561,6 +4732,15 @@ dependencies = [
"syn 2.0.38",
]
+[[package]]
+name = "zune-inflate"
+version = "0.2.54"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02"
+dependencies = [
+ "simd-adler32",
+]
+
[[package]]
name = "zvariant"
version = "3.15.0"
diff --git a/Cargo.toml b/Cargo.toml
index f4e62b8934303397dac114448e68c4fc3ba85037..61c9d187da62433bab49129dd7c48fd5a323cc57 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -115,7 +115,8 @@ clap = { version = "4", default-features = false, features = [
] }
# GUI
-iced = { version = "0.10", features = ["tokio", "system", "advanced", "debug"] }
+image = { version = "0.24", default-features = false, features = ["png"] }
+iced = { version = "0.10", features = ["tokio", "system", "advanced", "image"] }
iced_aw = { version = "0.7", default-features = false, features = [
"split",
"wrap",
diff --git a/amadeus/Cargo.toml b/amadeus/Cargo.toml
index e3bc99b948e794db0120d640956cedfa22a981f0..7465d597cef60b6f7d2a76d63797e869d83e8976 100644
--- a/amadeus/Cargo.toml
+++ b/amadeus/Cargo.toml
@@ -14,6 +14,7 @@ serde_json.workspace = true
anyhow.workspace = true
hashbrown.workspace = true
+image.workspace = true
iced.workspace = true
iced_aw.workspace = true
diff --git a/amadeus/src/main.rs b/amadeus/src/main.rs
index 05a3779c3038b07e180ac35e1df617c515ed2dbe..9f97cd8dd0676363fe84da90c8bd32d5fbc52c9b 100644
--- a/amadeus/src/main.rs
+++ b/amadeus/src/main.rs
@@ -48,8 +48,12 @@ fn main() -> Result<()> {
Ok(<Amadeus as iced::Application>::run(iced::Settings {
id: Some("Amadeus".to_string()),
window: iced::window::Settings {
+ icon: Some(iced::window::icon::from_file_data(
+ include_bytes!("../../utils/desktop/amadeus.png"),
+ Some(image::ImageFormat::Png),
+ )?),
resizable: true,
- decorations: false,
+ decorations: true, // Wait for https://github.com/iced-rs/iced/pull/1542 to be merged
transparent: false,
visible: true,
min_size: Some((900, 600)),