diff --git a/crates/ui-egui/locales/cs.json b/crates/ui-egui/locales/cs.json --- a/crates/ui-egui/locales/cs.json +++ b/crates/ui-egui/locales/cs.json @@ -2408,5 +2408,7 @@ "Import dropped files without review": "Importovat přetažené soubory bez kontroly", "An import is running": "Import už běží", "An import is running. Drop photos when it has finished": "Import už běží. Fotky přetáhněte, až skončí", - "Finish Lightroom catalog import before adding photos": "Dokončete import katalogu Lightroom, než přidáte fotky" + "Finish Lightroom catalog import before adding photos": "Dokončete import katalogu Lightroom, než přidáte fotky", + "Keys are in the sidebar: arrows move, Enter opens, type to find, Esc goes back to the photos": "Klávesy ovládají postranní panel: šipky přesouvají, Enter otevírá, psaním hledáte, Esc vrací k fotografiím", + "This row has no name to change": "Tento řádek nemá název, který by šlo změnit" } diff --git a/crates/ui-egui/locales/de.json b/crates/ui-egui/locales/de.json --- a/crates/ui-egui/locales/de.json +++ b/crates/ui-egui/locales/de.json @@ -3440,5 +3440,7 @@ "Import dropped files without review": "Abgelegte Dateien ohne Prüfung importieren", "An import is running": "Ein Import läuft", "An import is running. Drop photos when it has finished": "Ein Import läuft. Lege die Fotos ab, wenn er fertig ist", - "Finish Lightroom catalog import before adding photos": "Schließe den Import des Lightroom-Katalogs ab, bevor du Fotos hinzufügst" + "Finish Lightroom catalog import before adding photos": "Schließe den Import des Lightroom-Katalogs ab, bevor du Fotos hinzufügst", + "Keys are in the sidebar: arrows move, Enter opens, type to find, Esc goes back to the photos": "Die Tasten gelten der Seitenleiste: Pfeile bewegen, Eingabe öffnet, Tippen sucht, Esc führt zurück zu den Fotos", + "This row has no name to change": "Diese Zeile hat keinen Namen, der sich ändern ließe" } diff --git a/crates/ui-egui/locales/es.json b/crates/ui-egui/locales/es.json --- a/crates/ui-egui/locales/es.json +++ b/crates/ui-egui/locales/es.json @@ -2358,5 +2358,7 @@ "Import dropped files without review": "Importar los archivos soltados sin revisión", "An import is running": "Hay una importación en curso", "An import is running. Drop photos when it has finished": "Hay una importación en curso. Suelta las fotos cuando termine", - "Finish Lightroom catalog import before adding photos": "Termina la importación del catálogo de Lightroom antes de añadir fotos" + "Finish Lightroom catalog import before adding photos": "Termina la importación del catálogo de Lightroom antes de añadir fotos", + "Keys are in the sidebar: arrows move, Enter opens, type to find, Esc goes back to the photos": "Las teclas están en la barra lateral: las flechas mueven, Intro abre, escribe para buscar, Esc vuelve a las fotos", + "This row has no name to change": "Esta fila no tiene un nombre que cambiar" } diff --git a/crates/ui-egui/locales/fi.json b/crates/ui-egui/locales/fi.json --- a/crates/ui-egui/locales/fi.json +++ b/crates/ui-egui/locales/fi.json @@ -2327,5 +2327,7 @@ "Drop to open the face model": "Pudota avataksesi kasvomallin", "Dropped Files": "Pudotetut tiedostot", "Finish Lightroom catalog import before adding photos": "Viimeistele Lightroom-luettelon tuonti ennen kuvien lisäämistä", - "Import dropped files without review": "Tuo pudotetut tiedostot ilman tarkistusta" + "Import dropped files without review": "Tuo pudotetut tiedostot ilman tarkistusta", + "Keys are in the sidebar: arrows move, Enter opens, type to find, Esc goes back to the photos": "Näppäimet toimivat sivupalkissa: nuolet liikuttavat, Enter avaa, kirjoita etsiäksesi, Esc palaa kuviin", + "This row has no name to change": "Tällä rivillä ei ole nimeä, jota voisi muuttaa" } diff --git a/crates/ui-egui/locales/fr.json b/crates/ui-egui/locales/fr.json --- a/crates/ui-egui/locales/fr.json +++ b/crates/ui-egui/locales/fr.json @@ -2390,5 +2390,7 @@ "Checking recent libraries": "Vérification des bibliothèques récentes", "The photos are imported once a library is open": "Les photos seront importées dès qu'une bibliothèque sera ouverte", "Open a library first, then drop the presets again": "Ouvrez d'abord une bibliothèque, puis déposez à nouveau les préréglages", - "This library couldn't be checked:": "Impossible de vérifier cette bibliothèque :" + "This library couldn't be checked:": "Impossible de vérifier cette bibliothèque :", + "Keys are in the sidebar: arrows move, Enter opens, type to find, Esc goes back to the photos": "Les touches sont dans la barre latérale : les flèches déplacent, Entrée ouvre, tapez pour chercher, Échap revient aux photos", + "This row has no name to change": "Cette ligne n’a pas de nom à modifier" } diff --git a/crates/ui-egui/locales/id.json b/crates/ui-egui/locales/id.json --- a/crates/ui-egui/locales/id.json +++ b/crates/ui-egui/locales/id.json @@ -2339,5 +2339,7 @@ "Drop to open the face model": "Jatuhkan untuk membuka model wajah", "Dropped Files": "File yang dijatuhkan", "Finish Lightroom catalog import before adding photos": "Selesaikan impor katalog Lightroom sebelum menambahkan foto", - "Import dropped files without review": "Impor file yang dijatuhkan tanpa tinjauan" + "Import dropped files without review": "Impor file yang dijatuhkan tanpa tinjauan", + "Keys are in the sidebar: arrows move, Enter opens, type to find, Esc goes back to the photos": "Tombol berlaku di bilah samping: panah untuk berpindah, Enter untuk membuka, ketik untuk mencari, Esc untuk kembali ke foto", + "This row has no name to change": "Baris ini tidak punya nama yang bisa diubah" } diff --git a/crates/ui-egui/locales/it.json b/crates/ui-egui/locales/it.json --- a/crates/ui-egui/locales/it.json +++ b/crates/ui-egui/locales/it.json @@ -2361,5 +2361,7 @@ "Import dropped files without review": "Importa i file rilasciati senza revisione", "An import is running": "Un'importazione è in corso", "An import is running. Drop photos when it has finished": "Un'importazione è in corso. Trascina le foto quando è finita", - "Finish Lightroom catalog import before adding photos": "Termina l'importazione del catalogo Lightroom prima di aggiungere foto" + "Finish Lightroom catalog import before adding photos": "Termina l'importazione del catalogo Lightroom prima di aggiungere foto", + "Keys are in the sidebar: arrows move, Enter opens, type to find, Esc goes back to the photos": "I tasti agiscono sulla barra laterale: le frecce spostano, Invio apre, digita per cercare, Esc torna alle foto", + "This row has no name to change": "Questa riga non ha un nome da cambiare" } diff --git a/crates/ui-egui/locales/ja.json b/crates/ui-egui/locales/ja.json --- a/crates/ui-egui/locales/ja.json +++ b/crates/ui-egui/locales/ja.json @@ -2356,5 +2356,7 @@ "Import dropped files without review": "ドロップしたファイルを確認せずに読み込む", "An import is running": "読み込み中です", "An import is running. Drop photos when it has finished": "読み込み中です。完了してから写真をドロップしてください", - "Finish Lightroom catalog import before adding photos": "写真を追加する前に Lightroom カタログの読み込みを完了してください" + "Finish Lightroom catalog import before adding photos": "写真を追加する前に Lightroom カタログの読み込みを完了してください", + "Keys are in the sidebar: arrows move, Enter opens, type to find, Esc goes back to the photos": "キーはサイドバーにあります。矢印で移動、Enter で開く、入力で検索、Esc で写真に戻ります", + "This row has no name to change": "この行には変更できる名前がありません" } diff --git a/crates/ui-egui/locales/ka.json b/crates/ui-egui/locales/ka.json --- a/crates/ui-egui/locales/ka.json +++ b/crates/ui-egui/locales/ka.json @@ -2734,5 +2734,7 @@ "Import dropped files without review": "ჩაგდებული ფაილების იმპორტი გადახედვის გარეშე", "An import is running": "იმპორტი მიმდინარეობს", "An import is running. Drop photos when it has finished": "იმპორტი მიმდინარეობს. ფოტოები ჩააგდეთ, როცა დასრულდება", - "Finish Lightroom catalog import before adding photos": "ფოტოების დამატებამდე დაასრულეთ Lightroom-ის კატალოგის იმპორტი" + "Finish Lightroom catalog import before adding photos": "ფოტოების დამატებამდე დაასრულეთ Lightroom-ის კატალოგის იმპორტი", + "Keys are in the sidebar: arrows move, Enter opens, type to find, Esc goes back to the photos": "კლავიშები გვერდით ზოლს მართავს: ისრები გადაადგილებს, Enter ხსნის, აკრიფეთ საძებნად, Esc ფოტოებს უბრუნდება", + "This row has no name to change": "ამ მწკრივს შესაცვლელი სახელი არ აქვს" } diff --git a/crates/ui-egui/locales/pl.json b/crates/ui-egui/locales/pl.json --- a/crates/ui-egui/locales/pl.json +++ b/crates/ui-egui/locales/pl.json @@ -2283,5 +2283,7 @@ "Import dropped files without review": "Importuj upuszczone pliki bez przeglądu", "An import is running": "Import jest w toku", "An import is running. Drop photos when it has finished": "Import jest w toku. Upuść zdjęcia, gdy się zakończy", - "Finish Lightroom catalog import before adding photos": "Zakończ import katalogu Lightrooma, zanim dodasz zdjęcia" + "Finish Lightroom catalog import before adding photos": "Zakończ import katalogu Lightrooma, zanim dodasz zdjęcia", + "Keys are in the sidebar: arrows move, Enter opens, type to find, Esc goes back to the photos": "Klawisze działają na pasku bocznym: strzałki przesuwają, Enter otwiera, pisz, aby szukać, Esc wraca do zdjęć", + "This row has no name to change": "Ten wiersz nie ma nazwy do zmiany" } diff --git a/crates/ui-egui/locales/pt-br.json b/crates/ui-egui/locales/pt-br.json --- a/crates/ui-egui/locales/pt-br.json +++ b/crates/ui-egui/locales/pt-br.json @@ -2202,5 +2202,7 @@ "Import dropped files without review": "Importar arquivos soltos sem revisão", "An import is running": "Uma importação está em andamento", "An import is running. Drop photos when it has finished": "Uma importação está em andamento. Solte as fotos quando ela terminar", - "Finish Lightroom catalog import before adding photos": "Conclua a importação do catálogo do Lightroom antes de adicionar fotos" + "Finish Lightroom catalog import before adding photos": "Conclua a importação do catálogo do Lightroom antes de adicionar fotos", + "Keys are in the sidebar: arrows move, Enter opens, type to find, Esc goes back to the photos": "As teclas estão na barra lateral: as setas movem, Enter abre, digite para achar, Esc volta às fotos", + "This row has no name to change": "Esta linha não tem um nome para mudar" } diff --git a/crates/ui-egui/locales/ru.json b/crates/ui-egui/locales/ru.json --- a/crates/ui-egui/locales/ru.json +++ b/crates/ui-egui/locales/ru.json @@ -2349,5 +2349,7 @@ "Import dropped files without review": "Импортировать перетащенные файлы без проверки", "An import is running": "Импорт уже выполняется", "An import is running. Drop photos when it has finished": "Импорт уже выполняется. Перетащите фото, когда он закончится", - "Finish Lightroom catalog import before adding photos": "Завершите импорт каталога Lightroom, прежде чем добавлять фото" + "Finish Lightroom catalog import before adding photos": "Завершите импорт каталога Lightroom, прежде чем добавлять фото", + "Keys are in the sidebar: arrows move, Enter opens, type to find, Esc goes back to the photos": "Клавиши работают в боковой панели: стрелки перемещают, Enter открывает, набор текста ищет, Esc возвращает к фотографиям", + "This row has no name to change": "У этой строки нет имени, которое можно изменить" } diff --git a/crates/ui-egui/locales/sv.json b/crates/ui-egui/locales/sv.json --- a/crates/ui-egui/locales/sv.json +++ b/crates/ui-egui/locales/sv.json @@ -2429,5 +2429,7 @@ "Drop to open the face model": "Släpp för att öppna ansiktsmodellen", "Dropped Files": "Släppta filer", "Finish Lightroom catalog import before adding photos": "Slutför importen av Lightroom-katalogen innan du lägger till foton", - "Import dropped files without review": "Importera släppta filer utan granskning" + "Import dropped files without review": "Importera släppta filer utan granskning", + "Keys are in the sidebar: arrows move, Enter opens, type to find, Esc goes back to the photos": "Tangenterna styr sidofältet: piltangenterna flyttar, Enter öppnar, skriv för att söka, Esc går tillbaka till fotona", + "This row has no name to change": "Raden har inget namn att ändra" } diff --git a/crates/ui-egui/locales/uk.json b/crates/ui-egui/locales/uk.json --- a/crates/ui-egui/locales/uk.json +++ b/crates/ui-egui/locales/uk.json @@ -2354,5 +2354,7 @@ "Import dropped files without review": "Імпортувати перетягнуті файли без перегляду", "An import is running": "Імпорт уже виконується", "An import is running. Drop photos when it has finished": "Імпорт уже виконується. Перетягніть фото, коли він завершиться", - "Finish Lightroom catalog import before adding photos": "Завершіть імпорт каталогу Lightroom, перш ніж додавати фото" + "Finish Lightroom catalog import before adding photos": "Завершіть імпорт каталогу Lightroom, перш ніж додавати фото", + "Keys are in the sidebar: arrows move, Enter opens, type to find, Esc goes back to the photos": "Клавіші працюють у бічній панелі: стрілки переміщують, Enter відкриває, набір тексту шукає, Esc повертає до фотографій", + "This row has no name to change": "Цей рядок не має назви, яку можна змінити" } diff --git a/crates/ui-egui/locales/vi.json b/crates/ui-egui/locales/vi.json --- a/crates/ui-egui/locales/vi.json +++ b/crates/ui-egui/locales/vi.json @@ -2235,5 +2235,7 @@ "Drop to open the face model": "Thả để mở mô hình khuôn mặt", "Dropped Files": "Tệp đã thả", "Finish Lightroom catalog import before adding photos": "Hoàn tất nhập danh mục Lightroom trước khi thêm ảnh", - "Import dropped files without review": "Nhập các tệp đã thả mà không xem lại" + "Import dropped files without review": "Nhập các tệp đã thả mà không xem lại", + "Keys are in the sidebar: arrows move, Enter opens, type to find, Esc goes back to the photos": "Phím đang điều khiển thanh bên: phím mũi tên di chuyển, Enter mở, gõ để tìm, Esc quay lại ảnh", + "This row has no name to change": "Hàng này không có tên để đổi" } diff --git a/crates/ui-egui/locales/zh-hans.json b/crates/ui-egui/locales/zh-hans.json --- a/crates/ui-egui/locales/zh-hans.json +++ b/crates/ui-egui/locales/zh-hans.json @@ -2200,5 +2200,7 @@ "Import dropped files without review": "不经检查直接导入拖入的文件", "An import is running": "正在导入", "An import is running. Drop photos when it has finished": "正在导入。导入完成后再拖放照片", - "Finish Lightroom catalog import before adding photos": "添加照片前，请先完成 Lightroom 目录的导入" + "Finish Lightroom catalog import before adding photos": "添加照片前，请先完成 Lightroom 目录的导入", + "Keys are in the sidebar: arrows move, Enter opens, type to find, Esc goes back to the photos": "按键现在作用于边栏：方向键移动，回车打开，输入文字查找，Esc 返回照片", + "This row has no name to change": "此行没有可更改的名称" } diff --git a/crates/ui-egui/locales/zh-hant.json b/crates/ui-egui/locales/zh-hant.json --- a/crates/ui-egui/locales/zh-hant.json +++ b/crates/ui-egui/locales/zh-hant.json @@ -2157,5 +2157,7 @@ "Import dropped files without review": "不經檢查直接匯入拖放的檔案", "An import is running": "正在匯入", "An import is running. Drop photos when it has finished": "正在匯入。匯入完成後再拖放照片", - "Finish Lightroom catalog import before adding photos": "新增照片前，請先完成 Lightroom 目錄的匯入" + "Finish Lightroom catalog import before adding photos": "新增照片前，請先完成 Lightroom 目錄的匯入", + "Keys are in the sidebar: arrows move, Enter opens, type to find, Esc goes back to the photos": "按鍵現在作用於側邊欄：方向鍵移動，Enter 開啟，輸入文字尋找，Esc 返回照片", + "This row has no name to change": "此列沒有可變更的名稱" } diff --git a/crates/ui-egui/src/panels.rs b/crates/ui-egui/src/panels.rs --- a/crates/ui-egui/src/panels.rs +++ b/crates/ui-egui/src/panels.rs @@ -26,6 +26,7 @@ pub mod presets; pub mod profiles; pub mod right; pub mod second; +pub(crate) mod side_keys; pub mod slideshow; pub mod strip; pub mod topbar; diff --git a/crates/ui-egui/src/panels/left.rs b/crates/ui-egui/src/panels/left.rs --- a/crates/ui-egui/src/panels/left.rs +++ b/crates/ui-egui/src/panels/left.rs @@ -32,10 +32,10 @@ use local::{local_now, local_rows}; pub(crate) use rows::{INDENT_STEP, MIN_INDENT_STEP}; use rows::{LIBFOLDER_REVEALED, SCROLL_TO_ROW, row, set_tree_open}; pub(crate) use rows::{content_width, indent_step, step_for}; -pub(crate) use sections::PlacedSection; pub use sections::section_drag_feedback; #[cfg(test)] pub(crate) use sections::section_drop_before; +pub(crate) use sections::{PlacedSection, SECTION_HEADER}; use sections::{SECTION_GAP, missing_count, pinned_header, section, section_drag, sections_menu}; /// Draw the My Photos sidebar: title and open-library name, the scrollable sources, albums, diff --git a/crates/ui-egui/src/panels/left/sections.rs b/crates/ui-egui/src/panels/left/sections.rs --- a/crates/ui-egui/src/panels/left/sections.rs +++ b/crates/ui-egui/src/panels/left/sections.rs @@ -6,7 +6,7 @@ use super::*; pub(super) const SECTION_GAP: f32 = 10.0; /// Height of a section's header. -const SECTION_HEADER: f32 = 34.0; +pub(crate) const SECTION_HEADER: f32 = 34.0; /// One sidebar section: the gap above it, its header, and (while it is open) the rows `body` /// draws. Every section goes through here, so they all fold, space and announce themselves alike. diff --git a/crates/ui-egui/src/panels/side_keys.rs b/crates/ui-egui/src/panels/side_keys.rs new file mode 100644 --- /dev/null +++ b/crates/ui-egui/src/panels/side_keys.rs @@ -0,0 +1,628 @@ +//! The keyboard in the left sidebar: with Keyboard in Sidebar on (`view.sidebarKeys`, Cmd+Alt+B), the +//! arrow keys move a cursor over the rows and section headers that are drawn, Left / Right fold +//! and unfold, Enter or Space chooses the row as a click does, typing jumps to the next row that +//! starts so, F2 renames, and Esc gives the keys back to the photos. +//! +//! It is a mode asked for, never entered by a click: with it off every key is what it always +//! was (P picks a photo also right after an album was clicked). While it is on, keys without Cmd / +//! Ctrl / Alt belong to the sidebar ([`owns_keys`]); the others stay shortcuts. Tab, a click +//! elsewhere, a text field taking the keys (Find), or the sidebar going out of sight end it. +//! +//! The rows say what they are as they are drawn ([`note_row`], [`note_open`]); a key acts on what +//! the last frame drew, and what it asks of a row (choose, fold) is handed to that row when it is +//! drawn next, so a key does exactly what the click on the row does. +//! +//! Nothing calls this yet: it is the tested core of Keyboard in Sidebar (LR-BEHAV-SIDEBAR-KEYS), and +//! the next part of that feature starts it: the sidebar's rows say what they are through [`note_row`] +//! and the rest, and the `view.sidebarKeys` command, its menu item and its shortcut turn the mode on. +//! Until then the app's keys are what they were, and the module is not counted as dead code outside tests. +#![cfg_attr(not(test), allow(dead_code))] + +use egui::{Key, Rect}; + +use crate::LightcraftApp; + +/// A row or section header as the keys see it. +#[derive(Clone, Debug)] +struct NavRow { + /// The row's widget id without `source:` (`all`, `album:3`, `libfolder:/pics`), or a + /// header's whole id (`sidebarSection:albums`); a second Local row of the same id in one + /// frame (a folder that is a place and also lies inside another) has [`TWIN`] and `2` after + /// it, which no file name can hold. + id: String, + /// What typing is matched against. + label: String, + indent: f32, + header: bool, + /// Whether it is open, when it can be opened at all. + open: Option, + selected: bool, +} + +/// What a key asks of a row, done when the row is drawn. +#[derive(Clone, Copy, Debug, PartialEq, Eq)] +enum Ask { + /// As a click on the row. + Choose, + /// As a click on its triangle. + Fold, +} + +#[derive(Clone, Default)] +struct Nav { + /// The rows drawn so far this frame, top to bottom. + rows: Vec, + /// The rows of the last frame: what a key press acts on. + prev: Vec, + ask: Option<(String, Ask)>, + /// What was typed lately, and when the last letter came. + typed: String, + typed_at: f64, + /// The pass the sidebar last began in: keys are the sidebar's only while it is drawn. + seen: u64, + /// Whether the keys were the sidebar's when it was last drawn (to say so when that begins). + was_on: bool, + /// Whether the keys' toast was shown this session: it explains the mode once. + told: bool, + /// How often each Local row's id was drawn so far this frame (only they can repeat). + twins: std::collections::HashMap, + /// Whether a dialog or a menu was open when the sidebar was last drawn: what it leaves + /// focused as it closes is let go, where any other focus ends the mode. + had_window: bool, + /// Whether an album or a section was being dragged when the sidebar was last drawn: the Esc + /// that abandons a drag ends the drag before the sidebar is drawn again, and is the drag's. + was_dragging: bool, +} + +/// What parts a Local row's id from its number when the same folder is drawn more than once: a +/// character no path contains, so a folder really called `Day #2` is never taken for a second row. +const TWIN: char = '\u{1f}'; + +fn nav_id() -> egui::Id { + egui::Id::unique("left-side-keys") +} + +/// What every row asks about each frame, kept apart from [`Nav`] so asking copies two words: +/// whether the keys are the sidebar's, and the row a key chose this frame (by its response's id). +#[derive(Clone, Copy, Default)] +struct Now { + on: bool, + chose: Option, +} + +fn now(ctx: &egui::Context) -> Now { + ctx.data(|d| d.get_temp::(nav_id())).unwrap_or_default() +} + +fn with(ctx: &egui::Context, f: impl FnOnce(&mut Nav) -> R) -> R { + ctx.data_mut(|d| f(d.get_temp_mut_or_default::