From 946ae26349eedbd6d7bdd859280c10ad80520417 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 1 Jun 2020 14:41:12 +1000 Subject: UI: use term current frame instead of playhead Avoid mixing different terminologies up, current frame is used in a majority of Blender. --- source/blender/editors/space_sequencer/sequencer_draw.c | 4 ++-- source/blender/editors/space_sequencer/sequencer_edit.c | 10 +++++----- source/blender/editors/space_sequencer/sequencer_select.c | 12 ++++++------ 3 files changed, 13 insertions(+), 13 deletions(-) (limited to 'source/blender/editors/space_sequencer') diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c index 5d8851d5e3d..1f06ab68516 100644 --- a/source/blender/editors/space_sequencer/sequencer_draw.c +++ b/source/blender/editors/space_sequencer/sequencer_draw.c @@ -2299,10 +2299,10 @@ void draw_timeline_seq(const bContext *C, ARegion *region) cfra_flag |= DRAWCFRA_UNIT_SECONDS; } - /* Draw playhead. */ + /* Draw the current frame indicator. */ ANIM_draw_cfra(C, v2d, cfra_flag); - /* Draw overlap playhead. */ + /* Draw overlap frame frame indicator. */ if (scene->ed && scene->ed->over_flag & SEQ_EDIT_OVERLAY_SHOW) { int cfra_over = (scene->ed->over_flag & SEQ_EDIT_OVERLAY_ABS) ? scene->ed->over_cfra : diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c index 7898c7fa8d0..ea0d5785d22 100644 --- a/source/blender/editors/space_sequencer/sequencer_edit.c +++ b/source/blender/editors/space_sequencer/sequencer_edit.c @@ -311,7 +311,7 @@ static int mouse_frame_side(View2D *v2d, short mouse_x, int frame) mval[0] = mouse_x; mval[1] = 0; - /* Choose the side based on which side of the playhead the mouse is on. */ + /* Choose the side based on which side of the current frame the mouse is on. */ UI_view2d_region_to_view(v2d, mval[0], mval[1], &mouseloc[0], &mouseloc[1]); return mouseloc[0] > frame ? SEQ_SIDE_RIGHT : SEQ_SIDE_LEFT; @@ -1376,7 +1376,7 @@ static int sequencer_snap_invoke(bContext *C, wmOperator *op, const wmEvent *UNU void SEQUENCER_OT_snap(struct wmOperatorType *ot) { /* Identifiers. */ - ot->name = "Snap Strips to Playhead"; + ot->name = "Snap Strips to the Current Frame"; ot->idname = "SEQUENCER_OT_snap"; ot->description = "Frame where selected strips will be snapped"; @@ -1727,7 +1727,7 @@ static int sequencer_slip_modal(bContext *C, wmOperator *op, const wmEvent *even mouse_x = event->mval[0]; } - /* Choose the side based on which side of the playhead the mouse is. */ + /* Choose the side based on which side of the current frame the mouse is. */ UI_view2d_region_to_view(v2d, mouse_x, 0, &mouseloc[0], &mouseloc[1]); offset = mouseloc[0] - data->init_mouseloc[0]; @@ -2374,7 +2374,7 @@ void SEQUENCER_OT_split(struct wmOperatorType *ot) "use_cursor_position", 0, "Use Cursor Position", - "Split at position of the cursor instead of playhead"); + "Split at position of the cursor instead of current frame"); prop = RNA_def_enum(ot->srna, "side", @@ -2976,7 +2976,7 @@ void SEQUENCER_OT_view_frame(wmOperatorType *ot) /* Identifiers. */ ot->name = "Go to Current Frame"; ot->idname = "SEQUENCER_OT_view_frame"; - ot->description = "Move the view to the playhead"; + ot->description = "Move the view to the current frame"; /* Api callbacks. */ ot->exec = sequencer_view_frame_exec; diff --git a/source/blender/editors/space_sequencer/sequencer_select.c b/source/blender/editors/space_sequencer/sequencer_select.c index a8779d96248..25e1b70482e 100644 --- a/source/blender/editors/space_sequencer/sequencer_select.c +++ b/source/blender/editors/space_sequencer/sequencer_select.c @@ -412,7 +412,7 @@ static int sequencer_select_exec(bContext *C, wmOperator *op) ret_value = OPERATOR_FINISHED; } - /* Select left, right or under playhead. */ + /* Select left, right or overlapping the current frame. */ else if (left_right != SEQ_SELECT_LR_NONE) { /* Use different logic for this. */ float x; @@ -422,7 +422,7 @@ static int sequencer_select_exec(bContext *C, wmOperator *op) switch (left_right) { case SEQ_SELECT_LR_MOUSE: { - /* 10px margin around playhead to select under playhead with mouse. */ + /* 10px margin around current frame to select under the current frame with mouse. */ float margin = BLI_rctf_size_x(&v2d->cur) / BLI_rcti_size_x(&v2d->mask) * 10; x = UI_view2d_region_to_view_x(v2d, mval[0]); if (x >= CFRA - margin && x <= CFRA + margin) { @@ -443,7 +443,7 @@ static int sequencer_select_exec(bContext *C, wmOperator *op) } SEQP_BEGIN (ed, seq) { - /* Select under playhead. */ + /* Select overlapping the current frame. */ if ((x == CFRA) && (seq->startdisp <= CFRA) && (seq->enddisp >= CFRA)) { seq->flag = SELECT; recurs_sel_seq(seq); @@ -643,9 +643,9 @@ void SEQUENCER_OT_select(wmOperatorType *ot) static const EnumPropertyItem sequencer_select_left_right_types[] = { {SEQ_SELECT_LR_NONE, "NONE", 0, "None", "Don't do left-right selection"}, {SEQ_SELECT_LR_MOUSE, "MOUSE", 0, "Mouse", "Use mouse position for selection"}, - {SEQ_SELECT_LR_LEFT, "LEFT", 0, "Left", "Select to the left of the playhead"}, - {SEQ_SELECT_LR_RIGHT, "RIGHT", 0, "Right", "Select to the right of the playhead"}, - {SEQ_SELECT_LR_UNDER_PLAYHEAD, "UNDER", 0, "Under", "Select under the playhead"}, + {SEQ_SELECT_LR_LEFT, "LEFT", 0, "Left", "Select to the left of the current frame"}, + {SEQ_SELECT_LR_RIGHT, "RIGHT", 0, "Right", "Select to the right of the current frame"}, + {SEQ_SELECT_LR_UNDER_PLAYHEAD, "UNDER", 0, "Under", "Select under the current frame"}, {0, NULL, 0, NULL, NULL}, }; PropertyRNA *prop; -- cgit v1.2.3