Skip to content

LightCraft: An open-source non-destructive photo editor written by scratch in pure Rust

Merge upstream/main (integration batch 43, #2729, #2737, #2412) into round3a-integration

francoisgn144d900c2194
diff --cc apps/lightcraft/src/native_menu.rs
index c52999b80,14debc498..e9323a210
--- a/apps/lightcraft/src/native_menu.rs
+++ b/apps/lightcraft/src/native_menu.rs
@@@ -48,6 -51,116 +53,118 @@@ struct Item
label: String,
enabled: bool,
checked: Option<bool>,
+ /// Whether the item may be replaced to drop its key. Not in the Help menu: a swap there left
+ /// the old row and added a second one (muda 0.21, macOS 27), so those keys stay.
+ swappable: bool,
+ }
+
+ impl Item {
++ /// The row's text as installed: `label` is already what the row shows (translated, with a
++ /// borrowed key's hint, `native_item_presentation`).
+ fn native_label(&self) -> String {
- lightcraft_ui_egui::menubar::display_item_label(&self.cmd, &self.params, &self.label).replace('&', "&&")
++ self.label.replace('&', "&&")
+ }
+
+ /// Puts `want` on the native item. muda's `set_accelerator(None)` does nothing on macOS (the
+ /// old key equivalent stays and the menu still takes the key), so there the item is replaced
+ /// by an identical one without an accelerator, at the same position and with the same id,
+ /// text, enabled and checked state. Only done when the accelerator changes (and again while a
+ /// native call keeps failing), never per frame otherwise.
+ fn set_accelerator(&mut self, want: Option<Accelerator>) {
+ if self.current == want {
+ return;
+ }
+ if cfg!(target_os = "macos") && want.is_none() && self.swappable {
+ // `current` follows the native item: it changes only when the swap went through, so a
+ // failed swap (the old item, key and all, is still there) is tried again
+ let done = self.replace_without_accelerator();
+ self.current = settled(self.current, want, done);
+ return;
+ }
+ let done = match &self.handle {
+ Handle::Plain(h) => h.set_accelerator(want),
+ Handle::Check(h) => h.set_accelerator(want),
+ }
+ .is_ok();
+ self.current = settled(self.current, want, done);
+ }
+
+ /// Replaces the native item by one without an accelerator. `self.handle` changes only when the
+ /// new item is attached; on failure the old item is still the one in the submenu.
+ fn replace_without_accelerator(&mut self) -> bool {
+ let (id, old): (_, &dyn muda::IsMenuItem) = match &self.handle {
+ Handle::Plain(h) => (h.id().clone(), h),
+ Handle::Check(h) => (h.id().clone(), h),
+ };
+ let Some(position) = self.parent.items().iter().position(|k| *k.id() == id) else { return false };
+ let new = match &self.handle {
+ Handle::Plain(_) => Handle::Plain(MenuItem::with_id(id, self.native_label(), self.enabled, None)),
+ Handle::Check(h) => Handle::Check(CheckMenuItem::with_id(id, self.native_label(), self.enabled, h.is_checked(), None)),
+ };
+ let new_ref: &dyn muda::IsMenuItem = match &new {
+ Handle::Plain(h) => h,
+ Handle::Check(h) => h,
+ };
+ if !swap_item(&self.parent, old, new_ref, position) {
+ return false;
+ }
+ self.handle = new;
+ true
+ }
+ }
+
+ /// The accelerator the native item has after trying to put `want` on it: `want` when the native
+ /// call worked, else what it had, so the caller sees the mismatch and tries again.
+ fn settled(had: Option<Accelerator>, want: Option<Accelerator>, native_call_worked: bool) -> Option<Accelerator> {
+ if native_call_worked { want } else { had }
+ }
+
+ /// Whether the per-frame accelerator sync has to run: the focus or recording state changed, or an
+ /// earlier sync left an item whose native accelerator is not the wanted one (a failed swap).
+ fn sync_needed(focus: bool, capturing: bool, synced_focus: bool, synced_capturing: bool, pending: bool) -> bool {
+ focus != synced_focus || capturing != synced_capturing || pending
+ }
+
+ /// The three submenu calls a swap needs, so the failure paths can be tested without a main-thread
+ /// `muda::Menu`.
+ trait SwapTarget {
+ type Row: ?Sized;
+ fn remove(&self, row: &Self::Row) -> bool;
+ fn insert(&self, row: &Self::Row, position: usize) -> bool;
+ fn append(&self, row: &Self::Row) -> bool;
+ }
+
+ impl SwapTarget for Submenu {
+ type Row = dyn muda::IsMenuItem;
+ fn remove(&self, row: &Self::Row) -> bool {
+ Submenu::remove(self, row).is_ok()
+ }
+ fn insert(&self, row: &Self::Row, position: usize) -> bool {
+ Submenu::insert(self, row, position).is_ok()
+ }
+ fn append(&self, row: &Self::Row) -> bool {
+ Submenu::append(self, row).is_ok()
+ }
+ }
+
+ /// Puts `new` where `old` is. Returns whether `new` is attached; when it is not, `old` is back in
+ /// the menu (at its position, else at the end), so the caller keeps `old` as its handle.
+ fn swap_item<T: SwapTarget + ?Sized>(target: &T, old: &T::Row, new: &T::Row, position: usize) -> bool {
+ if !target.remove(old) {
+ return false;
+ }
+ // (an item at the end beats a missing one)
+ if target.insert(new, position) || target.append(new) {
+ return true;
+ }
+ let _ = target.insert(old, position) || target.append(old);
+ false
+ }
+
+ /// The accelerator a native item has: none while a shortcut is being recorded, and none for the
+ /// keys a focused text field needs.
+ fn wanted_accelerator(accel: Option<Accelerator>, sc: &str, text_focus: bool, capturing: bool) -> Option<Accelerator> {
+ if capturing || (text_focus && yields_to_text(sc)) { None } else { accel }
}
pub struct NativeMenu {
@@@ -189,12 -353,12 +322,13 @@@ impl NativeMenu
m
}
+ /// Recreate native handles and shortcut ownership from the current shared menu model.
fn rebuild(&mut self, app: &mut LightcraftApp) {
let bar = menu_bar(app);
- self.structure = structure_of(&bar);
+ self.structure = structure_of(&bar, &app.ui.settings.keymap);
self.menu = Menu::new();
self.items.clear();
+ self.app_items.clear();
// the application menu
let app_menu = Submenu::new("LightCraft", true);
@@@ -214,6 -378,22 +348,22 @@@
&PredefinedMenuItem::separator(),
&quit,
]);
+ for (handle, cmd, shortcut, text) in [(&settings, SETTINGS, SETTINGS_KEY, "Settings…"), (&quit, QUIT, "Cmd+Q", "Quit LightCraft")] {
+ let accel = accelerator(shortcut);
+ self.app_items.push(Item {
+ handle: Handle::Plain(handle.clone()),
+ parent: app_menu.clone(),
+ swappable: true,
+ cmd: cmd.to_string(),
+ params: Value::Null,
+ shortcut: Some(shortcut.to_string()),
+ accel,
+ current: accel,
- label: text.to_string(),
++ label: lightcraft_ui_egui::menubar::display_item_label(cmd, &Value::Null, text).to_string(),
+ enabled: true,
+ checked: None,
+ });
+ }
let _ = self.menu.append(&app_menu);
for (title, nodes) in &bar {
@@@ -232,7 -412,9 +382,9 @@@
.cloned()
.collect();
let nodes = tidy_separators(nodes);
- self.append_nodes(&sub, &nodes, &app.ui.settings.keymap);
+ // Swapping an item in the Help menu leaves the old row in place and adds a second one
+ // (measured on macOS 27 with muda 0.21): the Help menu is not addressed row for row.
- self.append_nodes(&sub, &nodes, title != "Help");
++ self.append_nodes(&sub, &nodes, &app.ui.settings.keymap, title != "Help");
if title == "File" {
// ⌘W, the system's own item
let _ = sub.append_items(&[
@@@ -258,8 -441,8 +411,9 @@@
self.publish_shortcuts(app);
}
+ /// Install translated rows with their effective accelerators, preserving hint-only keys.
- fn append_nodes(&mut self, sub: &Submenu, nodes: &[MenuNode], keymap: &lightcraft_ui_egui::shortcuts::Keymap) {
+ /// `swappable`: whether its items may be replaced to drop their key (see `Item::swappable`).
- fn append_nodes(&mut self, sub: &Submenu, nodes: &[MenuNode], swappable: bool) {
++ fn append_nodes(&mut self, sub: &Submenu, nodes: &[MenuNode], keymap: &lightcraft_ui_egui::shortcuts::Keymap, swappable: bool) {
for n in nodes {
match n {
MenuNode::Separator => {
@@@ -267,7 -450,7 +421,7 @@@
}
MenuNode::Submenu { label, children } => {
let s = Submenu::new(label_text(label), true);
- self.append_nodes(&s, children, keymap);
- self.append_nodes(&s, children, swappable);
++ self.append_nodes(&s, children, keymap, swappable);
let _ = sub.append(&s);
}
MenuNode::Item { id, params, label, shortcut, enabled, checked } => {
@@@ -297,7 -492,8 +453,8 @@@
params: params.clone(),
shortcut: shortcut.clone(),
accel,
+ current: accel,
- label: label.clone(),
+ label: native_label,
enabled: *enabled,
checked: *checked,
},
@@@ -337,24 -533,23 +494,25 @@@
}
}
let bar = menu_bar(app);
- if structure_of(&bar) != self.structure {
+ if structure_of(&bar, &app.ui.settings.keymap) != self.structure {
+ // (no early return: a rebuild installs every accelerator and resets the state they were synced
+ // to, so the sync below runs in this same frame and no key reaches the menu in between)
self.rebuild(app);
- return quit;
}
- fn walk(nodes: &[MenuNode], items: &mut HashMap<String, Item>) {
+ /// Synchronize live labels and states; accelerator ownership changes already triggered a rebuild.
+ fn walk(nodes: &[MenuNode], items: &mut HashMap<String, Item>, keymap: &lightcraft_ui_egui::shortcuts::Keymap) {
for n in nodes {
match n {
- MenuNode::Submenu { children, .. } => walk(children, items),
- MenuNode::Item { id, params, label, enabled, checked, .. } => {
+ MenuNode::Submenu { children, .. } => walk(children, items, keymap),
+ MenuNode::Item { id, params, label, shortcut, enabled, checked } => {
let Some(it) = items.get_mut(&MenuNode::key(id, params)) else { continue };
- if it.label != *label {
+ let (native_label, _) = native_item_presentation(keymap, id, params, label, shortcut.as_deref());
+ if it.label != native_label {
match &it.handle {
- Handle::Plain(h) => h.set_text(lightcraft_ui_egui::menubar::display_item_label(id, params, label).replace('&', "&&")),
- Handle::Check(h) => h.set_text(lightcraft_ui_egui::menubar::display_item_label(id, params, label).replace('&', "&&")),
+ Handle::Plain(h) => h.set_text(native_label.replace('&', "&&")),
+ Handle::Check(h) => h.set_text(native_label.replace('&', "&&")),
}
- it.label = label.clone();
+ it.label = native_label;
}
if it.enabled != *enabled {
match &it.handle {
@@@ -415,12 -610,8 +573,8 @@@ mod tests
let mut seen = std::collections::BTreeSet::new();
for language in Locale::ALL {
set_language(*language);
- assert!(seen.insert(structure_of(&bar)), "{language:?} shares another language's menu structure key");
+ assert!(seen.insert(structure_of(&bar, &app.ui.settings.keymap)), "{language:?} shares another language's menu structure key");
}
- set_language(Locale::ZhHant);
- assert_eq!(label_text("File"), "檔案");
- assert_eq!(label_text("Settings…"), "設定…");
- assert_eq!(label_text("Quit LightCraft"), "結束 LightCraft");
set_language(Locale::En);
}
diff --cc crates/engine/src/cmd/library.rs
index b6658b34b,334d9c92d..ec9e92b59
--- a/crates/engine/src/cmd/library.rs
+++ b/crates/engine/src/cmd/library.rs
@@@ -1836,6 -1804,6 +1868,10 @@@ mod relative_rating_tests
#[path = "library/tests_flag_cycle.rs"]
mod flag_cycle_tests;
+#[cfg(test)]
+#[path = "library/tests_rated_out.rs"]
+mod rated_out_tests;
++
+ #[cfg(test)]
+ #[path = "library/tests_enable_filters.rs"]
+ mod enable_filters_tests;
diff --cc crates/ui-egui/src/i18n.rs
index 5acf43791,3614637a0..c9ee3878c
--- a/crates/ui-egui/src/i18n.rs
+++ b/crates/ui-egui/src/i18n.rs
@@@ -2106,78 -1619,11 +1661,100 @@@ mod "
}
#[test]
- fn vietnamese_switches_persists_formats_dates_and_preserves_values() {
+ fn tr_format_messages_are_read_from_source() {
+ let call = concat!("tr_format", "!(");
+ let source = format!("{call}\"Imported {{}} photo{{}}\", n, s); crate::i18n::{call}\n \"Say \\\"hi\\\" \\u{{2192}}\", x); {call}name)");
+ assert_eq!(tr_format_messages(&source), ["Imported {} photo{}", "Say \"hi\" →"]);
+ }
++
++ /// A drop's notice comes from what `library.import` reported: a photo added, one brought back from Recently
++ /// Deleted and a file that could not be read are each named; a drop of duplicates only says nothing.
++ #[test]
++ fn a_dropped_photos_notice_names_every_outcome_of_the_import_and_is_silent_for_duplicates_only() {
++ set_language(Locale::En);
++ let dir = std::env::temp_dir().join(format!("lc-drop-notice-{}", std::process::id()));
++ let _ = std::fs::remove_dir_all(&dir);
++ std::fs::create_dir_all(&dir).unwrap();
++ let png = |name: &str, seed: u8| {
++ let data: Vec<[u8; 4]> = (0..48 * 32).map(|i| [(i % 48 * 5) as u8, (i / 48 * 7) as u8, seed, 255]).collect();
++ let img = lightcraft_raster::Rgba8 { width: 48, height: 32, data };
++ let bytes =
++ lightcraft_codecs::encode_png(&lightcraft_codecs::EncodeImage::rgba8(&img), &lightcraft_codecs::EncodeMeta::default()).unwrap();
++ std::fs::write(dir.join(name), bytes).unwrap();
++ dir.join(name).to_string_lossy().into_owned()
++ };
++ let (trashed, added) = (png("trashed.png", 1), png("new.png", 2));
++ let broken = dir.join("broken.jpg");
++ std::fs::write(&broken, b"not a jpeg at all").unwrap();
++ let mut s = lightcraft_engine::Session::new().with_fs();
++ let r = s.execute("library.import", &serde_json::json!({"paths": [trashed]})).unwrap();
++ s.execute("photo.delete", &serde_json::json!({"ids": [r["imported"][0]]})).unwrap();
++ let report = s.execute("library.import", &serde_json::json!({"paths": [trashed, added, broken]})).unwrap();
++ assert_eq!(
++ dropped_photos_outcome(&report).as_deref(),
++ Some("Added 1 photo · Restored 1 photo from Recently Deleted · 1 photo not readable"),
++ "{report}"
++ );
++ let again = s.execute("library.import", &serde_json::json!({"paths": [added]})).unwrap();
++ assert_eq!(dropped_photos_outcome(&again), None, "a duplicate only: {again}");
++ let _ = std::fs::remove_dir_all(dir);
++ }
++
++ /// Polish: the menu and control channel select it, dates read day.month.year, and every count
++ /// reads right for any number. Polish has three plural forms (1 zdjęcie, 2 zdjęcia, 5 zdjęć), so
++ /// counts follow their noun ("Zaimportowane zdjęcia: 22") instead of a form that fits only some.
++ #[test]
++ fn polish_switches_formats_dates_and_reads_every_count() {
+ use crate::control::{ControlRequest, Outcome};
+ let mut app = crate::LightcraftApp::new(lightcraft_engine::Session::with_demo(), Default::default());
- app.run("app.language.vietnamese", serde_json::json!({})).unwrap();
- assert_eq!(app.ui.language, Locale::Vi);
- assert_eq!(crate::menubar::checked(&app, "app.language.vietnamese"), Some(true));
- assert_eq!(tr("Light"), "Ánh sáng");
- assert_eq!(tr("Exposure"), "Phơi sáng");
- assert_eq!(Locale::Vi.name(), "Tiếng Việt");
- assert_eq!(tr("Settings"), "Cài đặt");
- assert_eq!(tr("Appearance"), "Giao diện");
- assert_eq!(tr("My Photos"), "Ảnh của tôi");
- assert_eq!(tr("Candidate"), "Ảnh ứng viên");
- assert_eq!(tr("Subject"), "Chủ thể");
- assert_eq!(date_group_label("2026-09-20", false), "Chủ Nhật, 20/9/2026");
- assert_eq!(date_group_label("2026-09", false), "Tháng 9 năm 2026");
- assert_eq!(date_group_label("2026-09", true), "Tháng 9");
- assert_eq!(display_time("2026-09-20T16:04:05"), "Chủ Nhật, 20/9/2026 16:04:05");
- for n in [0, 1, 2, 5, 22] {
- let text = tr_format!("Imported {} photo{}", n, if n == 1 { "" } else { "s" });
- assert!(text.contains(&n.to_string()) && text.contains("ảnh"), "{n}: {text}");
- assert!(!text.contains("photos") && !text.contains("photo"), "{n}: {text}");
++ app.run("app.language.polish", serde_json::json!({})).unwrap();
++ assert_eq!(app.ui.language, Locale::Pl);
++ assert_eq!(Locale::Pl.name(), "Polski");
++ assert_eq!(crate::menubar::checked(&app, "app.language.polish"), Some(true));
++ assert_eq!(tr("File"), "Plik");
++ assert_eq!(tr("Exposure"), "Ekspozycja");
++ assert_eq!(date_group_label("2026-09-20", false), "Niedziela, 20.09.2026");
++ assert_eq!(date_group_label("2026-09-20", true), "Niedziela, 20");
++ assert_eq!(date_group_label("2026-09", false), "09.2026");
++ assert_eq!(date_group_label("2026", false), "2026");
++ assert_eq!(display_time("2026-09-20T16:04:05"), "Niedziela, 20.09.2026 16:04:05");
++ for n in [0, 1, 2, 3, 4, 5, 12, 21, 22, 25, 111] {
++ let s = if n == 1 { "" } else { "s" };
++ assert_eq!(tr_format!("Imported {} photo{}", n, s), format!("Zaimportowane zdjęcia: {n}"));
++ for (one, many, noun) in [
++ ("photo waiting", "photos waiting", "Oczekujące zdjęcia"),
++ ("cached picture", "cached pictures", "Obrazy w pamięci podręcznej"),
++ ("photo has its denoised picture.", "photos have their denoised picture.", "Zdjęcia z odszumioną wersją"),
++ ] {
++ assert_eq!(tr_format!("{n} {noun}", n = n, noun = tr(if n == 1 { one } else { many })), format!("{noun}: {n}"));
++ }
++ assert_eq!(tr_format!("Delete {n} Photos", n = n), format!("Usuń zdjęcia ({n})"));
++ assert_eq!(tr_format!("{n} preset{}", s, n = n), format!("Ustawienia: {n}"));
+ }
- let name = "Color {title} 日本語";
- assert_eq!(tr_format!("Added {n} photo{} to “{}”", "s", name, n = 22), format!("Đã thêm 22 ảnh vào «{name}»"));
- assert_eq!(builtin_label("Warm Glow", false), "Warm Glow");
- assert_ne!(builtin_label("Warm Glow", true), "Warm Glow");
- assert_eq!(tr("photo-{title}.jpg"), "photo-{title}.jpg");
- assert_eq!(tr("develop.set"), "develop.set");
++ let name = String::from("Color 1234.56 {title} 日本語");
++ assert_eq!(tr_format!("Added {n} photo{} to “{}”", "s", name, n = 22), format!("Dodano do „{name}”: 22"));
+ let saved = serde_json::to_string(&app.ui).unwrap();
- assert!(saved.contains(r#""language":"vi""#), "{saved}");
- assert_eq!(serde_json::from_str::<crate::state::UiState>(&saved).unwrap().language, Locale::Vi);
++ assert_eq!(serde_json::from_str::<crate::state::UiState>(&saved).unwrap().language, Locale::Pl);
+ let ctx = egui::Context::default();
- for code in ["vi", "vi-VN", "vi_VN", "vi_VN.UTF-8"] {
- assert_eq!(Locale::parse_tag(code), Some(Locale::Vi));
- let (request, _) = ControlRequest::new("ui.set", serde_json::json!({"language": code}));
++ for tag in ["pl", "pl-PL", "pl_PL.UTF-8", "PL-pl"] {
++ assert_eq!(Locale::parse_tag(tag), Some(Locale::Pl), "{tag}");
++ let (request, _) = ControlRequest::new("ui.set", serde_json::json!({"language": tag}));
+ let Outcome::Done(reply) = crate::control::handle(&mut app, &ctx, &request) else { panic!("expected reply") };
+ assert_eq!(reply["ok"], true);
- assert_eq!(language(), Locale::Vi);
- }
- set_language(Locale::En);
- }
-
- #[test]
- fn vietnamese_panels_dialogs_and_diacritics_paint_with_bundled_fonts() {
- let ctx = fonts_ctx(&[]);
- let mut app = crate::LightcraftApp::new(lightcraft_engine::Session::with_demo(), Default::default());
- app.ui.left_panel = true;
- let text = painted_text(&ctx, &mut app, Locale::Vi);
- assert!(text.contains("Ảnh của tôi") && text.contains("Tất cả ảnh"), "{text}");
- for (command, title) in [("app.about", "Giới thiệu LightCraft"), ("app.shortcuts", "Phím tắt"), ("app.settings", "Cài đặt")] {
- app.ui.dialog = None;
- app.run(command, serde_json::json!({})).unwrap();
- let text = painted_text(&ctx, &mut app, Locale::Vi);
- assert!(text.contains(title), "{command}: {text}");
++ assert_eq!(language(), Locale::Pl);
+ }
++ let text = painted_text(&ctx, &mut app, Locale::Pl);
++ assert!(text.contains("Plik") && text.contains("Ekspozycja"), "{text}");
+ ctx.fonts_mut(|fonts| {
+ for family in [egui::FontFamily::Proportional, egui::FontFamily::Name(crate::theme::FONT_SEMIBOLD.into())] {
+ let font = egui::FontId::new(13.0, family);
- for ch in "ĂăÂâÊêÔôƠơƯưĐđáàảãạéèẻẽẹíìỉĩịóòỏõọúùủũụýỳỷỹỵ".chars().chain(
- Locale::Vi
- .catalog()
- .values()
- .flat_map(|text| text.chars())
- .filter(|ch| ('\u{00c0}'..='\u{024f}').contains(ch) || ('\u{1ea0}'..='\u{1ef9}').contains(ch)),
- ) {
- assert!(fonts.has_glyph(&font, ch), "missing Vietnamese glyph {ch}");
++ for ch in "ąćęłńóśźżĄĆĘŁŃÓŚŹŻ„”".chars() {
++ assert!(fonts.has_glyph(&font, ch), "missing Polish glyph {ch}");
+ }
+ }
+ });
+ set_language(Locale::En);
+ }
}
#[cfg(test)]
diff --cc crates/ui-egui/src/lib.rs
index 07997e207,6f23c9bd7..216d6cb61
--- a/crates/ui-egui/src/lib.rs
+++ b/crates/ui-egui/src/lib.rs
@@@ -90,12 -81,10 +90,14 @@@ mod tests_dialog_fit
#[cfg(test)]
mod tests_dialog_primary;
#[cfg(test)]
+mod tests_dialog_settings;
+#[cfg(test)]
+ mod tests_dialog_tab;
+ #[cfg(test)]
mod tests_dialogs;
#[cfg(test)]
+mod tests_drop_import;
+#[cfg(test)]
mod tests_edit_layout;
#[cfg(test)]
mod tests_empty_library;
diff --cc crates/ui-egui/src/panels/keyword_list.rs
index 64210d896,4f2cba91c..43190002a
--- a/crates/ui-egui/src/panels/keyword_list.rs
+++ b/crates/ui-egui/src/panels/keyword_list.rs
@@@ -642,72 -618,4 +671,31 @@@ mod tests
let (c, ids) = library(&[&["Ärzte", "ÄRZTE"], &[]]);
assert_eq!(Ticks::of(&c, &ids).tick("ärzte"), Tick::Some);
}
+
+ /// Given photos that have keywords inside other keywords, when the list is asked what is
+ /// inside a keyword for the selection, then every keyword above an applied one names it (by
+ /// its own name, once, in order), whichever case it was written in and however deep; a keyword
+ /// with nothing applied inside, a keyword that is itself the applied one, and an empty
+ /// selection name nothing.
+ #[test]
+ fn a_keyword_names_the_applied_keywords_inside_it() {
+ let (c, ids) = library(&[&["Travel|Italy|Rome", "beach"], &["travel|italy|venice", "travel|Spain"], &["travel|italy|ROME"]]);
+ let all = Ticks::of(&c, &ids);
+ assert_eq!(all.inside("travel"), ["Italy|Rome", "Italy|venice", "Spain"].map(|k| k.rsplit('|').next().unwrap()));
+ assert_eq!(all.inside("Travel|Italy"), ["Rome", "venice"]);
+ assert_eq!(all.inside("travel|italy|rome"), [] as [&str; 0], "nothing is inside the applied keyword itself");
+ assert_eq!(all.inside("travel|spain"), [] as [&str; 0]);
+ assert_eq!(all.inside("beach"), [] as [&str; 0]);
+ assert_eq!(all.inside("weddings"), [] as [&str; 0], "a keyword no photo has anything of");
+ // the selection decides: the third photo alone has nothing of Spain or Venice
+ assert_eq!(Ticks::of(&c, &ids[2..]).inside("travel"), ["ROME"]);
+ assert_eq!(Ticks::of(&c, &[]).inside("travel"), [] as [&str; 0]);
+ // a keyword applied itself and with one inside: the tick is its own, and what is inside is still named
+ let (c, ids) = library(&[&["travel", "travel|Italy"]]);
+ let t = Ticks::of(&c, &ids);
+ assert_eq!((t.tick("travel"), t.inside("travel")), (Tick::All, &["Italy".to_string()][..]));
+ // a name that only starts like another is not inside it
+ let (c, ids) = library(&[&["travelling|Rome"]]);
+ assert_eq!(Ticks::of(&c, &ids).inside("travel"), [] as [&str; 0]);
+ }
-
- /// The labels the Keyword List and its dialogs pass to `tr` through variables (out of reach of
- /// a literal search) are translated in every language.
- #[test]
- fn labels_passed_through_variables_are_translated() {
- use crate::i18n::Locale;
- let labels = [
- "Include on Export",
- "Export Containing Keywords",
- "Export Synonyms",
- "Person",
- "Merge Keywords",
- "No keywords yet",
- "No keywords match",
- "Add to Selected Photos",
- "Remove from Selected Photos",
- "Keywords",
- "& Containing",
- "Will Export",
- "No keywords are exported",
- "Add to All Selected Photos",
- "Set name",
- "Edit Set…",
- "Edit Keyword Set",
- "A keyword set needs a name",
- "Recent Keywords",
- "Keywords (⌥1–⌥9)",
- "Save as a new set",
- "Import Keywords…",
- "Export Keywords…",
- ];
- let dir = std::path::Path::new(env!("CARGO_MANIFEST_DIR")).join("locales");
- for code in ["de", "es", "fr", "pt-br", "ru", "uk", "it", "ka", "ja", "zh-hans", "zh-hant", "pl", "cs", "sv", "fi", "id", "vi"] {
- let text = std::fs::read_to_string(dir.join(format!("{code}.json"))).unwrap();
- let catalog: std::collections::HashMap<String, String> = serde_json::from_str(&text).unwrap();
- for label in labels {
- assert!(catalog.contains_key(label), "{code}: “{label}”");
- }
- }
- assert_eq!(Locale::ALL.len(), 18, "a language added: list its file above");
- }
}
diff --cc crates/ui-egui/src/panels/masking.rs
index 38d64b6c3,4fb31be80..675e5da6f
--- a/crates/ui-egui/src/panels/masking.rs
+++ b/crates/ui-egui/src/panels/masking.rs
@@@ -923,47 -897,6 +923,28 @@@ fn brush_settings(app: &mut LightcraftA
mod tests {
use super::*;
+ #[test]
+ fn a_detail_pass_counts_as_the_segmenter_working() {
+ assert!(segmenter_working(false, false, true, false));
+ assert!(segmenter_working(true, false, false, false));
+ assert!(segmenter_working(false, true, false, false));
+ assert!(!segmenter_working(false, false, false, false));
+ }
+
+ #[test]
+ fn a_pending_detail_pass_counts_as_the_segmenter_working() {
+ // a new prompt finishing before it starts would replace its target, and that mask never refines
+ assert!(segmenter_working(false, false, false, true));
+ }
+
+ #[test]
+ fn enter_in_the_describe_field_starts_nothing_while_the_segmenter_works() {
+ assert!(enter_submits(false, true, true));
+ assert!(!enter_submits(true, true, true));
+ assert!(!enter_submits(false, false, true));
+ assert!(!enter_submits(false, true, false));
+ }
+
- #[test]
- fn masking_context_actions_use_catalog_translations() {
- let saved = crate::i18n::language();
- crate::i18n::set_language(crate::i18n::Locale::Fr);
- for (english, translated) in [
- ("Duplicate Mask", "Dupliquer le masque"),
- ("Invert Mask", "Inverser le masque"),
- ("Hide Mask", "Masquer le masque"),
- ("Move Up", "Monter"),
- ("Brush", "Pinceau"),
- ("Luminance Range", "Plage de luminance"),
- ] {
- assert_eq!(menu_label(english), translated, "{english}");
- }
- // An arbitrary user name has no catalog entry and is left unchanged.
- assert_eq!(menu_label("My custom mask"), "My custom mask");
- crate::i18n::set_language(saved);
- }
-
/// The grid keeps four 52 pt tiles when the labels fit, and gives a long (translated) label
/// room by dropping a column rather than drawing it past its tile.
#[test]
diff --cc docs/gaps.md
index d59de595f,329dcf531..d377b5d77
--- a/docs/gaps.md
+++ b/docs/gaps.md
@@@ -1,6 -1,6 +1,6 @@@
# Gaps: where LightCraft falls short of Lightroom
- > **Last reviewed:** 2026-10-11 · **Last updated:** 2026-10-23 · **Change:** minor (gap 13: before a Lightroom catalog import the app asks merge or new library, #2672; gap 28: F8 shows / hides the right panel; import review album hierarchy, #2362; gap 20: Minolta MRW decodes; gap 10: 551 models verified; gap 15: Print Page Options — page numbers, page info, crop marks; gap 28: `\` shows / hides the Filter Bar in the grids; gap 21: Indonesian interface shipped, every message but What's New; gap 27: the Windows x64 installer verified on Windows 11; the Settings → Apps uninstall confirmation remains)
-> **Last reviewed:** 2026-10-11 · **Last updated:** 2026-10-23 · **Change:** minor (gap 28: ⌘L Enable Filters switches the filter off and on; gap 28: F8 shows / hides the right panel; import review album hierarchy, #2362; gap 20: Minolta MRW decodes; gap 10: 551 models verified; gap 15: Print Page Options — page numbers, page info, crop marks; gap 15: Print Page Options — page numbers, page info, crop marks; gap 28: `\` shows / hides the Filter Bar in the grids; gap 21: Indonesian interface shipped, every message but What's New; gap 27: the Windows x64 installer verified on Windows 11; the Settings → Apps uninstall confirmation remains)
++> **Last reviewed:** 2026-10-11 · **Last updated:** 2026-10-23 · **Change:** minor (gap 13: before a Lightroom catalog import the app asks merge or new library, #2672; gap 28: F8 shows / hides the right panel; import review album hierarchy, #2362; gap 20: Minolta MRW decodes; gap 10: 551 models verified; gap 15: Print Page Options — page numbers, page info, crop marks; gap 28: `\` shows / hides the Filter Bar in the grids; gap 21: Indonesian interface shipped, every message but What's New; gap 27: the Windows x64 installer verified on Windows 11; the Settings → Apps uninstall confirmation remains; gap 28: ⌘L Enable Filters switches the filter off and on)
Every known shortfall, one entry each, ranked by user impact (how many Lightroom users hit it, and
how hard it blocks them), then by effort. **Agents pick work from the top** (the first entry nobody is
@@@ -43,7 -43,8 +43,8 @@@ Hours are Opus 5.5 agent wall-clock hou
| 26 | **Performance at scale**: 85k-photo library opens in 1.7–4.7 s; 100k grid test pending; colour NR at half resolution; at 100k photos stack and album lookups are indexed (an "In a Stack" or "Album" smart album counts in ~14 ms, was 0.6–2.7 s) | ROADMAP log, gpu-pipeline.md | large-catalog users | 15–30 | [target-app-parity](target-app-parity.md#by-dimension) |
| 27 | **Windows / Linux runtime coverage**: the Windows x64 installer is verified on Windows 11 (0.9.1: install and upgrade end on the completion page, a custom folder is kept, Launch works, removal is clean), but uninstalling from Settings → Apps ends with no confirmation (#892, #931); GPU path proven on Apple and on one AMD GPU on Linux (Radeon 8060S, Vulkan); NVIDIA, Intel and DX12 unverified; the Linux riscv64 tarball (new in 0.6.0, #844) is cross-compiled and never run beyond a QEMU smoke test | ROADMAP, issues, `release.yml` | non-Mac users find bugs first | 13–27 | [hardware-parity](hardware-parity.md) |
| 29 | **HDR merge leftovers** (LR-MERGE-HDR): AI Denoise doesn't run on merged (linear) DNGs; JPEG brackets are treated as linear (no camera response curve); every frame is held as 32-bit float, ~0.86 GB per 67 MP frame (half-float frames would halve it) | tested on Sony A7R VI brackets 2026-10-14 ([merge.md](merge.md)); Lightroom's Denoise supports HDR DNGs | HDR shooters who denoise their merges, merge JPEGs, or merge 7+ frames of high-resolution raws on 16 GB machines | 10–20 (+ denoise linear-RGB contract, gap 11) | [merge](merge.md) |
- | 28 | **Small Classic shortcuts and keys**: ⌘L (Enable Filters), Tab / ⇧Tab (hide the side panels / all panels; Tab moves the keyboard focus here) and F5. Rating `[` `]`, flag cycling (`` ` ``), `\` (Filter Bar), F1 help, F6 / F7 / F8 (filmstrip, left panel, right panel) are bound; the grid-cycle key is shown beside both grid rows in View (#2500) | [ui-parity](ui-parity.md#shortcuts) | Classic muscle memory | 2–4 | [ui-parity](ui-parity.md) |
-| 28 | **Small Classic shortcuts and keys**: Tab / ⇧Tab (hide the side panels / all panels; Tab moves the keyboard focus here) and F5. Rating `[` `]`, flag cycling (`` ` ``), `\` (Filter Bar), ⌘L (Enable Filters), F1 help, F6 / F7 / F8 (filmstrip, left panel, right panel) are bound | [ui-parity](ui-parity.md#shortcuts) | Classic muscle memory | 2–4 | [ui-parity](ui-parity.md) |
++| 28 | **Small Classic shortcuts and keys**: Tab / ⇧Tab (hide the side panels / all panels; Tab moves the keyboard focus here) and F5. Rating `[` `]`, flag cycling (`` ` ``), `\` (Filter Bar), ⌘L (Enable Filters), F1 help, F6 / F7 / F8 (filmstrip, left panel, right panel) are bound; the grid-cycle key is shown beside both grid rows in View (#2500) | [ui-parity](ui-parity.md#shortcuts) | Classic muscle memory | 2–4 | [ui-parity](ui-parity.md) |
+ | 30 | **Multi-select metadata editing in the UI**: `photo.setMeta` already iterates all selected photos, so the engine applies changes to every target, but the Info panel and All Metadata dialog always show one photo's values with no "mixed" indication when selected photos differ — users cannot tell whether a field is uniform or mixed across the selection before editing | standard in Lightroom Classic's multi-select Info panel | anyone editing metadata on a batch (copyright, keywords, custom fields) | 4–8 | [ui-parity](ui-parity.md) |
Beta-blocking gaps (B) total **~230–430 h**; with the stability and platform work they need around them,
**~340–600 h** to beta (incl. 40–80 h for the ~92 open core-path user issues) (see [target-app-parity.md](target-app-parity.md#stage)).
@@@ -79,19 -84,17 +84,23 @@@
| Date | Change | Summary |
|---|---|---|
+| 2026-10-23 | minor | Gap 13: before a Lightroom catalog import the app asks whether it merges into the open library or goes into a new one (opt-out in Settings, #2672); hours unchanged |
+| 2026-10-22 | patch | Gap 28: View shows the current grid-cycle key beside Photo Grid and Square Grid (#2500); no new binding and no change to the remaining shortcut gap or hours |
+| 2026-10-22 | minor | Gap 15: the Print page setup and PDF gain the Japanese photo and postcard paper sizes (L判 89×127, 2L判 127×178, KG判 102×152, はがき 100×148, 往復はがき 148×200, 六切 203×254, 四切 254×305, 名刺 55×91 mm), by their customary names; gap not closed |
+| 2026-10-22 | minor | #2052: Thai glyphs added to shared export text; gap 21 retains Thai mark positioning, Arabic joining and bidi limits. No ranked gap closes; estimates unchanged |
+ | 2026-10-22 | patch | XMP namespace-prefix collisions no longer overwrite foreign metadata; ranked gaps and estimates unchanged |
+ | 2026-10-22 | patch | Issue #2519: PSD/PSB EXIF resource 1058 and XMP resource 1060 now use the common metadata extractor, and `.psb` files are accepted by import; no ranked gap or readiness count changes |
+ | 2026-10-22 | minor | Gap 30 added: multi-select metadata editing — Info panel and All Metadata dialog show one photo's values with no mixed-value indication |
| 2026-10-21 | minor | Gap 28 shrinks: F8 shows / hides the right panel (`view.rightPanel`); rating `[` `]`, flag cycling and F1 help were already bound, so the entry lists only filter-bar keys, Tab / ⇧Tab and F5; 2–4 h (was 4–8) |
| 2026-10-20 | minor | #2362: import destination albums use the shared hierarchy/search picker instead of a flat name list; existing import workflows retained; ranked gaps/readiness counts unchanged |
+| 2026-10-19 | minor | Gap 9 shrinks: `.github/workflows/ci.yml` runs `cargo xtask ci` on Linux x64 for every PR and push to main; macOS and Windows remain |
| 2026-10-19 | minor | Gap 21: Indonesian (`id`) shipped with every catalog message but What's New; four new languages left (Hindi, Arabic, Korean, Vietnamese), 135–239 h |
| 2026-10-19 | minor | Gap 27: the released 0.9.1 x64 MSI is tested on Windows 11 Pro 24H2 (a fresh install and an upgrade from 0.8.0 end on the completion page, so #790 is fixed; the upgrade keeps a custom folder; Launch starts the app; removal leaves nothing behind); uninstalling from Settings → Apps still ends with no confirmation (#892, #931); hours unchanged |
| 2026-10-18 | patch | Gap 1: six X-Trans CMOS 4 Fujifilm bodies (X-T30 …) take the X-T3's spectral matrices instead of the neutral matrix |
| 2026-10-15 | minor | Gap 15 shrinks: the Page panel's Page Options (Page Numbers, Page Info, Crop Marks) print on Single Image and Contact Sheet pages; identity plate, watermark, photo info, Cut Guides, direct printing and JPEG output remain |
+| 2026-10-14 | minor | Gap 4 follow-up: the diagnostic overlays (Visualize Spots, Point Color range, HDR range) render zoom windows too; soft proofing runs on the GPU |
| 2026-10-12 | minor | Gap 10: SR2/SRF folder discovery fixed; F828 imports as preview-only. Sensor decoding remains a gap; readiness scores unchanged |
+ | 2026-10-23 | minor | Gap 28: ⌘L / Ctrl+L (Library ▸ Enable Filters) puts the filter aside and brings it back as it was; the entry drops ⌘L; hours unchanged |
| 2026-10-15 | minor | Gap 28: `\` shows / hides the Filter Bar in the grids; the entry drops `[` `]` (#509), flag cycling (#1490) and F1 (Help), already on main; ⌘L is the filter-bar key left; hours unchanged |
| 2026-10-14 | minor | Gap 26: at 100k photos stack and album lookups are indexed, so an "In a Stack" or "Album" smart album counts in ~14 ms (was 0.6–2.7 s); open time unchanged |
| 2026-10-14 | minor | Gap 10: Camera-coverage sweep (#1327): 30 models verified on 40 CC0 files (coverage.py 515 → 545 verified); sensor verification does not establish colour parity (#1277) |
diff --cc docs/parity-checklist.md
index d285b88bb,9790523e1..bf6f32c6f
--- a/docs/parity-checklist.md
+++ b/docs/parity-checklist.md
@@@ -1,6 -1,6 +1,6 @@@
# Lightroom parity checklist
- > **Last reviewed:** 2026-10-10 · **Last updated:** 2026-10-23 · **Change:** minor (LRC-LIB-CATALOG-IMPORT: Import Lightroom Catalog… asks whether the catalog merges into the open library or goes into a new library, with an opt-out in Settings ▸ General, #2672; LR-MERGE-HDR / LR-MERGE-PANO: Lanczos-3 warps; LR-IMP-LOCAL: browsing from the sidebar records the folder; LR-VIEW-ZOOM: only a full-size drag within 20 ms clears a slow-drag verdict; LR-IMP-ADD-DIALOG: hierarchical import album destination reconciled with main, #2362; KEY-SLIDER-NUDGE: vertical wheel nudges need a click or drag in the row; leaving it disarms them; LR-EDIT-OPTICS-PROFILE: Fujifilm nine-knot lens tables read at the plain radius; LRC-LIB-LIBFOLDERS, LR-BEHAV-BG-TASKS: Synchronize Folder's scan shows its folder listing and stops it on ✕; LRC-LIB-LIBFOLDERS: Synchronize Folder says a folder is up to date; LR-LIB-STACK: filmstrip stack badge click; LRC-LIB-REFVIEW / CATALOG-SWITCH: Escape preserves edits; catalog-local pins; deleted and malformed references refused; LRC-LIB-COMPARE: the Info panel labels the active photo while culling, #2398; KEYC-RATING: `\` shows / hides the Filter Bar in the grids; LR-VIEW-PHOTOGRID: the grid reads only the photos an import batch or an edit touched, not the whole list; earlier: LRC-PRINT-PAGE: Print Page Options; LR-META-XMP: fewer false unimported-XMP warnings) · **Target:** Adobe Lightroom Classic 15.5 / Lightroom 9.6
-> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-10-22 · **Change:** minor (MENU-BAR: on macOS a menu item that yields its key to a focused text field or to shortcut recording really lets it go; LR-MERGE-HDR / LR-MERGE-PANO: Lanczos-3 warps; LR-IMP-LOCAL: browsing from the sidebar records the folder; LR-VIEW-ZOOM: only a full-size drag within 20 ms clears a slow-drag verdict; LR-IMP-ADD-DIALOG: hierarchical import album destination reconciled with main, #2362; KEY-SLIDER-NUDGE: vertical wheel nudges need a click or drag in the row; leaving it disarms them; LR-EDIT-OPTICS-PROFILE: Fujifilm nine-knot lens tables read at the plain radius; LR-VIEW-ZOOM: only a full-size drag within 20 ms clears a slow-drag verdict; LRC-LIB-LIBFOLDERS, LR-BEHAV-BG-TASKS: Synchronize Folder's scan shows its folder listing and stops it on ✕; LRC-LIB-LIBFOLDERS: Synchronize Folder says a folder is up to date; LR-LIB-STACK: filmstrip stack badge click; LRC-LIB-REFVIEW / CATALOG-SWITCH: Escape preserves edits; catalog-local pins; deleted and malformed references refused; LRC-LIB-COMPARE: the Info panel labels the active photo while culling, #2398; KEYC-RATING: `\` shows / hides the Filter Bar in the grids; LR-VIEW-PHOTOGRID: the grid reads only the photos an import batch or an edit touched, not the whole list; earlier: LRC-PRINT-PAGE: Print Page Options; LR-META-XMP: fewer false unimported-XMP warnings) · **Target:** Adobe Lightroom Classic 15.5 / Lightroom 9.6
++> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-10-23 · **Change:** minor (LRC-LIB-CATALOG-IMPORT: Import Lightroom Catalog… asks whether the catalog merges into the open library or goes into a new library, with an opt-out in Settings ▸ General, #2672; LR-MERGE-HDR / LR-MERGE-PANO: Lanczos-3 warps; LR-IMP-LOCAL: browsing from the sidebar records the folder; LR-VIEW-ZOOM: only a full-size drag within 20 ms clears a slow-drag verdict; LR-IMP-ADD-DIALOG: hierarchical import album destination reconciled with main, #2362; KEY-SLIDER-NUDGE: vertical wheel nudges need a click or drag in the row; leaving it disarms them; LR-EDIT-OPTICS-PROFILE: Fujifilm nine-knot lens tables read at the plain radius; LRC-LIB-LIBFOLDERS, LR-BEHAV-BG-TASKS: Synchronize Folder's scan shows its folder listing and stops it on ✕; LRC-LIB-LIBFOLDERS: Synchronize Folder says a folder is up to date; LR-LIB-STACK: filmstrip stack badge click; LRC-LIB-REFVIEW / CATALOG-SWITCH: Escape preserves edits; catalog-local pins; deleted and malformed references refused; LRC-LIB-COMPARE: the Info panel labels the active photo while culling, #2398; KEYC-RATING: `\` shows / hides the Filter Bar in the grids; LR-VIEW-PHOTOGRID: the grid reads only the photos an import batch or an edit touched, not the whole list; earlier: LRC-PRINT-PAGE: Print Page Options; LR-META-XMP: fewer false unimported-XMP warnings; MENU-BAR: on macOS a menu item that yields its key to a focused text field or to shortcut recording really lets it go) · **Target:** Adobe Lightroom Classic 15.5 / Lightroom 9.6
The measured, row-by-row checklist: one row per Lightroom feature, menu item and shortcut, what we
have and what is missing. It answers *does the feature exist?* (feature breadth). Whether it is good
@@@ -248,9 -248,9 +248,9 @@@ differences and missing bindings are i
| Id | Feature | Tier | Status | Evidence | Missing / notes |
|---|---|---|---|---|---|
| LR-CROP-RECT | Crop rectangle | P0 | ✅ | `cmd:crop.set`, `cmd:crop.drag`, `crates/geom/src/crop_drag.rs`, `crates/ui-egui/src/panels/detail.rs` | double-click inside the box applies the crop (like Return); on a straightened photo a moved box slides along the tilted edges to where the pointer asks, so a box that fills the photo's height still reaches its sides (issue #2299) |
-| LR-CROP-ASPECT | Aspect ratios | P0 | ✅ | `cmd:crop.aspect`, `cmd:crop.rotateAspect`, `crates/ui-egui/src/panels/right.rs` | menu with presets + custom W × H (a preset takes the crop's orientation, portrait after X; a custom ratio is used as entered, issue #2253), visible Lock toggle (also A), button names the active ratio; every handle honours the lock, holding Shift while dragging a handle keeps the frame's proportions for that drag (issue #614), and the drag stops at the image edge instead of shifting the frame (issue #295); "Original" is the photo's own shape (no separate As Shot); the last chosen aspect is saved as a crop tool default, resolving Original per photo and preserving existing crops; opening Crop or browsing never edits a photo: the default applies only when a crop gesture starts, within its single undo step; a crop starts locked to the photo's own shape until the Lock is switched off once, then as last set (#991) |
+| LR-CROP-ASPECT | Aspect ratios | P0 | ✅ | `cmd:crop.aspect`, `cmd:crop.rotateAspect`, `crates/ui-egui/src/panels/right.rs` | menu with presets + custom W × H (a preset takes the crop's orientation, portrait after X; a custom ratio is used as entered, issue #2253), visible Lock toggle (also A, its own row in Keyboard Shortcuts: `crop.lockAspect` toggles it, sharing A with Visualize Spots by context), button names the active ratio; every handle honours the lock, holding Shift while dragging a handle keeps the frame's proportions for that drag (issue #614), and the drag stops at the image edge instead of shifting the frame (issue #295); "Original" is the photo's own shape (no separate As Shot); the last chosen aspect is saved as a crop tool default, resolving Original per photo and preserving existing crops; opening Crop or browsing never edits a photo: the default applies only when a crop gesture starts, within its single undo step; a crop starts locked to the photo's own shape until the Lock is switched off once, then as last set (#991) |
| LR-CROP-STRAIGHTEN | Straighten tool | P0 | ✅ | `cmd:crop.straighten`, `cmd:crop.autoStraighten`, `crates/ui-egui/src/panels/detail.rs` (`rotate_cursor`, `angle_readout`), `crates/ui-egui/src/panels/right.rs` (Angle field), `crates/ui-egui/src/tests_crop_rotate.rs` | Straighten Tool button: drag along a horizon/vertical; double-click or Auto levels automatically. Dragging outside the crop box rotates it: there the pointer is a curved double arrow that bulges away from the side of the box it is on, diagonally off a corner and following a rotated box (`rotate_cursor_turn`, tested by `rotate_cursor_faces_away_from_the_crop_box`) (with ⌘ held, the straighten crosshair), and while rotating the angle shows next to it, kept on the canvas (issue #534); an exact angle goes in the Angle field under Straighten (`cropAngleField`: applies on Return or leaving it, Esc keeps the old angle, takes a decimal comma; a drag on it is one undo step) or by clicking the Straighten value (its hover says so). Every way of setting the angle (rotate handle, Straighten slider, Angle field, `crop.straighten`, `crop.set {angle}`, and the generic `develop.set` / `develop.adjust` / `develop.quickAdjust` / `develop.resetControl` on `crop.angle`, as MCP, the control channel and `lightcraft-cli render --set` use them) keeps the crop if it still fits, else shrinks it about its own centre, keeping its aspect, until it fits; the full photo (or a crop an earlier turn shrank to the largest of its aspect) stays the largest, so it grows back towards 0° (issue #1388), and no other crop ever grows (issue #1794: a crop dragged in from a corner turned into nearly the whole photo) (`CropGeometry::with_angle`, `crates/engine/src/tests_crop_angle.rs`; before issue #742 the generic path left the box, and the export, past the photo with smeared edge pixels in the corners). The dimming outside the box is the photo minus the (rotated) box, drawn as one mesh (`outside_crop_mesh`), so rotating never dims wedges inside the box or doubles them outside (issue #731) |
- | LR-CROP-AUTO | Auto straighten | P1 | ✅ | `cmd:crop.autoStraighten` | crop-angle leveling from detected horizon/plumb lines (consensus required) |
+ | LR-CROP-AUTO | Auto straighten | P1 | 🟡 | `cmd:crop.autoStraighten` | crop-angle leveling from detected horizon/plumb lines (consensus required); turns by at most 10° (`STRAIGHTEN_MAX_DEGREES`) and only on at least 3 agreeing lines (`STRAIGHTEN_MIN_LINES`), and says so when it finds nothing (`auto_straighten_says_when_it_finds_nothing`). Measured on 68 photos straightened by hand in Lightroom Classic and 300 left as shot: it levels 14 of the 68 within 0.5° (1 more than 1° off) and turns 19 of the 300 by more than 1° (before the limits: 79, some by 20° or more). 🟡 because it still leaves most tilted photos alone: a soft sea horizon among wave crests, and verticals that converge in perspective, aren't used yet |
| LR-CROP-ANGLE | Angle slider | P0 | ✅ | `ctl:crop.angle`, `crates/ui-egui/src/panels/right.rs` | the Straighten slider; an exact angle can also be typed in the Angle field under it (see LR-CROP-STRAIGHTEN); setting `crop.angle` through `develop.set` fits the crop inside the photo as Straighten does (issue #742) |
| LR-GUIDED-SELECT | Guide selection in Guided Upright mode | P0 | ✅ | `cmd:tool.guidedUpright`, `cmd:geometry.guides`, `crates/ui-egui/src/panels/detail.rs`, `crates/ui-egui/src/state.rs` (`selected_guide`), `crates/ui-egui/src/tests_guided_guides.rs` | a press near a guide's line selects it (`selected_guide = Some((photo id, index))`; another press on it deselects), a press on an empty spot starts a new guide at that point, and an endpoint drags to reshape the guide (`Gesture::GuideEndpoint`, one undo step; clicking an endpoint only selects); tested in `tests_guided_guides` 8/8 |
| LR-GUIDED-DELETE | Delete removes the selected guide alone | P0 | ✅ | `cmd:photo.delete`, `crates/ui-egui/src/shortcuts.rs`, `crates/ui-egui/src/tests_guided_guides.rs` | with the Guided Upright tool open (`RightPanel::Crop && tool == "guidedUpright"`), Delete / Backspace removes only the selected guide and clears the selection; with nothing selected it removes nothing (the photo itself is never deleted while the tool is open); tested in `tests_guided_guides` |
@@@ -479,9 -479,9 +479,9 @@@
| LR-BEHAV-TOOLTIPS | Tooltips with shortcuts | P0 | ✅ | `crates/ui-egui/src/panels/bottombar.rs` | |
| LR-BEHAV-TEXTFIELD | Text fields behave alike | P1 | 🟡 | `crates/ui-egui/src/text_field.rs`, `crates/ui-egui/src/panels/topbar.rs`, `crates/ui-egui/src/widgets.rs`, `crates/ui-egui/src/panels/right.rs` (`meta_field`), `crates/ui-egui/src/panels/dialogs.rs`, `crates/ui-egui/src/panels/unnamed.rs` | one shared field: right-click Cut / Copy / Paste / Select All (no Paste in the browser), Esc gives back the text from before the edit, Return / leaving / Esc reported to the caller, optional select-on-focus; agents use `ui.clipboard` (MCP `clipboard`) and `ui.inspect` → `copied`. Used by Search Photos, slider values, the Info panel's metadata fields (multi-line captions), the one-field dialogs (New / Rename Album, New Smart Album, Rename / Merge Keywords, text prompts) and the unnamed faces' name field so far; the other text fields (most dialogs, import, settings, masking, keywords …) still use egui's own and have no menu |
| LR-BEHAV-HEADLESS | Headless UI snapshots | P2 | ✅ | `apps/lightcraft-cli/src/main.rs`, `crates/ui-egui/src/headless.rs`, `docs/control-protocol.md` | `snapshot` rasterizes the UI and defaults photo development to the CPU before the first frame, without adapter discovery; scaled dimensions are validated before allocation, and UI zoom preserves the requested physical viewport; JSON-lines control scripts are supported |
- | LR-BEHAV-ACCESS | Accessibility | P2 | 🟡 | `crates/ui-egui/src/widgets.rs`, `crates/ui-egui/src/text_field.rs`, `crates/ui-egui/src/panels/grid.rs`, `crates/ui-egui/tests/it/accessibility.rs` | AccessKit (VoiceOver / Narrator / AT-SPI): sliders announce control, value, range and step and take Increment / Decrement, buttons / icon buttons / dropdowns / section headers / sources their labels and state, text fields their caption, grid thumbnails file name, rating, flag and label. `tests/it/accessibility.rs` fails on an unnamed control, a slider without range or an untitled dialog in every view, Develop tool and 13 dialogs, and checks that Crop and Remove sliders are reached with Tab and that Tab walks the right panels top to bottom. Canvas tools by keyboard (`crates/ui-egui/src/canvas_keys.rs`, `crates/ui-egui/src/tests_canvas_keys.rs`): crop corners, edges and box, spot targets and sources, a New spot point (Return adds), radial / linear gradient handles and mask pins take the focus, are announced with their position and move with the arrows (Shift: further). Brush strokes and red-eye ellipses are pointer-only; not tried with a real screen reader ([audit](ui-parity.md#accessibility-audit)) |
+ | LR-BEHAV-ACCESS | Accessibility | P2 | 🟡 | `crates/ui-egui/src/widgets.rs`, `crates/ui-egui/src/text_field.rs`, `crates/ui-egui/src/panels/grid.rs`, `crates/ui-egui/tests/it/accessibility.rs` | AccessKit (VoiceOver / Narrator / AT-SPI): sliders announce control, value, range and step and take Increment / Decrement, buttons / icon buttons / dropdowns / section headers / sources their labels and state, text fields their caption, grid thumbnails file name, rating, flag and label. `tests/it/accessibility.rs` fails on an unnamed control, a slider without range or an untitled dialog in every view, Develop tool and 13 dialogs, and checks that Crop and Remove sliders are reached with Tab and that Tab walks the right panels top to bottom. Canvas tools by keyboard (`crates/ui-egui/src/canvas_keys.rs`, `crates/ui-egui/src/tests_canvas_keys.rs`): crop corners, edges and box, spot targets and sources, a New spot point (Return adds), radial / linear gradient handles and mask pins take the focus, are announced with their position and move with the arrows (Shift: further). Dialogs with one name field (New Album, New Smart Album, Save Metadata Preset, the renames) take the focus once when they open, so Tab and Shift+Tab reach their check box, Cancel and OK, and Return and Esc still confirm and cancel (`crates/ui-egui/src/tests_dialog_tab.rs`). Brush strokes and red-eye ellipses are pointer-only; not tried with a real screen reader ([audit](ui-parity.md#accessibility-audit)) |
-| LR-BEHAV-LOCALE | Language options | P2 | ✅ | `cmd:app.language.english`, `cmd:app.language.simplifiedChinese`, `cmd:app.language.traditionalChinese`, `cmd:app.language.japanese`, `cmd:app.language.portuguese`, `cmd:app.language.french`, `cmd:app.language.spanish`, `cmd:app.language.german`, `cmd:app.language.russian`, `cmd:app.language.ukrainian`, `cmd:app.language.georgian` | Edit > Language lists every language in the table and the active one is checked; shared with Settings > General (docs/localization.md) |
-| LR-BEHAV-LOCALIZE | Localisation | P2 | 🟡 | `crates/ui-egui/src/i18n.rs`, `crates/ui-egui/locales/`, `docs/localization.md`, `docs/localization-zh-hans.md`, `docs/localization-zh-hant.md`, `docs/localization-ja.md`, `docs/localization-pt-br.md`, `docs/localization-es.md`, `docs/localization-de.md`, `docs/localization-ru.md`, `docs/localization-ka.md` | One table entry per language (code, endonym, ISO 15924 script, catalog): English, Simplified Chinese, Traditional Chinese (Taiwan), Japanese, Brazilian Portuguese, Spanish, German, Russian, Ukrainian and Georgian UI with a persisted language preference and craft-fonts regular/bold faces per script (a variable face, as for Arabic, is drawn heavier for bold from its one file); menus, edit, crop/masks, settings, import/export and primary progress messages. Adding a language registers the locale and its language command, plus two catalogs. Stock presets/profiles, history steps, library headings, date headings and capture times are localised (user-named items stay verbatim); the Ukrainian catalog covers every existing catalog key, command/control label and rule-editor label; the German catalog reports newly added gaps; the other catalogs fall back to English for messages they lack. Technical errors remain English; release notes are translated in German and Ukrainian; craft-fonts faces for other scripts (Thai, Arabic, …) are UI fallbacks in every language, for file, folder and album names (#736); Traditional Chinese borrows the Simplified Chinese face (no TC face in craft-fonts yet), and the web build embeds the Japanese, Thai and Georgian faces in WASM while loading the Simplified Chinese face from a separate font file. |
+| LR-BEHAV-LOCALE | Language options | P2 | ✅ | `cmd:app.language.english`, `cmd:app.language.simplifiedChinese`, `cmd:app.language.traditionalChinese`, `cmd:app.language.japanese`, `cmd:app.language.portuguese`, `cmd:app.language.french`, `cmd:app.language.spanish`, `cmd:app.language.german`, `cmd:app.language.russian`, `cmd:app.language.ukrainian`, `cmd:app.language.georgian`, `cmd:app.language.polish` | Edit > Language lists every language in the table and the active one is checked; shared with Settings > General (docs/localization.md) |
+| LR-BEHAV-LOCALIZE | Localisation | P2 | 🟡 | `crates/ui-egui/src/i18n.rs`, `crates/ui-egui/locales/`, `docs/localization.md`, `docs/localization-zh-hans.md`, `docs/localization-zh-hant.md`, `docs/localization-ja.md`, `docs/localization-pt-br.md`, `docs/localization-es.md`, `docs/localization-de.md`, `docs/localization-ru.md`, `docs/localization-ka.md`, `docs/localization-pl.md` | One table entry per language (code, endonym, ISO 15924 script, catalog): English, Simplified Chinese, Traditional Chinese (Taiwan), Japanese, Brazilian Portuguese, Spanish, German, Russian, Ukrainian and Georgian UI with a persisted language preference and craft-fonts regular/bold faces per script (a variable face, as for Arabic, is drawn heavier for bold from its one file); menus, edit, crop/masks, settings, import/export and primary progress messages. Adding a language registers the locale and its language command, plus two catalogs. Stock presets/profiles, history steps, library headings, date headings and capture times are localised (user-named items stay verbatim); the Ukrainian catalog covers every existing catalog key, command/control label and rule-editor label; the German catalog reports newly added gaps; the other catalogs fall back to English for messages they lack. Technical errors remain English; release notes are translated in German and Ukrainian; craft-fonts faces for other scripts (Thai, Arabic, …) are UI fallbacks in every language, for file, folder and album names (#736); Traditional Chinese borrows the Simplified Chinese face (no TC face in craft-fonts yet), and the web build embeds the Japanese, Thai and Georgian faces in WASM while loading the Simplified Chinese face from a separate font file. |
| LR-BEHAV-LEARN | Tutorials | OOS | 🚫 | | |
| LR-BEHAV-WHATSNEW | What's new | P2 | ✅ | `cmd:app.whatsNew`, `docs/whats-new.md` | Help ▸ What's New: release highlights |
| LR-BEHAV-AI-EA | Early-access badges | P2 | ⬜ | | |
@@@ -798,15 -798,9 +798,17 @@@ Latin stays upright. Advanced Japanese
| Date | Change | Summary |
|---|---|---|
+| 2026-10-23 | minor | LRC-LIB-CATALOG-SWITCH, LR-PREF-GENERAL: Settings ▸ General ▸ At launch (Open the last library / Ask me) with a launch window listing the recent libraries, Alt/Option at launch asks once, File ▸ Open Recent Library ▸ Remove from List and `app.recentLibraries {remove}` (issue #1290); photos dropped while no library is open wait for the one opened (presets are refused then); status and counts unchanged (✅) |
+| 2026-10-23 | minor | LRC-LIB-CATALOG-IMPORT: Import Lightroom Catalog… (and Open Library's offer for a Lightroom catalog) asks whether the catalog merges into the open library or goes into a new library made next to it; Settings ▸ General or "Don't ask again" switches the question off; `file.importLightroom` takes `into` / `name` / `location` (#2672); status unchanged (🟡) |
+| 2026-10-22 | minor | LR-VIEW-INFOOVERLAY: the info overlay shows the star rating and flag, and in the full-screen preview on macOS it starts below the window controls (issue #2460); status unchanged |
+| 2026-10-22 | patch | KEY-GRID: both grid rows in View show the cycle shortcut and follow keymap changes; direct bindings and native accelerator ownership are preserved (#2500); status and counts unchanged |
+| 2026-10-22 | minor | LRC-PRINT-LAYOUT: the Japanese photo and postcard paper sizes (L判, 2L判, KG判, はがき, 往復はがき, 六切, 四切, 名刺) are selectable in the page setup and Print dialog and print to PDF at their metric sizes |
+| 2026-10-22 | minor | #2052 (partial): shared export text adds only Thai faces after Inter and the existing CJK chain. Thai horizontal mark positioning remains incomplete; Arabic fallback is deferred until joining and bidi reordering exist. LR-EXP-WATERMARK reassessed as partial for these layout and font limits; UI fallback unchanged |
+ | 2026-10-22 | patch | LR-META-XMP: namespace URI determines ownership; foreign namespaces using recognized prefixes survive saves and cannot supply native settings or ratings; status and counts unchanged |
+ | 2026-10-22 | patch | LR-EXP-PSD, LR-META-EXIF-FULL: PSD/PSB imports and image resources 1058/1060 now supply EXIF and XMP to metadata readers and All Metadata; Original with Remove Location Info refuses detected PSD/PSB GPS; statuses and feature counts unchanged |
+| 2026-10-21 | patch | LR-LIB-CAPTURETIME: a capture time that doesn't fully read is left as it is and counted (`unreadable`) instead of shifted into a wrong one; it can't anchor a set that moves other photos; status unchanged |
| 2026-10-21 | patch | LR-IMP-ADD-DIALOG: reconcile #2362 with current main; deleted-album guard and hierarchical picker retained; counts unchanged |
+| 2026-10-20 | patch | Graphic watermark inset regression: Oversized graphics fit the space remaining after the applicable anchor insets, with one aspect-preserving scale before quarter-turn rotation. Centered axes continue to ignore insets. Pixel-bound regressions cover edge/corner anchors, centered placement and all four rotations. Main d999e382 is integrated; HDR size-limit and EXIF-orientation fixes are unchanged. |
| 2026-10-20 | minor | LR-IMP-ADD-DIALOG: #2362 gives the import review the shared hierarchy/search album picker while retaining None/New album and existing destination IDs; status and feature counts unchanged |
| 2026-10-21 | patch | KEY-SLIDER-NUDGE: vertical wheel nudges need a click or drag in the slider's row; leaving it (even between two frames) or Tab focus alone does not arm them (issue #1355); status unchanged |
| 2026-10-21 | minor | KEYC-PANELS: F8 shows / hides the right panel (`view.rightPanel`), with F6 / F7 already bound; ⬜ → 🟡 |
diff --cc docs/ui-parity.md
index 510e306c8,7a746fdf3..16665f3d4
--- a/docs/ui-parity.md
+++ b/docs/ui-parity.md
@@@ -149,8 -149,8 +149,9 @@@ establish OS keyboard delivery or cross
| Date | Change | Summary |
|---|---|---|
| 2026-10-15 | patch | Context menus: a right-click elsewhere on the same widget while its menu is open moves the menu to the pointer; before it flashed at the new spot and closed (issue #1877); every site uses `widgets::context_menu`; 70% unchanged |
+ | 2026-10-23 | patch | KEYC-RATING: ⌘L / Ctrl+L (Library ▸ Enable Filters) switches the filter off and on, restoring it as it was |
| 2026-10-15 | patch | KEYC-RATING: `\` shows / hides the Filter Bar in Photo Grid and Square Grid (Show Original in Detail); ⌘L is the filter-bar key left |
+| 2026-10-14 | minor | Zoom row: diagnostic overlays render zoom windows too |
| 2026-10-14 | patch | Shortcuts: Visualize HDR loses its default ⇧H, which cycles the Tool Overlay (issue #224); both PRs had claimed it |
| 2026-10-12 | minor | Accessibility: crop handles, spots, gradient handles and mask pins operable by keyboard with AccessKit names and values; Tab order test for the right panels; hand-drawn icons and rows named; 55% → 75%; UI remaining 34–58 h → 32–54 h |
| 2026-10-13 | minor | Shortcuts: Tool Overlay modes for spot and mask pins on ⇧H (H stays Remove; issue #224), listed with the deliberate differences; dropped from the missing list |
diff --cc docs/whats-new.md
index 0f864e4e2,c09dddc09..c27c7e474
--- a/docs/whats-new.md
+++ b/docs/whats-new.md
@@@ -1,99 -1,53 +1,143 @@@
# What's new in LightCraft
- ## 2026-10-22
-
- ### Find the grid shortcut in View
- - Photo Grid and Square Grid now show the grid-cycle shortcut (G by default) in the View menu. The hints follow
- shortcut changes; clicking a menu row still selects that grid (issue #2500).
## 2026-10-23
+ ### Tab leaves the name field in New Album, New Smart Album and the name prompts
+ - In New Album, New Smart Album, Save Metadata Preset and the other dialogs with one name field, the field has the
+ keyboard focus when the dialog opens, and Tab now moves on to the check box, Cancel and OK (Shift+Tab goes back).
+ Before, the field took the focus back every frame, so only Return and Esc got you out of it. Return still
+ confirms and Esc still cancels.
+
+ ### Foreign XMP metadata survives namespace-prefix collisions
+ - Saving a sidecar keeps another application's properties even when its namespace uses prefixes such as `lc`
+ or `xmp`. Those foreign properties no longer become LightCraft settings or ratings when imported.
+
+ ### Find Missing Photos finds the files of a library made on Windows
+ - A library made on Windows records its originals with Windows paths. Opened on macOS or Linux, its photos are
+ missing until relinked, and Find Missing Photos found them only by their content, so it missed every photo it had
+ no fingerprint for (such as photos brought in from a Lightroom catalog) or that had been edited since, even in a
+ folder holding every file under the same name. It now matches them by name as it does any other photo: the name
+ after the last `/` or `\`, in any letter case, checked against the size when the library has one. Several files
+ of that name are still reported rather than guessed, and undo puts back the paths as they were.
+
+ ### Auto straighten leaves straight photos alone
+ - Auto straighten (Auto in the crop panel, or a double-click with the Straighten tool) no longer turns a photo by
+ more than 10°, and acts only when at least three lines agree. Before, it often turned photos that were straight:
+ the edges of wooden planks, a branch or a bird's wing were taken for the horizon, sometimes for a 25° turn.
+ - When it finds no horizon or vertical lines, it says so instead of doing nothing without a word.
+
+ ### PSD and PSB metadata stays available
+ - LightCraft now imports PSD and PSB files with EXIF and XMP image resources. Capture dates, GPS and descriptive fields
+ stay available in All Metadata; PSD edit copies keep their capture date. Original exports with Remove Location Info enabled
+ are refused when a PSD or PSB embeds GPS, since LightCraft cannot strip metadata from a byte-for-byte original copy.
+
+### Choose where a Lightroom catalog goes
+- File ▸ Import Lightroom Catalog… now asks first: merge the catalog's photos, collections and edits into the
+ library open now, or create a new library for them, named after the catalog and placed next to the open library
+ (both can be changed). LightCraft opens the new library, then imports the catalog into it. Cancel does nothing.
+ Open Library… on a Lightroom catalog goes through the same choice.
+- To import as before without the question, choose Settings ▸ General ▸ When importing a Lightroom catalog ▸
+ Always merge into the open library, or tick Don't ask again in the window. Ask where to import it brings the
+ question back.
+
+
+### Choose which library opens at launch
+- Settings ▸ General ▸ **At launch**: *Open the last library* (as before) or *Ask me*. With *Ask me*, LightCraft
+ starts with a window listing your recent libraries: each one's name, the folder it is in and when you last opened
+ it. One that is gone (moved, renamed, on a disconnected drive), can't be read or no longer holds a library is
+ greyed out with the reason. Each one is checked in the background, showing *Checking…* until it answers (and that
+ the drive isn't answering after 5 s), so the list never waits on a network share that is offline or a disk that
+ has to wake up; File ▸ Open Recent Library uses the same answers (it greys out only libraries that are gone). Making the list only looks: it never locks or writes anything in your libraries, so one
+ that another program has open is reported, with who has it, when you press **Open**, and the window stays. The
+ last library is selected; **Open** (or Return, or a double-click) opens it,
+ **Open Another…** asks for a folder, **New Library…** makes one, **Quit** (or Esc) quits. ↑ and ↓ move through
+ the list.
+- Holding Alt (Option on a Mac) as the window appears shows the same list once, over the library that opened: open
+ another one from it, or press Esc to keep working where you were. On a Mac, an Option key held from before
+ LightCraft starts is only noticed once it changes, so press it as the window appears.
+- `--library` and `LIGHTCRAFT_LIBRARY` still decide the library when given, and `lightcraft-cli` never asks.
+- File ▸ Open Recent Library ▸ **Remove from List** forgets one library, and the launch window's **Remove from
+ List** does the same. Only the entry goes: the library and its photos stay where they are. Agents use
+ `app.recentLibraries {remove: path}`; its list now also says when each library was last opened (`lastOpened`).
+- Photos dropped on the window while the list (or the window of a library that couldn't open) is up wait for the
+ library you open and are imported into it, as files given on the command line are; presets dropped then are
+ refused with a note, since they belong to a library.
+
+ ## 2026-10-22
+
+ ### Reliability
+ - Opening a library no longer writes through a link left at the lock's owner note (`catalog.lock.owner`): the link
+ is removed and a new note made in its place, so the file it pointed to is never changed (as for the catalog's
+ temporary files, issue #1502).
+
+ ### Keys reach text fields and the shortcut editor on macOS
+ - While a text field has focus, the native menu now lets go of the keys the field needs (`G`, the digits `0`–`9`,
+ `P`, `U` and the like), and while Keyboard Shortcuts is recording a key it lets go of all of them (⌘, and ⌘Q in
+ the LightCraft menu too), except the system's own items (Hide LightCraft ⌘H, Hide Others ⌥⌘H, Close Window ⌘W
+ and Minimize ⌘M) and the two keys of the Help menu (⌘/ and F1). Before, the menu item kept its key on macOS, so the
+ key could still run the menu command instead of reaching the field or the editor. The keys come back on the menu
+ items when the field loses focus or recording ends; the menu's order, checkmarks and enabled state are unchanged.
+
++### Find the grid shortcut in View
++- Photo Grid and Square Grid now show the grid-cycle shortcut (G by default) in the View menu. The hints follow
++ shortcut changes; clicking a menu row still selects that grid (issue #2500).
++
++
## 2026-10-21
+### Settings window
+- Settings is one size on every tab and stays where it is as you go through them; before, each tab made its own
+ size and the tabs moved under the pointer. The tabs stay in place while a long page scrolls (in a very short
+ LightCraft window, where the page has too little room to scroll by itself, the tabs and the page scroll together), a
+ page that goes on below shows a scroll handle without the pointer on it, and each page remembers where it was
+ scrolled to, also when Settings is closed and opened again.
+- Nothing in Settings runs off the side any more. A row with more choices than fit (the languages on General) wraps
+ onto further lines and a long label wraps in its column, where both used to widen the window: in a small
+ LightCraft window the labels and the Close button of General ended up off screen.
+- The Slideshow tab is one column like the other tabs, with the slide preview first, instead of a column beside the
+ preview that made Settings much wider on that tab. The preview stays above the page while it scrolls, so pointing
+ at a template further down still shows it there (in a very short window it scrolls with the page instead). Pointing
+ at a template no longer pushes its rows out from under the pointer, and the Export buttons wrap.
+- A long folder (General ▸ Library ▸ Location, the folder Auto Import watches, the smart previews folder, a monitor
+ profile's file) is shortened to its last folders ("…/Pictures/Library") on one line; rest the pointer on it for
+ the whole path.
+### One star rating control
+- The stars in the bottom bar, the Info panel and the filter bar are now one shared control, and the badges on grid
+ cells, filmstrip thumbnails and the Compare caption use the same drawing. Hovering a star in the filter bar now
+ previews the rating like the others do, and with a star focused (Tab), ← and → lower and raise the rating.
+### Progress looks the same everywhere
+- Download, scan, denoise and activity progress now use one bar that fills the width it is given, with its text on
+ it, and a gentle sweep while the amount of work isn't known yet. Waits that only said "Selecting…", "Waiting to
+ start…" or "Installing…" now show a small turning arc beside the text, and a thumbnail still being made shows a
+ quiet placeholder that fits the theme in the grid, the filmstrip and Compare. Screen readers hear a progress
+ indicator with its percentage.
+### Menu names that say what they are
+- Switches in the menus are named for what they show, with the check mark saying whether it is on: Filmstrip ✓,
+ Focus Point ✓, Clipping ✓, Photo Counts ✓, Mask Overlay ✓ instead of Show Focus Point ✓. No two commands share a
+ name any more: View ▸ Detail is now Detail View (the Edit section Detail keeps its name), Window ▸ Edit is Edit
+ Panel, and Compare Before and After is Before/After Side by Side, next to Split and Top/Bottom.
+- The preview cache command has one name, Discard Preview Cache, in File ▸ Previews and in the toast that confirms
+ it. Keyboard shortcuts are unchanged.
+### Dropping files shows what will happen
+- While files are dragged over the window, it dims and a card says what dropping will do: review the photos and
+ folders for import, import the presets, or open the face model. If a dialog is open, the card asks you to close it
+ first, and a drop is refused with a message instead of replacing the dialog. The same goes while an import is
+ running, and in the web version.
+- The import review of a finished scan (a drop, or File ▸ Import) no longer replaces a dialog you opened in the
+ meantime; it opens as soon as that dialog is closed.
+- Photos and folders dropped on the window now open the same import review as File ▸ Import, so you pick add, copy or
+ move, the destination and a preset before anything is imported. Settings ▸ Import ▸ "Import dropped files without
+ review" brings back the old behaviour of importing at once.
+- In the web version, a dropped file the browser can't read, or that can't be imported, now shows a message instead of
+ failing silently.
+- For scripts: `ui.dropFiles` hovers files over the window or drops them, as the operating system does.
+### Counting many smart albums is faster
+- Counting every smart album at once (the numbers in the Albums list, and the `albums.list` command) now works out an
+ album that other smart albums test (“album is …”) once for the whole library, instead of again for every album
+ that tests it. On a synthetic library of 312,000 photos with 77 smart albums, 51 of them testing one shared album,
+ the full count took about 14 s instead of about 23 s on a heavily loaded machine; the rest is the text rules of
+ the albums themselves. The counts are the same as before, including for albums that loop through each other.
+
### Sharper resampling in HDR and panorama merges
- Merged photos (HDR and panorama) are resampled with a sharper filter (Lanczos-3 instead of bilinear). Moving a
photo by half a pixel used to lose a third of its finest detail; now it keeps most of it, without halos around
@@@ -131,30 -85,15 +175,28 @@@
- `photo.setReference` refuses an `id` that is not a photo id (a string, a negative or fractional
number) instead of pinning the active photo; only an absent or null `id` means the active photo.
- ## 2026-10-20
-
- ### Smart albums check File Path rules faster
- - A smart album rule on File Path (contains, doesn't contain, is, isn't, starts with, ends with, is empty, isn't
- empty) no longer builds new text for every photo. On a synthetic library of 312,000 photos, a File Path "contains"
- or "doesn't contain" rule took about 17 ms per pass instead of about 62 ms, around 3.5 times faster, with the same
- photos matched; about 6 ms of that is only reading the paths. Paths and rule text with letters beyond A–Z are
- compared as before.
- ## 2026-10-21
-
+### Edit Capture Time leaves a capture time it can't read as it was
+- A capture time that is cut short, has seconds that aren't digits or has text after it (a Lightroom catalog's capture
+ time is copied as it is) is no longer shifted into a clean-looking wrong time: Edit Capture Time leaves the photo as
+ it was and says so, and its preview says the photo's time can't be read instead of previewing a wrong one.
+ `photo.setCaptureTime` counts those photos as `unreadable`. Set date & time still repairs such a photo selected on
+ its own; with other photos selected it says why it can't move them by the same amount. When the dialog can't make a
+ change (a time that isn't a date, a shift past year 9999), it now says why and stays open, instead of closing.
+
+### Month names in folder and file name templates
+- Date templates take the month by name: `%B` gives January, `%b` gives Jan. Import ▸ Folders ▸ Custom template…
+ `{date:%Y}/{date:%B}` files photos into 2026/January, 2026/February…, the layout many existing libraries already
+ use. The names are English in every interface language, so folders don't change when the language does. Rename
+ Photos and export file names take them too.
+
+ ## 2026-10-20
+
+ ### Smart albums check File Path rules faster
+ - A smart album rule on File Path (contains, doesn't contain, is, isn't, starts with, ends with, is empty, isn't
+ empty) no longer builds new text for every photo. On a synthetic library of 312,000 photos, a File Path "contains"
+ or "doesn't contain" rule took about 17 ms per pass instead of about 62 ms, around 3.5 times faster, with the same
+ photos matched; about 6 ms of that is only reading the paths. Paths and rule text with letters beyond A–Z are
+ compared as before.
-
## 2026-10-19
### AI Denoise on DirectX 12 with NVIDIA GTX 10-series cards
@@@ -177,6 -116,6 +219,13 @@@
- With several locations removed from Local, "Show N hidden locations" now lists them, so each comes back on its own
(Restore All is there too). The row used to bring every hidden location back at once (issue #2114).
++### Rating in a filtered view keeps your place
++- When a filter shows only one-star photos and you take the star off a photo, it leaves the view and the photo after
++ it is now selected, so you carry on from where you were (issue #2312). The same goes for flags and colour labels,
++ in Picks and in smart albums. Before, the photo stayed selected although the grid no longer showed it, and → or
++ Auto Advance jumped back to the first photo of the view. With Auto Advance on, or with Shift+0–5, you land on the
++ photo after it: no photo is skipped.
++
## 2026-10-18
### Thumbnails of Lightroom HDR and panorama merges in a second
@@@ -248,15 -187,7 +297,6 @@@
one (issue #1507). LightCraft used to open the library without it, showing an incomplete catalog that the next save
would write over the stored copy. It now leaves the library unopened, saves nothing and says which file couldn't be
read; reload the page to try again.
- ## 2026-10-19
-
- ### Rating in a filtered view keeps your place
- - When a filter shows only one-star photos and you take the star off a photo, it leaves the view and the photo after
- it is now selected, so you carry on from where you were (issue #2312). The same goes for flags and colour labels,
- in Picks and in smart albums. Before, the photo stayed selected although the grid no longer showed it, and → or
- Auto Advance jumped back to the first photo of the view. With Auto Advance on, or with Shift+0–5, you land on the
- photo after it: no photo is skipped.
--
## 2026-10-14
### Model downloads time out on a name that doesn't resolve
diff --cc xtask/src/main.rs
index c4101ec38,e9a9716ce..088103f78
--- a/xtask/src/main.rs
+++ b/xtask/src/main.rs
@@@ -36,17 -34,14 +36,18 @@@ commands
web [--serve [port]] [--dev]
build the browser app (apps/lightcraft-web) into <target>/web-site/;
--serve serves it on http://127.0.0.1:<port> (default 8080)
- ci [--hardware] [--summary-md]
+ ci [--hardware] [--summary-md] [--quick [--base REF]]
fmt --check, clippy -D warnings, heif, test, GPU probe, parity refs, layers, assets, wasm
(stops at first failure). Tests run under cargo test (cargo nextest with
- LIGHTCRAFT_NEXTEST=1), without examples, then doctests with cargo test --doc. Writes
+ LIGHTCRAFT_NEXTEST=1), without examples, then doctests with cargo test --doc; after
+ them it prints the translation gaps report (never a failure). Writes
target/ci/report.json (machine, GPU adapters, data,
steps, skipped tests) and target/ci/summary.md; --hardware also runs the GPU tests on
- every backend with a hardware adapter; --summary-md prints the Markdown summary
+ every backend with a hardware adapter; --summary-md prints the Markdown summary.
+ --quick: only what the changes since the merge base with origin/main (or REF) can
+ break: clippy, the changed packages' tests, and heif / parity / wasm when they apply.
+ One ci runs at a time per machine; others wait (LIGHTCRAFT_CI_SLOTS=N for N at once,
+ LIGHTCRAFT_CI_LOCK=off to skip the lock)
corpus [--download]
show where test corpora live; --download fetches PngSuite and CC0 raw samples (raw.pixls.us) into corpus/ and checks their sha256
stats [--exact] count tests and lines per crate (--exact: ask the test harness via `-- --list`)
@@@ -244,60 -239,39 +245,93 @@@ fn doctests() -> (Command, String)
(c, "cargo test --workspace --doc".to_owned())
}
+/// `ci --quick`'s tests: build every workspace test target, then run only the test binaries of
+/// `packages`. Building with `-p` instead would resolve features per selection: different
+/// artifacts from `ci`'s workspace build, so it would recompile ~130 crates. Doc tests are left to
+/// the full `ci`.
+fn test_selected(root: &Path, packages: &std::collections::BTreeSet<String>, skip_log: &Path) -> Result<(), String> {
+ let manifests: std::collections::BTreeMap<String, String> = metadata()?["packages"]
+ .as_array()
+ .into_iter()
+ .flatten()
+ .filter_map(|p| Some((p["manifest_path"].as_str()?.to_owned(), p["name"].as_str()?.to_owned())))
+ .filter(|(_, name)| packages.contains(name))
+ .collect();
+ let what = "cargo test --workspace --no-run --lib --bins --tests";
+ eprintln!("$ {what} (then the test binaries of {})", packages.iter().map(String::as_str).collect::<Vec<_>>().join(", "));
+ let out = cargo()
+ .args(with_test_targets(&["test", "--workspace", "--no-run", "--message-format=json-render-diagnostics"]))
+ .stderr(std::process::Stdio::inherit())
+ .output()
+ .map_err(|e| format!("{what}: failed to spawn: {e}"))?;
+ if !out.status.success() {
+ return Err(format!("{what}: exited with {}", out.status));
+ }
+ let mut binaries = Vec::new();
+ for line in String::from_utf8_lossy(&out.stdout).lines() {
+ let Ok(msg) = serde_json::from_str::<serde_json::Value>(line) else { continue };
+ if msg["reason"] != "compiler-artifact" || msg["profile"]["test"] != true {
+ continue;
+ }
+ let (Some(exe), Some(manifest)) = (msg["executable"].as_str(), msg["manifest_path"].as_str()) else { continue };
+ if let Some(name) = manifests.get(manifest) {
+ binaries.push((name.clone(), manifest.to_owned(), exe.to_owned()));
+ }
+ }
+ if binaries.is_empty() {
+ println!("no test binaries in {}", packages.iter().map(String::as_str).collect::<Vec<_>>().join(", "));
+ return Ok(());
+ }
+ let mut failed = Vec::new();
+ for (name, manifest, exe) in &binaries {
+ let dir = Path::new(manifest).parent().unwrap_or(root);
+ let mut c = Command::new(exe);
+ c.current_dir(dir).env("CARGO_MANIFEST_DIR", dir).env("CARGO_PKG_NAME", name).env(ci_report::SKIP_LOG_ENV, skip_log);
+ if std::env::var_os("RUST_TEST_THREADS").is_none() {
+ // as the cargo runs of ci (`cargo()`): more threads make the frame-budget tests flaky
+ c.env("RUST_TEST_THREADS", std::thread::available_parallelism().map_or(4, |n| n.get()).min(4).to_string());
+ }
+ let file = Path::new(exe).file_name().map(|f| f.to_string_lossy().into_owned()).unwrap_or_default();
+ if run(c, &format!("{name}: {file}")).is_err() {
+ failed.push(format!("{name} ({file})"));
+ }
+ }
+ if failed.is_empty() { Ok(()) } else { Err(format!("tests failed in {}", failed.join(", "))) }
+}
+
+ /// The test that prints the messages each language lacks (shown in English); it always passes.
+ const TRANSLATION_GAPS_TEST: &str = "i18n::tests::translation_gaps_report";
+
+ /// Print the translation gaps report into the log: [`TRANSLATION_GAPS_TEST`] of lightcraft-ui-egui,
+ /// run from the test binary the test step built (found with `--no-run` and the step's own
+ /// arguments, so nothing rebuilds). A report that can't run is a note, never a failed step.
+ fn translation_gaps() {
+ eprintln!("\n=== ci: translation gaps ===");
+ let mut c = cargo();
+ c.args(["test", "--no-run", "--message-format=json"]).args(with_test_targets(&["--workspace"]));
+ let binary = c.output().map_err(|e| format!("cargo test --no-run: {e}")).and_then(|out| {
+ String::from_utf8_lossy(&out.stdout)
+ .lines()
+ .filter_map(|line| serde_json::from_str::<serde_json::Value>(line).ok())
+ .find(|m| {
+ m["reason"] == "compiler-artifact"
+ && m["target"]["name"] == "lightcraft_ui_egui"
+ && m["profile"]["test"] == true
+ && m["target"]["kind"].as_array().is_some_and(|kinds| kinds.iter().any(|kind| kind == "lib"))
+ })
+ .and_then(|m| m["executable"].as_str().map(PathBuf::from))
+ .ok_or_else(|| format!("no lightcraft-ui-egui test binary in the build (cargo exited with {})", out.status))
+ });
+ let ran = binary.and_then(|binary| {
+ let mut c = Command::new(&binary);
+ c.args(["--exact", TRANSLATION_GAPS_TEST, "--nocapture", "--quiet"]);
+ run(c, &format!("{} --exact {TRANSLATION_GAPS_TEST} --nocapture --quiet", binary.display()))
+ });
+ if let Err(e) = ran {
+ eprintln!("note: the translation gaps report did not run: {e}");
+ }
+ }
+
pub fn run(mut cmd: Command, what: &str) -> Result<(), String> {
eprintln!("$ {what}");
let status = cmd.status().map_err(|e| format!("{what}: failed to spawn: {e}"))?;
@@@ -541,9 -462,10 +575,10 @@@ fn cmd_ci(args: &[&str]) -> Result<(),
let r = f();
let status = if r.is_ok() { "ok" } else { "fail" };
results.push(serde_json::json!({"name": name, "status": status, "seconds": t.elapsed().as_secs_f64()}));
- if *name == "test" {
+ if *name == "test" && plan.is_none() {
// right after the workspace tests, before parity and wasm build other feature sets
probe();
+ translation_gaps();
}
if let Err(e) = r {
failure = Some((*name, e));