Merge pull request #6024 from OpenShot/mask-fixes

Timeline Improvements (Ruler Time Editor, Zoom & Thumbnail fixes, New Motion Presets)

Author: jonoomph

doc/clips.rst

@@ -151,7 +151,7 @@ the user has the following menu options:
    Copy / Cut / Paste  Copy selected clip data, cut selected clips, or paste copied clip data. Copy supports full clips, effects, and keyframe groups.
    Align               Align the left or right edge of multiple selected clips and transitions (only shown when multiple clips are selected).
    Fade                Fade the clip in or out — automatically fades video (alpha) and/or audio (volume) based on what the clip contains.
-   Motion              Add animated motion to a clip: slide in/out, bounce, blur, zoom, emphasis effects at the playhead, camera movements, and scrolling credits. Only shown for visual clips.
+   Motion              Add animated motion to a clip: slide in/out, bounce, blur, wipe/focus-wipe, zoom, emphasis effects at the playhead, camera movements, and scrolling credits. Only shown for visual clips.
    Transform           Apply geometric presets to a clip: rotate/flip, crop, or snap to a corner layout. Also provides a **No Transform** reset. Only shown for visual clips.
    Look                Apply visual style presets: color grades, film grain, analog tape, sharpen, blur, shadow, and glow effects. Includes **Adjust Colors** (Color Wheels editor) and **Analyze Colors** (video scopes). Only shown for visual clips.
    Speed               Reverse, repeat, speed up, or slow down video. Includes Freeze and Freeze & Zoom options.
@@ -189,12 +189,13 @@ several submenus. See :ref:`clip_location_x_ref` and :ref:`clip_scale_x_ref` key
   - **Back In** (From Bottom / Left / Right / Top) — clip overshoots and springs back into position.
   - **Blur In** — clip fades in from a motion blur.
   - **Bounce In** (Center / From Bottom / Left / Right / Top) — clip bounces as it enters.
+  - **Focus Wipe In** (Circle Expand / Circle Shrink / From Bottom / Left / Right / Top) — clip is revealed by a wipe while sharpening from blur into focus.
   - **Pop In** — clip scales up quickly from nothing.
   - **Slide In** (From Bottom / Left / Right / Top) — clip slides onto the screen.
   - **Spiral In** — clip rotates in while scaling up.
   - **Wipe In** (Circle Expand / Circle Shrink / From Bottom / Left / Right / Top) — clip is revealed by a wipe.
 
-- :guilabel:`Out` — exit animations applied at the end of the clip (mirrors the In options: Back Out, Blur Out, Bounce Out, Pop Out, Slide Out, Spiral Out, Wipe Out).
+- :guilabel:`Out` — exit animations applied at the end of the clip (mirrors the In options: Back Out, Blur Out, Bounce Out, Focus Wipe Out, Pop Out, Slide Out, Spiral Out, Wipe Out).
 
 - :guilabel:`Emphasis` — short attention-grabbing animations **inserted at the current playhead position** (not applied across the whole clip). Useful for mid-clip highlights: **Bounce**, **Flash**, **Heartbeat**, **Jello**, **Pulse**, **Rubber Band**, **Shake X**, **Shake Y**, **Swing**, **Tada**, **Wobble**.
 

doc/main_window.rst

@@ -40,7 +40,7 @@ Overview
    4   Preview Window      This is the area that the video will playback on the screen.
    5   Timeline Toolbar    This toolbar contains buttons used for snapping, inserting markers, slicing razor, jumping between markers, and centering the timeline on the playhead. See :ref:`timeline_toolbar_ref`.
    6   Zoom Slider         This slider will adjust the time-scale of your timeline. Drag the left or right edge to zoom in or out. Drag the blue area to scroll the timeline left or right. Clips and transitions are displayed as simple rectangles, to give you context for adjusting the zoom to specific clips.
-   7   Play-head / Ruler   The ruler shows the time-scale, and the red line is the play-head. The play-head represents the current playback position. Hold :kbd:`Shift` key while dragging the playhead to snap to nearby clips.
+   7   Play-head / Ruler   The ruler shows the time-scale, and the line is the play-head. The play-head represents the current playback position. The current timecode can be clicked to enter an exact timecode. Hold :kbd:`Shift` key while dragging the playhead to snap to nearby clips.
    8   Timeline            The timeline visualizes your video project, and each clip and transition in your project. You can drag the mouse to select, move, or delete multiple items.
    9   Filter              Filter the list of items shown (project files, transitions, effects, and emojis) by using these buttons and filter textbox. Enter a few letters of what you are looking for, and the results will be shown.
    10  Playback            Left to Right: Jump to Start, Rewind, Play/Pause, Fast Forward, and Jump to End

doc/timeline.rst

@@ -54,6 +54,18 @@ These terms are used often in this guide:
 
 For a full glossary, see :ref:`glossary_ref`.
 
+Current Timecode
+----------------
+
+The current timecode appears at the left side of the timeline ruler and shows the
+playhead's exact position. Click the timecode, enter a new value, and press
+:kbd:`Enter` to move the playhead to that frame.
+
+Clear the field or enter ``0`` to jump to the start of the timeline.
+Press :kbd:`Up` or :kbd:`Down` to step the selected timecode segment;
+hold :kbd:`Shift` to step by 10. When the frame segment is selected,
+hold :kbd:`Ctrl` to step by one second. Press :kbd:`Esc` to cancel.
+
 Common Timeline Tasks
 ---------------------
 

src/animation_presets.py

@@ -53,6 +53,7 @@
     'ease_in_quint': (0.755, 0.050, 0.855, 0.060),
     'ease_out': (0.000, 0.000, 0.580, 1.000),
     'ease_out_cubic': (0.215, 0.610, 0.355, 1.000),
+    'ease_in_out': (0.250, 0.000, 0.750, 1.000),
 }
 
 PRESETS = {