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/animation | |
parent | 50cb8013ebf8e421a16428756dd869ab844b41f6 (diff) |
UI: rename Border Select -> Box Select
See: T56648
Diffstat (limited to 'source/blender/editors/animation')
-rw-r--r-- | source/blender/editors/animation/anim_channels_edit.c | 36 | ||||
-rw-r--r-- | source/blender/editors/animation/anim_markers.c | 30 | ||||
-rw-r--r-- | source/blender/editors/animation/anim_ops.c | 10 |
3 files changed, 38 insertions, 38 deletions
diff --git a/source/blender/editors/animation/anim_channels_edit.c b/source/blender/editors/animation/anim_channels_edit.c index 26ef7f5ee73..ce60fce23fc 100644 --- a/source/blender/editors/animation/anim_channels_edit.c +++ b/source/blender/editors/animation/anim_channels_edit.c @@ -2383,9 +2383,9 @@ static void ANIM_OT_channels_select_all(wmOperatorType *ot) WM_operator_properties_select_all(ot); } -/* ******************** Borderselect Operator *********************** */ +/* ******************** Box Select Operator *********************** */ -static void borderselect_anim_channels(bAnimContext *ac, rcti *rect, short selectmode) +static void box_select_anim_channels(bAnimContext *ac, rcti *rect, short selectmode) { ListBase anim_data = {NULL, NULL}; bAnimListElem *ale; @@ -2414,7 +2414,7 @@ static void borderselect_anim_channels(bAnimContext *ac, rcti *rect, short selec filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_LIST_CHANNELS); ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype); - /* loop over data, doing border select */ + /* loop over data, doing box select */ for (ale = anim_data.first; ale; ale = ale->next) { if (ac->datatype == ANIMCONT_NLA) ymin = ymax - NLACHANNEL_STEP(snla); @@ -2459,7 +2459,7 @@ static void borderselect_anim_channels(bAnimContext *ac, rcti *rect, short selec /* ------------------- */ -static int animchannels_borderselect_exec(bContext *C, wmOperator *op) +static int animchannels_box_select_exec(bContext *C, wmOperator *op) { bAnimContext ac; rcti rect; @@ -2485,8 +2485,8 @@ static int animchannels_borderselect_exec(bContext *C, wmOperator *op) selectmode = ACHANNEL_SETFLAG_CLEAR; } - /* apply borderselect animation channels */ - borderselect_anim_channels(&ac, &rect, selectmode); + /* apply box_select animation channels */ + box_select_anim_channels(&ac, &rect, selectmode); /* send notifier that things have changed */ WM_event_add_notifier(C, NC_ANIMATION | ND_ANIMCHAN | NA_SELECTED, NULL); @@ -2494,18 +2494,18 @@ static int animchannels_borderselect_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -static void ANIM_OT_channels_select_border(wmOperatorType *ot) +static void ANIM_OT_channels_select_box(wmOperatorType *ot) { /* identifiers */ - ot->name = "Border Select"; - ot->idname = "ANIM_OT_channels_select_border"; + ot->name = "Box Select"; + ot->idname = "ANIM_OT_channels_select_box"; ot->description = "Select all animation channels within the specified region"; /* api callbacks */ - ot->invoke = WM_gesture_border_invoke; - ot->exec = animchannels_borderselect_exec; - ot->modal = WM_gesture_border_modal; - ot->cancel = WM_gesture_border_cancel; + ot->invoke = WM_gesture_box_invoke; + ot->exec = animchannels_box_select_exec; + ot->modal = WM_gesture_box_modal; + ot->cancel = WM_gesture_box_cancel; ot->poll = animedit_poll_channels_nla_tweakmode_off; @@ -2513,7 +2513,7 @@ static void ANIM_OT_channels_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); } /* ******************* Rename Operator ***************************** */ @@ -3162,7 +3162,7 @@ static void ANIM_OT_channel_select_keys(wmOperatorType *ot) void ED_operatortypes_animchannels(void) { WM_operatortype_append(ANIM_OT_channels_select_all); - WM_operatortype_append(ANIM_OT_channels_select_border); + WM_operatortype_append(ANIM_OT_channels_select_box); WM_operatortype_append(ANIM_OT_channels_click); WM_operatortype_append(ANIM_OT_channel_select_keys); @@ -3216,9 +3216,9 @@ void ED_keymap_animchannels(wmKeyConfig *keyconf) /* deselect all */ ED_keymap_template_select_all(keymap, "ANIM_OT_channels_select_all"); - /* borderselect */ - WM_keymap_add_item(keymap, "ANIM_OT_channels_select_border", BKEY, KM_PRESS, 0, 0); - WM_keymap_add_item(keymap, "ANIM_OT_channels_select_border", EVT_TWEAK_L, KM_ANY, 0, 0); + /* box select */ + WM_keymap_add_item(keymap, "ANIM_OT_channels_select_box", BKEY, KM_PRESS, 0, 0); + WM_keymap_add_item(keymap, "ANIM_OT_channels_select_box", EVT_TWEAK_L, KM_ANY, 0, 0); /* delete */ WM_keymap_add_item(keymap, "ANIM_OT_channels_delete", XKEY, KM_PRESS, 0, 0); diff --git a/source/blender/editors/animation/anim_markers.c b/source/blender/editors/animation/anim_markers.c index a1e7df39014..e44edae22a1 100644 --- a/source/blender/editors/animation/anim_markers.c +++ b/source/blender/editors/animation/anim_markers.c @@ -1254,7 +1254,7 @@ static void MARKER_OT_select(wmOperatorType *ot) #endif } -/* *************************** border select markers **************** */ +/* *************************** box select markers **************** */ /* operator state vars used: (added by default WM callbacks) * xmin, ymin @@ -1275,7 +1275,7 @@ static void MARKER_OT_select(wmOperatorType *ot) * poll() has to be filled in by user for context */ -static int ed_marker_border_select_exec(bContext *C, wmOperator *op) +static int ed_marker_box_select_exec(bContext *C, wmOperator *op) { View2D *v2d = UI_view2d_fromcontext(C); ListBase *markers = ED_context_get_markers(C); @@ -1311,23 +1311,23 @@ static int ed_marker_border_select_exec(bContext *C, wmOperator *op) return 1; } -static int ed_marker_select_border_invoke_wrapper(bContext *C, wmOperator *op, const wmEvent *event) +static int ed_marker_select_box_invoke_wrapper(bContext *C, wmOperator *op, const wmEvent *event) { - return ed_markers_opwrap_invoke_custom(C, op, event, WM_gesture_border_invoke); + return ed_markers_opwrap_invoke_custom(C, op, event, WM_gesture_box_invoke); } -static void MARKER_OT_select_border(wmOperatorType *ot) +static void MARKER_OT_select_box(wmOperatorType *ot) { /* identifiers */ - ot->name = "Marker Border Select"; - ot->description = "Select all time markers using border selection"; - ot->idname = "MARKER_OT_select_border"; + ot->name = "Marker Box Select"; + ot->description = "Select all time markers using box selection"; + ot->idname = "MARKER_OT_select_box"; /* api callbacks */ - ot->exec = ed_marker_border_select_exec; - ot->invoke = ed_marker_select_border_invoke_wrapper; - ot->modal = WM_gesture_border_modal; - ot->cancel = WM_gesture_border_cancel; + ot->exec = ed_marker_box_select_exec; + ot->invoke = ed_marker_select_box_invoke_wrapper; + ot->modal = WM_gesture_box_modal; + ot->cancel = WM_gesture_box_cancel; ot->poll = ed_markers_poll_markers_exist; @@ -1335,7 +1335,7 @@ static void MARKER_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); } /* *********************** (de)select all ***************** */ @@ -1636,7 +1636,7 @@ void ED_operatortypes_marker(void) WM_operatortype_append(MARKER_OT_move); WM_operatortype_append(MARKER_OT_duplicate); WM_operatortype_append(MARKER_OT_select); - WM_operatortype_append(MARKER_OT_select_border); + WM_operatortype_append(MARKER_OT_select_box); WM_operatortype_append(MARKER_OT_select_all); WM_operatortype_append(MARKER_OT_delete); WM_operatortype_append(MARKER_OT_rename); @@ -1671,7 +1671,7 @@ void ED_keymap_marker(wmKeyConfig *keyconf) (void)kmi; #endif - WM_keymap_verify_item(keymap, "MARKER_OT_select_border", BKEY, KM_PRESS, 0, 0); + WM_keymap_verify_item(keymap, "MARKER_OT_select_box", BKEY, KM_PRESS, 0, 0); ED_keymap_template_select_all(keymap, "MARKER_OT_select_all"); diff --git a/source/blender/editors/animation/anim_ops.c b/source/blender/editors/animation/anim_ops.c index 5ec38025ade..c45b7b4b228 100644 --- a/source/blender/editors/animation/anim_ops.c +++ b/source/blender/editors/animation/anim_ops.c @@ -401,7 +401,7 @@ static int previewrange_define_exec(bContext *C, wmOperator *op) float sfra, efra; rcti rect; - /* get min/max values from border select rect (already in region coordinates, not screen) */ + /* get min/max values from box select rect (already in region coordinates, not screen) */ WM_operator_properties_border_to_rcti(op, &rect); /* convert min/max values to frames (i.e. region to 'tot' rect) */ @@ -434,10 +434,10 @@ static void ANIM_OT_previewrange_set(wmOperatorType *ot) ot->description = "Interactively define frame range used for playback"; /* api callbacks */ - ot->invoke = WM_gesture_border_invoke; + ot->invoke = WM_gesture_box_invoke; ot->exec = previewrange_define_exec; - ot->modal = WM_gesture_border_modal; - ot->cancel = WM_gesture_border_cancel; + ot->modal = WM_gesture_box_modal; + ot->cancel = WM_gesture_box_cancel; ot->poll = ED_operator_animview_active; @@ -448,7 +448,7 @@ static void ANIM_OT_previewrange_set(wmOperatorType *ot) /* used to define frame range. * * note: border Y values are not used, - * but are needed by borderselect gesture operator stuff */ + * but are needed by box_select gesture operator stuff */ WM_operator_properties_border(ot); } |