Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow clip drag past edge of Timeline (without resetting position) #5621

Merged
merged 17 commits into from
Oct 4, 2024
Merged

Allow clip drag past edge of Timeline (without resetting position) #5621

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
f7051c9
Remove Droppable Track from Angular timeline code. Replace with stati…
jonoomph Sep 17, 2024
8f378dc
Fixing Codacy nitpicks
jonoomph Sep 17, 2024
ca35a9f
Fixed playhead and ruler dragging to be global (i.e. you can drag out…
jonoomph Sep 17, 2024
3ad246b
Clicking the ruler time (top left of the timeline ruler) now jumps to…
jonoomph Sep 17, 2024
233c600
Fix small regression on clip/transition selection when clicking or re…
jonoomph Sep 18, 2024
0eb5935
Tons of fixes to Zoom Slider, no longer breaks when zooming too far o…
jonoomph Sep 20, 2024
a4319ba
Fixed bug on double click when restoring previous scrollbar, that cau…
jonoomph Sep 20, 2024
011890f
Fixed bug when single click jumping the zoom slider to a new position…
jonoomph Sep 20, 2024
c7d98a2
Fixed many issues with track resizing, and playhead becoming detacthe…
jonoomph Sep 20, 2024
2109d06
Renaming .resize-handle to .track-resize-handle for clarity. Adding s…
jonoomph Sep 20, 2024
347296f
When extremely zoomed in on the right edge of the timeline, keep the …
jonoomph Sep 22, 2024
b8f560b
Keep the right edge of the timeline stuck on the right side of the sc…
jonoomph Sep 23, 2024
c50f3c9
Adding new Advanced export option (Export Entire Timeline), which adj…
jonoomph Sep 24, 2024
70c59e5
Adding export settings to a project, so the export dialog will always…
jonoomph Sep 30, 2024
39be79e
Rename "Export Entire Timeline" option to "End at Last Clip", and add…
jonoomph Sep 30, 2024
6dc4364
Update translations for new checkboxes on Export dialog, and update E…
jonoomph Sep 30, 2024
a2051ca
Fixing Codacy nitpicks in JS
jonoomph Sep 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions doc/export.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,15 @@ Advanced Options
.. table::
:widths: 10 30

================== ============
Advanced Setting Description
================== ============
Export To Export both `video & audio`, `only audio`, `only video`, or an `image sequence`
Start Frame The first frame to export (default is 1)
End Frame The final frame to export (default is the last frame in your project to contain a clip)
================== ============
======================= ============
Advanced Setting Description
======================= ============
Export To Export both `video & audio`, `only audio`, `only video`, or an `image sequence`
Start Frame The first frame to export (default is 1)
End Frame The final frame to export (default is the last frame in your project to contain a clip)
Start at First Clip This checkbox will toggle the **Start Frame** between `0.0` and the `start` of the first clip/transition position.
End at Last Clip This checkbox will toggle the **End Frame** between the `end` of the furthest clip/transition and the full `project duration`. The project duration can be adjusted by dragging the right edge of any track. You will need to zoom out (:guilabel:`Ctrl+Scroll Wheel`) of the timeline before you can drag the right edge of a track.
======================= ============

Profile
^^^^^^^
Expand Down
176 changes: 90 additions & 86 deletions doc/main_window.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ Timeline Toolbar
Previous Marker Jump to the previous marker. This moves the playhead to the left, seeking to the next marker or important position (i.e. start / end positions of clips).
Next Marker Jump to the next marker. This moves the playhead to the right, seeking to the next marker or important position (i.e. start / end positions of clips).
Center Timeline on Playhead This centers the timeline on the playhead position. This can be useful if the playhead is not visible and you want to quickly scroll the timeline to that position.
Zoom Slider This controls the visible portion of the timeline. Adjusting the left/right handles will zoom in/out of your timeline, keeping a specific section of your project in view.
Zoom Slider This controls the visible portion of the timeline. Adjusting the left/right handles will zoom in/out of your timeline, keeping a specific section of your project in view. Double click to zoom to your entire timeline.
=========================== ============

.. _keyboard_shortcut_ref:
Expand All @@ -116,91 +116,95 @@ configure these shortcuts in the Preferences window, which is opened by selectin
(On macOS, choose :guilabel:`OpenShot Video Editor→Preferences`.)
Learning a few of these shortcuts can save you a bunch of time!

=================================== ======================= ========================== ====================
Action Shortcut 1 Shortcut 2 Shortcut 3
=================================== ======================= ========================== ====================
About OpenShot :kbd:`Ctrl+H`
Add Marker :kbd:`M`
Add Track :kbd:`Ctrl+Y`
Add to Timeline :kbd:`Ctrl+Alt+A`
Advanced View :kbd:`Alt+Shift+1`
Animated Title :kbd:`Ctrl+Shift+T`
Ask a Question... :kbd:`F4`
Center on Playhead :kbd:`Shift+C` :kbd:`Alt+Up`
Choose Profile :kbd:`Ctrl+Alt+P`
Clear All Cache :kbd:`Ctrl+Shift+ESC`
Clear History :kbd:`Ctrl+Shift+H`
Clear Waveform Display Data :kbd:`Ctrl+Shift+W`
Copy :kbd:`Ctrl+C`
Cut :kbd:`Ctrl+X`
Delete Item :kbd:`Delete` :kbd:`Backspace`
Delete Item (Ripple) :kbd:`Shift+Delete`
Details View :kbd:`Ctrl+Page Up`
Donate :kbd:`F7`
Duplicate :kbd:`Ctrl+Shift+/`
Edit Title :kbd:`Alt+T`
Export Selected Files :kbd:`Ctrl+Shift+E`
Export Video / Media :kbd:`Ctrl+E` :kbd:`Ctrl+M`
Fast Forward :kbd:`L`
File Properties :kbd:`Alt+I` :kbd:`Ctrl+Double Click`
Freeze View :kbd:`Ctrl+F`
Fullscreen :kbd:`F11`
Import Files... :kbd:`Ctrl+I`
Insert Keyframe :kbd:`Alt+Shift+K`
Join our Community... :kbd:`F5`
Jump To End :kbd:`End`
Jump To Start :kbd:`Home`
Launch Tutorial :kbd:`F2`
New Project :kbd:`Ctrl+N`
Next Frame :kbd:`Right` :kbd:`.`
Next Marker :kbd:`Shift+M` :kbd:`Alt+Right`
Nudge left (1 Frame) :kbd:`Ctrl+Left`
Nudge left (5 Frames) :kbd:`Shift+Ctrl+Left`
Nudge right (1 Frame) :kbd:`Ctrl+Right`
Nudge right (5 Frames) :kbd:`Shift+Ctrl+Right`
Open Help Contents :kbd:`F1`
Open Project... :kbd:`Ctrl+O`
Paste :kbd:`Ctrl+V`
Play/Pause Toggle :kbd:`Space` :kbd:`Up` :kbd:`Down`
Preferences :kbd:`Ctrl+P`
Preview File :kbd:`Alt+P` :kbd:`Double Click`
Previous Frame :kbd:`Left` :kbd:`,`
Previous Marker :kbd:`Ctrl+Shift+M` :kbd:`Alt+Left`
Properties :kbd:`U`
Quit :kbd:`Ctrl+Q`
Razor Toggle :kbd:`C` :kbd:`B` :kbd:`R`
Redo :kbd:`Ctrl+Shift+Z`
Report a Bug... :kbd:`F3`
Rewind :kbd:`J`
Save Current Frame :kbd:`Ctrl+Shift+Y`
Save Current Frame :kbd:`Ctrl+Shift+Y`
Save Project :kbd:`Ctrl+S`
Save Project As... :kbd:`Ctrl+Shift+S`
Select All :kbd:`Ctrl+A`
Select Item (Ripple) :kbd:`Shift+A` :kbd:`Shift+Click`
Select None :kbd:`Ctrl+Shift+A`
Show All Docks :kbd:`Ctrl+Shift+D`
Simple View :kbd:`Alt+Shift+0`
Slice All: Keep Both Sides :kbd:`Ctrl+Shift+K`
Slice All: Keep Left Side :kbd:`Ctrl+Shift+J`
Slice All: Keep Right Side :kbd:`Ctrl+Shift+L`
Slice Selected: Keep Both Sides :kbd:`Ctrl+K`
Slice Selected: Keep Left Side :kbd:`Ctrl+J`
Slice Selected: Keep Right Side :kbd:`Ctrl+L`
Slice Selected: Keep Left (Ripple) :kbd:`W`
Slice Selected: Keep Right (Ripple) :kbd:`Q`
Snapping Toggle :kbd:`S`
Split File :kbd:`Alt+S` :kbd:`Shift+Double Click`
Thumbnail View :kbd:`Ctrl+Page Down`
Title :kbd:`Ctrl+T`
Transform :kbd:`Ctrl+Alt+T`
Translate this Application... :kbd:`F6`
Un-Freeze View :kbd:`Ctrl+Shift+F`
Undo :kbd:`Ctrl+Z`
View Toolbar :kbd:`Ctrl+Shift+B`
Zoom In :kbd:`=` :kbd:`Ctrl+=`
Zoom Out :kbd:`-` :kbd:`Ctrl+-`
=================================== ======================= ========================== ====================
.. table::
:widths: 35 20 20 20

=================================== ======================= ========================== ====================
Action Shortcut 1 Shortcut 2 Shortcut 3
=================================== ======================= ========================== ====================
About OpenShot :kbd:`Ctrl+H`
Add Marker :kbd:`M`
Add Track :kbd:`Ctrl+Y`
Add to Timeline :kbd:`Ctrl+Alt+A`
Advanced View :kbd:`Alt+Shift+1`
Animated Title :kbd:`Ctrl+Shift+T`
Ask a Question... :kbd:`F4`
Center on Playhead :kbd:`Shift+C` :kbd:`Alt+Up`
Choose Profile :kbd:`Ctrl+Alt+P`
Clear All Cache :kbd:`Ctrl+Shift+ESC`
Clear History :kbd:`Ctrl+Shift+H`
Clear Waveform Display Data :kbd:`Ctrl+Shift+W`
Copy :kbd:`Ctrl+C`
Cut :kbd:`Ctrl+X`
Delete Item :kbd:`Delete` :kbd:`Backspace`
Delete Item (Ripple) :kbd:`Shift+Delete`
Details View :kbd:`Ctrl+Page Up`
Donate :kbd:`F7`
Duplicate :kbd:`Ctrl+Shift+/`
Edit Title :kbd:`Alt+T`
Export Selected Files :kbd:`Ctrl+Shift+E`
Export Video / Media :kbd:`Ctrl+E` :kbd:`Ctrl+M`
Fast Forward :kbd:`L`
File Properties :kbd:`Alt+I` :kbd:`Ctrl+Double Click`
Freeze View :kbd:`Ctrl+F`
Fullscreen :kbd:`F11`
Import Files... :kbd:`Ctrl+I`
Insert Keyframe :kbd:`Alt+Shift+K`
Join our Community... :kbd:`F5`
Jump To End :kbd:`End`
Jump To Start :kbd:`Home`
Launch Tutorial :kbd:`F2`
New Project :kbd:`Ctrl+N`
Next Frame :kbd:`Right` :kbd:`.`
Next Marker :kbd:`Shift+M` :kbd:`Alt+Right`
Nudge left (1 Frame) :kbd:`Ctrl+Left`
Nudge left (5 Frames) :kbd:`Shift+Ctrl+Left`
Nudge right (1 Frame) :kbd:`Ctrl+Right`
Nudge right (5 Frames) :kbd:`Shift+Ctrl+Right`
Open Help Contents :kbd:`F1`
Open Project... :kbd:`Ctrl+O`
Paste :kbd:`Ctrl+V`
Play/Pause Toggle :kbd:`Space` :kbd:`Up` :kbd:`Down`
Preferences :kbd:`Ctrl+P`
Preview File :kbd:`Alt+P` :kbd:`Double Click`
Previous Frame :kbd:`Left` :kbd:`,`
Previous Marker :kbd:`Ctrl+Shift+M` :kbd:`Alt+Left`
Properties :kbd:`U`
Quit :kbd:`Ctrl+Q`
Razor Toggle :kbd:`C` :kbd:`B` :kbd:`R`
Redo :kbd:`Ctrl+Shift+Z`
Report a Bug... :kbd:`F3`
Rewind :kbd:`J`
Save Current Frame :kbd:`Ctrl+Shift+Y`
Save Current Frame :kbd:`Ctrl+Shift+Y`
Save Project :kbd:`Ctrl+S`
Save Project As... :kbd:`Ctrl+Shift+S`
Select All :kbd:`Ctrl+A`
Select Item (Ripple) :kbd:`Shift+A` :kbd:`Shift+Click`
Select None :kbd:`Ctrl+Shift+A`
Show All Docks :kbd:`Ctrl+Shift+D`
Simple View :kbd:`Alt+Shift+0`
Slice All: Keep Both Sides :kbd:`Ctrl+Shift+K`
Slice All: Keep Left Side :kbd:`Ctrl+Shift+J`
Slice All: Keep Right Side :kbd:`Ctrl+Shift+L`
Slice Selected: Keep Both Sides :kbd:`Ctrl+K`
Slice Selected: Keep Left Side :kbd:`Ctrl+J`
Slice Selected: Keep Right Side :kbd:`Ctrl+L`
Slice Selected: Keep Left (Ripple) :kbd:`W`
Slice Selected: Keep Right (Ripple) :kbd:`Q`
Snapping Toggle :kbd:`S`
Split File :kbd:`Alt+S` :kbd:`Shift+Double Click`
Thumbnail View :kbd:`Ctrl+Page Down`
Title :kbd:`Ctrl+T`
Transform :kbd:`Ctrl+Alt+T`
Translate this Application... :kbd:`F6`
Un-Freeze View :kbd:`Ctrl+Shift+F`
Undo :kbd:`Ctrl+Z`
View Toolbar :kbd:`Ctrl+Shift+B`
Zoom In :kbd:`=` :kbd:`Ctrl+=`
Zoom Out :kbd:`-` :kbd:`Ctrl+-`
Zoom to Timeline :kbd:`\\` :kbd:`Shift+\\` :kbd:`Double Click`
=================================== ======================= ========================== ====================

Menu
----
Expand Down
3 changes: 1 addition & 2 deletions src/classes/timeline.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,7 @@ def changed(self, action):
""" This method is invoked by the UpdateManager each time a change happens (i.e UpdateInterface) """

# Ignore changes that don't affect libopenshot
if action and len(action.key) >= 1 and action.key[0].lower() in ["files", "history", "markers",
"layers", "scale", "profile"]:
if action and len(action.key) >= 1 and action.key[0].lower() in ["files", "history", "markers", "layers", "scale", "profile", "export_settings"]:
return

# Disable video caching temporarily
Expand Down
Loading
Loading