Merge lp://staging/~fincha/openshot/andy-1.2 into lp://staging/openshot/1.4
Proposed by
Andy Finch
| Status: | Merged | ||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Merge reported by: | Jonathan Thomas | ||||||||||||||||
| Merged at revision: | not available | ||||||||||||||||
| Proposed branch: | lp://staging/~fincha/openshot/andy-1.2 | ||||||||||||||||
| Merge into: | lp://staging/openshot/1.4 | ||||||||||||||||
| Diff against target: |
939 lines (+627/-19) (has conflicts) 14 files modified
openshot/classes/clip.py (+76/-1) openshot/classes/project.py (+21/-0) openshot/classes/thumbnail.py (+19/-7) openshot/effects/bass.xml (+23/-0) openshot/effects/treble.xml (+22/-0) openshot/windows/AddFiles.py (+53/-5) openshot/windows/FileProperties.py (+13/-0) openshot/windows/ImportTransitions.py (+138/-0) openshot/windows/MainGTK.py (+75/-4) openshot/windows/TreeTransitions.py (+28/-1) openshot/windows/preferences.py (+3/-1) openshot/windows/ui/ImportTransitions.ui (+134/-0) openshot/windows/ui/Main.ui (+9/-0) openshot/windows/ui/Main_clip_properties.ui (+13/-0) Text conflict in openshot/classes/clip.py Text conflict in openshot/classes/project.py Text conflict in openshot/windows/FileProperties.py |
||||||||||||||||
| To merge this branch: | bzr merge lp://staging/~fincha/openshot/andy-1.2 | ||||||||||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Jonathan Thomas | Pending | ||
|
Review via email:
|
|||
Description of the change
Includes the following fixes/changes:
#510755 - 'Replace Clip' option on the right click menu - replaces clip, but preserves current properties.
#510708 - Allow user to import new transitions (done via a gui)
#502861 - Dragging a clip on the Timeline shouldn't change the mute/visible properties (Couldn't actually prevent the change when dragging, but now you can't accidentally change them when right clicking or in razor mode).
#517068 - Add Frame snapshot. Keyboard shortcut 'f' extracts the current frame and adds to the project as an image.
Also added Bass & Treble audio effects - might replace these later with a proper equaliser, if I can get the ladspa audio effects working.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
