PdfCraft: An open-source PDF reader and editor written by scratch in pure Rust
Update prompt shows the app icon and accent color instead of a letter (#5388)
Dylan M. Taylor3517d05b47bf
diff --git a/Cargo.lock b/Cargo.lockindex 2aea77107..efe849ad7 100644--- a/Cargo.lock+++ b/Cargo.lock@@ -229,7 +229,7 @@ dependencies = ["objc2-foundation 0.3.2","parking_lot","percent-encoding",- "windows-sys 0.59.0",+ "windows-sys 0.61.2","wl-clipboard-rs","x11rb",]@@ -1279,13 +1279,14 @@ dependencies = [[[package]]name = "craft-update"version = "0.1.0"-source = "git+https://github.com/storytold/craft-libs?rev=e11f9d9aebea5f6b8e74643c1ea1ed172ba5f545#e11f9d9aebea5f6b8e74643c1ea1ed172ba5f545"+source = "git+https://github.com/storytold/craft-libs?rev=1065653e75854e9c17e1ff563acdd344c1b185f0#1065653e75854e9c17e1ff563acdd344c1b185f0"dependencies = ["chrono","dunce","egui","flate2","getrandom 0.3.4",+ "image","log","plist","semver",@@ -2015,7 +2016,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]]@@ -4114,7 +4115,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]]@@ -5259,7 +5260,7 @@ dependencies = ["once_cell","socket2","tracing",- "windows-sys 0.59.0",+ "windows-sys 0.61.2",][[package]]@@ -5796,7 +5797,7 @@ dependencies = ["errno","libc","linux-raw-sys 0.12.1",- "windows-sys 0.59.0",+ "windows-sys 0.61.2",][[package]]@@ -5866,7 +5867,7 @@ dependencies = ["security-framework","security-framework-sys","webpki-root-certs",- "windows-sys 0.59.0",+ "windows-sys 0.61.2",][[package]]@@ -6756,7 +6757,7 @@ dependencies = ["getrandom 0.3.4","once_cell","rustix 1.1.5",- "windows-sys 0.59.0",+ "windows-sys 0.61.2",][[package]]@@ -7867,7 +7868,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 64a3cf5b6..145495bed 100644--- a/Cargo.toml+++ b/Cargo.toml@@ -23,7 +23,8 @@ craft-keymap = { git = "https://github.com/storytold/craft-libs", version = "0.1craft-print = { git = "https://github.com/storytold/craft-libs", version = "0.1.0", rev = "e11f9d9aebea5f6b8e74643c1ea1ed172ba5f545" }# Whether a path stored in a document may be opened (GoToR link targets).craft-docpath = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "e11f9d9aebea5f6b8e74643c1ea1ed172ba5f545" }-craft-update = { git = "https://github.com/storytold/craft-libs", version = "=0.1.0", rev = "e11f9d9aebea5f6b8e74643c1ea1ed172ba5f545", features = ["egui"] }+# craft-update with storytold/craft-libs#434: the update prompt shows the app's icon, accent and developer.+craft-update = { git = "https://github.com/storytold/craft-libs", version = "=0.1.0", rev = "1065653e75854e9c17e1ff563acdd344c1b185f0", features = ["egui"] }# internalpdfcraft-geom = { path = "crates/geom", version = "0.15.0" }pdfcraft-filters = { path = "crates/filters", version = "0.15.0" }diff --git a/apps/pdfcraft/src/main.rs b/apps/pdfcraft/src/main.rsindex f8e4e5b0d..814730f34 100644--- a/apps/pdfcraft/src/main.rs+++ b/apps/pdfcraft/src/main.rs@@ -196,7 +196,7 @@ fn rejoin_split_paths(args: Vec<String>, exists: impl Fn(&str) -> bool) -> Vec<Sfn main() -> eframe::Result {// Windows: the update helper is a copy of this program started with `--finish-update`.#[cfg(windows)]- if let Some(result) = craft_update::self_update::finish(&craft_update::suite::PDFCRAFT, &std::env::args_os().skip(1).collect::<Vec<_>>()) {+ if let Some(result) = craft_update::self_update::finish(&pdfcraft_ui_egui::UPDATE_APP, &std::env::args_os().skip(1).collect::<Vec<_>>()) {std::process::exit(i32::from(result.is_err()));}// First, so the panic hook and every start-up warning are recorded (`logging`).diff --git a/crates/edit/src/images.rs b/crates/edit/src/images.rsindex 5180e7601..c39ee44fc 100644--- a/crates/edit/src/images.rs+++ b/crates/edit/src/images.rs@@ -186,12 +186,11 @@ impl ImageState {self.path.curve_to(self.point(x1, y1), end, end);}}- b"h" => {+ b"h"// ClosePath with no subpath panics by the same contract (#3581).- if self.path.elements().last().is_some() {+ if self.path.elements().last().is_some() => {self.path.close_path();}- }b"re" => {if let Some([x, y, w, h]) = op.nums::<4>() {self.path.move_to(self.point(x, y));diff --git a/crates/forms/src/appearance.rs b/crates/forms/src/appearance.rsindex b6fedbd55..c9ff86d17 100644--- a/crates/forms/src/appearance.rs+++ b/crates/forms/src/appearance.rs@@ -599,7 +599,7 @@ fn comb_dividers(doc: &Document, wd: &Dict, w: f64, h: f64, cells: usize) -> Strlet inset = border_width(doc, wd);let lw = line_width(doc, wd);let Some(bc) = color_array(doc, mk.as_ref(), b"BC") else { return String::new() };- if !(inset > 0.0 && inset.is_finite() && lw > 0.0 && lw.is_finite()) || !(2..=MAX_COMB_DIVIDERS).contains(&cells) {+ if !(inset > 0.0 && inset.is_finite() && lw > 0.0 && lw.is_finite() && (2..=MAX_COMB_DIVIDERS).contains(&cells)) {return String::new();}let cell = w / cells as f64;diff --git a/crates/ui-egui/src/lib.rs b/crates/ui-egui/src/lib.rsindex 8a8c51775..440c0d13c 100644--- a/crates/ui-egui/src/lib.rs+++ b/crates/ui-egui/src/lib.rs@@ -9,6 +9,15 @@// The settings object in `persist` is one `json!` literal past the default limit of 128.#![recursion_limit = "256"]+/// PdfCraft as craft-update knows it, with its 128 px icon and accent colour: the update+/// prompt shows both, and an AppImage's menu entry gets the icon.+#[cfg(not(target_arch = "wasm32"))]+pub const UPDATE_APP: craft_update::app::App = craft_update::app::App {+ icon_png: Some(include_bytes!("../../../assets/app-icon/hicolor/128x128/apps/ai.storyteller.pdfcraft.png")),+ accent: Some([0xb7, 0x02, 0x28]),+ ..craft_update::suite::PDFCRAFT+};+use crate::control::Host as _;/// Translate an English UI string into the current language (see [`i18n`]).diff --git a/crates/ui-egui/src/platform/updates.rs b/crates/ui-egui/src/platform/updates.rsindex fa59f9a89..7ffebdcbc 100644--- a/crates/ui-egui/src/platform/updates.rs+++ b/crates/ui-egui/src/platform/updates.rs@@ -30,7 +30,7 @@ impl Default for Updates {fn default() -> Self {Self {#[cfg(not(target_arch = "wasm32"))]- updater: Updater::new(&craft_update::suite::PDFCRAFT, env!("CARGO_PKG_VERSION")),+ updater: Updater::new(&crate::UPDATE_APP, env!("CARGO_PKG_VERSION")),open: false,#[cfg(not(target_arch = "wasm32"))]startup_check: false,@@ -50,7 +50,7 @@ impl PdfCraftApp {/// Replaces the network with `source` (tests).#[cfg(not(target_arch = "wasm32"))]pub fn set_update_source(&mut self, source: UpdateSource) {- self.updates.updater = Updater::new(&craft_update::suite::PDFCRAFT, env!("CARGO_PKG_VERSION")).with_source(source);+ self.updates.updater = Updater::new(&crate::UPDATE_APP, env!("CARGO_PKG_VERSION")).with_source(source);}/// Help ▸ Check for updates: ask for the latest release and show the outcome.