[Bf-blender-cvs] [ab0d02b704d] master: UI: use term 'Current Frame' instead of 'Playhead'

[Campbell Barton]

Commit: ab0d02b704d01fdcfedf33bc1a8a2ee434a3fb65
Author: Campbell Barton
Date:   Wed Jul 1 19:54:12 2020 +1000
Branches: master
https://developer.blender.org/rBab0d02b704d01fdcfedf33bc1a8a2ee434a3fb65

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

Keep terminology consistent, 'Current Frame' is used nearly everywhere.

===================================================================

M	release/scripts/startup/bl_operators/sequencer.py
M	release/scripts/startup/bl_ui/space_sequencer.py
M	release/scripts/startup/bl_ui/space_time.py
M	source/blender/editors/screen/screen_ops.c
M	source/blender/windowmanager/intern/wm_operator_props.c

===================================================================

diff --git a/release/scripts/startup/bl_operators/sequencer.py b/release/scripts/startup/bl_operators/sequencer.py
index f8f37953f1c..9ffb23287f8 100644
--- a/release/scripts/startup/bl_operators/sequencer.py
+++ b/release/scripts/startup/bl_operators/sequencer.py
@@ -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",
diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py
index 5b8d97488f9..8dfa182f52d 100644
--- a/release/scripts/startup/bl_ui/space_sequencer.py
+++ b/release/scripts/startup/bl_ui/space_sequencer.py
@@ -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))
diff --git a/release/scripts/startup/bl_ui/space_time.py b/release/scripts/startup/bl_ui/space_time.py
index 257e0c26a5d..1a9244a3051 100644
--- a/release/scripts/startup/bl_ui/space_time.py
+++ b/release/scripts/startup/bl_ui/space_time.py
@@ -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()
 
diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c
index 373d3e5349e..1623b59167e 100644
--- a/source/blender/editors/screen/screen_ops.c
+++ b/source/blender/editors/screen/screen_ops.c
@@ -4398,8 +4398,9 @@ static void screen_animation_region_tag_redraw(ScrArea *area,
     }
   }
 
-  /* No need to do a full redraw as the playhead is only updated. We do need to redraw when this
-   * area is in full screen as no other areas will be tagged for redrawing. */
+  /* No need to do a full redraw as the current frame indicator is only updated.
+   * We do need to redraw when this area is in full screen as no other areas
+   * will be tagged for redrawing. */
   if ((region->regiontype == RGN_TYPE_WINDOW) &&
       (ELEM(area->spacetype, SPACE_GRAPH, SPACE_NLA, SPACE_ACTION, SPACE_SEQ)) && !area->full) {
     return;
diff --git a/source/blender/windowmanager/intern/wm_operator_props.c b/source/blender/windowmanager/intern/wm_operator_props.c
index 93cd757ea93..78d8fc9a20d 100644
--- a/source/blender/windowmanager/intern/wm_operator_props.c
+++ b/source/blender/windowmanager/intern/wm_operator_props.c
@@ -446,8 +446,8 @@ void WM_operator_properties_select_walk_direction(wmOperatorType *ot)
  * help getting the wanted behavior to work. Most generic logic should be handled in these, so that
  * the select operators only have to care for the case dependent handling.
  *
- * Every select operator has slightly different requirements, e.g. VSE strip selection also needs
- * to account for handle selection. This should be the baseline behavior though.
+ * Every select operator has slightly different requirements, e.g. sequencer strip selection
+ * also needs to account for handle selection. This should be the baseline behavior though.
  */
 void WM_operator_properties_generic_select(wmOperatorType *ot)
 {