griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

UI: use term 'Current Frame' instead of 'Playhead'

Browse Source 
Keep terminology consistent, 'Current Frame' is used nearly everywhere.
This commit is contained in:
Campbell Barton
2020-07-01 19:54:12 +10:00
parent 4387aff99e
commit ab0d02b704
5 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
release/scripts/startup/bl_operators/sequencer.py
View File

@@ -185,8 +185,10 @@ class SequencerFadesAdd(Operator):
('IN_OUT', 'Fade In And Out', 'Fade selected strips in and out'),
('IN', 'Fade In', 'Fade in selected strips'),
('OUT', 'Fade Out', 'Fade out selected strips'),
('CURSOR_FROM', 'From Playhead', 'Fade from the time cursor to the end of overlapping sequences'),
('CURSOR_TO', 'To Playhead', 'Fade from the start of sequences under the time cursor to the current frame'),
('CURSOR_FROM', 'From Current Frame',
'Fade from the time cursor to the end of overlapping sequences'),
('CURSOR_TO', 'To Current Frame',
'Fade from the start of sequences under the time cursor to the current frame'),
),
name="Fade type",
description="Fade in, out, both in and out, to, or from the current frame. Default is both in and out",

6
release/scripts/startup/bl_ui/space_sequencer.py
View File

@@ -474,7 +474,7 @@ class SEQUENCER_MT_navigation(Menu):
layout.separator()
layout.operator("sequencer.view_frame", text="Go to Playhead")
layout.operator("sequencer.view_frame")
layout.separator()
@@ -635,7 +635,7 @@ class SEQUENCER_MT_strip_transform(Menu):
layout = self.layout
layout.operator("transform.seq_slide", text="Move")
layout.operator("transform.transform", text="Move/Extend from Playhead").mode = 'TIME_EXTEND'
layout.operator("transform.transform", text="Move/Extend from Current Frame").mode = 'TIME_EXTEND'
layout.operator("sequencer.slip", text="Slip Strip Contents")
layout.separator()
@@ -1569,7 +1569,7 @@ class SEQUENCER_PT_time(SequencerButtonsPanel, Panel):
split = col.split(factor=0.5 + max_factor, align=True)
split.alignment = 'RIGHT'
split.label(text="Playhead")
split.label(text="Current Frame")
split = split.split(factor=0.8 + max_factor, align=True)
frame_display = frame_current - frame_final_start
split.label(text="%14s" % smpte_from_frame(frame_display))

4
release/scripts/startup/bl_ui/space_time.py
View File

@@ -243,8 +243,8 @@ class TIME_PT_playback(TimelinePanelButtons, Panel):
layout.prop(scene, "show_subframe", text="Subframes")
layout.prop(scene, "lock_frame_selection_to_range", text="Limit Playhead to Frame Range")
layout.prop(screen, "use_follow", text="Follow Playhead")
layout.prop(scene, "lock_frame_selection_to_range", text="Limit Playback to Frame Range")
layout.prop(screen, "use_follow", text="Follow Current Frame")
layout.separator()