Skip to content

Commit 118d53a

Browse files
committed
Fix shortcuts for Copy, Paste, and Slice, which broke due to Timeline backend refactor.
1 parent b41da06 commit 118d53a

File tree

1 file changed

+11
-10
lines changed

1 file changed

+11
-10
lines changed

src/windows/main_window.py

+11-10
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252

5353
from classes import exceptions, info, qt_types, sentry, ui_util, updates
5454
from classes.app import get_app
55+
from windows.views.timeline_backend.enums import MenuCopy, MenuSlice
5556
from classes.exporters.edl import export_edl
5657
from classes.exporters.final_cut_pro import export_xml
5758
from classes.importers.edl import import_edl
@@ -1767,52 +1768,52 @@ def keyPressEvent(self, event):
17671768
# Get list of clip ids
17681769
clip_ids = [c.id for c in intersecting_clips]
17691770
trans_ids = [t.id for t in intersecting_trans]
1770-
self.timeline.Slice_Triggered(0, clip_ids, trans_ids, playhead_position)
1771+
self.timeline.Slice_Triggered(MenuSlice.KEEP_BOTH, clip_ids, trans_ids, playhead_position)
17711772
elif key.matches(self.getShortcutByName("sliceAllKeepLeftSide")) == QKeySequence.ExactMatch:
17721773
intersecting_clips = Clip.filter(intersect=playhead_position)
17731774
intersecting_trans = Transition.filter(intersect=playhead_position)
17741775
if intersecting_clips or intersecting_trans:
17751776
# Get list of clip ids
17761777
clip_ids = [c.id for c in intersecting_clips]
17771778
trans_ids = [t.id for t in intersecting_trans]
1778-
self.timeline.Slice_Triggered(1, clip_ids, trans_ids, playhead_position)
1779+
self.timeline.Slice_Triggered(MenuSlice.KEEP_LEFT, clip_ids, trans_ids, playhead_position)
17791780
elif key.matches(self.getShortcutByName("sliceAllKeepRightSide")) == QKeySequence.ExactMatch:
17801781
intersecting_clips = Clip.filter(intersect=playhead_position)
17811782
intersecting_trans = Transition.filter(intersect=playhead_position)
17821783
if intersecting_clips or intersecting_trans:
17831784
# Get list of clip ids
17841785
clip_ids = [c.id for c in intersecting_clips]
17851786
trans_ids = [t.id for t in intersecting_trans]
1786-
self.timeline.Slice_Triggered(2, clip_ids, trans_ids, playhead_position)
1787+
self.timeline.Slice_Triggered(MenuSlice.KEEP_RIGHT, clip_ids, trans_ids, playhead_position)
17871788
elif key.matches(self.getShortcutByName("sliceSelectedKeepBothSides")) == QKeySequence.ExactMatch:
17881789
intersecting_clips = Clip.filter(intersect=playhead_position)
17891790
intersecting_trans = Transition.filter(intersect=playhead_position)
17901791
if intersecting_clips or intersecting_trans:
17911792
# Get list of clip ids
17921793
clip_ids = [c.id for c in intersecting_clips if c.id in self.selected_clips]
17931794
trans_ids = [t.id for t in intersecting_trans if t.id in self.selected_transitions]
1794-
self.timeline.Slice_Triggered(0, clip_ids, trans_ids, playhead_position)
1795+
self.timeline.Slice_Triggered(MenuSlice.KEEP_BOTH, clip_ids, trans_ids, playhead_position)
17951796
elif key.matches(self.getShortcutByName("sliceSelectedKeepLeftSide")) == QKeySequence.ExactMatch:
17961797
intersecting_clips = Clip.filter(intersect=playhead_position)
17971798
intersecting_trans = Transition.filter(intersect=playhead_position)
17981799
if intersecting_clips or intersecting_trans:
17991800
# Get list of clip ids
18001801
clip_ids = [c.id for c in intersecting_clips if c.id in self.selected_clips]
18011802
trans_ids = [t.id for t in intersecting_trans if t.id in self.selected_transitions]
1802-
self.timeline.Slice_Triggered(1, clip_ids, trans_ids, playhead_position)
1803+
self.timeline.Slice_Triggered(MenuSlice.KEEP_LEFT, clip_ids, trans_ids, playhead_position)
18031804
elif key.matches(self.getShortcutByName("sliceSelectedKeepRightSide")) == QKeySequence.ExactMatch:
18041805
intersecting_clips = Clip.filter(intersect=playhead_position)
18051806
intersecting_trans = Transition.filter(intersect=playhead_position)
18061807
if intersecting_clips or intersecting_trans:
18071808
# Get list of ids that are also selected
18081809
clip_ids = [c.id for c in intersecting_clips if c.id in self.selected_clips]
18091810
trans_ids = [t.id for t in intersecting_trans if t.id in self.selected_transitions]
1810-
self.timeline.Slice_Triggered(2, clip_ids, trans_ids, playhead_position)
1811+
self.timeline.Slice_Triggered(MenuSlice.KEEP_RIGHT, clip_ids, trans_ids, playhead_position)
18111812

18121813
elif key.matches(self.getShortcutByName("copyAll")) == QKeySequence.ExactMatch:
1813-
self.timeline.Copy_Triggered(-1, self.selected_clips, self.selected_transitions)
1814+
self.timeline.Copy_Triggered(MenuCopy.ALL, self.selected_clips, self.selected_transitions)
18141815
elif key.matches(self.getShortcutByName("pasteAll")) == QKeySequence.ExactMatch:
1815-
self.timeline.Paste_Triggered(9, float(playhead_position), -1, [], [])
1816+
self.timeline.Paste_Triggered(MenuCopy.PASTE, float(playhead_position), -1, [], [])
18161817
elif key.matches(self.getShortcutByName("nudgeLeft")) == QKeySequence.ExactMatch:
18171818
self.timeline.Nudge_Triggered(-1, self.selected_clips, self.selected_transitions)
18181819
elif key.matches(self.getShortcutByName("nudgeRight")) == QKeySequence.ExactMatch:
@@ -3140,14 +3141,14 @@ def playToggle(self):
31403141

31413142
def copyAll(self):
31423143
"""Handle Copy QShortcut (selected clips / transitions)"""
3143-
self.timeline.Copy_Triggered(-1, self.selected_clips, self.selected_transitions)
3144+
self.timeline.Copy_Triggered(MenuCopy.ALL, self.selected_clips, self.selected_transitions)
31443145

31453146
def pasteAll(self):
31463147
"""Handle Paste QShortcut (at timeline position, same track as original clip)"""
31473148
fps = get_app().project.get("fps")
31483149
fps_float = float(fps["num"]) / float(fps["den"])
31493150
playhead_position = float(self.preview_thread.current_frame - 1) / fps_float
3150-
self.timeline.Paste_Triggered(9, float(playhead_position), -1, [], [])
3151+
self.timeline.Paste_Triggered(MenuCopy.PASTE, float(playhead_position), -1, [], [])
31513152

31523153
def eventFilter(self, obj, event):
31533154
"""Filter out certain QShortcuts - for example, arrow keys used

0 commit comments

Comments
 (0)