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

Open Help from develop as well as from the grid

Browse Source 
The "Controls and shortcuts" sheet was drawn by LibraryGrid, so only the
grid's Help button and its F1 could open it. Develop, where most of the
keys it lists are bound (Ctrl+E, Ctrl+Shift+C, A/D, Z, R, H, [ ]), had no
way to it: a photographer who wanted to look a shortcut up had to leave
the photograph they wanted it for.

The sheet now hangs off the shell beside the export and copy sheets, on a
`help-open` property both views set. The grid's Help button and F1 raise
it through a callback, and its keys stand down through the `sheet-open`
they already honour for the export sheet, so Escape falls through to the
shell, which closes it. Develop gains a Help button beside Settings in
its top bar, as in the library header, and F1 in its key scope; its keys
decline while the sheet is up, as they do for the other two sheets, so
nothing behind it is rated or stepped. The book already begins with the
Develop section, so from develop it opens where the reader wants it.

Tests hold the shape: the sheet is drawn by the shell and not the grid,
and develop's opening guard names all three sheets and its F1 opens this
one. The new GESTURE: block puts the develop route in the book.
This commit is contained in:
dtourolle
2026-09-25 23:24:52 -04:00
parent 19dd3257e3
commit d9f259656a
7 changed files with 224 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/dev/traceability.md
+34 -34
View File
File diff suppressed because one or more lines are too long
docs/gestures.md
+60 -50
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. 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.
67 gestures, in 5 places. 68 gestures, in 5 places.
## Develop ## Develop
@@ -28,7 +28,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. 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:1885`</sub> <sub>`ui/dr-ui/ui/app.slint:1895`</sub>
### Move a magnified photograph about ### Move a magnified photograph about
@@ -39,7 +39,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. 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:1981`</sub> <sub>`ui/dr-ui/ui/app.slint:1991`</sub>
### Paint a mask by hand ### Paint a mask by hand
@@ -49,7 +49,17 @@ 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. 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:2072`</sub> <sub>`ui/dr-ui/ui/app.slint:2082`</sub>
### Open this list
- **Touch** — Press Help in the top bar, and Done to put it away
- **Pointer** — Press Help in the top bar, and Done to put it away
- **Keyboard** — `F1`; the key that closes any sheet puts it away
Most of the keys are develop's, and a reference that could only be opened from the grid had to be looked up before opening the photograph they were wanted for.
<sub>`ui/dr-ui/ui/app.slint:2308`</sub>
### Take back the last change ### Take back the last change
@@ -60,7 +70,7 @@ 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. 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:2306`</sub> <sub>`ui/dr-ui/ui/app.slint:2338`</sub>
### Do it again after taking it back ### Do it again after taking it back
@@ -69,7 +79,7 @@ A whole drag is one step, so undo takes back a decision rather than a frame of a
- **Keyboard** — `Ctrl+Shift+Z`, or `Ctrl+Y` - **Keyboard** — `Ctrl+Shift+Z`, or `Ctrl+Y`
- **See it** — [in the manual](manual/README.md#history-snapshots-presets) - **See it** — [in the manual](manual/README.md#history-snapshots-presets)
<sub>`ui/dr-ui/ui/app.slint:2320`</sub> <sub>`ui/dr-ui/ui/app.slint:2352`</sub>
### Remove a repair ### Remove a repair
@@ -77,7 +87,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 - **Pointer** — Click it, then Delete Repair
- **Keyboard** — `Delete` or `Backspace`, while repairing - **Keyboard** — `Delete` or `Backspace`, while repairing
<sub>`ui/dr-ui/ui/app.slint:2340`</sub> <sub>`ui/dr-ui/ui/app.slint:2372`</sub>
### Copy the settings from this photograph ### Copy the settings from this photograph
@@ -88,7 +98,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. 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:2359`</sub> <sub>`ui/dr-ui/ui/app.slint:2391`</sub>
### Paste the settings onto this photograph ### Paste the settings onto this photograph
@@ -99,7 +109,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. 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:2372`</sub> <sub>`ui/dr-ui/ui/app.slint:2404`</sub>
### Choose which kinds of edit a copy carries ### Choose which kinds of edit a copy carries
@@ -110,7 +120,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. 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:2390`</sub> <sub>`ui/dr-ui/ui/app.slint:2422`</sub>
### Export this photograph as the last one was ### Export this photograph as the last one was
@@ -121,7 +131,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. 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:2415`</sub> <sub>`ui/dr-ui/ui/app.slint:2447`</sub>
### Choose how to export, then export ### Choose how to export, then export
@@ -132,7 +142,7 @@ 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. 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:2428`</sub> <sub>`ui/dr-ui/ui/app.slint:2460`</sub>
### Keep a crop that leaves a mask outside ### Keep a crop that leaves a mask outside
@@ -140,7 +150,7 @@ The export sheet is the export defaults alone with an Export button. What is cho
- **Pointer** — 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 - **Keyboard** — `Enter` keeps it; `Ctrl+Z` takes the crop back, like any other step
<sub>`ui/dr-ui/ui/app.slint:2493`</sub> <sub>`ui/dr-ui/ui/app.slint:2525`</sub>
### Go back to the grid ### Go back to the grid
@@ -150,7 +160,7 @@ The export sheet is the export defaults alone with an Export button. What is cho
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. 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> <sub>`ui/dr-ui/ui/app.slint:2542`</sub>
### Nudge the control last moved ### Nudge the control last moved
@@ -160,7 +170,7 @@ Lightroom's key for the grid. Escape gets there too, but a step at a time — ou
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. 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> <sub>`ui/dr-ui/ui/app.slint:2571`</sub>
### Change which group of adjustments is on screen ### Change which group of adjustments is on screen
@@ -171,7 +181,7 @@ Lightroom's keys for the selected slider. There is no focus ring on a slider her
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. 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:2567`</sub> <sub>`ui/dr-ui/ui/app.slint:2599`</sub>
### Look at the photograph at 1:1 ### Look at the photograph at 1:1
@@ -182,7 +192,7 @@ The groups are whatever the operation set declares itself to be about, so there
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. 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:2603`</sub> <sub>`ui/dr-ui/ui/app.slint:2635`</sub>
### Rate this photograph ### Rate this photograph
@@ -190,7 +200,7 @@ Noise reduction and capture sharpening are judgements about single pixels, and a
- **Pointer** — Click a star in the top bar - **Pointer** — Click a star in the top bar
- **Keyboard** — `0`–`5` - **Keyboard** — `0`–`5`
<sub>`ui/dr-ui/ui/app.slint:2660`</sub> <sub>`ui/dr-ui/ui/app.slint:2692`</sub>
### Pick or reject this photograph ### Pick or reject this photograph
@@ -200,7 +210,7 @@ Noise reduction and capture sharpening are judgements about single pixels, and a
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. 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> <sub>`ui/dr-ui/ui/app.slint:2698`</sub>
### Give this photograph a colour label ### Give this photograph a colour label
@@ -211,7 +221,7 @@ The grid's keys, on the photograph that is open (FR-UI-5, 2026-09-19). Judging h
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. 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:2696`</sub> <sub>`ui/dr-ui/ui/app.slint:2728`</sub>
### Move to the next or previous photograph ### Move to the next or previous photograph
@@ -222,7 +232,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. 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:2721`</sub> <sub>`ui/dr-ui/ui/app.slint:2753`</sub>
### See the photograph before you edited it ### See the photograph before you edited it
@@ -233,7 +243,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. 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:2851`</sub> <sub>`ui/dr-ui/ui/app.slint:2883`</sub>
### Put one control back to its default ### Put one control back to its default
@@ -317,7 +327,7 @@ 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. 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:975`</sub> <sub>`ui/dr-ui/ui/app.slint:981`</sub>
### Do what a sheet offers ### Do what a sheet offers
@@ -325,7 +335,7 @@ One key for "up one", innermost first: a question before the sheet under it, a s
- **Pointer** — Press its button — Export, or Copy - **Pointer** — Press its button — Export, or Copy
- **Keyboard** — `Enter`, on the export and copy sheets - **Keyboard** — `Enter`, on the export and copy sheets
<sub>`ui/dr-ui/ui/app.slint:985`</sub> <sub>`ui/dr-ui/ui/app.slint:991`</sub>
## Collections sidebar ## Collections sidebar
@@ -440,7 +450,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. 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:1705`</sub> <sub>`ui/dr-ui/ui/library.slint:1701`</sub>
### Add or remove one photograph ### Add or remove one photograph
@@ -450,7 +460,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. 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:1715`</sub> <sub>`ui/dr-ui/ui/library.slint:1711`</sub>
### Leave selecting ### Leave selecting
@@ -459,7 +469,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 - **Keyboard** — `Escape`, or `Back`; an open sheet closes first
- **See it** — [in the manual](manual/README.md#selecting-several) - **See it** — [in the manual](manual/README.md#selecting-several)
<sub>`ui/dr-ui/ui/library.slint:1724`</sub> <sub>`ui/dr-ui/ui/library.slint:1720`</sub>
### Pick a photograph up to drag it ### Pick a photograph up to drag it
@@ -469,7 +479,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. 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:1755`</sub> <sub>`ui/dr-ui/ui/library.slint:1751`</sub>
### Select a range ### Select a range
@@ -480,7 +490,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. 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:1821`</sub> <sub>`ui/dr-ui/ui/library.slint:1817`</sub>
### Take the blinks out of a burst ### Take the blinks out of a burst
@@ -490,7 +500,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. 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:2538`</sub> <sub>`ui/dr-ui/ui/library.slint:2534`</sub>
### Find photographs with two people in them ### Find photographs with two people in them
@@ -500,7 +510,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. "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:2568`</sub> <sub>`ui/dr-ui/ui/library.slint:2564`</sub>
### Show only photographs with one colour label ### Show only photographs with one colour label
@@ -510,7 +520,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. 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:2692`</sub> <sub>`ui/dr-ui/ui/library.slint:2688`</sub>
### Export the selection as the last export was ### Export the selection as the last export was
@@ -521,7 +531,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. 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:3175`</sub> <sub>`ui/dr-ui/ui/library.slint:3158`</sub>
### Paste copied settings onto the selection ### Paste copied settings onto the selection
@@ -530,7 +540,7 @@ Lightroom's and darktable's chords. Every export runs on the saved defaults, so
- **Keyboard** — `Ctrl+V` - **Keyboard** — `Ctrl+V`
- **See it** — [in the manual](manual/README.md#copying-settings) - **See it** — [in the manual](manual/README.md#copying-settings)
<sub>`ui/dr-ui/ui/library.slint:3199`</sub> <sub>`ui/dr-ui/ui/library.slint:3182`</sub>
### Keyword the selection ### Keyword the selection
@@ -540,7 +550,7 @@ Lightroom's and darktable's chords. Every export runs on the saved defaults, so
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. 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:3228`</sub> <sub>`ui/dr-ui/ui/library.slint:3211`</sub>
### Show only photographs with some number of stars ### Show only photographs with some number of stars
@@ -551,7 +561,7 @@ Lightroom's keywording chord. The sheet opens with its field ready for typing, s
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. 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:3262`</sub> <sub>`ui/dr-ui/ui/library.slint:3245`</sub>
### Give photographs a colour label ### Give photographs a colour label
@@ -562,7 +572,7 @@ 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. 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:3312`</sub> <sub>`ui/dr-ui/ui/library.slint:3295`</sub>
### Pick or reject a photograph ### Pick or reject a photograph
@@ -572,7 +582,7 @@ Lightroom's keys, so hands that learned them there need not learn them again. Pu
The keys every culling tool uses, so muscle memory built elsewhere works here. The keys every culling tool uses, so muscle memory built elsewhere works here.
<sub>`ui/dr-ui/ui/library.slint:3336`</sub> <sub>`ui/dr-ui/ui/library.slint:3319`</sub>
### Move photographs to the trash ### Move photographs to the trash
@@ -582,7 +592,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. 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:3363`</sub> <sub>`ui/dr-ui/ui/library.slint:3346`</sub>
### Open this list ### Open this list
@@ -590,7 +600,7 @@ The bin acts on one photograph, so a stray click cannot trash a selection; the k
- **Pointer** — Press Help in the header, and Done to put it away - **Pointer** — Press Help in the header, and Done to put it away
- **Keyboard** — `F1`, and `Escape` to put it away - **Keyboard** — `F1`, and `Escape` to put it away
<sub>`ui/dr-ui/ui/library.slint:3388`</sub> <sub>`ui/dr-ui/ui/library.slint:3371`</sub>
### Rename the collection the grid is showing ### Rename the collection the grid is showing
@@ -598,7 +608,7 @@ The bin acts on one photograph, so a stray click cannot trash a selection; the k
- **Pointer** — Double-click it in the sidebar - **Pointer** — Double-click it in the sidebar
- **Keyboard** — `F2` - **Keyboard** — `F2`
<sub>`ui/dr-ui/ui/library.slint:3396`</sub> <sub>`ui/dr-ui/ui/library.slint:3379`</sub>
### Move through the grid ### Move through the grid
@@ -608,7 +618,7 @@ 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. The cursor selects what it lands on, so walking and judging are one hand's work.
<sub>`ui/dr-ui/ui/library.slint:3416`</sub> <sub>`ui/dr-ui/ui/library.slint:3399`</sub>
### Resize the thumbnails ### Resize the thumbnails
@@ -619,7 +629,7 @@ The cursor selects what it lands on, so walking and judging are one hand's work.
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. 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:3543`</sub> <sub>`ui/dr-ui/ui/library.slint:3526`</sub>
### File photographs in a collection ### File photographs in a collection
@@ -629,7 +639,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. 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:3742`</sub> <sub>`ui/dr-ui/ui/library.slint:3725`</sub>
### Open a photograph ### Open a photograph
@@ -640,7 +650,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. 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:4047`</sub> <sub>`ui/dr-ui/ui/library.slint:4030`</sub>
### Rate a photograph without opening it ### Rate a photograph without opening it
@@ -651,7 +661,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. 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:4170`</sub> <sub>`ui/dr-ui/ui/library.slint:4153`</sub>
### Choose the frame a folded burst shows ### Choose the frame a folded burst shows
@@ -661,7 +671,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. 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:4303`</sub> <sub>`ui/dr-ui/ui/library.slint:4286`</sub>
### Drop the selection but keep selecting ### Drop the selection but keep selecting
@@ -672,7 +682,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. 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:4980`</sub> <sub>`ui/dr-ui/ui/library.slint:4963`</sub>
### Select everything the grid is showing ### Select everything the grid is showing
@@ -683,7 +693,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. 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:4999`</sub> <sub>`ui/dr-ui/ui/library.slint:4982`</sub>
### Take photographs out of a collection ### Take photographs out of a collection
@@ -693,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. 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:5180`</sub> <sub>`ui/dr-ui/ui/library.slint:5163`</sub>
ui/dr-ui/src/gesture_book.rs
+8
View File
@@ -56,6 +56,14 @@ pub const GESTURES: &[Gesture] = &[
keys: "", keys: "",
manual: "local-adjustments", manual: "local-adjustments",
}, },
Gesture {
title: "Open this list",
section: "Develop",
touch: "Press Help in the top bar, and Done to put it away",
pointer: "Press Help in the top bar, and Done to put it away",
keys: "F1; the key that closes any sheet puts it away",
manual: "",
},
Gesture { Gesture {
title: "Take back the last change", title: "Take back the last change",
section: "Develop", section: "Develop",
ui/dr-ui/src/gestures.rs
+49
View File
@@ -113,6 +113,55 @@ mod tests {
assert_eq!(rows.iter().filter(|r| !r.heading.is_empty()).count(), 1); assert_eq!(rows.iter().filter(|r| !r.heading.is_empty()).count(), 1);
} }
/// The develop view's key handler, from its `KEYMAP:` tag to the end of
/// the file — enough to hold its opening guard and its bindings.
fn develop_keys() -> &'static str {
let app = include_str!("../ui/app.slint");
let tag = "// KEYMAP: Develop\n key-pressed(event)";
let at = app
.find(tag)
.expect("app.slint no longer has develop's key-pressed handler");
&app[at..]
}
/// TRACES: FR-UI-4
/// The sheet is drawn by the shell, so both views can open it. Drawn
/// inside the grid, it was unreachable from develop — where most of the
/// keys it lists are bound.
#[test]
fn the_help_sheet_is_drawn_by_the_shell_and_not_by_the_grid() {
let app = include_str!("../ui/app.slint");
let library = include_str!("../ui/library.slint");
assert!(app.contains("if root.help-open: GestureSheet {"));
assert!(!library.contains("GestureSheet {"));
}
/// TRACES: FR-UI-4 | FR-UI-5
/// F1 opens it from develop, and develop's keys stand down while it is
/// up, as they do for the export and copy sheets — a key acting behind
/// the sheet would change a photograph the reader cannot see.
#[test]
fn develop_opens_help_on_f1_and_stands_down_behind_it() {
let keys = develop_keys();
let guard = keys
.find("return reject;")
.expect("develop's handler never declines");
let opening = &keys[..guard];
for sheet in ["export-sheet-open", "copy-sheet-open", "help-open"] {
assert!(
opening.contains(sheet),
"develop's keys do not stand down behind `{sheet}`"
);
}
let f1 = keys
.find("Keys.chord(event) == \"F1\"")
.expect("develop does not bind F1");
assert!(
keys[f1..].lines().nth(1).unwrap_or("").trim() == "root.help-open = true;",
"develop's F1 does not open the help sheet"
);
}
#[test] #[test]
fn nothing_in_makes_nothing_out() { fn nothing_in_makes_nothing_out() {
assert!(rows_from(&[]).is_empty()); assert!(rows_from(&[]).is_empty());
ui/dr-ui/ui/app.slint
+51 -7
View File
@@ -8,7 +8,7 @@ import { HistoryPanel, HistoryRow, Steps } from "history.slint";
import { LaunchScreen } from "launch.slint"; import { LaunchScreen } from "launch.slint";
import { IdentityScreen, IdentityPerson, IdentityFace } from "identity.slint"; import { IdentityScreen, IdentityPerson, IdentityFace } from "identity.slint";
import { LibraryGrid, LibraryCell, TimelineBar, PhotoRoll, KeywordRow, PersonChip, Library } from "library.slint"; import { LibraryGrid, LibraryCell, TimelineBar, PhotoRoll, KeywordRow, PersonChip, Library } from "library.slint";
import { GestureRow } from "gestures.slint"; import { GestureRow, GestureSheet } from "gestures.slint";
import { Button, PanelHeading, Label, Value, Caption, Panel, EmptyState, ProgressBar, ActivityRow } from "widgets.slint"; import { Button, PanelHeading, Label, Value, Caption, Panel, EmptyState, ProgressBar, ActivityRow } from "widgets.slint";
import { CollectionsPanel, CollectionRow, Collections, OfflinePrompt, CollectionMenu, import { CollectionsPanel, CollectionRow, Collections, OfflinePrompt, CollectionMenu,
MembershipSheet, MembershipRow } from "collections.slint"; MembershipSheet, MembershipRow } from "collections.slint";
@@ -654,6 +654,12 @@ export component AppWindow inherits Window {
/// The copy sheet: which kinds of edit a copy carries, and Copy. Ctrl+Shift+C. /// The copy sheet: which kinds of edit a copy carries, and Copy. Ctrl+Shift+C.
in-out property <bool> copy-sheet-open: false; in-out property <bool> copy-sheet-open: false;
/// TRACES: FR-UI-4 | FR-UI-5
/// The gesture reference, "Controls and shortcuts": Help, or F1. Over
/// the shell rather than inside the grid, because develop — where most
/// of the keys are — has to be able to open it too.
in-out property <bool> help-open: false;
/// TRACES: FR-EXP-7 | FR-UI-5 /// TRACES: FR-EXP-7 | FR-UI-5
/// Whether the export sheet's button would do anything — the develop /// Whether the export sheet's button would do anything — the develop
/// view's photograph, or the grid's selection. One definition for the /// view's photograph, or the grid's selection. One definition for the
@@ -1007,8 +1013,12 @@ in property <bool> panel-visible: true;
root.recovery-dismiss(); root.recovery-dismiss();
return accept; return accept;
} }
// The two shortcut sheets, which are drawn over everything // The help sheet and the two shortcut sheets, which are drawn
// but the recovery question. // over everything but the recovery question.
if (root.help-open) {
root.help-open = false;
return accept;
}
if (root.export-sheet-open) { if (root.export-sheet-open) {
root.export-sheet-open = false; root.export-sheet-open = false;
return accept; return accept;
@@ -1497,7 +1507,8 @@ in property <bool> panel-visible: true;
open-import() => { root.import-open(); } open-import() => { root.import-open(); }
open-settings() => { root.settings-open(); } open-settings() => { root.settings-open(); }
open-export-options() => { root.export-options-open(); } open-export-options() => { root.export-options-open(); }
sheet-open: root.export-sheet-open; sheet-open: root.export-sheet-open || root.help-open;
open-help() => { root.help-open = true; }
open-people() => { root.identity-open(); } open-people() => { root.identity-open(); }
cell-pressed(i, ctrl, shift) => { cell-pressed(i, ctrl, shift) => {
@@ -1535,8 +1546,6 @@ in property <bool> panel-visible: true;
filter-people-all: Library.library-filter-people-all; filter-people-all: Library.library-filter-people-all;
filter-eyes-open: Library.library-filter-eyes-open; filter-eyes-open: Library.library-filter-eyes-open;
people: Library.library-people; people: Library.library-people;
gestures: Library.library-gestures;
open-manual(anchor) => { Library.library-open-manual(anchor); }
filter-min-rating: Library.library-filter-min-rating; filter-min-rating: Library.library-filter-min-rating;
filter-max-rating: Library.library-filter-max-rating; filter-max-rating: Library.library-filter-max-rating;
filter-rating-range(low, high) => { filter-rating-range(low, high) => {
@@ -1632,6 +1641,7 @@ in property <bool> panel-visible: true;
back-to-library() => { root.back-to-library(); } back-to-library() => { root.back-to-library(); }
open-people() => { root.identity-open(); } open-people() => { root.identity-open(); }
open-settings() => { root.settings-open(); } open-settings() => { root.settings-open(); }
open-help() => { root.help-open = true; }
toggle-panel() => { root.toggle-panel(); } toggle-panel() => { root.toggle-panel(); }
export-image() => { root.export-image(); } export-image() => { root.export-image(); }
undo() => { Steps.undo(); } undo() => { Steps.undo(); }
@@ -2291,9 +2301,31 @@ in property <bool> panel-visible: true;
// the next frame behind the export form. Declined // the next frame behind the export form. Declined
// rather than swallowed, so Escape still reaches // rather than swallowed, so Escape still reaches
// the shell and closes the sheet. // the shell and closes the sheet.
if (root.export-sheet-open || root.copy-sheet-open) { if (root.export-sheet-open || root.copy-sheet-open
|| root.help-open) {
return reject; return reject;
} }
// GESTURE: Open this list
// where: Develop
// touch: Press Help in the top bar, and Done to
// put it away
// pointer: Press Help in the top bar, and Done to
// put it away
// keys: `F1`; the key that closes any sheet
// puts it away
// why: Most of the keys are develop's, and a
// reference that could only be opened
// from the grid had to be looked up
// before opening the photograph they
// were wanted for.
//
// TRACES: FR-UI-4 | FR-UI-5
// The same sheet the grid's Help opens, drawn by
// the shell; the book already starts on Develop.
if (Keys.chord(event) == "F1") {
root.help-open = true;
return accept;
}
// TRACES: FR-DEV-7 // TRACES: FR-DEV-7
// Hold backslash to see the unedited original. // Hold backslash to see the unedited original.
// Rust ignores a repeat that says what it already // Rust ignores a repeat that says what it already
@@ -3362,6 +3394,18 @@ in property <bool> panel-visible: true;
dismiss => { root.copy-sheet-open = false; } dismiss => { root.copy-sheet-open = false; }
} }
// TRACES: FR-UI-2 | FR-UI-4
// The gesture reference. Above the other sheets, because it is the one
// a user opens *because* another one confused them; over the shell for
// their reason — the grid and develop both open it.
if root.help-open: GestureSheet {
width: 100%;
height: 100%;
rows: Library.library-gestures;
close => { root.help-open = false; }
open-manual(anchor) => { Library.library-open-manual(anchor); }
}
OfflinePrompt { OfflinePrompt {
width: 100%; width: 100%;
height: 100%; height: 100%;
ui/dr-ui/ui/develop.slint
+14
View File
@@ -63,6 +63,9 @@ export component StatusBar inherits Rectangle {
callback back-to-library(); callback back-to-library();
callback open-people(); callback open-people();
callback open-settings(); callback open-settings();
/// TRACES: FR-UI-4
/// Open the gesture reference, which the window draws.
callback open-help();
callback toggle-panel(); callback toggle-panel();
callback export-image(); callback export-image();
callback undo(); callback undo();
@@ -303,6 +306,17 @@ export component StatusBar inherits Rectangle {
clicked => { root.export-image(); } clicked => { root.export-image(); }
} }
// TRACES: FR-UI-4
// The pointer and touch way to the reference F1 opens. Beside
// Settings, as in the library header, because it is about the
// application rather than about the photograph — and in the same
// place on both screens, so it is found where it was last seen.
Button {
text: "Help";
y: (parent.height - self.height) / 2;
clicked => { root.open-help(); }
}
// Reachable from develop as well as from the grid: export defaults are // Reachable from develop as well as from the grid: export defaults are
// most likely to be wanted with a finished photograph on screen, which // most likely to be wanted with a finished photograph on screen, which
// is exactly where this bar is and the library header is not. // is exactly where this bar is and the library header is not.
ui/dr-ui/ui/library.slint
+8 -36
View File
@@ -15,7 +15,7 @@ import { Button, IconButton, Label, Value, Caption, EmptyState, FilterChip, Prog
// two lists of collections that could disagree about what exists is one list // two lists of collections that could disagree about what exists is one list
// too many. // too many.
import { CollectionRow } from "collections.slint"; import { CollectionRow } from "collections.slint";
import { GestureSheet, GestureRow } from "gestures.slint"; import { GestureRow } from "gestures.slint";
import { Labels, LabelMark, LabelPicker } from "labels.slint"; import { Labels, LabelMark, LabelPicker } from "labels.slint";
// TRACES: FR-CAT-5 // TRACES: FR-CAT-5
@@ -1661,14 +1661,10 @@ export component LibraryGrid inherits Rectangle {
callback open-settings(); callback open-settings();
callback open-people(); callback open-people();
/// TRACES: FR-UI-4 /// TRACES: FR-UI-4
/// The gesture reference's rows, from Rust — which reads them from the /// Open the gesture reference. The window draws it, as it draws the
/// generated table. See gestures.slint for why they cannot be written here. /// export sheet, so develop can open the same one; while it is up
in property <[GestureRow]> gestures; /// `sheet-open` is true and the keys here stand down.
/// Open the manual, at the section `anchor` names or at the top. callback open-help();
callback open-manual(string);
/// Whether the reference is up. Local, like `naming` and `filing`: nothing
/// in Rust needs to know a sheet is open.
property <bool> helping: false;
// --- selection and drag --- // --- selection and drag ---
// //
@@ -2396,7 +2392,7 @@ export component LibraryGrid inherits Rectangle {
open-import => { root.open-import(); } open-import => { root.open-import(); }
open-settings => { root.open-settings(); } open-settings => { root.open-settings(); }
open-people => { root.open-people(); } open-people => { root.open-people(); }
open-gestures => { root.helping = true; } open-gestures => { root.open-help(); }
} }
// Compact: one button in place of the row. Labelled rather // Compact: one button in place of the row. Labelled rather
@@ -2452,7 +2448,7 @@ export component LibraryGrid inherits Rectangle {
open-import => { root.open-import(); } open-import => { root.open-import(); }
open-settings => { root.open-settings(); } open-settings => { root.open-settings(); }
open-people => { root.open-people(); } open-people => { root.open-people(); }
open-gestures => { root.helping = true; } open-gestures => { root.open-help(); }
} }
} }
} }
@@ -3137,13 +3133,6 @@ export component LibraryGrid inherits Rectangle {
// button, and a sheet it walked straight past would leave // button, and a sheet it walked straight past would leave
// the user out of the grid with their selection gone. // the user out of the grid with their selection gone.
if (Keys.chord(event) == "Back" || Keys.chord(event) == "Escape") { if (Keys.chord(event) == "Back" || Keys.chord(event) == "Escape") {
// The help sheet first: it is drawn over everything
// else here, and F1 opened it from the keyboard, so
// the keyboard has to be able to put it away.
if (root.helping) {
root.helping = false;
return accept;
}
if (root.keywording) { if (root.keywording) {
root.keywording = false; root.keywording = false;
return accept; return accept;
@@ -3166,12 +3155,6 @@ export component LibraryGrid inherits Rectangle {
} }
return reject; return reject;
} }
// Nothing else acts behind the help sheet: a key that
// judged or keyworded the grid under it would change
// photographs the reader cannot see.
if (root.helping) {
return reject;
}
// GESTURE: Export the selection as the last export was // GESTURE: Export the selection as the last export was
// where: Library grid // where: Library grid
// touch: Select them, then Export in the selection bar // touch: Select them, then Export in the selection bar
@@ -3403,7 +3386,7 @@ export component LibraryGrid inherits Rectangle {
// F1 opens the reference the Help button does — the help // F1 opens the reference the Help button does — the help
// key everywhere else. // key everywhere else.
if (Keys.chord(event) == "F1") { if (Keys.chord(event) == "F1") {
root.helping = true; root.open-help();
return accept; return accept;
} }
if (Keys.chord(event) == "F2") { if (Keys.chord(event) == "F2") {
@@ -5232,17 +5215,6 @@ export component LibraryGrid inherits Rectangle {
} }
} }
// TRACES: FR-UI-2 | FR-UI-4
// The gesture reference. Last of the sheets, and above them all, because it
// is the one a user opens *because* another one confused them.
if root.helping: GestureSheet {
width: 100%;
height: 100%;
rows: root.gestures;
close => { root.helping = false; }
open-manual(anchor) => { root.open-manual(anchor); }
}
// --- the naming sheet (FR-CAT-5, FR-CAT-7) ------------------------------ // --- the naming sheet (FR-CAT-5, FR-CAT-7) ------------------------------
// //
// Why a sheet at all, rather than the sidebar's rename field: see `naming` // Why a sheet at all, rather than the sidebar's rename field: see `naming`