diff --git a/docs/gestures.md b/docs/gestures.md index 3082d6e..2d09f65 100644 --- a/docs/gestures.md +++ b/docs/gestures.md @@ -5,11 +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. -<<<<<<< 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) +51 gestures, in 4 places. ## Develop @@ -29,19 +25,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 -`ui/dr-ui/ui/app.slint:1715` -======= -`ui/dr-ui/ui/app.slint:1710` ->>>>>>> d11c8aa (Dim the histogram while the canvas shows a draft) -======= -`ui/dr-ui/ui/app.slint:1755` ->>>>>>> 3f5f735 (Fade the draft into the sharp frame when a drag settles) -======= -`ui/dr-ui/ui/app.slint:1722` ->>>>>>> b2428ce (Show and set colour labels in the grid and develop, and filter by them) +`ui/dr-ui/ui/app.slint:1778` ### Move a magnified photograph about @@ -50,19 +34,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 -`ui/dr-ui/ui/app.slint:1808` -======= -`ui/dr-ui/ui/app.slint:1801` ->>>>>>> d11c8aa (Dim the histogram while the canvas shows a draft) -======= -`ui/dr-ui/ui/app.slint:1846` ->>>>>>> 3f5f735 (Fade the draft into the sharp frame when a drag settles) -======= -`ui/dr-ui/ui/app.slint:1813` ->>>>>>> b2428ce (Show and set colour labels in the grid and develop, and filter by them) +`ui/dr-ui/ui/app.slint:1871` ### Paint a mask by hand @@ -71,19 +43,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 -`ui/dr-ui/ui/app.slint:1895` -======= -`ui/dr-ui/ui/app.slint:1888` ->>>>>>> d11c8aa (Dim the histogram while the canvas shows a draft) -======= -`ui/dr-ui/ui/app.slint:1933` ->>>>>>> 3f5f735 (Fade the draft into the sharp frame when a drag settles) -======= -`ui/dr-ui/ui/app.slint:1900` ->>>>>>> b2428ce (Show and set colour labels in the grid and develop, and filter by them) +`ui/dr-ui/ui/app.slint:1958` ### Take back the last change @@ -93,23 +53,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. -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -`ui/dr-ui/ui/app.slint:2123` -======= -`ui/dr-ui/ui/app.slint:2116` ->>>>>>> 5b5164f (Say so when a crop leaves a mask outside the frame) -======= -`ui/dr-ui/ui/app.slint:2116` ->>>>>>> d11c8aa (Dim the histogram while the canvas shows a draft) -======= -`ui/dr-ui/ui/app.slint:2161` ->>>>>>> 3f5f735 (Fade the draft into the sharp frame when a drag settles) -======= -`ui/dr-ui/ui/app.slint:2128` ->>>>>>> b2428ce (Show and set colour labels in the grid and develop, and filter by them) +`ui/dr-ui/ui/app.slint:2189` ### Do it again after taking it back @@ -117,23 +61,7 @@ A whole drag is one step, so undo takes back a decision rather than a frame of a - **Pointer** — Click it, or press Redo in the History header - **Keyboard** — Ctrl+Shift+Z -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -`ui/dr-ui/ui/app.slint:2136` -======= -`ui/dr-ui/ui/app.slint:2129` ->>>>>>> 5b5164f (Say so when a crop leaves a mask outside the frame) -======= -`ui/dr-ui/ui/app.slint:2129` ->>>>>>> d11c8aa (Dim the histogram while the canvas shows a draft) -======= -`ui/dr-ui/ui/app.slint:2174` ->>>>>>> 3f5f735 (Fade the draft into the sharp frame when a drag settles) -======= -`ui/dr-ui/ui/app.slint:2141` ->>>>>>> b2428ce (Show and set colour labels in the grid and develop, and filter by them) +`ui/dr-ui/ui/app.slint:2202` ### Copy the settings from this photograph @@ -143,23 +71,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. -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -`ui/dr-ui/ui/app.slint:2169` -======= -`ui/dr-ui/ui/app.slint:2162` ->>>>>>> 5b5164f (Say so when a crop leaves a mask outside the frame) -======= -`ui/dr-ui/ui/app.slint:2162` ->>>>>>> d11c8aa (Dim the histogram while the canvas shows a draft) -======= -`ui/dr-ui/ui/app.slint:2207` ->>>>>>> 3f5f735 (Fade the draft into the sharp frame when a drag settles) -======= -`ui/dr-ui/ui/app.slint:2174` ->>>>>>> b2428ce (Show and set colour labels in the grid and develop, and filter by them) +`ui/dr-ui/ui/app.slint:2235` ### Paste the settings onto this photograph @@ -169,23 +81,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. -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -`ui/dr-ui/ui/app.slint:2181` -======= -`ui/dr-ui/ui/app.slint:2174` ->>>>>>> 5b5164f (Say so when a crop leaves a mask outside the frame) -======= -`ui/dr-ui/ui/app.slint:2174` ->>>>>>> d11c8aa (Dim the histogram while the canvas shows a draft) -======= -`ui/dr-ui/ui/app.slint:2219` ->>>>>>> 3f5f735 (Fade the draft into the sharp frame when a drag settles) -======= -`ui/dr-ui/ui/app.slint:2186` ->>>>>>> b2428ce (Show and set colour labels in the grid and develop, and filter by them) +`ui/dr-ui/ui/app.slint:2247` ### Choose which kinds of edit a copy carries @@ -195,23 +91,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. -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -`ui/dr-ui/ui/app.slint:2198` -======= -`ui/dr-ui/ui/app.slint:2191` ->>>>>>> 5b5164f (Say so when a crop leaves a mask outside the frame) -======= -`ui/dr-ui/ui/app.slint:2191` ->>>>>>> d11c8aa (Dim the histogram while the canvas shows a draft) -======= -`ui/dr-ui/ui/app.slint:2236` ->>>>>>> 3f5f735 (Fade the draft into the sharp frame when a drag settles) -======= -`ui/dr-ui/ui/app.slint:2203` ->>>>>>> b2428ce (Show and set colour labels in the grid and develop, and filter by them) +`ui/dr-ui/ui/app.slint:2264` ### Export this photograph as the last one was @@ -221,23 +101,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. -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -`ui/dr-ui/ui/app.slint:2227` -======= -`ui/dr-ui/ui/app.slint:2220` ->>>>>>> 5b5164f (Say so when a crop leaves a mask outside the frame) -======= -`ui/dr-ui/ui/app.slint:2220` ->>>>>>> d11c8aa (Dim the histogram while the canvas shows a draft) -======= -`ui/dr-ui/ui/app.slint:2265` ->>>>>>> 3f5f735 (Fade the draft into the sharp frame when a drag settles) -======= -`ui/dr-ui/ui/app.slint:2232` ->>>>>>> b2428ce (Show and set colour labels in the grid and develop, and filter by them) +`ui/dr-ui/ui/app.slint:2293` ### Choose how to export, then export @@ -247,23 +111,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. -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -`ui/dr-ui/ui/app.slint:2239` -======= -`ui/dr-ui/ui/app.slint:2232` ->>>>>>> 5b5164f (Say so when a crop leaves a mask outside the frame) -======= -`ui/dr-ui/ui/app.slint:2232` ->>>>>>> d11c8aa (Dim the histogram while the canvas shows a draft) -======= -`ui/dr-ui/ui/app.slint:2277` ->>>>>>> 3f5f735 (Fade the draft into the sharp frame when a drag settles) -======= -`ui/dr-ui/ui/app.slint:2244` ->>>>>>> b2428ce (Show and set colour labels in the grid and develop, and filter by them) +`ui/dr-ui/ui/app.slint:2305` ### Change which group of adjustments is on screen @@ -273,23 +121,7 @@ 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. -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -`ui/dr-ui/ui/app.slint:2264` -======= -`ui/dr-ui/ui/app.slint:2257` ->>>>>>> 5b5164f (Say so when a crop leaves a mask outside the frame) -======= -`ui/dr-ui/ui/app.slint:2257` ->>>>>>> d11c8aa (Dim the histogram while the canvas shows a draft) -======= -`ui/dr-ui/ui/app.slint:2302` ->>>>>>> 3f5f735 (Fade the draft into the sharp frame when a drag settles) -======= -`ui/dr-ui/ui/app.slint:2269` ->>>>>>> b2428ce (Show and set colour labels in the grid and develop, and filter by them) +`ui/dr-ui/ui/app.slint:2330` ### Look at the photograph at 1:1 @@ -299,22 +131,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. -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -`ui/dr-ui/ui/app.slint:2299` -======= -`ui/dr-ui/ui/app.slint:2292` ->>>>>>> 5b5164f (Say so when a crop leaves a mask outside the frame) -======= -`ui/dr-ui/ui/app.slint:2292` ->>>>>>> d11c8aa (Dim the histogram while the canvas shows a draft) -======= -`ui/dr-ui/ui/app.slint:2337` ->>>>>>> 3f5f735 (Fade the draft into the sharp frame when a drag settles) -======= -`ui/dr-ui/ui/app.slint:2304` +`ui/dr-ui/ui/app.slint:2365` ### Give this photograph a colour label @@ -324,8 +141,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. -`ui/dr-ui/ui/app.slint:2356` ->>>>>>> b2428ce (Show and set colour labels in the grid and develop, and filter by them) +`ui/dr-ui/ui/app.slint:2420` ### Move to the next or previous photograph @@ -335,23 +151,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. Unmodified only: Ctrl+D and Ctrl+A are not this. -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -`ui/dr-ui/ui/app.slint:2354` -======= -`ui/dr-ui/ui/app.slint:2344` ->>>>>>> 5b5164f (Say so when a crop leaves a mask outside the frame) -======= -`ui/dr-ui/ui/app.slint:2344` ->>>>>>> d11c8aa (Dim the histogram while the canvas shows a draft) -======= -`ui/dr-ui/ui/app.slint:2389` ->>>>>>> 3f5f735 (Fade the draft into the sharp frame when a drag settles) -======= -`ui/dr-ui/ui/app.slint:2381` ->>>>>>> b2428ce (Show and set colour labels in the grid and develop, and filter by them) +`ui/dr-ui/ui/app.slint:2445` ### See the photograph before you edited it @@ -361,23 +161,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. -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -`ui/dr-ui/ui/app.slint:2487` -======= -`ui/dr-ui/ui/app.slint:2477` ->>>>>>> 5b5164f (Say so when a crop leaves a mask outside the frame) -======= -`ui/dr-ui/ui/app.slint:2477` ->>>>>>> d11c8aa (Dim the histogram while the canvas shows a draft) -======= -`ui/dr-ui/ui/app.slint:2522` ->>>>>>> 3f5f735 (Fade the draft into the sharp frame when a drag settles) -======= -`ui/dr-ui/ui/app.slint:2514` ->>>>>>> b2428ce (Show and set colour labels in the grid and develop, and filter by them) +`ui/dr-ui/ui/app.slint:2578` ### Put one control back to its default