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

Show and set colour labels in the grid and develop, and filter by them

Browse Source 
Colour labels could be read from a Lightroom sidecar and queried by the
selector, but nothing drew one or set one, so the only labels a library
held were ones another program had written.

Every mark carries its label's initial on its colour — R, Y, G, B, P —
so a label is read without telling red from green, which is what
NFR-A11Y-3 asks of colour labels by name. A grid cell shows the mark
before its filename. In the grid, 6, 7, 8 and 9 set red, yellow, green and
blue as Lightroom's keys do, on the photograph under the pointer or on
the selection by the rule the star keys follow; the same key again takes
the label off, and over a mixed selection it sets it on all. The
selection bar gains Label, which opens the six choices — each a mark and
a name — and purple, which has no key, is there. In develop the top bar
says "Label: Green" beside the mark, opens the same choices, and 6-9
label the open photograph.

Each gesture is one catalog transaction, then the grid, the counts and
both sidecars are written as a rating's are. The filter bar gains a chip
per label, its mark and its name with a count, one at a time; the filter
is one SQL term, travels in the place record, and "All" clears it.
This commit is contained in:
dtourolle
2026-09-24 21:52:23 -04:00
parent d748527a4c
commit 46f5b95828
18 changed files with 860 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/gestures.md
+107 -18
View File
@@ -5,7 +5,11 @@
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.
<<<<<<< HEAD
48 gestures, in 4 places.
=======
50 gestures, in 4 places.
>>>>>>> b2428ce (Show and set colour labels in the grid and develop, and filter by them)
## Develop
@@ -25,6 +29,7 @@ Sampling a neutral is the first move of the tonal pass — every colour judgemen
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.
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<sub>`ui/dr-ui/ui/app.slint:1715`</sub>
@@ -34,6 +39,9 @@ Anchored on the fingers' midpoint, and on the pointer, so the gesture reads as m
=======
<sub>`ui/dr-ui/ui/app.slint:1755`</sub>
>>>>>>> 3f5f735 (Fade the draft into the sharp frame when a drag settles)
=======
<sub>`ui/dr-ui/ui/app.slint:1722`</sub>
>>>>>>> b2428ce (Show and set colour labels in the grid and develop, and filter by them)
### Move a magnified photograph about
@@ -42,6 +50,7 @@ Anchored on the fingers' midpoint, and on the pointer, so the gesture reads as m
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.
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<sub>`ui/dr-ui/ui/app.slint:1808`</sub>
@@ -51,6 +60,9 @@ Only once there is something outside the viewport to reach, which is why the cur
=======
<sub>`ui/dr-ui/ui/app.slint:1846`</sub>
>>>>>>> 3f5f735 (Fade the draft into the sharp frame when a drag settles)
=======
<sub>`ui/dr-ui/ui/app.slint:1813`</sub>
>>>>>>> b2428ce (Show and set colour labels in the grid and develop, and filter by them)
### Paint a mask by hand
@@ -59,6 +71,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.
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<sub>`ui/dr-ui/ui/app.slint:1895`</sub>
@@ -68,6 +81,9 @@ A model's mask stops inside a shoulder and leaks into the hair, and no single ed
=======
<sub>`ui/dr-ui/ui/app.slint:1933`</sub>
>>>>>>> 3f5f735 (Fade the draft into the sharp frame when a drag settles)
=======
<sub>`ui/dr-ui/ui/app.slint:1900`</sub>
>>>>>>> b2428ce (Show and set colour labels in the grid and develop, and filter by them)
### Take back the last change
@@ -80,6 +96,7 @@ A whole drag is one step, so undo takes back a decision rather than a frame of a
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<sub>`ui/dr-ui/ui/app.slint:2123`</sub>
=======
<sub>`ui/dr-ui/ui/app.slint:2116`</sub>
@@ -90,6 +107,9 @@ A whole drag is one step, so undo takes back a decision rather than a frame of a
=======
<sub>`ui/dr-ui/ui/app.slint:2161`</sub>
>>>>>>> 3f5f735 (Fade the draft into the sharp frame when a drag settles)
=======
<sub>`ui/dr-ui/ui/app.slint:2128`</sub>
>>>>>>> b2428ce (Show and set colour labels in the grid and develop, and filter by them)
### Do it again after taking it back
@@ -100,6 +120,7 @@ A whole drag is one step, so undo takes back a decision rather than a frame of a
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<sub>`ui/dr-ui/ui/app.slint:2136`</sub>
=======
<sub>`ui/dr-ui/ui/app.slint:2129`</sub>
@@ -110,6 +131,9 @@ A whole drag is one step, so undo takes back a decision rather than a frame of a
=======
<sub>`ui/dr-ui/ui/app.slint:2174`</sub>
>>>>>>> 3f5f735 (Fade the draft into the sharp frame when a drag settles)
=======
<sub>`ui/dr-ui/ui/app.slint:2141`</sub>
>>>>>>> b2428ce (Show and set colour labels in the grid and develop, and filter by them)
### Copy the settings from this photograph
@@ -122,6 +146,7 @@ The button is the copy that has to work: a tablet has no modifier key to hold an
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<sub>`ui/dr-ui/ui/app.slint:2169`</sub>
=======
<sub>`ui/dr-ui/ui/app.slint:2162`</sub>
@@ -132,6 +157,9 @@ The button is the copy that has to work: a tablet has no modifier key to hold an
=======
<sub>`ui/dr-ui/ui/app.slint:2207`</sub>
>>>>>>> 3f5f735 (Fade the draft into the sharp frame when a drag settles)
=======
<sub>`ui/dr-ui/ui/app.slint:2174`</sub>
>>>>>>> b2428ce (Show and set colour labels in the grid and develop, and filter by them)
### Paste the settings onto this photograph
@@ -144,6 +172,7 @@ The button names what would be pasted — "3 adjustments", and whether the crop
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<sub>`ui/dr-ui/ui/app.slint:2181`</sub>
=======
<sub>`ui/dr-ui/ui/app.slint:2174`</sub>
@@ -154,6 +183,9 @@ The button names what would be pasted — "3 adjustments", and whether the crop
=======
<sub>`ui/dr-ui/ui/app.slint:2219`</sub>
>>>>>>> 3f5f735 (Fade the draft into the sharp frame when a drag settles)
=======
<sub>`ui/dr-ui/ui/app.slint:2186`</sub>
>>>>>>> b2428ce (Show and set colour labels in the grid and develop, and filter by them)
### Choose which kinds of edit a copy carries
@@ -166,6 +198,7 @@ Lightroom's Copy Settings. Pasting a look across a shoot usually means leaving e
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<sub>`ui/dr-ui/ui/app.slint:2198`</sub>
=======
<sub>`ui/dr-ui/ui/app.slint:2191`</sub>
@@ -176,6 +209,9 @@ Lightroom's Copy Settings. Pasting a look across a shoot usually means leaving e
=======
<sub>`ui/dr-ui/ui/app.slint:2236`</sub>
>>>>>>> 3f5f735 (Fade the draft into the sharp frame when a drag settles)
=======
<sub>`ui/dr-ui/ui/app.slint:2203`</sub>
>>>>>>> b2428ce (Show and set colour labels in the grid and develop, and filter by them)
### Export this photograph as the last one was
@@ -188,6 +224,7 @@ Every export runs on the defaults in Settings, so "as the last one was" is what
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<sub>`ui/dr-ui/ui/app.slint:2227`</sub>
=======
<sub>`ui/dr-ui/ui/app.slint:2220`</sub>
@@ -198,6 +235,9 @@ Every export runs on the defaults in Settings, so "as the last one was" is what
=======
<sub>`ui/dr-ui/ui/app.slint:2265`</sub>
>>>>>>> 3f5f735 (Fade the draft into the sharp frame when a drag settles)
=======
<sub>`ui/dr-ui/ui/app.slint:2232`</sub>
>>>>>>> b2428ce (Show and set colour labels in the grid and develop, and filter by them)
### Choose how to export, then export
@@ -210,6 +250,7 @@ The export sheet is the export defaults alone with an Export button. What is cho
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<sub>`ui/dr-ui/ui/app.slint:2239`</sub>
=======
<sub>`ui/dr-ui/ui/app.slint:2232`</sub>
@@ -220,6 +261,9 @@ The export sheet is the export defaults alone with an Export button. What is cho
=======
<sub>`ui/dr-ui/ui/app.slint:2277`</sub>
>>>>>>> 3f5f735 (Fade the draft into the sharp frame when a drag settles)
=======
<sub>`ui/dr-ui/ui/app.slint:2244`</sub>
>>>>>>> b2428ce (Show and set colour labels in the grid and develop, and filter by them)
### Change which group of adjustments is on screen
@@ -232,6 +276,7 @@ The groups are whatever the operation set declares itself to be about, so there
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<sub>`ui/dr-ui/ui/app.slint:2264`</sub>
=======
<sub>`ui/dr-ui/ui/app.slint:2257`</sub>
@@ -242,6 +287,9 @@ The groups are whatever the operation set declares itself to be about, so there
=======
<sub>`ui/dr-ui/ui/app.slint:2302`</sub>
>>>>>>> 3f5f735 (Fade the draft into the sharp frame when a drag settles)
=======
<sub>`ui/dr-ui/ui/app.slint:2269`</sub>
>>>>>>> b2428ce (Show and set colour labels in the grid and develop, and filter by them)
### Look at the photograph at 1:1
@@ -254,6 +302,7 @@ Noise reduction and capture sharpening are judgements about single pixels, and a
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<sub>`ui/dr-ui/ui/app.slint:2299`</sub>
=======
<sub>`ui/dr-ui/ui/app.slint:2292`</sub>
@@ -264,6 +313,19 @@ Noise reduction and capture sharpening are judgements about single pixels, and a
=======
<sub>`ui/dr-ui/ui/app.slint:2337`</sub>
>>>>>>> 3f5f735 (Fade the draft into the sharp frame when a drag settles)
=======
<sub>`ui/dr-ui/ui/app.slint:2304`</sub>
### Give this photograph a colour label
- **Touch** — Tap Label in the top bar, then a colour
- **Pointer** — Click Label in the top bar, then a colour
- **Keyboard** — 6 red, 7 yellow, 8 green, 9 blue; the same key again takes it off
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:2356`</sub>
>>>>>>> b2428ce (Show and set colour labels in the grid and develop, and filter by them)
### Move to the next or previous photograph
@@ -276,6 +338,7 @@ The edit on screen is saved on the way out, so stepping through a folder is as m
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<sub>`ui/dr-ui/ui/app.slint:2354`</sub>
=======
<sub>`ui/dr-ui/ui/app.slint:2344`</sub>
@@ -286,6 +349,9 @@ The edit on screen is saved on the way out, so stepping through a folder is as m
=======
<sub>`ui/dr-ui/ui/app.slint:2389`</sub>
>>>>>>> 3f5f735 (Fade the draft into the sharp frame when a drag settles)
=======
<sub>`ui/dr-ui/ui/app.slint:2381`</sub>
>>>>>>> b2428ce (Show and set colour labels in the grid and develop, and filter by them)
### See the photograph before you edited it
@@ -298,6 +364,7 @@ Held rather than toggled, and no split screen: a split halves the working image
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<sub>`ui/dr-ui/ui/app.slint:2487`</sub>
=======
<sub>`ui/dr-ui/ui/app.slint:2477`</sub>
@@ -308,6 +375,9 @@ Held rather than toggled, and no split screen: a split halves the working image
=======
<sub>`ui/dr-ui/ui/app.slint:2522`</sub>
>>>>>>> 3f5f735 (Fade the draft into the sharp frame when a drag settles)
=======
<sub>`ui/dr-ui/ui/app.slint:2514`</sub>
>>>>>>> b2428ce (Show and set colour labels in the grid and develop, and filter by them)
### Put one control back to its default
@@ -459,7 +529,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:1591`</sub>
<sub>`ui/dr-ui/ui/library.slint:1625`</sub>
### Add or remove one photograph
@@ -468,7 +538,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:1600`</sub>
<sub>`ui/dr-ui/ui/library.slint:1634`</sub>
### Leave selecting
@@ -476,7 +546,7 @@ While selecting, a tap never opens. That is the whole point of the mode: one mea
- **Pointer** — Press Done in the header
- **Keyboard** — Escape
<sub>`ui/dr-ui/ui/library.slint:1608`</sub>
<sub>`ui/dr-ui/ui/library.slint:1642`</sub>
### Pick a photograph up to drag it
@@ -485,7 +555,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:1638`</sub>
<sub>`ui/dr-ui/ui/library.slint:1672`</sub>
### Select a range
@@ -494,7 +564,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:1703`</sub>
<sub>`ui/dr-ui/ui/library.slint:1737`</sub>
### Take the blinks out of a burst
@@ -503,7 +573,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:2411`</sub>
<sub>`ui/dr-ui/ui/library.slint:2450`</sub>
### Find photographs with two people in them
@@ -512,7 +582,16 @@ 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:2440`</sub>
<sub>`ui/dr-ui/ui/library.slint:2479`</sub>
### Show only photographs with one colour label
- **Touch** — Tap its chip in the filter bar
- **Pointer** — Click its chip in the filter bar
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:2602`</sub>
### Export the selection as the last export was
@@ -522,7 +601,7 @@ Face indexing reads each face's eyes. The chip drops frames where the chosen peo
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:2993`</sub>
<sub>`ui/dr-ui/ui/library.slint:3065`</sub>
### Paste copied settings onto the selection
@@ -530,7 +609,7 @@ Lightroom's and darktable's chords. Every export runs on the saved defaults, so
- **Pointer** — Select them, then "Paste to N"
- **Keyboard** — Ctrl+V
<sub>`ui/dr-ui/ui/library.slint:3017`</sub>
<sub>`ui/dr-ui/ui/library.slint:3089`</sub>
### Show only photographs with some number of stars
@@ -540,7 +619,17 @@ 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:3039`</sub>
<sub>`ui/dr-ui/ui/library.slint:3111`</sub>
### Give photographs a colour label
- **Touch** — Select them, then Label in the selection bar and tap a colour
- **Pointer** — Select them, then Label in the selection bar and click a colour
- **Keyboard** — 6 red, 7 yellow, 8 green, 9 blue, with the pointer over it or on the selection; the same key again takes the label off
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:3160`</sub>
### Resize the thumbnails
@@ -549,7 +638,7 @@ The chips say "this many or more". A range with a ceiling — the twos and three
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:3245`</sub>
<sub>`ui/dr-ui/ui/library.slint:3340`</sub>
### File photographs in a collection
@@ -558,7 +647,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:3442`</sub>
<sub>`ui/dr-ui/ui/library.slint:3537`</sub>
### Open a photograph
@@ -567,7 +656,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:3723`</sub>
<sub>`ui/dr-ui/ui/library.slint:3833`</sub>
### Rate a photograph without opening it
@@ -577,7 +666,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:3843`</sub>
<sub>`ui/dr-ui/ui/library.slint:3953`</sub>
### Choose the frame a folded burst shows
@@ -586,7 +675,7 @@ 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:3975`</sub>
<sub>`ui/dr-ui/ui/library.slint:4085`</sub>
### Drop the selection but keep selecting
@@ -595,7 +684,7 @@ A folded burst draws its earliest frame, which is a fact about the clock and not
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:4651`</sub>
<sub>`ui/dr-ui/ui/library.slint:4761`</sub>
### Select everything the grid is showing
@@ -605,7 +694,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:4668`</sub>
<sub>`ui/dr-ui/ui/library.slint:4778`</sub>
### Take photographs out of a collection
@@ -614,4 +703,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:4792`</sub>
<sub>`ui/dr-ui/ui/library.slint:4919`</sub>