diff --git a/Cargo.lock b/Cargo.lock index 6e6c42b..cd3117c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -466,6 +466,12 @@ dependencies = [ "lazy_static", ] +[[package]] +name = "cty" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35" + [[package]] name = "darling" version = "0.10.2" @@ -1104,6 +1110,7 @@ version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "abd5850c449b40bacb498b2bbdfaff648b1b055630073ba8db499caf2d0ea9f2" dependencies = [ + "cc", "pkg-config", "vcpkg", ] @@ -1778,6 +1785,15 @@ dependencies = [ "libc", ] +[[package]] +name = "raw-window-handle" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fba75eee94a9d5273a68c9e1e105d9cffe1ef700532325788389e5a83e2522b7" +dependencies = [ + "cty", +] + [[package]] name = "rayon" version = "1.5.1" @@ -1841,9 +1857,9 @@ checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" [[package]] name = "rfd" -version = "0.5.1" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2acac5884e3a23b02ebd6ce50fd2729732cdbdb16ea944fbbfbfa638a67992aa" +checksum = "df102be679ae47c269a6393851bc2cff8760173e7e67a2f1e8110d6578b7c555" dependencies = [ "block", "dispatch", @@ -1855,11 +1871,11 @@ dependencies = [ "objc", "objc-foundation", "objc_id", - "raw-window-handle", + "raw-window-handle 0.4.2", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "winapi", + "windows", ] [[package]] @@ -2525,6 +2541,58 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "054d31561409bbf7e1ee4a4f0a1233ac2bb79cfadf2a398438a04d8dda69225f" +dependencies = [ + "windows-sys", +] + +[[package]] +name = "windows-sys" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82ca39602d5cbfa692c4b67e3bcbb2751477355141c1ed434c94da4186836ff6" +dependencies = [ + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_msvc" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52695a41e536859d5308cc613b4a022261a274390b25bd29dfff4bf08505f3c2" + +[[package]] +name = "windows_i686_gnu" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f54725ac23affef038fecb177de6c9bf065787c2f432f79e3c373da92f3e1d8a" + +[[package]] +name = "windows_i686_msvc" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d5158a43cc43623c0729d1ad6647e62fa384a3d135fd15108d37c683461f64" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc31f409f565611535130cfe7ee8e6655d3fa99c1c61013981e491921b5ce954" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f2b8c7cbd3bfdddd9ab98769f9746a7fad1bca236554cd032b78d768bc0e89f" + [[package]] name = "winit" version = "0.25.0" @@ -2549,7 +2617,7 @@ dependencies = [ "objc", "parking_lot", "percent-encoding", - "raw-window-handle", + "raw-window-handle 0.3.3", "scopeguard", "smithay-client-toolkit 0.12.3", "wayland-client", diff --git a/Cargo.toml b/Cargo.toml index 30177b1..faebd20 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,7 +25,7 @@ eyre = "0.6.5" thiserror = "1.0.29" tracing = "0.1.29" tracing-subscriber = "0.3.0" -rusqlite = {version = "0.26.1", features = ["chrono", "trace", "serde_json"]} +rusqlite = {version = "0.26.1", features = ["chrono", "trace", "serde_json", "bundled"]} regex = "1.5.3" flate2 = "1.0.22" once_cell = "1.8.0" @@ -45,7 +45,7 @@ lru = { version = "0.7.0", optional = true } emlx = { git = "https://github.com/terhechte/emlx", features = []} walkdir = "2.3.2" mbox-reader = "0.2.0" -rfd = "0.5.1" +rfd = "0.6.1" rand = "0.8.4" shellexpand = "2.1.0" image = { version = "0.23", default-features = false, features = ["png"] } diff --git a/src/gui/platform/windows.rs b/src/gui/platform/windows.rs index 4017454..d5ecfd2 100644 --- a/src/gui/platform/windows.rs +++ b/src/gui/platform/windows.rs @@ -1,10 +1,11 @@ #![cfg(target_os = "windows")] use eframe::egui::{self, Color32}; +use eyre::Result; use super::{PlatformColors, Theme}; -pub fn platform_colors() -> PlatformColors { +pub fn platform_colors(theme: Theme) -> PlatformColors { // From Google images, Windows 11 match theme { Theme::Light => PlatformColors { @@ -38,7 +39,9 @@ pub fn platform_colors() -> PlatformColors { pub fn setup(ctx: &egui::CtxRef) {} /// This is called once from `App::update` on the first run. -pub fn initial_update(ctx: &egui::CtxRef) -> Result<()> {} +pub fn initial_update(ctx: &egui::CtxRef) -> Result<()> { + Ok(()) +} pub fn navigation_button(title: &str) -> egui::Button { egui::Button::new(title)