dtourolle/DarkRoom
1
0
Fork 0
Code Issues 39 Pull Requests Actions Packages Projects Releases 20 Wiki Activity

Drive develop, the grid, the sidebar and People from the keyboard

Browse Source 
An audit of every action by view against the keys the handlers bind left
develop without zoom, pan, fit or a way back to the grid, the grid without
select-none, thumbnail size or keywording, People with no key at all, and
the export and copy sheets without Enter. It also found the reverse gap
FR-UI-5 forbids: pick and reject had no route but P, X and U, and the
2026-09-19 amendment's judging in develop had not been built.

Develop: Ctrl+= and Ctrl+Plus zoom in and Ctrl+- out about the middle of the
view, Ctrl+0 fits and Ctrl+1 goes to 1:1, Shift and an arrow pan a magnified
view, G goes back to the grid, Ctrl+Y redoes, and Enter keeps a crop that hid
a mask. 0-5, P, X and U rate and flag the open photograph without moving on,
with stars and Pick/Reject in the top bar as the pointer and touch route.
= and - nudge the control last moved by a hundredth of its travel; the
framing sliders, perspective included, now count as "last moved", so R puts
them back as well. J turns the selected mask part's join chip.

Grid: Ctrl+D and Ctrl+Shift+A clear the selection, = and - resize the
thumbnails, Ctrl+K opens keywording, and Flag in the selection bar gives
pick and reject a pointer and touch route. Sidebar: Enter commits a
collection's name, and Enter or Escape hands the keyboard back to the grid,
where it used to go nowhere until something was clicked. People: Up and Down
walk the rail, F2 puts the name field under the keys, and Escape or Back now
leave the screen the way its back button does instead of doing nothing.
Sheets: Enter does what the export or copy sheet's button does.

