mirror of
https://github.com/storytold/lightcraft.git
synced 2026-10-26 02:59:17 -06:00
Robert WoldbergandClaude Opus 5.5
8ee7519a5f
Conflicts in crates/ui-egui/src/lightroom_import.rs: main moved the Lightroom import's progress from its own window to the shared activity stack, and this branch had added a second bar to that window. Resolved by keeping main's activity row and feeding it this branch's step-by-step progress (LightroomProgress): the row counts the step under way (the catalog, reading the photos, adding them) and names it, so it moves while the photos are read. The progress window stays removed; the whole-import fraction is still in the task's status. The engine half of this branch merged without conflict and is what main still lacks: reading the photos is counted, and Cancel stops it. main's two activity tests now drive the task through LightroomProgress. "Reading photos…" and "Adding photos…" are added to the language catalogs, cut from the existing "… N of M" translations. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>