LightCraft: An open-source non-destructive photo editor written by scratch in pure Rust
updates: show check results with craft-update's CheckResultDialog
aiongge31f826d5fd9
diff --git a/Cargo.lock b/Cargo.lockindex 4cd0bf148..9b3913f89 100644--- a/Cargo.lock+++ b/Cargo.lock@@ -1184,17 +1184,17 @@ dependencies = [[[package]]name = "craft-docpath"version = "0.1.0"-source = "git+https://github.com/storytold/craft-libs?rev=92d392cff132eaf53e13afff77f38b5c11b73aa0#92d392cff132eaf53e13afff77f38b5c11b73aa0"+source = "git+https://github.com/storytold/craft-libs?rev=c5a1cbfb5f9049f9270955caffb5bee5997aebf7#c5a1cbfb5f9049f9270955caffb5bee5997aebf7"[[package]]name = "craft-fonts-build"version = "0.1.0"-source = "git+https://github.com/storytold/craft-libs?rev=92d392cff132eaf53e13afff77f38b5c11b73aa0#92d392cff132eaf53e13afff77f38b5c11b73aa0"+source = "git+https://github.com/storytold/craft-libs?rev=c5a1cbfb5f9049f9270955caffb5bee5997aebf7#c5a1cbfb5f9049f9270955caffb5bee5997aebf7"[[package]]name = "craft-i18n"version = "0.1.0"-source = "git+https://github.com/storytold/craft-libs?rev=92d392cff132eaf53e13afff77f38b5c11b73aa0#92d392cff132eaf53e13afff77f38b5c11b73aa0"+source = "git+https://github.com/storytold/craft-libs?rev=c5a1cbfb5f9049f9270955caffb5bee5997aebf7#c5a1cbfb5f9049f9270955caffb5bee5997aebf7"dependencies = ["fixed_decimal","icu_decimal",@@ -1217,7 +1217,7 @@ dependencies = [[[package]]name = "craft-ui"version = "0.1.0"-source = "git+https://github.com/storytold/craft-libs?rev=92d392cff132eaf53e13afff77f38b5c11b73aa0#92d392cff132eaf53e13afff77f38b5c11b73aa0"+source = "git+https://github.com/storytold/craft-libs?rev=c5a1cbfb5f9049f9270955caffb5bee5997aebf7#c5a1cbfb5f9049f9270955caffb5bee5997aebf7"dependencies = ["craft-fonts-build","craft-i18n",@@ -1238,7 +1238,7 @@ dependencies = [[[package]]name = "craft-update"version = "0.1.0"-source = "git+https://github.com/storytold/craft-libs?rev=04aa1703b32d299e54f78fcde4182f2b393a9116#04aa1703b32d299e54f78fcde4182f2b393a9116"+source = "git+https://github.com/storytold/craft-libs?rev=c5a1cbfb5f9049f9270955caffb5bee5997aebf7#c5a1cbfb5f9049f9270955caffb5bee5997aebf7"dependencies = ["chrono","dunce",@@ -1264,7 +1264,7 @@ dependencies = [[[package]]name = "craft-window"version = "0.1.0"-source = "git+https://github.com/storytold/craft-libs?rev=92d392cff132eaf53e13afff77f38b5c11b73aa0#92d392cff132eaf53e13afff77f38b5c11b73aa0"+source = "git+https://github.com/storytold/craft-libs?rev=c5a1cbfb5f9049f9270955caffb5bee5997aebf7#c5a1cbfb5f9049f9270955caffb5bee5997aebf7"dependencies = ["egui","objc2 0.6.5",@@ -1871,7 +1871,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"dependencies = ["libc",- "windows-sys 0.59.0",+ "windows-sys 0.61.2",][[package]]@@ -4884,7 +4884,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "7d8fae84b431384b68627d0f9b3b1245fcf9f46f6c0e3dc902e9dce64edd1967"dependencies = ["libc",- "windows-sys 0.59.0",+ "windows-sys 0.61.2",][[package]]@@ -5843,7 +5843,7 @@ dependencies = ["errno","libc","linux-raw-sys 0.12.1",- "windows-sys 0.59.0",+ "windows-sys 0.61.2",][[package]]@@ -5900,7 +5900,7 @@ dependencies = ["security-framework","security-framework-sys","webpki-root-certs",- "windows-sys 0.59.0",+ "windows-sys 0.61.2",][[package]]@@ -6479,10 +6479,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd"dependencies = ["fastrand",- "getrandom 0.3.4",+ "getrandom 0.4.3","once_cell","rustix 1.1.5",- "windows-sys 0.59.0",+ "windows-sys 0.61.2",][[package]]@@ -7405,7 +7405,7 @@ version = "0.1.11"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"dependencies = [- "windows-sys 0.59.0",+ "windows-sys 0.61.2",][[package]]diff --git a/Cargo.toml b/Cargo.tomlindex 04d803a3f..0d2a65d71 100644--- a/Cargo.toml+++ b/Cargo.toml@@ -10,11 +10,11 @@ rust-version = "1.95"repository = "https://github.com/storytold/lightcraft"[workspace.dependencies]-craft-ui = { git = "https://github.com/storytold/craft-libs", rev = "92d392cff132eaf53e13afff77f38b5c11b73aa0", features = ["serde"] }-craft-docpath = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "92d392cff132eaf53e13afff77f38b5c11b73aa0" }+craft-ui = { git = "https://github.com/storytold/craft-libs", rev = "c5a1cbfb5f9049f9270955caffb5bee5997aebf7", features = ["serde"] }+craft-docpath = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "c5a1cbfb5f9049f9270955caffb5bee5997aebf7" }# craft-update: app-specific pretend versions apply to startup and manual checks.-craft-update = { git = "https://github.com/storytold/craft-libs", version = "=0.1.0", rev = "04aa1703b32d299e54f78fcde4182f2b393a9116", features = ["egui"] }-craft-window = { git = "https://github.com/storytold/craft-libs", rev = "92d392cff132eaf53e13afff77f38b5c11b73aa0", features = ["egui"] }+craft-update = { git = "https://github.com/storytold/craft-libs", version = "=0.1.0", rev = "c5a1cbfb5f9049f9270955caffb5bee5997aebf7", features = ["egui"] }+craft-window = { git = "https://github.com/storytold/craft-libs", rev = "c5a1cbfb5f9049f9270955caffb5bee5997aebf7", features = ["egui"] }# internallightcraft-denoise-core = { path = "crates/denoise-core" }lightcraft-denoise = { path = "crates/denoise", default-features = false }diff --git a/crates/ui-egui/src/dialogs/updates_ui.rs b/crates/ui-egui/src/dialogs/updates_ui.rsindex bdd2a81eb..c5dd6cd3a 100644--- a/crates/ui-egui/src/dialogs/updates_ui.rs+++ b/crates/ui-egui/src/dialogs/updates_ui.rs@@ -4,6 +4,8 @@ use serde_json::Value;use crate::LightcraftApp;+#[cfg(not(target_arch = "wasm32"))]+use craft_update::dialog::{CheckResultDialog, CheckResultResponse};#[cfg(not(target_arch = "wasm32"))]use craft_update::updater::{Action, Status, Updater};@@ -18,7 +20,9 @@ pub(crate) struct Runtime {/// The context of the last frame, to wake the UI when a check is queued from a menu callback.#[cfg(not(target_arch = "wasm32"))]repaint: Option<egui::Context>,+ /// A requested check's result dialog is showing.pub(crate) manual_window_open: bool,+ #[cfg(target_arch = "wasm32")]pub(crate) status_message: Option<String>,}@@ -34,6 +38,7 @@ impl Default for Runtime {#[cfg(not(target_arch = "wasm32"))]repaint: None,manual_window_open: false,+ #[cfg(target_arch = "wasm32")]status_message: None,}}@@ -84,6 +89,7 @@ pub(crate) fn tick(app: &mut LightcraftApp, ctx: &egui::Context) {rt.repaint = Some(ctx.clone());if std::mem::take(&mut rt.check_requested) {rt.updater.check_now(ctx);+ rt.manual_window_open = true;} else if rt.startup_check {rt.updater.check_at_start(ctx);}@@ -103,22 +109,26 @@ pub(crate) fn show(app: &mut LightcraftApp, ctx: &egui::Context) {Action::Close => ctx.send_viewport_cmd(egui::ViewportCommand::Close),Action::None => {}}- // The window answers Help ▸ Check for Updates, so it follows the updater's status.+ // A found update opens the startup prompt and leaves the status idle, which ends the result dialog.let rt = &mut app.updates_rt;- (rt.manual_window_open, rt.status_message) = match rt.updater.status() {- Status::Idle => (false, None),- Status::Checking => (true, Some(crate::i18n::tr("Checking for updates…").to_string())),- Status::UpToDate => (- true,- Some(- crate::i18n::tr("LightCraft {version} is currently the newest version available.")- .replace("{version}", env!("CARGO_PKG_VERSION")),- ),- ),- Status::Failed(e) => (true, Some(crate::i18n::tr("Could not check for updates:\n{error}").replace("{error}", e))),- };+ if rt.manual_window_open {+ let dialog = CheckResultDialog::new(&crate::UPDATE_APP, env!("CARGO_PKG_VERSION"));+ match dialog.show(ctx, rt.updater.status()) {+ CheckResultResponse::None => {}+ CheckResultResponse::Close => rt.manual_window_open = false,+ CheckResultResponse::CheckAgain => rt.check_requested = true,+ }+ if matches!(rt.updater.status(), Status::Idle) {+ rt.manual_window_open = false;+ }+ }+ // Closing the dialog dismisses the outcome it showed.+ if !rt.manual_window_open {+ rt.updater.dismiss_status();+ }}+ #[cfg(target_arch = "wasm32")]if app.updates_rt.manual_window_open {let mut open = true;egui::Window::new(crate::i18n::tr("LightCraft Updates"))@@ -140,12 +150,6 @@ pub(crate) fn show(app: &mut LightcraftApp, ctx: &egui::Context) {app.updates_rt.manual_window_open = false;}}-- // Closing the window dismisses the outcome it showed.- #[cfg(not(target_arch = "wasm32"))]- if !app.updates_rt.manual_window_open {- app.updates_rt.updater.dismiss_status();- }}#[cfg(test)]