The choices follow Lightroom where it has one. No new key steals typing: the
grid's and People's keys live on focus holders that are not ancestors of any
text field, and the sheets' Enter comes after a focused field has had it.
Every binding is tagged beside its handler, and the gate added in the
previous commit holds the two to each other.
This commit is contained in:
dtourolle
2026-09-24 23:42:26 -04:00
parent 9d1e31ffbb
commit d489a34190
15 changed files with 975 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/dev/traceability.md
+64 -64
View File
File diff suppressed because one or more lines are too long
docs/gestures.md
+144 -55
View File
@@ -5,7 +5,7 @@
Every entry here is extracted from the comment beside the code that implements it, so this file cannot describe a gesture the application does not have. Add one by writing a `GESTURE:` block next to the implementation; there is nowhere else to write it.
58 gestures, in 5 places.
67 gestures, in 5 places.
## Develop
@@ -23,21 +23,23 @@ Sampling a neutral is the first move of the tonal pass — every colour judgemen
- **Touch** — Pinch it with two fingers
- **Pointer** — The scroll wheel over it
- **Keyboard** — `Ctrl+=` or `Ctrl+Plus` in, `Ctrl+-` out, about the middle of the view
- **See it** — [in the manual](manual/README.md#looking-closer)
Anchored on the fingers' midpoint, and on the pointer, so the gesture reads as magnifying the picture rather than sliding it about. Double-tap is the way to an exact 1:1; this is the way to everything in between. Past 1:1 the pixels are shown as they are, square and unsmoothed; below it, filtered.
<sub>`ui/dr-ui/ui/app.slint:1792`</sub>
<sub>`ui/dr-ui/ui/app.slint:1885`</sub>
### Move a magnified photograph about
- **Touch** — Drag it
- **Pointer** — Drag it
- **Keyboard** — `Shift+←`, `Shift+→`, `Shift+↑` and `Shift+↓`, a fifth of the view at a time
- **See it** — [in the manual](manual/README.md#looking-closer)
Only once there is something outside the viewport to reach, which is why the cursor becomes a hand exactly then. The view is clamped to the frame: panning past the edge would show undefined area beside the photograph, and that reads as a rendering fault rather than as the end of the picture.
<sub>`ui/dr-ui/ui/app.slint:1886`</sub>
<sub>`ui/dr-ui/ui/app.slint:1981`</sub>
### Paint a mask by hand
@@ -47,7 +49,7 @@ Only once there is something outside the viewport to reach, which is why the cur
A model's mask stops inside a shoulder and leaks into the hair, and no single edge control fixes two errors that go opposite ways. The whole stroke is one step in the history, so taking a mark back costs one press however long it took to make.
<sub>`ui/dr-ui/ui/app.slint:1974`</sub>
<sub>`ui/dr-ui/ui/app.slint:2072`</sub>
### Take back the last change
@@ -58,16 +60,16 @@ A model's mask stops inside a shoulder and leaks into the hair, and no single ed
A whole drag is one step, so undo takes back a decision rather than a frame of a gesture. The list is there because arriving six steps back costs what arriving from one does.
<sub>`ui/dr-ui/ui/app.slint:2208`</sub>
<sub>`ui/dr-ui/ui/app.slint:2306`</sub>
### Do it again after taking it back
- **Touch** — Tap the step below the current one in the History list
- **Pointer** — Click it, or press Redo in the History header
- **Keyboard** — `Ctrl+Shift+Z`
- **Keyboard** — `Ctrl+Shift+Z`, or `Ctrl+Y`
- **See it** — [in the manual](manual/README.md#history-snapshots-presets)
<sub>`ui/dr-ui/ui/app.slint:2222`</sub>
<sub>`ui/dr-ui/ui/app.slint:2320`</sub>
### Remove a repair
@@ -75,7 +77,7 @@ A whole drag is one step, so undo takes back a decision rather than a frame of a
- **Pointer** — Click it, then Delete Repair
- **Keyboard** — `Delete` or `Backspace`, while repairing
<sub>`ui/dr-ui/ui/app.slint:2240`</sub>
<sub>`ui/dr-ui/ui/app.slint:2340`</sub>
### Copy the settings from this photograph
@@ -86,7 +88,7 @@ A whole drag is one step, so undo takes back a decision rather than a frame of a
The button is the copy that has to work: a tablet has no modifier key to hold and no menu bar to hang the action from. The shortcut is an accelerator for a control that is on screen either way.
<sub>`ui/dr-ui/ui/app.slint:2259`</sub>
<sub>`ui/dr-ui/ui/app.slint:2359`</sub>
### Paste the settings onto this photograph
@@ -97,7 +99,7 @@ The button is the copy that has to work: a tablet has no modifier key to hold an
The button names what would be pasted — "3 adjustments", and whether the crop is coming with it — which the shortcut cannot say. Both paste the same scope.
<sub>`ui/dr-ui/ui/app.slint:2272`</sub>
<sub>`ui/dr-ui/ui/app.slint:2372`</sub>
### Choose which kinds of edit a copy carries
@@ -108,7 +110,7 @@ The button names what would be pasted — "3 adjustments", and whether the crop
Lightroom's Copy Settings. Pasting a look across a shoot usually means leaving each frame's crop and rotation alone, and that is a choice to make at the moment of copying.
<sub>`ui/dr-ui/ui/app.slint:2290`</sub>
<sub>`ui/dr-ui/ui/app.slint:2390`</sub>
### Export this photograph as the last one was
@@ -119,7 +121,7 @@ Lightroom's Copy Settings. Pasting a look across a shoot usually means leaving e
Every export runs on the defaults in Settings, so "as the last one was" is what the button already does. The chord is Lightroom's and darktable's, kept so hands that learned it there need not learn it again.
<sub>`ui/dr-ui/ui/app.slint:2315`</sub>
<sub>`ui/dr-ui/ui/app.slint:2415`</sub>
### Choose how to export, then export
@@ -130,7 +132,35 @@ Every export runs on the defaults in Settings, so "as the last one was" is what
The export sheet is the export defaults alone with an Export button. What is chosen there is kept, so it is also what the next Ctrl+Shift+E uses.
<sub>`ui/dr-ui/ui/app.slint:2328`</sub>
<sub>`ui/dr-ui/ui/app.slint:2428`</sub>
### Keep a crop that leaves a mask outside
- **Touch** — Press "Keep crop" on the notice, or "Undo crop" to take it back
- **Pointer** — Press "Keep crop" on the notice, or "Undo crop" to take it back
- **Keyboard** — `Enter` keeps it; `Ctrl+Z` takes the crop back, like any other step
<sub>`ui/dr-ui/ui/app.slint:2493`</sub>
### Go back to the grid
- **Touch** — Press "‹ Library" in the top bar
- **Pointer** — Press "‹ Library" in the top bar
- **Keyboard** — `G`
Lightroom's key for the grid. Escape gets there too, but a step at a time — out of a mode, then out of a zoom — where this goes straight back.
<sub>`ui/dr-ui/ui/app.slint:2510`</sub>
### Nudge the control last moved
- **Touch** — Drag its track
- **Pointer** — Drag its track
- **Keyboard** — `=` or `Plus` up and `-` down, a hundredth of its travel at a time; hold for more
Lightroom's keys for the selected slider. There is no focus ring on a slider here, so "selected" is the last one moved — the same control `R` puts back — which covers the framing sliders, perspective included, as well as the adjustments.
<sub>`ui/dr-ui/ui/app.slint:2539`</sub>
### Change which group of adjustments is on screen
@@ -141,18 +171,36 @@ The export sheet is the export defaults alone with an Export button. What is cho
The groups are whatever the operation set declares itself to be about, so there are as many as the pipeline has and no key can be assigned to one of them by name. Stepping is the binding that survives a node being added.
<sub>`ui/dr-ui/ui/app.slint:2352`</sub>
<sub>`ui/dr-ui/ui/app.slint:2567`</sub>
### Look at the photograph at 1:1
- **Touch** — Double-tap the photograph
- **Pointer** — Double-click it, or press the zoom readout floating over the canvas
- **Keyboard** — `Z`
- **Keyboard** — `Z` goes in and back out; `Ctrl+1` goes to 1:1 and `Ctrl+0` back to the whole frame
- **See it** — [in the manual](manual/README.md#looking-closer)
Noise reduction and capture sharpening are judgements about single pixels, and a fitted view averages several of the file's into each one on screen — so the frame looks softer than it is and the correction goes too far. The point and the magnification survive opening the next photograph, which is what makes checking the same eye across forty portraits forty keystrokes rather than forty pans. From 1:1 on the photograph is drawn as its own pixels, each a hard-edged square, rather than smoothed into a blur.
<sub>`ui/dr-ui/ui/app.slint:2388`</sub>
<sub>`ui/dr-ui/ui/app.slint:2603`</sub>
### Rate this photograph
- **Touch** — Tap a star in the top bar
- **Pointer** — Click a star in the top bar
- **Keyboard** — `0`–`5`
<sub>`ui/dr-ui/ui/app.slint:2660`</sub>
### Pick or reject this photograph
- **Touch** — Press Pick or Reject in the top bar; again to take the flag off
- **Pointer** — Press Pick or Reject in the top bar; again to take the flag off
- **Keyboard** — `P` picks, `X` rejects and `U` takes the flag off
The grid's keys, on the photograph that is open (FR-UI-5, 2026-09-19). Judging here does not move on to the next frame: that belongs to culling, and in develop the photograph in front of you is the one being worked on.
<sub>`ui/dr-ui/ui/app.slint:2666`</sub>
### Give this photograph a colour label
@@ -163,7 +211,7 @@ Noise reduction and capture sharpening are judgements about single pixels, and a
The grid's keys, on the photograph that is open, so labelling while stepping through a folder is one hand's work. The bar names the label in words beside its mark.
<sub>`ui/dr-ui/ui/app.slint:2440`</sub>
<sub>`ui/dr-ui/ui/app.slint:2696`</sub>
### Move to the next or previous photograph
@@ -174,7 +222,7 @@ The grid's keys, on the photograph that is open, so labelling while stepping thr
The edit on screen is saved on the way out, so stepping through a folder is as much a departure as going back to the grid and loses nothing. A and D as well as the arrows, so the left hand steps along the roll while the right stays on the mouse.
<sub>`ui/dr-ui/ui/app.slint:2465`</sub>
<sub>`ui/dr-ui/ui/app.slint:2721`</sub>
### See the photograph before you edited it
@@ -185,7 +233,7 @@ The edit on screen is saved on the way out, so stepping through a folder is as m
Held rather than toggled, and no split screen: a split halves the working image on the tablet the column was sized for, and the comparison photographers describe making is a flick back and forth. It takes no history step, so checking whether a frame is overcooked costs nothing to undo afterwards.
<sub>`ui/dr-ui/ui/app.slint:2595`</sub>
<sub>`ui/dr-ui/ui/app.slint:2851`</sub>
### Put one control back to its default
@@ -242,6 +290,7 @@ A mask is judged by seeing where it falls, and two are judged by seeing where th
- **Touch** — Tap the + / − / ∩ chip on the part's row
- **Pointer** — Click the + / − / ∩ chip on the part's row
- **Keyboard** — `J` turns the selected part's chip, while masking
- **See it** — [in the manual](manual/README.md#local-adjustments)
A chip that cycles rather than a menu, because a photographer flips a join while looking at the picture, not at the panel: add, take away, keep only where both agree, and round.
@@ -256,7 +305,7 @@ A chip that cycles rather than a menu, because a photographer flips a join while
The question a correction raises is whether it did what it was for — whether the stroke filled the shoulder, whether the subtracted gradient took only the sky. Removing it answers that and loses it. The same ring the layer wears, one row down, because it is the same question about a smaller thing.
<sub>`ui/dr-ui/ui/masks.slint:407`</sub>
<sub>`ui/dr-ui/ui/masks.slint:409`</sub>
## Everywhere
@@ -268,7 +317,15 @@ The question a correction raises is whether it did what it was for — whether t
One key for "up one", innermost first: a question before the sheet under it, a sheet before the view, a view before the library. Nothing is left behind a dialogue that the key walked straight past.
<sub>`ui/dr-ui/ui/app.slint:916`</sub>
<sub>`ui/dr-ui/ui/app.slint:975`</sub>
### Do what a sheet offers
- **Touch** — Press its button — Export, or Copy
- **Pointer** — Press its button — Export, or Copy
- **Keyboard** — `Enter`, on the export and copy sheets
<sub>`ui/dr-ui/ui/app.slint:985`</sub>
## Collections sidebar
@@ -280,7 +337,7 @@ One key for "up one", innermost first: a question before the sheet under it, a s
The tree is inside a Flickable, which claims any drag beginning inside it — so with a finger a drag on a row is a scroll until something says otherwise. The hold is that something, and it is what every mobile list already uses to pick a row up. The row lifts the moment it fires, so the gesture says it has been understood before anything moves.
<sub>`ui/dr-ui/ui/collections.slint:337`</sub>
<sub>`ui/dr-ui/ui/collections.slint:351`</sub>
### Act on a collection — rename, nest, un-nest, delete
@@ -290,7 +347,7 @@ The tree is inside a Flickable, which claims any drag beginning inside it — so
The hold arms a drag and opens this menu, and which one you get is decided by whether you moved — the same fork the grid uses. One menu for everything done to a row, because there is one hold per row: while the hold opened the offline question by itself, nothing else the tree can do had a touch route.
<sub>`ui/dr-ui/ui/collections.slint:349`</sub>
<sub>`ui/dr-ui/ui/collections.slint:363`</sub>
### Take a collection back out of the one it is nested in
@@ -300,18 +357,18 @@ The hold arms a drag and opens this menu, and which one you get is decided by wh
Nesting is a drag of one row onto another, and its inverse had no gesture at all: "All photographs" refused every drop, which is right for a photograph — it is already in the library — and wrong for a collection, which has a top level to be returned to. Without it a collection dragged into another was in there permanently.
<sub>`ui/dr-ui/ui/collections.slint:360`</sub>
<sub>`ui/dr-ui/ui/collections.slint:374`</sub>
### Rename a collection
- **Touch** — Hold the collection, then "Rename"
- **Pointer** — Double-click its name, or right-click it and choose "Rename"
- **Keyboard** — `Escape` while typing abandons the new name
- **Keyboard** — Type the name and press `Enter`; `Escape` abandons it
- **See it** — [in the manual](manual/README.md#collections)
Double-click is what a file manager and a Lightroom panel use for the same thing, so it needs no discovering — but nothing on screen says so, which is what the menu item is for.
<sub>`ui/dr-ui/ui/collections.slint:374`</sub>
<sub>`ui/dr-ui/ui/collections.slint:388`</sub>
## People
@@ -323,7 +380,7 @@ Double-click is what a file manager and a Lightroom panel use for the same thing
Grouping over-merges on siblings, on parents and children, and on the same person a decade apart, so splitting is as prominent as merging. A tool that can only merge makes its own errors permanent.
<sub>`ui/dr-ui/ui/identity.slint:188`</sub>
<sub>`ui/dr-ui/ui/identity.slint:189`</sub>
### Rule on a suggested face
@@ -333,7 +390,25 @@ Grouping over-merges on siblings, on parents and children, and on the same perso
A face is either the system's guess or the user's judgement, and the two are never conflated. A rejection is remembered, so the face is not suggested for that person again. The gesture note above is the whole label: a tick and a cross are only "confirm" and "reject" to someone who can see the suggestion they sit beside, and `IconButton`'s fallback would announce them as "check" and "cross" — two icon names that say nothing about which person is being ruled on.
<sub>`ui/dr-ui/ui/identity.slint:209`</sub>
<sub>`ui/dr-ui/ui/identity.slint:210`</sub>
### Move between people
- **Touch** — Tap a person on the rail
- **Pointer** — Click a person on the rail
- **Keyboard** — `↑` and `↓`, along the rail
<sub>`ui/dr-ui/ui/identity.slint:385`</sub>
### Name a person
- **Touch** — Tap the name field over their faces, type, and press Enter
- **Pointer** — Click the name field over their faces, type, and press Enter
- **Keyboard** — `F2` puts the name field under the keys
The rename key everywhere else. Enter finishes the name and hands the keys back to the rail, so naming a run of people is `Down`, `F2`, a name, Enter, over and over.
<sub>`ui/dr-ui/ui/identity.slint:391`</sub>
### See a person's photographs
@@ -343,7 +418,7 @@ A face is either the system's guess or the user's judgement, and the two are nev
This is the point of having identified anybody. Without it the screen is a filing cabinet with no drawer handles.
<sub>`ui/dr-ui/ui/identity.slint:637`</sub>
<sub>`ui/dr-ui/ui/identity.slint:689`</sub>
### Change how faces are grouped
@@ -353,7 +428,7 @@ This is the point of having identified anybody. Without it the screen is a filin
The right match confidence is a property of your library, not of the model. "What would this do?" answers for this library without writing anything; names, confirmations and the groups you have set aside are kept whatever the dials say.
<sub>`ui/dr-ui/ui/identity.slint:675`</sub>
<sub>`ui/dr-ui/ui/identity.slint:727`</sub>
## Library grid
@@ -365,7 +440,7 @@ The right match confidence is a property of your library, not of the model. "Wha
Touch has no ctrl, so without a mode there is no way to select a second photograph — the first tap would open it. The hold is the fast way in and the button is the one that can be found.
<sub>`ui/dr-ui/ui/library.slint:1630`</sub>
<sub>`ui/dr-ui/ui/library.slint:1650`</sub>
### Add or remove one photograph
@@ -375,7 +450,7 @@ Touch has no ctrl, so without a mode there is no way to select a second photogra
While selecting, a tap never opens. That is the whole point of the mode: one meaning per gesture at a time. Press Done to get tap-to-open back.
<sub>`ui/dr-ui/ui/library.slint:1640`</sub>
<sub>`ui/dr-ui/ui/library.slint:1660`</sub>
### Leave selecting
@@ -384,7 +459,7 @@ While selecting, a tap never opens. That is the whole point of the mode: one mea
- **Keyboard** — `Escape`, or `Back`; an open sheet closes first
- **See it** — [in the manual](manual/README.md#selecting-several)
<sub>`ui/dr-ui/ui/library.slint:1649`</sub>
<sub>`ui/dr-ui/ui/library.slint:1669`</sub>
### Pick a photograph up to drag it
@@ -394,7 +469,7 @@ While selecting, a tap never opens. That is the whole point of the mode: one mea
A finger on a photograph might be starting a scroll, and for the first half-second the grid assumes it is. Holding says otherwise, and the ring is the grid saying it heard — from there the drag cannot be lost to a scroll. A mouse never waits: the cursor is precise enough that a sideways drag is unambiguous from the first pixel.
<sub>`ui/dr-ui/ui/library.slint:1680`</sub>
<sub>`ui/dr-ui/ui/library.slint:1700`</sub>
### Select a range
@@ -405,7 +480,7 @@ A finger on a photograph might be starting a scroll, and for the first half-seco
This replaced a double tap, which had no visible state and could take forty photographs by accident. The run is resolved by the catalog rather than by what is on screen, so the grid can scroll between the two taps — the ranges that hurt on a tablet are longer than a screenful, which is exactly where a finger sweep runs out.
<sub>`ui/dr-ui/ui/library.slint:1746`</sub>
<sub>`ui/dr-ui/ui/library.slint:1766`</sub>
### Take the blinks out of a burst
@@ -415,7 +490,7 @@ This replaced a double tap, which had no visible state and could take forty phot
Face indexing reads each face's eyes. The chip drops frames where the chosen people are caught blinking, and leaves sunglasses and eyes it could not read alone.
<sub>`ui/dr-ui/ui/library.slint:2463`</sub>
<sub>`ui/dr-ui/ui/library.slint:2483`</sub>
### Find photographs with two people in them
@@ -425,7 +500,7 @@ Face indexing reads each face's eyes. The chip drops frames where the chosen peo
"Any of them" is a union and "all of them" is an intersection. The tray is where both terms and the choice between them live, because a filter belongs on the filter bar.
<sub>`ui/dr-ui/ui/library.slint:2493`</sub>
<sub>`ui/dr-ui/ui/library.slint:2513`</sub>
### Show only photographs with one colour label
@@ -435,7 +510,7 @@ Face indexing reads each face's eyes. The chip drops frames where the chosen peo
Each chip is the label's mark and its name, so the one you want is found by reading it; tap the lit chip again to show every label.
<sub>`ui/dr-ui/ui/library.slint:2617`</sub>
<sub>`ui/dr-ui/ui/library.slint:2637`</sub>
### Export the selection as the last export was
@@ -446,7 +521,7 @@ Each chip is the label's mark and its name, so the one you want is found by read
Lightroom's and darktable's chords. Every export runs on the saved defaults, so the plain chord opens them beside an Export button and the shifted one skips straight to exporting.
<sub>`ui/dr-ui/ui/library.slint:3083`</sub>
<sub>`ui/dr-ui/ui/library.slint:3107`</sub>
### Paste copied settings onto the selection
@@ -455,7 +530,17 @@ Lightroom's and darktable's chords. Every export runs on the saved defaults, so
- **Keyboard** — `Ctrl+V`
- **See it** — [in the manual](manual/README.md#copying-settings)
<sub>`ui/dr-ui/ui/library.slint:3107`</sub>
<sub>`ui/dr-ui/ui/library.slint:3131`</sub>
### Keyword the selection
- **Touch** — Select them, then Keywords in the selection bar
- **Pointer** — Select them, then Keywords in the selection bar
- **Keyboard** — `Ctrl+K`
Lightroom's keywording chord. The sheet opens with its field ready for typing, so the keys that judge in the grid are out of the way until it closes.
<sub>`ui/dr-ui/ui/library.slint:3160`</sub>
### Show only photographs with some number of stars
@@ -466,7 +551,7 @@ Lightroom's and darktable's chords. Every export runs on the saved defaults, so
The chips say "this many or more". A range with a ceiling — the twos and threes still to be decided — is the keyboard's alone, and the bar says so in words while it holds.
<sub>`ui/dr-ui/ui/library.slint:3128`</sub>
<sub>`ui/dr-ui/ui/library.slint:3194`</sub>
### Give photographs a colour label
@@ -477,15 +562,17 @@ The chips say "this many or more". A range with a ceiling — the twos and three
Lightroom's keys, so hands that learned them there need not learn them again. Purple has no key there either, and is on the bar. Every mark carries its label's initial, so the label is read without telling the colours apart.
<sub>`ui/dr-ui/ui/library.slint:3178`</sub>
<sub>`ui/dr-ui/ui/library.slint:3244`</sub>
### Pick or reject a photograph
- **Touch** — Select them, then Flag in the selection bar and Pick, Reject or No flag
- **Pointer** — Select them, then Flag in the selection bar and Pick, Reject or No flag
- **Keyboard** — `P` picks, `X` rejects and `U` takes the flag off, with the pointer over it or on the selection
The keys every culling tool uses, so muscle memory built elsewhere works here.
<sub>`ui/dr-ui/ui/library.slint:3202`</sub>
<sub>`ui/dr-ui/ui/library.slint:3268`</sub>
### Move photographs to the trash
@@ -495,7 +582,7 @@ The keys every culling tool uses, so muscle memory built elsewhere works here.
The bin acts on one photograph, so a stray click cannot trash a selection; the key acts on the selection because that is what every file manager's Delete does. Both are undone from the trash view.
<sub>`ui/dr-ui/ui/library.slint:3225`</sub>
<sub>`ui/dr-ui/ui/library.slint:3295`</sub>
### Open this list
@@ -503,7 +590,7 @@ The bin acts on one photograph, so a stray click cannot trash a selection; the k
- **Pointer** — Press Help in the header
- **Keyboard** — `F1`
<sub>`ui/dr-ui/ui/library.slint:3250`</sub>
<sub>`ui/dr-ui/ui/library.slint:3320`</sub>
### Rename the collection the grid is showing
@@ -511,7 +598,7 @@ The bin acts on one photograph, so a stray click cannot trash a selection; the k
- **Pointer** — Double-click it in the sidebar
- **Keyboard** — `F2`
<sub>`ui/dr-ui/ui/library.slint:3256`</sub>
<sub>`ui/dr-ui/ui/library.slint:3326`</sub>
### Move through the grid
@@ -521,17 +608,18 @@ The bin acts on one photograph, so a stray click cannot trash a selection; the k
The cursor selects what it lands on, so walking and judging are one hand's work.
<sub>`ui/dr-ui/ui/library.slint:3276`</sub>
<sub>`ui/dr-ui/ui/library.slint:3346`</sub>
### Resize the thumbnails
- **Touch** — Pinch the grid with two fingers
- **Pointer** — Ctrl and the scroll wheel
- **Keyboard** — `=` or `Plus` for larger, `-` for smaller
- **See it** — [in the manual](manual/README.md#getting-about)
There is no wheel on a tablet, so without the pinch the cell size could only be changed by a control a finger cannot reach.
<sub>`ui/dr-ui/ui/library.slint:3403`</sub>
<sub>`ui/dr-ui/ui/library.slint:3473`</sub>
### File photographs in a collection
@@ -541,7 +629,7 @@ There is no wheel on a tablet, so without the pinch the cell size could only be
The selection is what the drag carries, which is why selecting several is worth the mode: forty photographs file in one gesture.
<sub>`ui/dr-ui/ui/library.slint:3601`</sub>
<sub>`ui/dr-ui/ui/library.slint:3672`</sub>
### Open a photograph
@@ -552,7 +640,7 @@ The selection is what the drag carries, which is why selecting several is worth
A tap opens; a tap that *moved* does not. Travel is what separates a deliberate tap from a hand brushing past, and it is the only thing that does: the two are the same length. An earlier version required the finger to dwell 120 ms instead, and that rejected ordinary taps — a real tap is often quicker than a brush.
<sub>`ui/dr-ui/ui/library.slint:3898`</sub>
<sub>`ui/dr-ui/ui/library.slint:3969`</sub>
### Rate a photograph without opening it
@@ -563,7 +651,7 @@ A tap opens; a tap that *moved* does not. Travel is what separates a deliberate
A star has to take the press without it also reaching the cell, or every rating throws the user into develop.
<sub>`ui/dr-ui/ui/library.slint:4021`</sub>
<sub>`ui/dr-ui/ui/library.slint:4092`</sub>
### Choose the frame a folded burst shows
@@ -573,17 +661,18 @@ A star has to take the press without it also reaching the cell, or every rating
A folded burst draws its earliest frame, which is a fact about the clock and not a judgement about the photograph — nothing in this application ranks a frame (FR-CULL-5). But the point of a burst is that one of the twelve is better than the other eleven, and the photographer is the only one who knows which. So the choice is offered on the frames themselves, while they are open and side by side, which is the one moment the alternatives are on screen to be compared.
<sub>`ui/dr-ui/ui/library.slint:4154`</sub>
<sub>`ui/dr-ui/ui/library.slint:4225`</sub>
### Drop the selection but keep selecting
- **Touch** — Press Clear in the selection strip
- **Pointer** — Press Clear in the selection strip
- **Keyboard** — `Ctrl+D` or `Ctrl+Shift+A`
- **See it** — [in the manual](manual/README.md#selecting-several)
Distinct from Done, which leaves the mode entirely. Clearing keeps it, so the next selection can start straight away.
<sub>`ui/dr-ui/ui/library.slint:4831`</sub>
<sub>`ui/dr-ui/ui/library.slint:4902`</sub>
### Select everything the grid is showing
@@ -594,7 +683,7 @@ Distinct from Done, which leaves the mode entirely. Clearing keeps it, so the ne
A scoped grid of two hundred frames is two hundred taps otherwise, and "all of them, except those three" is a far more common shape than the taps it took to say it.
<sub>`ui/dr-ui/ui/library.slint:4849`</sub>
<sub>`ui/dr-ui/ui/library.slint:4921`</sub>
### Take photographs out of a collection
@@ -604,4 +693,4 @@ A scoped grid of two hundred frames is two hundred taps otherwise, and "all of t
The badge on a cell says a photograph is filed in three collections and never which. This is the sheet that names them, and the only way out of one the grid is not currently scoped to.
<sub>`ui/dr-ui/ui/library.slint:4991`</sub>
<sub>`ui/dr-ui/ui/library.slint:5102`</sub>
ui/dr-ui/src/develop_ui.rs
+40
View File
@@ -411,6 +411,46 @@ fn wire_adjustments(window: &AppWindow, w: &DevelopWiring) {
redraw(&w);
});
}
{
// TRACES: FR-DEV-16
// The nudge keys, on the control last moved: a hundredth of its
// travel, which is the step the slider's own increment takes. Read
// off the row on screen rather than the descriptor, because the row
// is what the photographer is looking at — with masks selected it is
// the layer's value, not the global one.
//
// Scalars only. A switch or a choice has no "a little more", and a
// curve's points are not one number.
let weak = window.as_weak();
let session = session.clone();
let redraw = redraw.clone();
let rows = rows.clone();
window
.global::<Adjustments>()
.on_param_nudged(move |op, param, direction| {
use slint::Model as _;
let Some(w) = weak.upgrade() else { return };
let shown = w.global::<Adjustments>().get_rows();
let Some(row) = shown
.iter()
.find(|r| r.op_index == op && r.param_index == param)
else {
return;
};
if row.kind != "scalar" || row.maximum <= row.minimum {
return;
}
let step = (row.maximum - row.minimum) / 100.0;
let value =
(row.value + direction.signum() as f32 * step).clamp(row.minimum, row.maximum);
if let Some(s) = session.borrow_mut().as_mut() {
s.set_param(op, param, value);
s.rebake_film_if_affected(op);
}
sync_rows(&w, &rows, &session);
redraw(&w);
});
}
// TRACES: FR-DEV-3
// The local-adjustment panel. Wired as a block rather than inline because
// it is a dozen callbacks that all say the same three things, and they
ui/dr-ui/src/gesture_book.rs
+82 -10
View File
@@ -37,7 +37,7 @@ pub const GESTURES: &[Gesture] = &[
section: "Develop",
touch: "Pinch it with two fingers",
pointer: "The scroll wheel over it",
keys: "",
keys: "Ctrl+= or Ctrl+Plus in, Ctrl+- out, about the middle of the view",
manual: "looking-closer",
},
Gesture {
@@ -45,7 +45,7 @@ pub const GESTURES: &[Gesture] = &[
section: "Develop",
touch: "Drag it",
pointer: "Drag it",
keys: "",
keys: "Shift+←, Shift+→, Shift+↑ and Shift+↓, a fifth of the view at a time",
manual: "looking-closer",
},
Gesture {
@@ -69,7 +69,7 @@ pub const GESTURES: &[Gesture] = &[
section: "Develop",
touch: "Tap the step below the current one in the History list",
pointer: "Click it, or press Redo in the History header",
keys: "Ctrl+Shift+Z",
keys: "Ctrl+Shift+Z, or Ctrl+Y",
manual: "history-snapshots-presets",
},
Gesture {
@@ -120,6 +120,30 @@ pub const GESTURES: &[Gesture] = &[
keys: "Ctrl+E",
manual: "export",
},
Gesture {
title: "Keep a crop that leaves a mask outside",
section: "Develop",
touch: "Press \"Keep crop\" on the notice, or \"Undo crop\" to take it back",
pointer: "Press \"Keep crop\" on the notice, or \"Undo crop\" to take it back",
keys: "Enter keeps it; Ctrl+Z takes the crop back, like any other step",
manual: "",
},
Gesture {
title: "Go back to the grid",
section: "Develop",
touch: "Press \"‹ Library\" in the top bar",
pointer: "Press \"‹ Library\" in the top bar",
keys: "G",
manual: "",
},
Gesture {
title: "Nudge the control last moved",
section: "Develop",
touch: "Drag its track",
pointer: "Drag its track",
keys: "= or Plus up and - down, a hundredth of its travel at a time; hold for more",
manual: "",
},
Gesture {
title: "Change which group of adjustments is on screen",
section: "Develop",
@@ -133,9 +157,25 @@ pub const GESTURES: &[Gesture] = &[
section: "Develop",
touch: "Double-tap the photograph",
pointer: "Double-click it, or press the zoom readout floating over the canvas",
keys: "Z",
keys: "Z goes in and back out; Ctrl+1 goes to 1:1 and Ctrl+0 back to the whole frame",
manual: "looking-closer",
},
Gesture {
title: "Rate this photograph",
section: "Develop",
touch: "Tap a star in the top bar",
pointer: "Click a star in the top bar",
keys: "0–5",
manual: "",
},
Gesture {
title: "Pick or reject this photograph",
section: "Develop",
touch: "Press Pick or Reject in the top bar; again to take the flag off",
pointer: "Press Pick or Reject in the top bar; again to take the flag off",
keys: "P picks, X rejects and U takes the flag off",
manual: "",
},
Gesture {
title: "Give this photograph a colour label",
section: "Develop",
@@ -205,7 +245,7 @@ pub const GESTURES: &[Gesture] = &[
section: "Develop",
touch: "Tap the + / − / ∩ chip on the part's row",
pointer: "Click the + / − / ∩ chip on the part's row",
keys: "",
keys: "J turns the selected part's chip, while masking",
manual: "local-adjustments",
},
Gesture {
@@ -224,6 +264,14 @@ pub const GESTURES: &[Gesture] = &[
keys: "Escape, or Back where the device has one",
manual: "",
},
Gesture {
title: "Do what a sheet offers",
section: "Everywhere",
touch: "Press its button — Export, or Copy",
pointer: "Press its button — Export, or Copy",
keys: "Enter, on the export and copy sheets",
manual: "",
},
Gesture {
title: "Pick a collection up to rearrange the tree",
section: "Collections sidebar",
@@ -253,7 +301,7 @@ pub const GESTURES: &[Gesture] = &[
section: "Collections sidebar",
touch: "Hold the collection, then \"Rename\"",
pointer: "Double-click its name, or right-click it and choose \"Rename\"",
keys: "Escape while typing abandons the new name",
keys: "Type the name and press Enter; Escape abandons it",
manual: "collections",
},
Gesture {
@@ -272,6 +320,22 @@ pub const GESTURES: &[Gesture] = &[
keys: "",
manual: "people",
},
Gesture {
title: "Move between people",
section: "People",
touch: "Tap a person on the rail",
pointer: "Click a person on the rail",
keys: "↑ and ↓, along the rail",
manual: "",
},
Gesture {
title: "Name a person",
section: "People",
touch: "Tap the name field over their faces, type, and press Enter",
pointer: "Click the name field over their faces, type, and press Enter",
keys: "F2 puts the name field under the keys",
manual: "",
},
Gesture {
title: "See a person's photographs",
section: "People",
@@ -368,6 +432,14 @@ pub const GESTURES: &[Gesture] = &[
keys: "Ctrl+V",
manual: "copying-settings",
},
Gesture {
title: "Keyword the selection",
section: "Library grid",
touch: "Select them, then Keywords in the selection bar",
pointer: "Select them, then Keywords in the selection bar",
keys: "Ctrl+K",
manual: "",
},
Gesture {
title: "Show only photographs with some number of stars",
section: "Library grid",
@@ -387,8 +459,8 @@ pub const GESTURES: &[Gesture] = &[
Gesture {
title: "Pick or reject a photograph",
section: "Library grid",
touch: "",
pointer: "",
touch: "Select them, then Flag in the selection bar and Pick, Reject or No flag",
pointer: "Select them, then Flag in the selection bar and Pick, Reject or No flag",
keys: "P picks, X rejects and U takes the flag off, with the pointer over it or on the selection",
manual: "",
},
@@ -429,7 +501,7 @@ pub const GESTURES: &[Gesture] = &[
section: "Library grid",
touch: "Pinch the grid with two fingers",
pointer: "Ctrl and the scroll wheel",
keys: "",
keys: "= or Plus for larger, - for smaller",
manual: "getting-about",
},
Gesture {
@@ -469,7 +541,7 @@ pub const GESTURES: &[Gesture] = &[
section: "Library grid",
touch: "Press Clear in the selection strip",
pointer: "Press Clear in the selection strip",
keys: "",
keys: "Ctrl+D or Ctrl+Shift+A",
manual: "selecting-several",
},
Gesture {
ui/dr-ui/src/identity_ui.rs
+53
View File
@@ -798,6 +798,44 @@ fn wire_navigation(
reset_name_field(&w);
});
}
// TRACES: FR-UI-5
// Up and down the rail from the keyboard. The rail's order is the model's
// order, so the neighbour is found there and then picked exactly as a
// click on it would pick it — one path for selecting a person, whichever
// way it was asked for. Stops at either end rather than wrapping: a rail
// of two thousand people that jumped from the last to the first would
// lose the user's place.
{
let weak = window.as_weak();
window.on_identity_person_stepped(move |delta| {
let Some(w) = weak.upgrade() else { return };
let people = w.get_identity_people();
let ids: Vec<i32> = people.iter().map(|p| p.id).collect();
if let Some(id) = stepped_person(&ids, w.get_identity_selected(), delta) {
w.invoke_identity_person_picked(id);
}
});
}
}
/// The person `delta` places along the rail from `selected`, or `None` where
/// that is off either end or the rail is empty. With nobody selected, the
/// first key down the rail takes the first person and up takes the last.
fn stepped_person(ids: &[i32], selected: i32, delta: i32) -> Option<i32> {
let last = ids.len().checked_sub(1)?;
let next = match ids.iter().position(|id| *id == selected) {
Some(at) => {
let to = at as i64 + delta.signum() as i64;
if to < 0 || to > last as i64 {
return None;
}
to as usize
}
None if delta < 0 => last,
None => 0,
};
ids.get(next).copied()
}
/// Renaming a person, and the namesake merge offer a rename can raise.
@@ -1600,6 +1638,21 @@ fn park_cover_timer(timer: Option<slint::Timer>) {
#[cfg(test)]
mod tests {
use super::stepped_person;
/// TRACES: FR-UI-5
#[test]
fn stepping_the_rail_stops_at_either_end() {
let rail = [7, 3, 9];
assert_eq!(stepped_person(&rail, 3, 1), Some(9));
assert_eq!(stepped_person(&rail, 3, -1), Some(7));
assert_eq!(stepped_person(&rail, 9, 1), None);
assert_eq!(stepped_person(&rail, 7, -1), None);
assert_eq!(stepped_person(&rail, -1, 1), Some(7));
assert_eq!(stepped_person(&rail, -1, -1), Some(9));
assert_eq!(stepped_person(&[], -1, 1), None);
}
use super::*;
#[test]
ui/dr-ui/src/lib.rs
+9 -10
View File
@@ -448,6 +448,7 @@ fn reset_view_state(window: &AppWindow) {
// would land on whichever control happens to share them.
window.global::<Adjustments>().set_touched_op(-1);
window.global::<Adjustments>().set_touched_param(-1);
window.global::<Framing>().set_touched(0);
// TRACES: FR-DSP-7
// Emptied rather than left standing: the previous photograph's histogram
// beside the next one's filename is a confident, precise lie, and the gap
@@ -3433,19 +3434,17 @@ fn apply_layout_class(
/// the activity — the behaviour every application there has, and the reason
/// this answers with a bool rather than swallowing the gesture.
fn back_one_step(w: &AppWindow) -> bool {
// TRACES: FR-UI-5 | FR-UI-4
// The Identity screen has no representation in `NavState`: nothing here
// records which view it replaced, only `identity_ui`'s own
// `came_from_library`, which this function has no reason to reach for
// over one screen. Before this refactor, back queued nothing behind
// Identity opened from the library (show-library stayed true, unread by
// anything) and queued `ToLibrary` behind Identity opened from develop —
// but `ToLibrary` only ever set `show-library`, a property
// `IdentityScreen`'s own `if` never read, so both cases looked the same
// on screen: nothing happened. Swallowing the gesture here keeps that:
// falling into the general case below would instead write `active-view`,
// which `IdentityScreen`'s `if` *does* read, and close the screen as a
// side effect nobody asked for.
// `came_from_library`. So back leaves it the way its own "‹ Library" /
// "‹ Develop" button does, through `identity-close`, which knows where it
// came from — rather than through the general case below, which would
// write `active-view` without that knowledge. It used to swallow the key
// and do nothing, which left Escape and Android's Back dead on a whole
// screen.
if w.get_active_view() == View::Identity {
w.invoke_identity_close();
return true;
}
ui/dr-ui/src/library_ui/ratings_keywords.rs
+23
View File
@@ -986,6 +986,29 @@ pub(super) fn wire_ratings_and_flags(
});
}
// TRACES: FR-UI-5 | FR-CULL-4
// The flag of one photograph by row: develop's Pick and Reject, and its
// P, X and U. The open photograph only, for the reason a star clicked in
// the grid rates only its own cell — develop is working on one frame, and
// a selection left behind in the grid is not what is in front of it.
{
let weak = window.as_weak();
let ctl = ctl.clone();
window
.global::<Library>()
.on_library_cell_flagged(move |row, flag| {
let Some(w) = weak.upgrade() else { return };
let id = ctl
.image_ids
.borrow()
.get(row as usize)
.map(|id| dr_types::ImageId(*id as u64));
let Some(id) = id else { return };
apply_judgement(&w, &ctl, &[id], None, Some(flag_from_code(flag)));
});
}
// Fold a burst up, or open it out (FR-CULL-5). A reload rather than a repaint, because
// it changes what the grid's query returns — see [`crate::bursts::toggle`].
{
ui/dr-ui/src/masks_ui.rs
+41
View File
@@ -1136,6 +1136,47 @@ fn wire_layers_parts(
redraw(&w);
});
}
{
// TRACES: FR-DEV-16 | FR-DEV-19a
// The keyboard's turn of the join chip: the part the tools point at,
// on the one layer being edited, one step round the chip's own cycle.
// Nothing with several layers selected — a part belongs to one — and
// nothing on the base part, which joins nothing.
let weak = window.as_weak();
let session = session.clone();
let redraw = redraw.clone();
window
.global::<Masking>()
.on_selected_part_join_cycled(move || {
let Some(w) = weak.upgrade() else { return };
{
let mut slot = session.borrow_mut();
let Some(s) = slot.as_mut() else { return };
let [id] = s.active_masks() else { return };
let id = id.clone();
let index = s.active_part();
if index == 0 {
return;
}
let Some(join) = s
.masks()
.get(&id)
.and_then(|l| l.part(index))
.map(|p| p.join)
else {
return;
};
let at = dr_pipeline::mask::Join::ALL
.iter()
.position(|j| *j == join)
.unwrap_or(0);
let next = (at + 1) % dr_pipeline::mask::Join::ALL.len();
s.set_mask_part_join(&id, index, next);
}
sync(&w, &session);
redraw(&w);
});
}
{
let weak = window.as_weak();
let session = session.clone();
ui/dr-ui/ui/adjust.slint
+26 -3
View File
@@ -647,6 +647,11 @@ export global Framing {
in property <float> keystone-v: 0.0;
in property <float> keystone-h: 0.0;
in property <float> max-keystone: 100.0;
/// TRACES: FR-DEV-16
/// Which framing slider was moved last — 1 straighten, 2 vertical,
/// 3 horizontal — or 0 when the last control moved was an adjustment
/// (see `Adjustments.touched-op`). What `R` and the nudge keys act on.
in-out property <int> touched: 0;
/// Any of crop, angle, keystone, rotation or flips differs from neutral — what
/// lights the section's dot and enables its reset. Distinct from the crop
/// rect being non-full: a rotation or a flip is an edit with the crop
@@ -813,7 +818,11 @@ export component ComposePanel inherits Rectangle {
minimum: -Framing.max-straighten;
maximum: Framing.max-straighten;
unit: "°";
changed(v) => { Framing.angle-changed(v); }
changed(v) => {
Framing.touched = 1;
Adjustments.touched-op = -1;
Framing.angle-changed(v);
}
committed(v) => { Framing.angle-committed(v); }
reset => { Framing.angle-changed(0); }
}
@@ -831,7 +840,11 @@ export component ComposePanel inherits Rectangle {
minimum: -Framing.max-keystone;
maximum: Framing.max-keystone;
unit: "";
changed(v) => { Framing.keystone-v-changed(v); }
changed(v) => {
Framing.touched = 2;
Adjustments.touched-op = -1;
Framing.keystone-v-changed(v);
}
committed(v) => { Framing.keystone-committed(); }
reset => {
Framing.keystone-v-changed(0);
@@ -845,7 +858,11 @@ export component ComposePanel inherits Rectangle {
minimum: -Framing.max-keystone;
maximum: Framing.max-keystone;
unit: "";
changed(v) => { Framing.keystone-h-changed(v); }
changed(v) => {
Framing.touched = 3;
Adjustments.touched-op = -1;
Framing.keystone-h-changed(v);
}
committed(v) => { Framing.keystone-committed(); }
reset => {
Framing.keystone-h-changed(0);
@@ -1004,6 +1021,11 @@ export global Adjustments {
callback param-changed(int, int, float);
callback param-reset(int, int);
/// TRACES: FR-DEV-16
/// Move one scalar control a hundredth of its travel, up for a positive
/// direction — the nudge keys, on the control last moved. Rust reads the
/// range off the row, where it is.
callback param-nudged(int, int, int);
/// TRACES: FR-DEV-16
/// The control last moved, so a key can put it back.
///
/// The generated rows have no focus: they are a model the repeater
@@ -1531,6 +1553,7 @@ export component AdjustPanel inherits Rectangle {
curve-channel: Adjustments.curve-channel;
drag-changed(on) => { root.slider-dragging = on; }
param-changed(op, param, v) => {
Framing.touched = 0;
Adjustments.touched-op = op;
Adjustments.touched-param = param;
Adjustments.param-changed(op, param, v);
ui/dr-ui/ui/app.slint
+263 -16
View File
@@ -384,6 +384,9 @@ export component AppWindow inherits Window {
callback identity-open();
callback identity-close();
/// TRACES: FR-UI-5
/// Up or down the people rail by one, from the keyboard.
callback identity-person-stepped(int);
callback identity-person-picked(int);
callback identity-rename(string);
callback identity-merge-accept();
@@ -651,6 +654,62 @@ export component AppWindow inherits Window {
/// The copy sheet: which kinds of edit a copy carries, and Copy. Ctrl+Shift+C.
in-out property <bool> copy-sheet-open: false;
/// TRACES: FR-EXP-7 | FR-UI-5
/// Whether the export sheet's button would do anything — the develop
/// view's photograph, or the grid's selection. One definition for the
/// button and for Enter, so the key cannot export what the greyed button
/// would not.
property <bool> export-sheet-can-export: root.active-view == View.develop
? !root.export-busy && root.total > 0
: !Library.library-exporting && Library.library-selected-count > 0;
/// What the export sheet's button does.
function export-from-sheet() {
root.export-sheet-open = false;
if (root.active-view == View.develop) {
root.export-image();
} else {
Library.library-export-selection();
}
}
/// TRACES: FR-DEV-16 | FR-DEV-20
/// The framing slider moved last, nudged a hundredth of its travel — the
/// step its own increment takes — and committed, because one keystroke is
/// a whole gesture and the refit of the crop hangs off the end of one.
function framing-nudged(direction: int) {
if (Framing.touched == 1) {
Framing.angle-changed(clamp(
Framing.angle + direction * Framing.max-straighten / 50,
-Framing.max-straighten, Framing.max-straighten));
Framing.angle-committed(Framing.angle);
} else if (Framing.touched == 2) {
Framing.keystone-v-changed(clamp(
Framing.keystone-v + direction * Framing.max-keystone / 50,
-Framing.max-keystone, Framing.max-keystone));
Framing.keystone-committed();
} else if (Framing.touched == 3) {
Framing.keystone-h-changed(clamp(
Framing.keystone-h + direction * Framing.max-keystone / 50,
-Framing.max-keystone, Framing.max-keystone));
Framing.keystone-committed();
}
}
/// TRACES: FR-DEV-16 | FR-DEV-20
/// The framing slider moved last, back to level — what its own reset does.
function framing-reset-touched() {
if (Framing.touched == 1) {
Framing.angle-changed(0);
} else if (Framing.touched == 2) {
Framing.keystone-v-changed(0);
Framing.keystone-committed();
} else if (Framing.touched == 3) {
Framing.keystone-h-changed(0);
Framing.keystone-committed();
}
}
/// TRACES: FR-UI-5
/// One photograph along, from the keyboard.
///
@@ -923,6 +982,12 @@ in property <bool> panel-visible: true;
// view before the library. Nothing is left behind a
// dialogue that the key walked straight past.
//
// GESTURE: Do what a sheet offers
// where: Everywhere
// touch: Press its button — Export, or Copy
// pointer: Press its button — Export, or Copy
// keys: `Enter`, on the export and copy sheets
//
// KEYMAP: Everywhere
key-pressed(event) => {
// Escape alongside Back: the same "go up one" on a keyboard, and
@@ -971,6 +1036,21 @@ in property <bool> panel-visible: true;
}
return root.back-requested() ? accept : reject;
}
// TRACES: FR-UI-5 | FR-EXP-7 | FR-DEV-6
// Enter does what the sheet's own button does. A text field in
// the sheet that has focus takes Enter first, so typing a folder
// name and pressing it does not export from under the typing.
if (Keys.chord(event) == "Enter") {
if (root.export-sheet-open && root.export-sheet-can-export) {
root.export-from-sheet();
return accept;
}
if (root.copy-sheet-open && root.total > 0 && root.load-error == "") {
root.copy-sheet-open = false;
Transfer.copy();
return accept;
}
}
return reject;
}
@@ -1195,6 +1275,7 @@ in property <bool> panel-visible: true;
check-coverage() => { root.identity-check-coverage(); }
delete-all-face-data() => { root.identity-delete-all(); }
close() => { root.identity-close(); }
person-stepped(d) => { root.identity-person-stepped(d); }
}
// The launch screen replaces the whole window rather than overlaying it:
@@ -1292,6 +1373,9 @@ in property <bool> panel-visible: true;
Collections.collection-rename-commit(id, name);
}
rename-cancel() => { Collections.collection-rename-cancel(); }
// The name field took the keyboard; when a key
// finished the name, the grid gets it back.
keys-released() => { library-grid.take-keys(); }
trash-count: Collections.trash-count;
trash-label: Collections.trash-label;
selected-count: Library.library-selected-count;
@@ -1305,7 +1389,7 @@ in property <bool> panel-visible: true;
}
}
LibraryGrid {
library-grid := LibraryGrid {
horizontal-stretch: 1;
// FR-UI-1: the header collapses its actions behind a
// disclosure below the breakpoint. A tablet in portrait is
@@ -1526,6 +1610,15 @@ in property <bool> panel-visible: true;
label-picked(code) => {
Library.library-cell-labelled(Library.library-roll-current, code, false);
}
// TRACES: FR-UI-5 | FR-CULL-4
// The open photograph's stars and flag, read from its cell as
// the label is; -1 with no library to hold them.
rating: Library.library-total > 0 && Library.library-roll-current >= 0
? Library.library-cells[Library.library-roll-current].rating : -1;
flag: Library.library-total > 0 && Library.library-roll-current >= 0
? Library.library-cells[Library.library-roll-current].flag : 0;
rated(n) => { Library.library-cell-rated(Library.library-roll-current, n); }
flagged(f) => { Library.library-cell-flagged(Library.library-roll-current, f); }
position: root.total > 0 ? root.index + 1 + " / " + root.total : "";
// Only where a library was opened; command-line files have no
// grid to return to.
@@ -1793,6 +1886,8 @@ in property <bool> panel-visible: true;
// where: Develop
// touch: Pinch it with two fingers
// pointer: The scroll wheel over it
// keys: `Ctrl+=` or `Ctrl+Plus` in, `Ctrl+-` out,
// about the middle of the view
// why: Anchored on the fingers' midpoint, and on the
// pointer, so the gesture reads as magnifying
// the picture rather than sliding it about.
@@ -1887,6 +1982,9 @@ in property <bool> panel-visible: true;
// where: Develop
// touch: Drag it
// pointer: Drag it
// keys: `Shift+Left`, `Shift+Right`, `Shift+Up`
// and `Shift+Down`, a fifth of the view
// at a time
// why: Only once there is something outside the
// viewport to reach, which is why the
// cursor becomes a hand exactly then. The
@@ -2225,15 +2323,17 @@ in property <bool> panel-visible: true;
// the History list
// pointer: Click it, or press Redo in the
// History header
// keys: `Ctrl+Shift+Z`
// keys: `Ctrl+Shift+Z`, or `Ctrl+Y`
// manual: history-snapshots-presets
//
// Ctrl+Z and Ctrl+Shift+Z (FR-DEV-5).
// Ctrl+Z and Ctrl+Shift+Z (FR-DEV-5), and Ctrl+Y for
// hands that learned redo on Windows.
if (Keys.chord(event) == "Ctrl+Z") {
Steps.undo();
return accept;
}
if (Keys.chord(event) == "Ctrl+Shift+Z") {
if (Keys.chord(event) == "Ctrl+Shift+Z"
|| Keys.chord(event) == "Ctrl+Y") {
Steps.redo();
return accept;
}
@@ -2349,6 +2449,121 @@ in property <bool> panel-visible: true;
root.export-options-open();
return accept;
}
// TRACES: FR-UI-4 | FR-DEV-16
// Magnification from the keyboard: in and out about
// the middle of the view, the fit and the 1:1 by
// name. Photoshop's and Lightroom's chords. Not while
// composing, which drops the zoom on the way in so
// the crop handles stay on screen; the wheel and the
// pinch stand down there too.
if (!Develop.cropping) {
if (Keys.chord(event) == "Ctrl+=" || Keys.chord(event) == "Ctrl+Plus") {
root.zoom-at(1.25, 0.5, 0.5);
return accept;
}
if (Keys.chord(event) == "Ctrl+-") {
root.zoom-at(0.8, 0.5, 0.5);
return accept;
}
// The toggle goes out to fit from any zoom, so fit is
// the toggle when zoomed and nothing when not; and
// 1:1 is the toggle from fit — twice from a zoom
// that is not 1:1, once out and once back in.
if (Keys.chord(event) == "Ctrl+0") {
if (root.zoomed) { root.inspect-toggled(-1, -1); }
return accept;
}
if (Keys.chord(event) == "Ctrl+1") {
if (root.zoomed) { root.inspect-toggled(-1, -1); }
root.inspect-toggled(-1, -1);
return accept;
}
}
// TRACES: FR-UI-4 | FR-DEV-16
// Shift and an arrow move a magnified view by a fifth
// of itself — see "Move a magnified photograph about"
// above. Only while magnified, as the drag is: at fit
// there is nothing outside the view to move to.
if (root.zoomed) {
if (Keys.chord(event) == "Shift+Left") { root.pan-by(-0.2, 0); return accept; }
if (Keys.chord(event) == "Shift+Right") { root.pan-by(0.2, 0); return accept; }
if (Keys.chord(event) == "Shift+Up") { root.pan-by(0, -0.2); return accept; }
if (Keys.chord(event) == "Shift+Down") { root.pan-by(0, 0.2); return accept; }
}
// GESTURE: Keep a crop that leaves a mask outside
// where: Develop
// touch: Press "Keep crop" on the notice, or "Undo
// crop" to take it back
// pointer: Press "Keep crop" on the notice, or "Undo
// crop" to take it back
// keys: `Enter` keeps it; `Ctrl+Z` takes the crop
// back, like any other step
//
// TRACES: FR-DEV-17 | FR-DEV-16
// Only while the notice is up: Enter means nothing
// else here, and a key that dismissed a notice nobody
// could see would be a key that did nothing visible.
if (Framing.hidden-masks > 0 && Keys.chord(event) == "Enter") {
Framing.hidden-masks-kept();
return accept;
}
// GESTURE: Go back to the grid
// where: Develop
// touch: Press "‹ Library" in the top bar
// pointer: Press "‹ Library" in the top bar
// keys: `G`
// why: Lightroom's key for the grid. Escape gets
// there too, but a step at a time — out of a
// mode, then out of a zoom — where this goes
// straight back.
//
// TRACES: FR-DEV-16
// Only where there is a grid: files named on the
// command line have none, which is also when the bar
// hides its button.
if (Library.library-total > 0 && Keys.chord(event) == "G") {
root.back-to-library();
return accept;
}
// TRACES: FR-DEV-19a | FR-DEV-16
// J turns the selected part's join chip — see "Change
// how a part joins its mask" in masks.slint.
// The chip's own cycle, on the part the brush and
// the edge controls point at. Rust resolves which that
// is, and does nothing on a base part, which joins
// nothing.
if (Develop.local-mode && Keys.chord(event) == "J") {
Masking.selected-part-join-cycled();
return accept;
}
// GESTURE: Nudge the control last moved
// where: Develop
// touch: Drag its track
// pointer: Drag its track
// keys: `=` or `Plus` up and `-` down, a hundredth
// of its travel at a time; hold for more
// why: Lightroom's keys for the selected slider.
// There is no focus ring on a slider here, so
// "selected" is the last one moved — the same
// control `R` puts back — which covers the
// framing sliders, perspective included, as
// well as the adjustments.
//
// TRACES: FR-DEV-16 | FR-DEV-20
// A framing slider moved last takes the key; Rust
// works out an adjustment's step from its row, where
// the range is.
if (Keys.chord(event) == "=" || Keys.chord(event) == "Plus"
|| Keys.chord(event) == "-") {
if (Framing.touched > 0) {
root.framing-nudged(Keys.chord(event) == "-" ? -1 : 1);
} else if (Adjustments.touched-op >= 0) {
Adjustments.param-nudged(
Adjustments.touched-op, Adjustments.touched-param,
Keys.chord(event) == "-" ? -1 : 1);
}
return accept;
}
// GESTURE: Change which group of adjustments is on screen
// where: Develop
// touch: Tap a group in the rail down the left
@@ -2390,7 +2605,8 @@ in property <bool> panel-visible: true;
// touch: Double-tap the photograph
// pointer: Double-click it, or press the zoom
// readout floating over the canvas
// keys: `Z`
// keys: `Z` goes in and back out; `Ctrl+1` goes to
// 1:1 and `Ctrl+0` back to the whole frame
// why: Noise reduction and capture
// sharpening are judgements about
// single pixels, and a fitted view
@@ -2421,6 +2637,10 @@ in property <bool> panel-visible: true;
// been moved on this photograph until something
// has, so the key is silent until then rather than
// resetting a control nobody named.
if (Keys.chord(event) == "R" && Framing.touched > 0) {
root.framing-reset-touched();
return accept;
}
if (Keys.chord(event) == "R"
&& Adjustments.touched-op >= 0) {
Adjustments.param-reset(
@@ -2437,6 +2657,42 @@ in property <bool> panel-visible: true;
Masking.selected-toggled();
return accept;
}
// GESTURE: Rate this photograph
// where: Develop
// touch: Tap a star in the top bar
// pointer: Click a star in the top bar
// keys: `0`–`5`
//
// GESTURE: Pick or reject this photograph
// where: Develop
// touch: Press Pick or Reject in the top bar; again
// to take the flag off
// pointer: Press Pick or Reject in the top bar; again
// to take the flag off
// keys: `P` picks, `X` rejects and `U` takes the
// flag off
// why: The grid's keys, on the photograph that is
// open (FR-UI-5, 2026-09-19). Judging here does
// not move on to the next frame: that belongs
// to culling, and in develop the photograph in
// front of you is the one being worked on.
//
// TRACES: FR-UI-5 | FR-CULL-4 | FR-DEV-16
// Only with a library, like the labels below: a file
// named on the command line has no catalog to hold a
// rating.
if (Library.library-total > 0
&& Library.library-roll-current >= 0) {
if (Keys.chord(event) == "0") { Library.library-cell-rated(Library.library-roll-current, 0); return accept; }
if (Keys.chord(event) == "1") { Library.library-cell-rated(Library.library-roll-current, 1); return accept; }
if (Keys.chord(event) == "2") { Library.library-cell-rated(Library.library-roll-current, 2); return accept; }
if (Keys.chord(event) == "3") { Library.library-cell-rated(Library.library-roll-current, 3); return accept; }
if (Keys.chord(event) == "4") { Library.library-cell-rated(Library.library-roll-current, 4); return accept; }
if (Keys.chord(event) == "5") { Library.library-cell-rated(Library.library-roll-current, 5); return accept; }
if (Keys.chord(event) == "P") { Library.library-cell-flagged(Library.library-roll-current, 1); return accept; }
if (Keys.chord(event) == "X") { Library.library-cell-flagged(Library.library-roll-current, 2); return accept; }
if (Keys.chord(event) == "U") { Library.library-cell-flagged(Library.library-roll-current, 0); return accept; }
}
// GESTURE: Give this photograph a colour label
// where: Develop
// touch: Tap Label in the top bar, then a
@@ -3085,17 +3341,8 @@ in property <bool> panel-visible: true;
: (root.export-to-server
? "Export " + Library.library-selected-count + " to the library"
: "Export " + Library.library-selected-count);
can-export: root.active-view == View.develop
? !root.export-busy && root.total > 0
: !Library.library-exporting && Library.library-selected-count > 0;
export => {
root.export-sheet-open = false;
if (root.active-view == View.develop) {
root.export-image();
} else {
Library.library-export-selection();
}
}
can-export: root.export-sheet-can-export;
export => { root.export-from-sheet(); }
dismiss => { root.export-sheet-open = false; }
}
ui/dr-ui/ui/collections.slint
+18 -1
View File
@@ -106,6 +106,11 @@ component TreeRow inherits Rectangle {
callback rename-committed(string);
/// Renaming abandoned with Escape; the old name stands.
callback rename-cancelled();
/// TRACES: FR-UI-5
/// Enter or Escape finished the name, and the keyboard should go back to
/// whatever had it. Not raised when the name is committed by clicking
/// away: the click has already put focus where the user wanted it.
callback keys-released();
height: Theme.row-height;
@@ -255,6 +260,15 @@ component TreeRow inherits Rectangle {
// the input has focus and consumes it.
if (Keys.chord(event) == "Escape") {
root.rename-cancelled();
root.keys-released();
return accept;
}
// Enter keeps the name. The input's own `accepted`
// would do the same; answering it here is what puts the
// key where the checker can see it bound.
if (Keys.chord(event) == "Enter") {
root.rename-committed(self.text);
root.keys-released();
return accept;
}
return reject;
@@ -375,7 +389,7 @@ component TreeRow inherits Rectangle {
// where: Collections sidebar
// touch: Hold the collection, then "Rename"
// pointer: Double-click its name, or right-click it and choose "Rename"
// keys: `Escape` while typing abandons the new name
// keys: Type the name and press `Enter`; `Escape` abandons it
// why: Double-click is what a file manager and a Lightroom panel use
// for the same thing, so it needs no discovering — but nothing
// on screen says so, which is what the menu item is for.
@@ -506,6 +520,8 @@ export component CollectionsPanel inherits Rectangle {
callback rename-commit(int, string);
/// Renaming was abandoned.
callback rename-cancel();
/// A key finished a rename; see `CollectionRow.keys-released`.
callback keys-released();
// --- trash (FR-CAT-15) ---
//
@@ -698,6 +714,7 @@ export component CollectionsPanel inherits Rectangle {
rename-requested => { root.rename-start(row.id); }
rename-committed(name) => { root.rename-commit(row.id, name); }
rename-cancelled => { root.rename-cancel(); }
keys-released => { root.keys-released(); }
}
}
ui/dr-ui/ui/develop.slint
+42
View File
@@ -12,6 +12,7 @@ import { Develop } from "session.slint";
import { Transfer } from "adjust.slint";
import { Button, PanelHeading, Label, Value, Caption, Panel } from "widgets.slint";
import { Labels, LabelMark, LabelPicker } from "labels.slint";
import { StarStrip } from "library.slint";
// Status strip — surfaces the GPU backend and adapter, which matters during
// v0.1 because assumption A1 is exactly "does this compositing path work on
@@ -51,6 +52,13 @@ export component StatusBar inherits Rectangle {
/// Whether the label choices are open in the strip.
property <bool> picking-label: false;
callback label-picked(int);
/// TRACES: FR-UI-5 | FR-CULL-4
/// The open photograph's stars, or -1 where there is no library to hold
/// them, and its flag: 0 none, 1 pick, 2 reject.
in property <int> rating: -1;
in property <int> flag: 0;
callback rated(int);
callback flagged(int);
callback back-to-library();
callback open-people();
@@ -149,6 +157,40 @@ export component StatusBar inherits Rectangle {
}
}
// TRACES: FR-UI-5 | FR-CULL-4 | NFR-A11Y-3
// The judgement, shown and set on the photograph that is open — the
// pointer and touch half of the rating and flag keys, which a tablet
// has no number row for (FR-UI-5, amended 2026-09-19). The grid's own
// stars, so a rating looks the same in both places; the star already
// set clears it, as there.
StarStrip {
rating: max(0, root.rating);
show-empty: true;
can-trash: false;
visible: root.rating >= 0;
y: (parent.height - self.height) / 2;
rate(n) => { root.rated(n); }
}
// Pressed again, a flag comes off: two buttons that each toggle,
// rather than a third for "none" that is only ever pressed to undo
// one of the other two.
Button {
text: root.flag == 1 ? "Picked" : "Pick";
active: root.flag == 1;
visible: root.rating >= 0;
y: (parent.height - self.height) / 2;
clicked => { root.flagged(root.flag == 1 ? 0 : 1); }
}
Button {
text: root.flag == 2 ? "Rejected" : "Reject";
active: root.flag == 2;
visible: root.rating >= 0;
y: (parent.height - self.height) / 2;
clicked => { root.flagged(root.flag == 2 ? 0 : 2); }
}
Rectangle { horizontal-stretch: 1; }
// --- instrumentation lives in Settings now ------------------------
ui/dr-ui/ui/identity.slint
+53 -1
View File
@@ -15,6 +15,7 @@
// the confirm/reject pair sits on the face itself rather than behind a menu.
import { Theme } from "theme.slint";
import { Keys } from "keys.slint";
import { Panel, Button, IconButton, Field, ListView } from "widgets.slint";
import { SliderRow } from "controls.slint";
import { Icon } from "icons.slint";
@@ -290,6 +291,11 @@ export component IdentityScreen inherits Rectangle {
in property <string> back-label: "‹ Library";
callback person-picked(int);
/// TRACES: FR-UI-5
/// The person above (-1) or below (1) the selected one on the rail — the
/// arrow keys. Rust walks the rail, because the selection is an id and
/// only Rust can find it in the list.
callback person-stepped(int);
callback rename(string);
callback confirm-face(int);
callback reject-face(int);
@@ -376,6 +382,50 @@ export component IdentityScreen inherits Rectangle {
name-field.text = root.selected-name;
}
// GESTURE: Move between people
// where: People
// touch: Tap a person on the rail
// pointer: Click a person on the rail
// keys: `Up` and `Down`, along the rail
//
// GESTURE: Name a person
// where: People
// touch: Tap the name field over their faces, type, and press Enter
// pointer: Click the name field over their faces, type, and press Enter
// keys: `F2` puts the name field under the keys
// why: The rename key everywhere else. Enter finishes the name and
// hands the keys back to the rail, so naming a run of people
// is `Down`, `F2`, a name, Enter, over and over.
//
// TRACES: FR-UI-5
// The screen's keys, on a holder of no size that takes focus on show, as
// the grid's judgement keys do: without a focus item nothing on this
// screen hears a key at all — Escape included, which bubbles from here to
// the shell and leaves. Not an ancestor of the name field, so the arrows
// move the caret there rather than the selection.
screen-keys := FocusScope {
width: 0px;
height: 0px;
init => { self.focus(); }
// KEYMAP: People
key-pressed(event) => {
if (Keys.chord(event) == "Up") {
root.person-stepped(-1);
return accept;
}
if (Keys.chord(event) == "Down") {
root.person-stepped(1);
return accept;
}
if (Keys.chord(event) == "F2" && root.selected-person >= 0) {
name-field.take-focus();
return accept;
}
return reject;
}
}
HorizontalLayout {
// ── the people rail ───────────────────────────────────────────────
Panel {
@@ -570,7 +620,9 @@ export component IdentityScreen inherits Rectangle {
// and the screen looks stuck.
accepted(t) => {
root.rename(t);
name-field.release-focus();
// To the screen's keys rather than to nothing, so
// the arrows walk the rail again straight away.
screen-keys.focus();
}
}
if root.selected-person < 0: Text {
ui/dr-ui/ui/library.slint
+111
View File
@@ -632,6 +632,10 @@ export global Library {
// own rather than a zero score.
/// A star was clicked on a cell: row, then the rating 0..5.
callback library-cell-rated(int, int);
/// TRACES: FR-UI-5 | FR-CULL-4
/// Pick (1), reject (2) or clear the flag (0) of one photograph by row —
/// the one open in develop.
callback library-cell-flagged(int, int);
/// The trash target was clicked on one cell, by row.
callback library-cell-trashed(int);
/// The burst mark was clicked on one cell, by row (FR-CULL-5).
@@ -1556,6 +1560,22 @@ export component LibraryGrid inherits Rectangle {
/// Whether the selection bar's label picker is open. Local, like
/// `keywording`.
property <bool> labelling: false;
/// TRACES: FR-UI-5 | FR-CULL-4
/// Whether the selection bar's pick / reject choices are open. Local,
/// like `labelling`.
property <bool> flagging: false;
/// TRACES: FR-UI-5
/// Give the keyboard back to the grid.
///
/// For a field outside the grid that has just finished — a collection's
/// name in the sidebar. The field took focus to be typed into and then
/// went away with it, and from there no key reached anything: the arrows,
/// the judgement keys and Escape were all dead until something was
/// clicked.
public function take-keys() {
judge-keys.focus();
}
/// TRACES: FR-UI-5
/// The library ordinal of the cell under the pointer, -1 when none.
@@ -3070,6 +3090,10 @@ export component LibraryGrid inherits Rectangle {
root.labelling = false;
return accept;
}
if (root.flagging) {
root.flagging = false;
return accept;
}
if (root.filing) {
root.filing = false;
return accept;
@@ -3125,6 +3149,48 @@ export component LibraryGrid inherits Rectangle {
root.select-all();
return accept;
}
// TRACES: FR-CAT-5 | FR-UI-5
// Lightroom's two chords for "select none". Clears, and
// stays in select mode, as the strip's Clear does.
if (Keys.chord(event) == "Ctrl+D"
|| Keys.chord(event) == "Ctrl+Shift+A") {
root.clear-selection();
return accept;
}
// GESTURE: Keyword the selection
// where: Library grid
// touch: Select them, then Keywords in the selection
// bar
// pointer: Select them, then Keywords in the selection
// bar
// keys: `Ctrl+K`
// why: Lightroom's keywording chord. The sheet opens
// with its field ready for typing, so the
// keys that judge in the grid are out of the
// way until it closes.
//
// TRACES: FR-CAT-5 | FR-CAT-6 | FR-UI-5
// What the Keywords button does, and only when it is on
// the bar: with nothing selected there is nothing to
// keyword.
if (Keys.chord(event) == "Ctrl+K") {
if (root.selected-count > 0) {
root.keywords-opened();
root.keywording = true;
}
return accept;
}
// TRACES: FR-UI-4 | FR-UI-5
// Lightroom's grid keys for the thumbnail size, the same
// step as a notch of Ctrl and the wheel.
if (Keys.chord(event) == "=" || Keys.chord(event) == "Plus") {
root.zoom-cells(1);
return accept;
}
if (Keys.chord(event) == "-") {
root.zoom-cells(-1);
return accept;
}
// GESTURE: Show only photographs with some number of stars
// where: Library grid
// touch: Tap a star chip in the filter bar
@@ -3201,6 +3267,10 @@ export component LibraryGrid inherits Rectangle {
if (Keys.chord(event) == "9") { root.labelled(4, root.hover-ordinal); return accept; }
// GESTURE: Pick or reject a photograph
// where: Library grid
// touch: Select them, then Flag in the selection bar
// and Pick, Reject or No flag
// pointer: Select them, then Flag in the selection bar
// and Pick, Reject or No flag
// keys: `P` picks, `X` rejects and `U` takes the flag
// off, with the pointer over it or on the
// selection
@@ -3404,6 +3474,7 @@ export component LibraryGrid inherits Rectangle {
// where: Library grid
// touch: Pinch the grid with two fingers
// pointer: Ctrl and the scroll wheel
// keys: `=` or `Plus` for larger, `-` for smaller
// why: There is no wheel on a tablet, so without the
// pinch the cell size could only be changed by a
// control a finger cannot reach.
@@ -4832,6 +4903,7 @@ export component LibraryGrid inherits Rectangle {
// where: Library grid
// touch: Press Clear in the selection strip
// pointer: Press Clear in the selection strip
// keys: `Ctrl+D` or `Ctrl+Shift+A`
// why: Distinct from Done, which leaves the mode
// entirely. Clearing keeps it, so the next
// selection can start straight away.
@@ -4933,6 +5005,45 @@ export component LibraryGrid inherits Rectangle {
}
}
// TRACES: FR-UI-5 | FR-CULL-4
// Pick or reject the selection. Until this the flag had no route
// but `P`, `X` and `U`, which a tablet does not have. Opened like
// Label, so the three choices take room on the bar only while
// they are being made.
if !root.ranging && root.selected-count > 0: Button {
text: "Flag";
active: root.flagging;
y: (parent.height - self.height) / 2;
clicked => { root.flagging = !root.flagging; }
}
if !root.ranging && root.selected-count > 0 && root.flagging: Button {
text: "Pick";
y: (parent.height - self.height) / 2;
clicked => {
root.judged(-1, 1, -1);
root.flagging = false;
}
}
if !root.ranging && root.selected-count > 0 && root.flagging: Button {
text: "Reject";
y: (parent.height - self.height) / 2;
clicked => {
root.judged(-1, 2, -1);
root.flagging = false;
}
}
if !root.ranging && root.selected-count > 0 && root.flagging: Button {
text: "No flag";
y: (parent.height - self.height) / 2;
clicked => {
root.judged(-1, 0, -1);
root.flagging = false;
}
}
// TRACES: FR-DEV-6
// Paste the copied edit onto the selection. One of the things a
// selection can have done to it, like filing it in a collection,
ui/dr-ui/ui/masks.slint
+6
View File
@@ -368,6 +368,8 @@ component MaskEntry inherits Rectangle {
// where: Develop
// touch: Tap the + / − / ∩ chip on the part's row
// pointer: Click the + / − / ∩ chip on the part's row
// keys: `J` turns the selected part's chip, while
// masking
// why: A chip that cycles rather than a menu, because
// a photographer flips a join while looking at
// the picture, not at the panel: add, take
@@ -879,6 +881,10 @@ export global Masking {
/// TRACES: FR-DEV-19a
callback part-selected(string, int);
callback part-join-picked(string, int, int);
/// TRACES: FR-DEV-16
/// The selected part's join chip, turned once — the keyboard's copy of
/// tapping it. Rust knows which part the tools point at.
callback selected-part-join-cycled();
/// Whether the part at this index is left out of the build.
callback part-hidden-toggled(string, int, bool);
callback part-removed(string, int);