Skip to content

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

MENU-CTX-ALBUM: an album's Import ▸ Import from Device lists the devices found (#1267)

Markus Friedela940fae19316
diff --git a/crates/ui-egui/src/panels/left.rs b/crates/ui-egui/src/panels/left.rs
index 144fcc1cd..5cbee69d5 100644
--- a/crates/ui-egui/src/panels/left.rs
+++ b/crates/ui-egui/src/panels/left.rs
@@ -1529,20 +1529,34 @@ fn folder_menu(app: &mut LightcraftApp, resp: &egui::Response, a: &Album) {
}
// File ▸ Import's ways in; the import review opens with this album chosen
let menu = ui.menu_button(crate::i18n::tr("Import"), |ui| {
- for (label, command, widget) in [
- ("Import Photos…", "file.addPhotos", "button:albumImportPhotos"),
- ("Import from Folder…", "file.addFolder", "button:albumImportFolder"),
- ("Import from Device", "file.addFromDevice", "button:albumImportDevice"),
- ] {
- let r = ui.button(crate::i18n::tr(label));
+ let mut entry = |ui: &mut egui::Ui, label: String, widget: String, command: &str, params: serde_json::Value| {
+ let r = ui.button(label);
crate::widgets::register(ui.ctx(), widget, r.rect);
if r.clicked() {
- if let Err(e) = app.run(command, json!({"album": a.id.0})) {
+ if let Err(e) = app.run(command, params) {
app.toast(ui.ctx(), e);
}
ui.close();
}
+ };
+ for (label, command, widget) in [
+ ("Import Photos…", "file.addPhotos", "button:albumImportPhotos"),
+ ("Import from Folder…", "file.addFolder", "button:albumImportFolder"),
+ ] {
+ entry(ui, crate::i18n::tr(label).into(), widget.into(), command, json!({"album": a.id.0}));
}
+ // like File ▸ Import from Device: one entry per camera or card found
+ let device = ui.menu_button(crate::i18n::tr("Import from Device"), |ui| {
+ let devices = lightcraft_engine::devices::devices();
+ if devices.is_empty() {
+ ui.add_enabled(false, egui::Button::new(crate::i18n::tr("No Camera or Card Found")));
+ }
+ for (i, d) in devices.into_iter().enumerate() {
+ let params = json!({"path": d.path, "album": a.id.0});
+ entry(ui, format!("{}…", d.name), format!("button:albumImportDevice:{i}"), "file.addFromDevice", params);
+ }
+ });
+ crate::widgets::register(ui.ctx(), "button:albumImportDevice", device.response.rect);
});
crate::widgets::register(ui.ctx(), "button:albumImport", menu.response.rect);
}
diff --git a/docs/parity-checklist.md b/docs/parity-checklist.md
index 838431bf4..bd79ca98d 100644
--- a/docs/parity-checklist.md
+++ b/docs/parity-checklist.md
@@ -577,7 +577,7 @@ visible menu bar yet: the menu model is only exposed through the control channel
| MENU-HELP-SYSINFO | System info | P2 | ✅ | `cmd:app.systemInfo`, `cmd:library.info` | Help ▸ System Info…: version, OS, CPU threads, GPU, memory budget, preview size, library, timings; Copy to Clipboard; one Close button, like About (#782); JSON for agents (`open: false`) |
| MENU-CTX-GRID | Photo context menu | P0 | ✅ | `crates/ui-egui/src/panels/grid.rs` (`context_menu`) | rate, flag, label, add to / remove from album, rename, virtual copy, version, stack, copy / paste / paste selected, reset, merge, rotate, show in Finder, export / export with preset, set as album cover (in an album), delete (restore / delete permanently in Recently Deleted) |
| MENU-CTX-DETAIL | Loupe context menu | P1 | ✅ | `crates/ui-egui/src/panels/detail.rs` | Zoom submenu (fit, 100%, in, out), then the photo menu |
-| MENU-CTX-ALBUM | Album / folder row menu | P0 | ✅ | `crates/ui-egui/src/panels/left.rs` (`folder_menu`), `cmd:album.move`, `cmd:dialog.export`, `cmd:file.addPhotos`, `cmd:file.addFolder`, `cmd:file.addFromDevice` | add selected, Import ▸ Import Photos… / Import from Folder… / Import from Device (the import review opens with that album chosen: `{album}` on those commands; `button:albumImport`), export album (dialog / preset), New ▸ Create Album / Smart Album / Smart Album from Filter / Folder (on a folder: made inside it), move to a folder or the top level, rename, delete; smart albums: update rules |
+| MENU-CTX-ALBUM | Album / folder row menu | P0 | ✅ | `crates/ui-egui/src/panels/left.rs` (`folder_menu`), `cmd:album.move`, `cmd:dialog.export`, `cmd:file.addPhotos`, `cmd:file.addFolder`, `cmd:file.addFromDevice` | add selected, Import ▸ Import Photos… / Import from Folder… / Import from Device ▸ (one entry per camera or card, as in File ▸ Import from Device; the import review opens with that album chosen: `{album}` on those commands; `button:albumImport`), export album (dialog / preset), New ▸ Create Album / Smart Album / Smart Album from Filter / Folder (on a folder: made inside it), move to a folder or the top level, rename, delete; smart albums: update rules |
| MENU-CTX-MASK | Mask / component menu | P0 | ✅ | `crates/ui-egui/src/panels/masking.rs` (`mask_menu`, `component_row_menu`), `cmd:mask.component` | mask rows: duplicate (and invert), invert, show/hide, move, rename, delete; component rows (right-click or "…"): invert, duplicate, mode (add / subtract / intersect), intersect with / subtract a new component, rename (also double-click), delete (the last one deletes the mask) |
| MENU-CTX-PRESET | Preset menu | P1 | ✅ | `crates/ui-egui/src/panels/presets.rs` | favourite, update with current settings, rename, move to group, delete; group: export |
| MENU-CTX-PROFILE | Profile favourites | P2 | ✅ | `cmd:profile.favorite`, `crates/ui-egui/src/panels/profiles.rs` | star in the profile browser; Favorites group first |