Skip to content

Commit 10f34df

Browse files
jonoomphjonoomph
committed
Merge branch 'develop' into multi-drop-improvements
# Conflicts: # doc/main_window.rst
2 parents b64ba44 + 00c3cb4 commit 10f34df

File tree

23 files changed

+866
-526
lines changed

23 files changed

+866
-526
lines changed

‎doc/export.rst

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,15 @@ Advanced Options
6565
.. table::
6666
:widths: 10 30
6767

68-
================== ============
69-
Advanced Setting Description
70-
================== ============
71-
Export To Export both `video & audio`, `only audio`, `only video`, or an `image sequence`
72-
Start Frame The first frame to export (default is 1)
73-
End Frame The final frame to export (default is the last frame in your project to contain a clip)
74-
================== ============
68+
======================= ============
69+
Advanced Setting Description
70+
======================= ============
71+
Export To Export both `video & audio`, `only audio`, `only video`, or an `image sequence`
72+
Start Frame The first frame to export (default is 1)
73+
End Frame The final frame to export (default is the last frame in your project to contain a clip)
74+
Start at First Clip This checkbox will toggle the **Start Frame** between `0.0` and the `start` of the first clip/transition position.
75+
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.
76+
======================= ============
7577

7678
Profile
7779
^^^^^^^

‎doc/main_window.rst

Lines changed: 90 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ Timeline Toolbar
103103
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).
104104
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).
105105
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.
106-
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.
106+
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.
107107
=========================== ============
108108

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

