Merge branch 'worktree-agent-abfe489c84c337e7c' into integration

ui/dr-ui/ui/app.slint

@@ -2,7 +2,7 @@ import { Theme } from "theme.slint";
 import { AdjustPanel, GeometryPanel, ModeStrip, ParamRow, TransferPanel, ViewMode } from "adjust.slint";
 import { GradientHandle, HandleRole, MaskPanel, MaskRow, SubjectRow } from "masks.slint";
 import { LaunchScreen } from "launch.slint";
-import { LibraryGrid, LibraryCell, TimelineBar, PhotoRoll } from "library.slint";
+import { LibraryGrid, LibraryCell, TimelineBar, PhotoRoll, KeywordRow } from "library.slint";
 import { Button, PanelHeading, Label, Value, Caption, Panel, EmptyState, ProgressBar, ActivityRow } from "widgets.slint";
 import { CollectionsPanel, CollectionRow, OfflinePrompt } from "collections.slint";
 import { HistogramPanel, HistogramView } from "histogram.slint";
@@ -589,6 +589,25 @@ export component AppWindow inherits Window {
     /// the target's id, and whether to take the images out of the collection
     /// currently being shown.
     callback library-file-in-collection(int, bool);
+    /// TRACES: FR-CAT-5 | FR-CAT-6
+    /// Keywording the grid's selection. The catalog has been searchable by
+    /// keyword since it existed and there was nowhere to type one; this is it.
+    ///
+    /// The vocabulary arrives already answered against the selection — each row
+    /// says how many of the selected photographs carry that word — because only
+    /// Rust knows what is selected, and a `.slint` file counting it would need
+    /// the selection as a second model that could disagree with the first.
+    in property <[KeywordRow]> library-keywords;
+    /// The sheet is opening: recompute the rows against the selection as it
+    /// stands now. Pulled rather than pushed, because the selection changes on
+    /// every arrow key and the sheet is shut for almost all of them.
+    callback library-keywords-opened();
+    /// Put a keyword on the selection, creating it if it is new. By name, so a
+    /// word typed into the field and a word tapped in the list are one path.
+    callback library-assign-keyword(string);
+    /// Take a keyword off the selection. Never deletes the keyword itself —
+    /// it stays in the vocabulary and on every other photograph that carries it.
+    callback library-unassign-keyword(string);
     /// TRACES: FR-UI-2
     /// Whether a tap in the grid selects rather than opens, and the button
     /// that turns it on. The long press does the same thing without it.
@@ -1268,6 +1287,10 @@ in property <bool> panel-visible: true;
                     file-in-collection(id, moves) => {
                         root.library-file-in-collection(id, moves);
                     }
+                    keywords: root.library-keywords;
+                    keywords-opened() => { root.library-keywords-opened(); }
+                    assign-keyword(word) => { root.library-assign-keyword(word); }
+                    unassign-keyword(word) => { root.library-unassign-keyword(word); }
                     cursor: root.library-cursor;
                     move-cursor(delta, extend) => {
                         root.library-move-cursor(delta, extend);