Skip to content

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

Merge slideshow-playback into slideshow-composer (origin/main: batches 32–33)

Jason Baldwina021ad2c5683
diff --cc Cargo.lock
index 4f0b845da,bf2ac824f..fa471b6ac
--- a/Cargo.lock
+++ b/Cargo.lock
@@@ -3461,15 -3460,6 +3461,15 @@@ dependencies =
"thiserror 2.0.21",
]
+[[package]]
+name = "lightcraft-slideshow"
- version = "0.6.0"
++version = "0.7.1"
+dependencies = [
+ "lightcraft-raster",
+ "serde",
+ "serde_json",
+]
+
[[package]]
name = "lightcraft-sysmem"
version = "0.7.1"
diff --cc crates/engine/src/media.rs
index b5dd2e6aa,cf17c3264..22831bd79
--- a/crates/engine/src/media.rs
+++ b/crates/engine/src/media.rs
@@@ -806,30 -844,31 +847,54 @@@ impl RenderJob
self
}
+ /// Render. A panic inside (a decoder or pipeline bug) is this job's failure: the view waiting
+ /// for it is told, instead of waiting forever on a worker that died (the pool doesn't replace
+ /// it, so a few such panics used to stop every render).
+ pub fn run(self) -> RenderResult {
+ let failed = self.failed(String::new());
+ crate::guard::catch("the render", || self.run_unguarded()).unwrap_or_else(|e| RenderResult { rendered: Err(e), ..failed })
+ }
+
+ /// This job's result when it fails with `e`.
+ fn failed(&self, e: String) -> RenderResult {
+ RenderResult {
+ request_id: self.request_id,
+ source_key: self.source_key,
+ photo: self.photo,
+ level: self.level,
+ key: self.key,
+ rendered: Err(e),
+ gpu_fallback: None,
+ loaded: None,
+ quick: None,
+ display: None,
+ }
+ }
+
+ /// Compose the render into a slideshow slide (layout, options, backdrop): the result is the
+ /// slide, not the photo. Gets its own result key; the photo's cached view preview stays the
+ /// photo. The slide stays sRGB ([`Self::with_display`] leaves it alone).
+ pub fn with_slide(mut self, slide: Arc<crate::slide::SlideCompose>) -> Self {
+ let k = |s: &Option<Arc<crate::slide::SlideCompose>>| s.as_ref().map_or(0, |s| s.key()).wrapping_mul(0xa24b_aed4_963e_e407);
+ self.key ^= k(&self.slide);
+ self.key ^= k(&Some(slide.clone()));
+ self.slide = Some(slide);
+ self
+ }
+
- /// [`Self::run_photo`], composed into its slide when this is a slide job.
- pub fn run(self) -> RenderResult {
++ /// [`Self::run_photo`], composed into its slide when this is a slide job (inside [`Self::run`]'s guard).
+ fn run_unguarded(self) -> RenderResult {
+ let slide = self.slide.clone();
+ let mut r = self.run_photo();
+ if let (Some(slide), Ok(rendered)) = (slide, r.rendered.as_mut()) {
+ rendered.image = slide.compose(&rendered.image);
+ rendered.deep = None;
+ }
+ r
+ }
+
+ /// The photo's render (without slide composition).
+ fn run_photo(self) -> RenderResult {
if let Some((cache, key)) = &self.cache
&& let Some(img) = cache.get_at(self.cache_generation, *key)
{
diff --cc crates/ui-egui/locales/de.json
index 84687c55e,25c411ce0..407e3fcb6
--- a/crates/ui-egui/locales/de.json
+++ b/crates/ui-egui/locales/de.json
@@@ -2111,30 -2116,7 +2116,33 @@@
"not added to Apple Photos (cancelled)": "nicht zu Apple Fotos hinzugefügt (abgebrochen)",
"The first time, macOS asks whether LightCraft may control Photos.": "Beim ersten Mal fragt macOS, ob LightCraft Fotos steuern darf.",
"Adding to Apple Photos": "Wird zu Apple Fotos hinzugefügt",
+ "No graphics processor found: LightCraft renders on the CPU, which is much slower. Details in Help → System Info.": "Kein Grafikprozessor gefunden: LightCraft rendert auf der CPU, was viel langsamer ist. Details unter Hilfe → Systeminformationen.",
+ "On NixOS, start it from `nix develop`.": "Unter NixOS starten Sie es aus `nix develop`.",
- "Files with the same content as another file in this import: only the first is imported.": "Dateien mit demselben Inhalt wie eine andere Datei dieses Imports: Nur die erste wird importiert."
++ "Files with the same content as another file in this import: only the first is imported.": "Dateien mit demselben Inhalt wie eine andere Datei dieses Imports: Nur die erste wird importiert.",
+ "Playback": "Wiedergabe",
+ "Layout": "Layout",
+ "Link all margins": "Alle Ränder verknüpfen",
+ "Margins": "Ränder",
+ "Left": "Links",
+ "Right": "Rechts",
+ "Top": "Oben",
+ "Bottom": "Unten",
+ "Margins are a share of the slide's shorter side, so slides look the same on any screen.": "Ränder sind ein Anteil der kürzeren Seite der Folie, damit Folien auf jedem Bildschirm gleich aussehen.",
+ "Show guides": "Hilfslinien anzeigen",
+ "Aspect preview": "Seitenverhältnis-Vorschau",
+ "Zoom to fill frame": "Zoomen, um Rahmen zu füllen",
+ "Stroke border": "Konturlinie",
+ "Colour": "Farbe",
+ "Cast shadow": "Schlagschatten",
+ "Offset": "Versatz",
+ "Backdrop": "Hintergrund",
+ "Background colour": "Hintergrundfarbe",
+ "Colour wash": "Farbverlauf",
+ "Background image": "Hintergrundbild",
+ "(not in the library)": "(nicht in der Bibliothek)",
+ "Use selected photo": "Ausgewähltes Foto verwenden",
+ "Select a photo, then turn this on to fill the slide behind every photo with it.": "Wählen Sie ein Foto aus und schalten Sie dies ein, um die Folie hinter jedem Foto damit zu füllen.",
+ "Reset layout": "Layout zurücksetzen",
+ "Select a photo to preview its slide": "Wählen Sie ein Foto, um seine Folie in der Vorschau zu sehen",
+ "The selected photo as a slide. Playback fills the screen; the aspect preview only changes this preview.": "Das ausgewählte Foto als Folie. Die Wiedergabe füllt den Bildschirm; die Seitenverhältnis-Vorschau ändert nur diese Vorschau."
}
diff --cc crates/ui-egui/locales/es.json
index ef31d40cd,ba3e1e331..46848d993
--- a/crates/ui-egui/locales/es.json
+++ b/crates/ui-egui/locales/es.json
@@@ -1952,30 -1993,7 +1993,33 @@@
"not added to Apple Photos (cancelled)": "no se añadieron a Fotos de Apple (cancelado)",
"The first time, macOS asks whether LightCraft may control Photos.": "La primera vez, macOS pregunta si LightCraft puede controlar Fotos.",
"Adding to Apple Photos": "Añadiendo a Fotos de Apple",
+ "No graphics processor found: LightCraft renders on the CPU, which is much slower. Details in Help → System Info.": "No se encontró ningún procesador gráfico: LightCraft renderiza en la CPU, lo que es mucho más lento. Detalles en Ayuda → Información del sistema.",
+ "On NixOS, start it from `nix develop`.": "En NixOS, inícielo desde `nix develop`.",
- "Files with the same content as another file in this import: only the first is imported.": "Archivos con el mismo contenido que otro archivo de esta importación: solo se importa el primero."
++ "Files with the same content as another file in this import: only the first is imported.": "Archivos con el mismo contenido que otro archivo de esta importación: solo se importa el primero.",
+ "Playback": "Reproducción",
+ "Layout": "Diseño",
+ "Link all margins": "Vincular todos los márgenes",
+ "Margins": "Márgenes",
+ "Left": "Izquierda",
+ "Right": "Derecha",
+ "Top": "Arriba",
+ "Bottom": "Abajo",
+ "Margins are a share of the slide's shorter side, so slides look the same on any screen.": "Los márgenes son una parte del lado más corto de la diapositiva, así que las diapositivas se ven igual en cualquier pantalla.",
+ "Show guides": "Mostrar guías",
+ "Aspect preview": "Vista previa de proporción",
+ "Zoom to fill frame": "Ampliar para llenar el marco",
+ "Stroke border": "Borde de trazo",
+ "Colour": "Color",
+ "Cast shadow": "Proyectar sombra",
+ "Offset": "Desplazamiento",
+ "Backdrop": "Fondo",
+ "Background colour": "Color de fondo",
+ "Colour wash": "Degradado de color",
+ "Background image": "Imagen de fondo",
+ "(not in the library)": "(no está en la biblioteca)",
+ "Use selected photo": "Usar la foto seleccionada",
+ "Select a photo, then turn this on to fill the slide behind every photo with it.": "Selecciona una foto y activa esta opción para llenar con ella el fondo detrás de cada foto.",
+ "Reset layout": "Restablecer diseño",
+ "Select a photo to preview its slide": "Selecciona una foto para previsualizar su diapositiva",
+ "The selected photo as a slide. Playback fills the screen; the aspect preview only changes this preview.": "La foto seleccionada como diapositiva. La reproducción llena la pantalla; la vista previa de proporción solo cambia esta vista previa."
}
diff --cc crates/ui-egui/locales/fr.json
index 6eee2b898,b0becb154..5c3a4f8d8
--- a/crates/ui-egui/locales/fr.json
+++ b/crates/ui-egui/locales/fr.json
@@@ -1952,30 -1955,7 +1955,33 @@@
"not added to Apple Photos (cancelled)": "non ajouté à Apple Photos (annulé)",
"The first time, macOS asks whether LightCraft may control Photos.": "La première fois, macOS demande si LightCraft peut contrôler Photos.",
"Adding to Apple Photos": "Ajout à Apple Photos",
+ "No graphics processor found: LightCraft renders on the CPU, which is much slower. Details in Help → System Info.": "Aucun processeur graphique trouvé : LightCraft effectue le rendu sur le processeur, ce qui est beaucoup plus lent. Détails dans Aide → Informations système.",
+ "On NixOS, start it from `nix develop`.": "Sous NixOS, lancez-le depuis `nix develop`.",
- "Files with the same content as another file in this import: only the first is imported.": "Fichiers au contenu identique à un autre fichier de cette importation : seul le premier est importé."
++ "Files with the same content as another file in this import: only the first is imported.": "Fichiers au contenu identique à un autre fichier de cette importation : seul le premier est importé.",
+ "Playback": "Lecture",
+ "Layout": "Disposition",
+ "Link all margins": "Lier toutes les marges",
+ "Margins": "Marges",
+ "Left": "Gauche",
+ "Right": "Droite",
+ "Top": "Haut",
+ "Bottom": "Bas",
+ "Margins are a share of the slide's shorter side, so slides look the same on any screen.": "Les marges sont une part du petit côté de la diapositive : les diapositives sont identiques sur tous les écrans.",
+ "Show guides": "Afficher les repères",
+ "Aspect preview": "Aperçu des proportions",
+ "Zoom to fill frame": "Zoom pour remplir le cadre",
+ "Stroke border": "Contour",
+ "Colour": "Couleur",
+ "Cast shadow": "Ombre portée",
+ "Offset": "Décalage",
+ "Backdrop": "Toile de fond",
+ "Background colour": "Couleur d’arrière-plan",
+ "Colour wash": "Dégradé de couleur",
+ "Background image": "Image d’arrière-plan",
+ "(not in the library)": "(absente de la bibliothèque)",
+ "Use selected photo": "Utiliser la photo sélectionnée",
+ "Select a photo, then turn this on to fill the slide behind every photo with it.": "Sélectionnez une photo, puis activez cette option pour en remplir le fond derrière chaque photo.",
+ "Reset layout": "Réinitialiser la disposition",
+ "Select a photo to preview its slide": "Sélectionnez une photo pour prévisualiser sa diapositive",
+ "The selected photo as a slide. Playback fills the screen; the aspect preview only changes this preview.": "La photo sélectionnée en diapositive. La lecture remplit l’écran ; l’aperçu des proportions ne change que cet aperçu."
}
diff --cc crates/ui-egui/locales/ja.json
index c0095b9ef,7a282e676..753bfbe80
--- a/crates/ui-egui/locales/ja.json
+++ b/crates/ui-egui/locales/ja.json
@@@ -1954,30 -1959,7 +1959,33 @@@
"not added to Apple Photos (cancelled)": "Appleの写真には追加されませんでした(キャンセル)",
"The first time, macOS asks whether LightCraft may control Photos.": "初回は、LightCraftに写真の操作を許可するかmacOSが確認します。",
"Adding to Apple Photos": "Appleの写真に追加中",
+ "No graphics processor found: LightCraft renders on the CPU, which is much slower. Details in Help → System Info.": "グラフィックプロセッサが見つかりません。LightCraftはCPUで描画するため、かなり遅くなります。詳細は「ヘルプ → システム情報」を参照してください。",
+ "On NixOS, start it from `nix develop`.": "NixOSでは `nix develop` から起動してください。",
- "Files with the same content as another file in this import: only the first is imported.": "この読み込み内の別のファイルと内容が同じファイルです。最初のファイルだけが読み込まれます。"
++ "Files with the same content as another file in this import: only the first is imported.": "この読み込み内の別のファイルと内容が同じファイルです。最初のファイルだけが読み込まれます。",
+ "Playback": "再生",
+ "Layout": "レイアウト",
+ "Link all margins": "すべての余白をリンク",
+ "Margins": "余白",
+ "Left": "左",
+ "Right": "右",
+ "Top": "上",
+ "Bottom": "下",
+ "Margins are a share of the slide's shorter side, so slides look the same on any screen.": "余白はスライドの短辺に対する割合なので、どの画面でもスライドは同じように見えます。",
+ "Show guides": "ガイドを表示",
+ "Aspect preview": "縦横比プレビュー",
+ "Zoom to fill frame": "ズームして枠を埋める",
+ "Stroke border": "境界線",
+ "Colour": "カラー",
+ "Cast shadow": "ドロップシャドウ",
+ "Offset": "オフセット",
+ "Backdrop": "背景",
+ "Background colour": "背景色",
+ "Colour wash": "カラーウォッシュ",
+ "Background image": "背景画像",
+ "(not in the library)": "(ライブラリにありません)",
+ "Use selected photo": "選択した写真を使用",
+ "Select a photo, then turn this on to fill the slide behind every photo with it.": "写真を選択してからこれをオンにすると、各写真の背後をその写真で埋めます。",
+ "Reset layout": "レイアウトをリセット",
+ "Select a photo to preview its slide": "写真を選択するとスライドをプレビューできます",
+ "The selected photo as a slide. Playback fills the screen; the aspect preview only changes this preview.": "選択した写真をスライドとして表示します。再生では画面全体に表示され、縦横比プレビューはこのプレビューだけを変更します。"
}
diff --cc crates/ui-egui/locales/pt-br.json
index 01858aaf6,2e21c727c..2081ec0d1
--- a/crates/ui-egui/locales/pt-br.json
+++ b/crates/ui-egui/locales/pt-br.json
@@@ -1952,30 -1957,46 +1957,72 @@@
"not added to Apple Photos (cancelled)": "não adicionadas ao Fotos da Apple (cancelado)",
"The first time, macOS asks whether LightCraft may control Photos.": "Na primeira vez, o macOS pergunta se o LightCraft pode controlar o Fotos.",
"Adding to Apple Photos": "Adicionando ao Fotos da Apple",
+ "Sort Albums A–Z": "Ordenar álbuns de A a Z",
+ "Go back to listing them by name": "Voltar a listá-los por nome",
+ "Sort Contents A–Z": "Ordenar conteúdo de A a Z",
+ "Cancel Pending Photo Action": "Cancelar ação pendente da foto",
+ "Show Person": "Mostrar pessoa",
+ "Add Face Model…": "Adicionar modelo de rostos…",
+ "Cancel Face Model Download": "Cancelar download do modelo de rostos",
+ "Choose Face Recognition Model": "Escolher modelo de reconhecimento facial",
+ "Detect Faces": "Detectar rostos",
+ "Download Face Model": "Baixar modelo de rostos",
+ "Drag Crop Handle": "Arrastar alça de recorte",
+ "Evaluate Face Recognition": "Avaliar reconhecimento facial",
+ "Face Model Downloads": "Downloads de modelos de rostos",
+ "Face Models": "Modelos de rostos",
+ "Face Recognition On/Off": "Ativar/desativar reconhecimento facial",
+ "Faces of a Person": "Rostos de uma pessoa",
+ "Index Faces": "Indexar rostos",
+ "Index Faces in the Background": "Indexar rostos em segundo plano",
+ "Inspect Face Model File": "Inspecionar arquivo do modelo de rostos",
+ "Install Face Model": "Instalar modelo de rostos",
+ "Library Folders": "Pastas da biblioteca",
+ "Name Face": "Nomear rosto",
+ "Name Faces": "Nomear rostos",
+ "Remove Face Model": "Remover modelo de rostos",
+ "Reorder Album": "Reordenar álbum",
+ "Sort Albums by Name": "Ordenar álbuns por nome",
+ "Suggest Names for Faces": "Sugerir nomes para rostos",
+ "Test Face Model": "Testar modelo de rostos",
+ "Unnamed Faces": "Rostos sem nome",
+ "Faces": "Rostos",
+ "Face recognition": "Reconhecimento facial",
+ "This build has nowhere to keep face models, so the model list is not available. (The desktop app has.)": "Esta versão não tem onde guardar modelos de rostos, então a lista de modelos não está disponível. (O aplicativo para desktop tem.)",
+ "Recognise faces (experimental)": "Reconhecer rostos (experimental)",
+ "Suggests who is in a photo from the faces you have named. Everything stays on your computer.": "Sugere quem aparece em uma foto com base nos rostos que você nomeou. Tudo permanece no seu computador.",
+ "This build cannot run recognition models: they can be added and chosen, not used.": "Esta versão não consegue executar modelos de reconhecimento: eles podem ser adicionados e escolhidos, mas não usados.",
+ "Choose a model below (Use) to start.": "Escolha um modelo abaixo (Usar) para começar.",
+ "Face detector": "Detector de rostos",
+ "Detect Faces (Photo menu) needs it: a small one-time download.": "Detectar rostos (menu Foto) precisa dele: um pequeno download único.",
+ "Recognition models": "Modelos de reconhecimento",
+ "No graphics processor found: LightCraft renders on the CPU, which is much slower. Details in Help → System Info.": "Nenhum processador gráfico encontrado: o LightCraft renderiza na CPU, o que é muito mais lento. Detalhes em Ajuda → Informações do sistema.",
+ "On NixOS, start it from `nix develop`.": "No NixOS, inicie-o a partir de `nix develop`.",
- "Files with the same content as another file in this import: only the first is imported.": "Arquivos com o mesmo conteúdo de outro arquivo desta importação: apenas o primeiro é importado."
++ "Files with the same content as another file in this import: only the first is imported.": "Arquivos com o mesmo conteúdo de outro arquivo desta importação: apenas o primeiro é importado.",
+ "Playback": "Reprodução",
+ "Layout": "Layout",
+ "Link all margins": "Vincular todas as margens",
+ "Margins": "Margens",
+ "Left": "Esquerda",
+ "Right": "Direita",
+ "Top": "Superior",
+ "Bottom": "Inferior",
+ "Margins are a share of the slide's shorter side, so slides look the same on any screen.": "As margens são uma parte do lado menor do slide, então os slides ficam iguais em qualquer tela.",
+ "Show guides": "Mostrar guias",
+ "Aspect preview": "Visualização da proporção",
+ "Zoom to fill frame": "Zoom para preencher o quadro",
+ "Stroke border": "Borda",
+ "Colour": "Cor",
+ "Cast shadow": "Projetar sombra",
+ "Offset": "Deslocamento",
+ "Backdrop": "Fundo",
+ "Background colour": "Cor de fundo",
+ "Colour wash": "Degradê de cor",
+ "Background image": "Imagem de fundo",
+ "(not in the library)": "(não está na biblioteca)",
+ "Use selected photo": "Usar a foto selecionada",
+ "Select a photo, then turn this on to fill the slide behind every photo with it.": "Selecione uma foto e ative esta opção para preencher com ela o fundo atrás de cada foto.",
+ "Reset layout": "Redefinir layout",
+ "Select a photo to preview its slide": "Selecione uma foto para visualizar o slide dela",
+ "The selected photo as a slide. Playback fills the screen; the aspect preview only changes this preview.": "A foto selecionada como slide. A reprodução preenche a tela; a visualização da proporção muda só esta visualização."
}
diff --cc crates/ui-egui/locales/ru.json
index 1f4e87a52,c840218a0..169b090bb
--- a/crates/ui-egui/locales/ru.json
+++ b/crates/ui-egui/locales/ru.json
@@@ -2144,30 -2149,7 +2149,33 @@@
"not added to Apple Photos (cancelled)": "не добавлено в Apple Фото (отменено)",
"The first time, macOS asks whether LightCraft may control Photos.": "В первый раз macOS спросит, может ли LightCraft управлять приложением «Фото».",
"Adding to Apple Photos": "Добавление в Apple Фото",
+ "No graphics processor found: LightCraft renders on the CPU, which is much slower. Details in Help → System Info.": "Графический процессор не найден: LightCraft выполняет рендеринг на CPU, а это намного медленнее. Подробности: Справка → Сведения о системе.",
+ "On NixOS, start it from `nix develop`.": "В NixOS запускайте его из `nix develop`.",
- "Files with the same content as another file in this import: only the first is imported.": "Файлы с тем же содержимым, что и другой файл этого импорта: импортируется только первый."
++ "Files with the same content as another file in this import: only the first is imported.": "Файлы с тем же содержимым, что и другой файл этого импорта: импортируется только первый.",
+ "Playback": "Воспроизведение",
+ "Layout": "Макет",
+ "Link all margins": "Связать все поля",
+ "Margins": "Поля",
+ "Left": "Слева",
+ "Right": "Справа",
+ "Top": "Сверху",
+ "Bottom": "Снизу",
+ "Margins are a share of the slide's shorter side, so slides look the same on any screen.": "Поля задаются долей короткой стороны слайда, поэтому слайды выглядят одинаково на любом экране.",
+ "Show guides": "Показывать направляющие",
+ "Aspect preview": "Предпросмотр пропорций",
+ "Zoom to fill frame": "Масштабировать по рамке",
+ "Stroke border": "Обводка",
+ "Colour": "Цвет",
+ "Cast shadow": "Отбрасывать тень",
+ "Offset": "Смещение",
+ "Backdrop": "Фон",
+ "Background colour": "Цвет фона",
+ "Colour wash": "Цветовой градиент",
+ "Background image": "Фоновое изображение",
+ "(not in the library)": "(нет в библиотеке)",
+ "Use selected photo": "Использовать выбранное фото",
+ "Select a photo, then turn this on to fill the slide behind every photo with it.": "Выберите фото и включите этот параметр, чтобы заполнить им фон за каждым фото.",
+ "Reset layout": "Сбросить макет",
+ "Select a photo to preview its slide": "Выберите фото, чтобы увидеть его слайд",
+ "The selected photo as a slide. Playback fills the screen; the aspect preview only changes this preview.": "Выбранное фото в виде слайда. При воспроизведении слайд заполняет экран; предпросмотр пропорций меняет только этот предпросмотр."
}
diff --cc crates/ui-egui/locales/uk.json
index d9f0f0129,85a838098..7d20de142
--- a/crates/ui-egui/locales/uk.json
+++ b/crates/ui-egui/locales/uk.json
@@@ -2146,30 -2149,7 +2149,33 @@@
"not added to Apple Photos (cancelled)": "не додано до Apple Фото (скасовано)",
"The first time, macOS asks whether LightCraft may control Photos.": "Першого разу macOS запитає, чи може LightCraft керувати програмою «Фото».",
"Adding to Apple Photos": "Додавання до Apple Фото",
+ "No graphics processor found: LightCraft renders on the CPU, which is much slower. Details in Help → System Info.": "Графічний процесор не знайдено: LightCraft виконує рендеринг на ЦП, а це набагато повільніше. Докладніше: Довідка → Інформація про систему.",
+ "On NixOS, start it from `nix develop`.": "У NixOS запускайте його з `nix develop`.",
- "Files with the same content as another file in this import: only the first is imported.": "Файли з тим самим вмістом, що й інший файл цього імпорту: імпортується лише перший."
++ "Files with the same content as another file in this import: only the first is imported.": "Файли з тим самим вмістом, що й інший файл цього імпорту: імпортується лише перший.",
+ "Playback": "Відтворення",
+ "Layout": "Макет",
+ "Link all margins": "Зв’язати всі поля",
+ "Margins": "Поля",
+ "Left": "Ліворуч",
+ "Right": "Праворуч",
+ "Top": "Угорі",
+ "Bottom": "Унизу",
+ "Margins are a share of the slide's shorter side, so slides look the same on any screen.": "Поля задаються часткою короткої сторони слайда, тож слайди виглядають однаково на будь-якому екрані.",
+ "Show guides": "Показувати напрямні",
+ "Aspect preview": "Попередній перегляд пропорцій",
+ "Zoom to fill frame": "Масштабувати за рамкою",
+ "Stroke border": "Обведення",
+ "Colour": "Колір",
+ "Cast shadow": "Відкидати тінь",
+ "Offset": "Зсув",
+ "Backdrop": "Тло",
+ "Background colour": "Колір тла",
+ "Colour wash": "Кольоровий градієнт",
+ "Background image": "Фонове зображення",
+ "(not in the library)": "(немає в бібліотеці)",
+ "Use selected photo": "Використати вибране фото",
+ "Select a photo, then turn this on to fill the slide behind every photo with it.": "Виберіть фото й увімкніть цей параметр, щоб заповнити ним тло за кожним фото.",
+ "Reset layout": "Скинути макет",
+ "Select a photo to preview its slide": "Виберіть фото, щоб переглянути його слайд",
+ "The selected photo as a slide. Playback fills the screen; the aspect preview only changes this preview.": "Вибране фото як слайд. Під час відтворення слайд заповнює екран; попередній перегляд пропорцій змінює лише цей перегляд."
}
diff --cc crates/ui-egui/locales/zh-hans.json
index 0c5640507,ad379f1ef..f7c76dbd3
--- a/crates/ui-egui/locales/zh-hans.json
+++ b/crates/ui-egui/locales/zh-hans.json
@@@ -1990,30 -1995,7 +1995,33 @@@
"not added to Apple Photos (cancelled)": "未添加到 Apple 照片(已取消)",
"The first time, macOS asks whether LightCraft may control Photos.": "首次使用时,macOS 会询问是否允许 LightCraft 控制“照片”。",
"Adding to Apple Photos": "正在添加到 Apple 照片",
+ "No graphics processor found: LightCraft renders on the CPU, which is much slower. Details in Help → System Info.": "未找到图形处理器:LightCraft 改用 CPU 渲染,速度会慢很多。详情见“帮助 → 系统信息”。",
+ "On NixOS, start it from `nix develop`.": "在 NixOS 上,请从 `nix develop` 启动。",
- "Files with the same content as another file in this import: only the first is imported.": "与本次导入中另一个文件内容相同的文件:只导入第一个。"
++ "Files with the same content as another file in this import: only the first is imported.": "与本次导入中另一个文件内容相同的文件:只导入第一个。",
+ "Playback": "播放",
+ "Layout": "布局",
+ "Link all margins": "链接所有边距",
+ "Margins": "边距",
+ "Left": "左",
+ "Right": "右",
+ "Top": "上",
+ "Bottom": "下",
+ "Margins are a share of the slide's shorter side, so slides look the same on any screen.": "边距按幻灯片短边的比例设置,因此幻灯片在任何屏幕上看起来都一样。",
+ "Show guides": "显示参考线",
+ "Aspect preview": "长宽比预览",
+ "Zoom to fill frame": "缩放以填充框架",
+ "Stroke border": "描边",
+ "Colour": "颜色",
+ "Cast shadow": "投影",
+ "Offset": "偏移",
+ "Backdrop": "背景",
+ "Background colour": "背景颜色",
+ "Colour wash": "颜色渐变",
+ "Background image": "背景图像",
+ "(not in the library)": "(不在图库中)",
+ "Use selected photo": "使用所选照片",
+ "Select a photo, then turn this on to fill the slide behind every photo with it.": "选择一张照片,然后打开此项,用它填充每张照片后面的幻灯片背景。",
+ "Reset layout": "重置布局",
+ "Select a photo to preview its slide": "选择一张照片以预览其幻灯片",
+ "The selected photo as a slide. Playback fills the screen; the aspect preview only changes this preview.": "将所选照片显示为幻灯片。播放时会填满屏幕;长宽比预览只改变此预览。"
}
diff --cc crates/ui-egui/locales/zh-hant.json
index b979c6896,647d153d0..b2e0f8e46
--- a/crates/ui-egui/locales/zh-hant.json
+++ b/crates/ui-egui/locales/zh-hant.json
@@@ -1952,30 -1957,7 +1957,33 @@@
"not added to Apple Photos (cancelled)": "未加入 Apple 照片(已取消)",
"The first time, macOS asks whether LightCraft may control Photos.": "第一次使用時,macOS 會詢問是否允許 LightCraft 控制「照片」。",
"Adding to Apple Photos": "正在加入 Apple 照片",
+ "No graphics processor found: LightCraft renders on the CPU, which is much slower. Details in Help → System Info.": "找不到圖形處理器:LightCraft 改用 CPU 算繪,速度會慢很多。詳情請見「說明 → 系統資訊」。",
+ "On NixOS, start it from `nix develop`.": "在 NixOS 上,請從 `nix develop` 啟動。",
- "Files with the same content as another file in this import: only the first is imported.": "與本次匯入中另一個檔案內容相同的檔案:只匯入第一個。"
++ "Files with the same content as another file in this import: only the first is imported.": "與本次匯入中另一個檔案內容相同的檔案:只匯入第一個。",
+ "Playback": "播放",
+ "Layout": "版面",
+ "Link all margins": "連結所有邊界",
+ "Margins": "邊界",
+ "Left": "左",
+ "Right": "右",
+ "Top": "上",
+ "Bottom": "下",
+ "Margins are a share of the slide's shorter side, so slides look the same on any screen.": "邊界以投影片短邊的比例設定,因此投影片在任何螢幕上看起來都一樣。",
+ "Show guides": "顯示參考線",
+ "Aspect preview": "長寬比預覽",
+ "Zoom to fill frame": "縮放以填滿框架",
+ "Stroke border": "描邊",
+ "Colour": "顏色",
+ "Cast shadow": "投射陰影",
+ "Offset": "偏移",
+ "Backdrop": "背景",
+ "Background colour": "背景顏色",
+ "Colour wash": "顏色漸層",
+ "Background image": "背景影像",
+ "(not in the library)": "(不在圖庫中)",
+ "Use selected photo": "使用所選照片",
+ "Select a photo, then turn this on to fill the slide behind every photo with it.": "選取一張照片,然後開啟此項,以它填滿每張照片後方的投影片背景。",
+ "Reset layout": "重設版面",
+ "Select a photo to preview its slide": "選取一張照片以預覽其投影片",
+ "The selected photo as a slide. Playback fills the screen; the aspect preview only changes this preview.": "將所選照片顯示為投影片。播放時會填滿螢幕;長寬比預覽只會改變此預覽。"
}
diff --cc crates/ui-egui/src/render.rs
index 9f80c35ba,79377ab91..53a94c2ab
--- a/crates/ui-egui/src/render.rs
+++ b/crates/ui-egui/src/render.rs
@@@ -58,9 -58,9 +58,12 @@@ pub enum Slot
/// A slideshow slide (the one up, the one fading out, the next ones prepared in advance; see
/// [`crate::panels::slideshow`]).
Slide(PhotoId),
+ /// The small composed slide in Settings ▸ Slideshow (the active photo with the layout being
+ /// edited).
+ SlidePreview,
+ /// A slider drag's live HDR histogram: a small full-quality render of an HDR edit, beside the
+ /// drafts (which have no HDR histogram), with no texture ([`Renderer::live_hdr_histogram`]).
+ HdrHistogram,
}
pub struct Tex {
diff --cc docs/parity-checklist.md
index 39749f3c0,67937e846..bf62b881f
--- a/docs/parity-checklist.md
+++ b/docs/parity-checklist.md
@@@ -52,10 -52,10 +52,10 @@@ cited here still exists. Formerly docs/
| X. Cross-cutting behaviours (BEHAV) | 23 | 6 | 1 | 1 | 8/8 (100%) | 7/10 (70%) |
| Y. Menus | 84 | 0 | 4 | 8 | 47/47 (100%) | 23/23 (100%) |
| Z. Keyboard shortcuts (desktop) | 76 | 3 | 3 | 1 | 49/52 (94%) | 23/24 (96%) |
-| Lightroom Classic extras | 34 | 17 | 34 | 8 | — | 24/26 (92%) |
-| **Total** | 409 | 53 | 71 | 35 | 193/201 (96%) | 146/158 (92%) |
+| Lightroom Classic extras | 36 | 18 | 31 | 8 | — | 24/26 (92%) |
- | **Total** | 410 | 53 | 68 | 35 | 193/201 (96%) | 145/157 (92%) |
++| **Total** | 411 | 54 | 68 | 35 | 193/201 (96%) | 146/158 (92%) |
- Weighted completion (✅ = 1, 🟡 = ½, 🚫 left out): **82.2%** of 531 in-scope rows — P0 98.0% of 201 · P1 95.2% of 157 · P2 51.7% of 172.
-Weighted completion (✅ = 1, 🟡 = ½, 🚫 left out): **81.7%** of 533 in-scope rows — P0 98.0% of 201 · P1 95.3% of 158 · P2 50.3% of 173.
++Weighted completion (✅ = 1, 🟡 = ½, 🚫 left out): **82.2%** of 533 in-scope rows — P0 98.0% of 201 · P1 95.3% of 158 · P2 51.7% of 173.
<!-- /parity:summary -->
## Top gaps and shortcut notes
diff --cc docs/whats-new.md
index b4345634b,923bc8e9d..9f1ce987e
--- a/docs/whats-new.md
+++ b/docs/whats-new.md
@@@ -45,19 -150,24 +150,36 @@@
- Upgrading from a Windows installer older than 0.6 (such as 0.5.0) keeps LightCraft in the folder it was installed
in, instead of moving it back to Program Files (issue #399). If that folder has been deleted since, the upgrade
installs to Program Files.
+ - A photo that runs into a bug in LightCraft while it renders (in a raw decoder or the editing pipeline) now fails
+ like a photo that can't be opened, with the reason, instead of rendering forever; its thumbnail stops waiting too.
+ Each such bug used to take one of the render threads with it, so after a few of them no photo rendered until
+ LightCraft was restarted. The bug is still written to the log (Help ▸ Open Log Folder) for a report.
+
+ ### Library sorting
+ - Photos that tie on the sort key (equal ratings, one import batch, a burst shot within the same second) now sort by
+ file name, then id, instead of import order. Recently Added keeps a batch in file name order, and Auto-Stack orders a
+ burst by file name, so the first file is the cover.
+
+ ### Large preset collections
+ - A library holding thousands of presets (a Lightroom collection imported whole: 11 000 presets, a 42 MB
+ presets.json) stays responsive. Every command used to re-serialize the whole list to see whether it had changed
+ (~0.6 s per slider tick); now the list is saved only after it changes, and a slider tick takes ~2 ms.
+ - The Presets panel builds only the rows in view (and their thumbnails) instead of every preset on every frame; the
+ preset pickers in Import and Settings ▸ Import scroll the same way.
+ - Importing a large collection and opening its library no longer compare every preset with every other.
+### Slideshow layout, options and backdrop
+- Slides can now be laid out like Lightroom Classic's Slideshow Layout, Options and Backdrop panels: margins (all four
+ linked, or each on its own), Zoom to Fill Frame (crop the photo to fill its cell), a stroke border (colour, width),
+ a cast shadow (opacity, offset, radius, angle), and a backdrop colour with an optional colour wash (a gradient from a
+ second colour, at an angle and opacity) and a background image (a photo from the library, at an opacity).
+- Set them in Settings ▸ Slideshow, which now shows the selected photo as a slide as you change them (with the margin
+ guides, at the screen's aspect or 16:9 / 4:3). Sizes are a share of the slide, so a slide looks the same on any
+ screen. They are saved with the library.
+- View ▸ Slideshow plays the composed slides, prepared ahead off the UI thread like before, so fades and the playback
+ controls work as they did. With the default layout (no margins, border, shadow or backdrop) it plays the photos as
+ before. Agents use `slideshow.layout`, and `slideshow.preview` returns one composed slide as a PNG.
+
### Slideshow playback
- View ▸ Slideshow (⌥⌘↩) now plays with Lightroom Classic's Playback settings: how long each slide stays up, a fade
between slides (a crossfade, or through black, white or any colour; 0 cuts), random order (every photo once per