119-
=================================== ======================= ========================== ====================
120-
Action Shortcut 1 Shortcut 2 Shortcut 3
121-
=================================== ======================= ========================== ====================
122-
About OpenShot :kbd:`Ctrl+H`
123-
Add Marker :kbd:`M`
124-
Add Track :kbd:`Ctrl+Y`
125-
Add to Timeline :kbd:`Ctrl+Alt+A`
126-
Advanced View :kbd:`Alt+Shift+1`
127-
Animated Title :kbd:`Ctrl+Shift+T`
128-
Ask a Question... :kbd:`F4`
129-
Center on Playhead :kbd:`Shift+C` :kbd:`Alt+Up`
130-
Choose Profile :kbd:`Ctrl+Alt+P`
131-
Clear All Cache :kbd:`Ctrl+Shift+ESC`
132-
Clear History :kbd:`Ctrl+Shift+H`
133-
Clear Waveform Display Data :kbd:`Ctrl+Shift+W`
134-
Copy :kbd:`Ctrl+C`
135-
Cut :kbd:`Ctrl+X`
136-
Delete Item :kbd:`Delete` :kbd:`Backspace`
137-
Delete Item (Ripple) :kbd:`Shift+Delete`
138-
Details View :kbd:`Ctrl+Page Up`
139-
Donate :kbd:`F7`
140-
Duplicate :kbd:`Ctrl+Shift+/`
141-
Edit Title :kbd:`Alt+T`
142-
Export Selected Files :kbd:`Ctrl+Shift+E`
143-
Export Video / Media :kbd:`Ctrl+E` :kbd:`Ctrl+M`
144-
Fast Forward :kbd:`L`
145-
File Properties :kbd:`Alt+I` :kbd:`Ctrl+Double Click`
146-
Freeze View :kbd:`Ctrl+F`
147-
Fullscreen :kbd:`F11`
148-
Import Files... :kbd:`Ctrl+I`
149-
Insert Keyframe :kbd:`Alt+Shift+K`
150-
Join our Community... :kbd:`F5`
151-
Jump To End :kbd:`End`
152-
Jump To Start :kbd:`Home`
153-
Launch Tutorial :kbd:`F2`
154-
New Project :kbd:`Ctrl+N`
155-
Next Frame :kbd:`Right` :kbd:`.`
156-
Next Marker :kbd:`Shift+M` :kbd:`Alt+Right`
157-
Nudge left (1 Frame) :kbd:`Ctrl+Left`
158-
Nudge left (5 Frames) :kbd:`Shift+Ctrl+Left`
159-
Nudge right (1 Frame) :kbd:`Ctrl+Right`
160-
Nudge right (5 Frames) :kbd:`Shift+Ctrl+Right`
161-
Open Help Contents :kbd:`F1`
162-
Open Project... :kbd:`Ctrl+O`
163-
Paste :kbd:`Ctrl+V`
164-
Play/Pause Toggle :kbd:`Space` :kbd:`Up` :kbd:`Down`
165-
Preferences :kbd:`Ctrl+P`
166-
Preview File :kbd:`Alt+P` :kbd:`Double Click`
167-
Previous Frame :kbd:`Left` :kbd:`,`
168-
Previous Marker :kbd:`Ctrl+Shift+M` :kbd:`Alt+Left`
169-
Properties :kbd:`U`
170-
Quit :kbd:`Ctrl+Q`
171-
Razor Toggle :kbd:`C` :kbd:`B` :kbd:`R`
172-
Redo :kbd:`Ctrl+Shift+Z`
173-
Report a Bug... :kbd:`F3`
174-
Rewind :kbd:`J`
175-
Save Current Frame :kbd:`Ctrl+Shift+Y`
176-
Save Current Frame :kbd:`Ctrl+Shift+Y`
177-
Save Project :kbd:`Ctrl+S`
178-
Save Project As... :kbd:`Ctrl+Shift+S`
179-
Select All :kbd:`Ctrl+A`
180-
Select Item (Ripple) :kbd:`Alt+A` :kbd:`Alt+Click`
181-
Select None :kbd:`Ctrl+Shift+A`
182-
Show All Docks :kbd:`Ctrl+Shift+D`
183-
Simple View :kbd:`Alt+Shift+0`
184-
Slice All: Keep Both Sides :kbd:`Ctrl+Shift+K`
185-
Slice All: Keep Left Side :kbd:`Ctrl+Shift+J`
186-
Slice All: Keep Right Side :kbd:`Ctrl+Shift+L`
187-
Slice Selected: Keep Both Sides :kbd:`Ctrl+K`
188-
Slice Selected: Keep Left Side :kbd:`Ctrl+J`
189-
Slice Selected: Keep Right Side :kbd:`Ctrl+L`
190-
Slice Selected: Keep Left (Ripple) :kbd:`W`
191-
Slice Selected: Keep Right (Ripple) :kbd:`Q`
192-
Snapping Toggle :kbd:`S`
193-
Split File :kbd:`Alt+S` :kbd:`Shift+Double Click`
194-
Thumbnail View :kbd:`Ctrl+Page Down`
195-
Title :kbd:`Ctrl+T`
196-
Transform :kbd:`Ctrl+Alt+T`
197-
Translate this Application... :kbd:`F6`
198-
Un-Freeze View :kbd:`Ctrl+Shift+F`
199-
Undo :kbd:`Ctrl+Z`
200-
View Toolbar :kbd:`Ctrl+Shift+B`
201-
Zoom In :kbd:`=` :kbd:`Ctrl+=`
202-
Zoom Out :kbd:`-` :kbd:`Ctrl+-`
203-
=================================== ======================= ========================== ====================
119+
.. table::
120+
:widths: 35 20 20 20
121+
122+
=================================== ======================= ========================== ====================
123+
Action Shortcut 1 Shortcut 2 Shortcut 3
124+
=================================== ======================= ========================== ====================
125+
About OpenShot :kbd:`Ctrl+H`
126+
Add Marker :kbd:`M`
127+
Add Track :kbd:`Ctrl+Y`
128+
Add to Timeline :kbd:`Ctrl+Alt+A`
129+
Advanced View :kbd:`Alt+Shift+1`
130+
Animated Title :kbd:`Ctrl+Shift+T`
131+
Ask a Question... :kbd:`F4`
132+
Center on Playhead :kbd:`Shift+C` :kbd:`Alt+Up`
133+
Choose Profile :kbd:`Ctrl+Alt+P`
134+
Clear All Cache :kbd:`Ctrl+Shift+ESC`
135+
Clear History :kbd:`Ctrl+Shift+H`
136+
Clear Waveform Display Data :kbd:`Ctrl+Shift+W`
137+
Copy :kbd:`Ctrl+C`
138+
Cut :kbd:`Ctrl+X`
139+
Delete Item :kbd:`Delete` :kbd:`Backspace`
140+
Delete Item (Ripple) :kbd:`Shift+Delete`
141+
Details View :kbd:`Ctrl+Page Up`
142+
Donate :kbd:`F7`
143+
Duplicate :kbd:`Ctrl+Shift+/`
144+
Edit Title :kbd:`Alt+T`
145+
Export Selected Files :kbd:`Ctrl+Shift+E`
146+
Export Video / Media :kbd:`Ctrl+E` :kbd:`Ctrl+M`
147+
Fast Forward :kbd:`L`
148+
File Properties :kbd:`Alt+I` :kbd:`Ctrl+Double Click`
149+
Freeze View :kbd:`Ctrl+F`
150+
Fullscreen :kbd:`F11`
151+
Import Files... :kbd:`Ctrl+I`
152+
Insert Keyframe :kbd:`Alt+Shift+K`
153+
Join our Community... :kbd:`F5`
154+
Jump To End :kbd:`End`
155+
Jump To Start :kbd:`Home`
156+
Launch Tutorial :kbd:`F2`
157+
New Project :kbd:`Ctrl+N`
158+
Next Frame :kbd:`Right` :kbd:`.`
159+
Next Marker :kbd:`Shift+M` :kbd:`Alt+Right`
160+
Nudge left (1 Frame) :kbd:`Ctrl+Left`
161+
Nudge left (5 Frames) :kbd:`Shift+Ctrl+Left`
162+
Nudge right (1 Frame) :kbd:`Ctrl+Right`
163+
Nudge right (5 Frames) :kbd:`Shift+Ctrl+Right`
164+
Open Help Contents :kbd:`F1`
165+
Open Project... :kbd:`Ctrl+O`
166+
Paste :kbd:`Ctrl+V`
167+
Play/Pause Toggle :kbd:`Space` :kbd:`Up` :kbd:`Down`
168+
Preferences :kbd:`Ctrl+P`
169+
Preview File :kbd:`Alt+P` :kbd:`Double Click`
170+
Previous Frame :kbd:`Left` :kbd:`,`
171+
Previous Marker :kbd:`Ctrl+Shift+M` :kbd:`Alt+Left`
172+
Properties :kbd:`U`
173+
Quit :kbd:`Ctrl+Q`
174+
Razor Toggle :kbd:`C` :kbd:`B` :kbd:`R`
175+
Redo :kbd:`Ctrl+Shift+Z`
176+
Report a Bug... :kbd:`F3`
177+
Rewind :kbd:`J`
178+
Save Current Frame :kbd:`Ctrl+Shift+Y`
179+
Save Current Frame :kbd:`Ctrl+Shift+Y`
180+
Save Project :kbd:`Ctrl+S`
181+
Save Project As... :kbd:`Ctrl+Shift+S`
182+
Select All :kbd:`Ctrl+A`
183+
Select Item (Ripple) :kbd:`Alt+A` :kbd:`Alt+Click`
184+
Select None :kbd:`Ctrl+Shift+A`
185+
Show All Docks :kbd:`Ctrl+Shift+D`
186+
Simple View :kbd:`Alt+Shift+0`
187+
Slice All: Keep Both Sides :kbd:`Ctrl+Shift+K`
188+
Slice All: Keep Left Side :kbd:`Ctrl+Shift+J`
189+
Slice All: Keep Right Side :kbd:`Ctrl+Shift+L`
190+
Slice Selected: Keep Both Sides :kbd:`Ctrl+K`
191+
Slice Selected: Keep Left Side :kbd:`Ctrl+J`
192+
Slice Selected: Keep Right Side :kbd:`Ctrl+L`
193+
Slice Selected: Keep Left (Ripple) :kbd:`W`
194+
Slice Selected: Keep Right (Ripple) :kbd:`Q`
195+
Snapping Toggle :kbd:`S`
196+
Split File :kbd:`Alt+S` :kbd:`Shift+Double Click`
197+
Thumbnail View :kbd:`Ctrl+Page Down`
198+
Title :kbd:`Ctrl+T`
199+
Transform :kbd:`Ctrl+Alt+T`
200+
Translate this Application... :kbd:`F6`
201+
Un-Freeze View :kbd:`Ctrl+Shift+F`
202+
Undo :kbd:`Ctrl+Z`
203+
View Toolbar :kbd:`Ctrl+Shift+B`
204+
Zoom In :kbd:`=` :kbd:`Ctrl+=`
205+
Zoom Out :kbd:`-` :kbd:`Ctrl+-`
206+
Zoom to Timeline :kbd:`\\` :kbd:`Shift+\\` :kbd:`Double Click`
207+
=================================== ======================= ========================== ====================
204208

205209
Menu
206210
----

‎src/classes/timeline.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,7 @@ def changed(self, action):
7474
""" This method is invoked by the UpdateManager each time a change happens (i.e UpdateInterface) """
7575

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

8180
# Disable video caching temporarily

0 commit comments

Comments
 (0)