diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-10-05 03:27:04 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-10-05 03:29:31 +0300 |
commit | 0b98a679bb799fe496be67d8dd52fadef3c1027a (patch) | |
tree | 83302b41f2481cf9aad168459dce08a971b9d0fb /source/blender/editors/space_sequencer | |
parent | 50cb8013ebf8e421a16428756dd869ab844b41f6 (diff) |
UI: rename Border Select -> Box Select
See: T56648
Diffstat (limited to 'source/blender/editors/space_sequencer')
4 files changed, 21 insertions, 21 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c index 2ffc3971e18..38abfe909a6 100644 --- a/source/blender/editors/space_sequencer/sequencer_edit.c +++ b/source/blender/editors/space_sequencer/sequencer_edit.c @@ -3401,7 +3401,7 @@ void SEQUENCER_OT_swap_data(wmOperatorType *ot) /* properties */ } -/* borderselect operator */ +/* box select operator */ static int view_ghost_border_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); @@ -3436,7 +3436,7 @@ static int view_ghost_border_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -/* ****** Border Select ****** */ +/* ****** Box Select ****** */ void SEQUENCER_OT_view_ghost_border(wmOperatorType *ot) { /* identifiers */ @@ -3445,17 +3445,17 @@ void SEQUENCER_OT_view_ghost_border(wmOperatorType *ot) ot->description = "Set the boundaries of the border used for offset-view"; /* api callbacks */ - ot->invoke = WM_gesture_border_invoke; + ot->invoke = WM_gesture_box_invoke; ot->exec = view_ghost_border_exec; - ot->modal = WM_gesture_border_modal; + ot->modal = WM_gesture_box_modal; ot->poll = sequencer_view_preview_poll; - ot->cancel = WM_gesture_border_cancel; + ot->cancel = WM_gesture_box_cancel; /* flags */ ot->flag = 0; /* rna */ - WM_operator_properties_gesture_border(ot); + WM_operator_properties_gesture_box(ot); } /* rebuild_proxy operator */ diff --git a/source/blender/editors/space_sequencer/sequencer_intern.h b/source/blender/editors/space_sequencer/sequencer_intern.h index ef1559ca940..0d647c883be 100644 --- a/source/blender/editors/space_sequencer/sequencer_intern.h +++ b/source/blender/editors/space_sequencer/sequencer_intern.h @@ -148,7 +148,7 @@ void SEQUENCER_OT_select_linked(struct wmOperatorType *ot); void SEQUENCER_OT_select_linked_pick(struct wmOperatorType *ot); void SEQUENCER_OT_select_handles(struct wmOperatorType *ot); void SEQUENCER_OT_select_active_side(struct wmOperatorType *ot); -void SEQUENCER_OT_select_border(struct wmOperatorType *ot); +void SEQUENCER_OT_select_box(struct wmOperatorType *ot); void SEQUENCER_OT_select_inverse(struct wmOperatorType *ot); void SEQUENCER_OT_select_grouped(struct wmOperatorType *ot); diff --git a/source/blender/editors/space_sequencer/sequencer_ops.c b/source/blender/editors/space_sequencer/sequencer_ops.c index 61b6a6dc515..2b84466a353 100644 --- a/source/blender/editors/space_sequencer/sequencer_ops.c +++ b/source/blender/editors/space_sequencer/sequencer_ops.c @@ -107,7 +107,7 @@ void sequencer_operatortypes(void) WM_operatortype_append(SEQUENCER_OT_select_linked); WM_operatortype_append(SEQUENCER_OT_select_handles); WM_operatortype_append(SEQUENCER_OT_select_active_side); - WM_operatortype_append(SEQUENCER_OT_select_border); + WM_operatortype_append(SEQUENCER_OT_select_box); WM_operatortype_append(SEQUENCER_OT_select_grouped); /* sequencer_add.c */ @@ -318,7 +318,7 @@ void sequencer_keymap(wmKeyConfig *keyconf) WM_keymap_add_item(keymap, "SEQUENCER_OT_select_linked", LKEY, KM_PRESS, KM_CTRL, 0); - WM_keymap_add_item(keymap, "SEQUENCER_OT_select_border", BKEY, KM_PRESS, 0, 0); + WM_keymap_add_item(keymap, "SEQUENCER_OT_select_box", BKEY, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, "SEQUENCER_OT_select_grouped", GKEY, KM_PRESS, KM_SHIFT, 0); diff --git a/source/blender/editors/space_sequencer/sequencer_select.c b/source/blender/editors/space_sequencer/sequencer_select.c index 5b5f41ccb32..5fbe134b301 100644 --- a/source/blender/editors/space_sequencer/sequencer_select.c +++ b/source/blender/editors/space_sequencer/sequencer_select.c @@ -881,8 +881,8 @@ void SEQUENCER_OT_select_active_side(wmOperatorType *ot) } -/* borderselect operator */ -static int sequencer_borderselect_exec(bContext *C, wmOperator *op) +/* box_select operator */ +static int sequencer_box_select_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); Editing *ed = BKE_sequencer_editing_get(scene, false); @@ -919,19 +919,19 @@ static int sequencer_borderselect_exec(bContext *C, wmOperator *op) } -/* ****** Border Select ****** */ -void SEQUENCER_OT_select_border(wmOperatorType *ot) +/* ****** Box Select ****** */ +void SEQUENCER_OT_select_box(wmOperatorType *ot) { /* identifiers */ - ot->name = "Border Select"; - ot->idname = "SEQUENCER_OT_select_border"; - ot->description = "Select strips using border selection"; + ot->name = "Box Select"; + ot->idname = "SEQUENCER_OT_select_box"; + ot->description = "Select strips using box selection"; /* api callbacks */ - ot->invoke = WM_gesture_border_invoke; - ot->exec = sequencer_borderselect_exec; - ot->modal = WM_gesture_border_modal; - ot->cancel = WM_gesture_border_cancel; + ot->invoke = WM_gesture_box_invoke; + ot->exec = sequencer_box_select_exec; + ot->modal = WM_gesture_box_modal; + ot->cancel = WM_gesture_box_cancel; ot->poll = ED_operator_sequencer_active; @@ -939,7 +939,7 @@ void SEQUENCER_OT_select_border(wmOperatorType *ot) ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; /* rna */ - WM_operator_properties_gesture_border_select(ot); + WM_operator_properties_gesture_box_select(ot); } /* ****** Selected Grouped ****** */ |