From 0b98a679bb799fe496be67d8dd52fadef3c1027a Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 5 Oct 2018 10:27:04 +1000 Subject: UI: rename Border Select -> Box Select See: T56648 --- source/blender/windowmanager/WM_api.h | 14 +++---- .../blender/windowmanager/intern/wm_gesture_ops.c | 18 ++++----- .../windowmanager/intern/wm_operator_props.c | 14 +++---- source/blender/windowmanager/intern/wm_operators.c | 44 +++++++++++----------- .../blender/windowmanager/intern/wm_toolsystem.c | 2 +- source/blender/windowmanager/wm_event_types.h | 2 +- 6 files changed, 47 insertions(+), 47 deletions(-) (limited to 'source/blender/windowmanager') diff --git a/source/blender/windowmanager/WM_api.h b/source/blender/windowmanager/WM_api.h index 7f97831c6b7..1db4b4328e9 100644 --- a/source/blender/windowmanager/WM_api.h +++ b/source/blender/windowmanager/WM_api.h @@ -351,10 +351,10 @@ void WM_operator_properties_filesel( void WM_operator_properties_border(struct wmOperatorType *ot); void WM_operator_properties_border_to_rcti(struct wmOperator *op, struct rcti *rect); void WM_operator_properties_border_to_rctf(struct wmOperator *op, rctf *rect); -void WM_operator_properties_gesture_border_ex(struct wmOperatorType *ot, bool deselect, bool extend); -void WM_operator_properties_gesture_border(struct wmOperatorType *ot); -void WM_operator_properties_gesture_border_select(struct wmOperatorType *ot); -void WM_operator_properties_gesture_border_zoom(struct wmOperatorType *ot); +void WM_operator_properties_gesture_box_ex(struct wmOperatorType *ot, bool deselect, bool extend); +void WM_operator_properties_gesture_box(struct wmOperatorType *ot); +void WM_operator_properties_gesture_box_select(struct wmOperatorType *ot); +void WM_operator_properties_gesture_box_zoom(struct wmOperatorType *ot); void WM_operator_properties_gesture_lasso_ex(struct wmOperatorType *ot, bool deselect, bool extend); void WM_operator_properties_gesture_lasso(struct wmOperatorType *ot); void WM_operator_properties_gesture_lasso_select(struct wmOperatorType *ot); @@ -445,9 +445,9 @@ bool WM_paneltype_add(struct PanelType *mt); void WM_paneltype_remove(struct PanelType *mt); /* wm_gesture_ops.c */ -int WM_gesture_border_invoke (struct bContext *C, struct wmOperator *op, const struct wmEvent *event); -int WM_gesture_border_modal (struct bContext *C, struct wmOperator *op, const struct wmEvent *event); -void WM_gesture_border_cancel(struct bContext *C, struct wmOperator *op); +int WM_gesture_box_invoke (struct bContext *C, struct wmOperator *op, const struct wmEvent *event); +int WM_gesture_box_modal (struct bContext *C, struct wmOperator *op, const struct wmEvent *event); +void WM_gesture_box_cancel(struct bContext *C, struct wmOperator *op); int WM_gesture_circle_invoke(struct bContext *C, struct wmOperator *op, const struct wmEvent *event); int WM_gesture_circle_modal(struct bContext *C, struct wmOperator *op, const struct wmEvent *event); void WM_gesture_circle_cancel(struct bContext *C, struct wmOperator *op); diff --git a/source/blender/windowmanager/intern/wm_gesture_ops.c b/source/blender/windowmanager/intern/wm_gesture_ops.c index a4d811bf91b..b29da15a334 100644 --- a/source/blender/windowmanager/intern/wm_gesture_ops.c +++ b/source/blender/windowmanager/intern/wm_gesture_ops.c @@ -143,7 +143,7 @@ static int gesture_modal_state_from_operator(wmOperator *op) * * \{ */ -static bool gesture_border_apply_rect(wmOperator *op) +static bool gesture_box_apply_rect(wmOperator *op) { wmGesture *gesture = op->customdata; rcti *rect = gesture->customdata; @@ -161,13 +161,13 @@ static bool gesture_border_apply_rect(wmOperator *op) return 1; } -static bool gesture_border_apply(bContext *C, wmOperator *op) +static bool gesture_box_apply(bContext *C, wmOperator *op) { wmGesture *gesture = op->customdata; int retval; - if (!gesture_border_apply_rect(op)) { + if (!gesture_box_apply_rect(op)) { return 0; } @@ -179,7 +179,7 @@ static bool gesture_border_apply(bContext *C, wmOperator *op) return 1; } -int WM_gesture_border_invoke(bContext *C, wmOperator *op, const wmEvent *event) +int WM_gesture_box_invoke(bContext *C, wmOperator *op, const wmEvent *event) { int modal_state = gesture_modal_state_from_operator(op); @@ -208,7 +208,7 @@ int WM_gesture_border_invoke(bContext *C, wmOperator *op, const wmEvent *event) return OPERATOR_RUNNING_MODAL; } -int WM_gesture_border_modal(bContext *C, wmOperator *op, const wmEvent *event) +int WM_gesture_box_modal(bContext *C, wmOperator *op, const wmEvent *event) { wmGesture *gesture = op->customdata; rcti *rect = gesture->customdata; @@ -222,7 +222,7 @@ int WM_gesture_border_modal(bContext *C, wmOperator *op, const wmEvent *event) rect->xmax = event->x - gesture->winrct.xmin; rect->ymax = event->y - gesture->winrct.ymin; } - gesture_border_apply_rect(op); + gesture_box_apply_rect(op); wm_gesture_tag_redraw(C); } @@ -241,7 +241,7 @@ int WM_gesture_border_modal(bContext *C, wmOperator *op, const wmEvent *event) if (gesture->wait_for_input) { gesture->modal_state = event->val; } - if (gesture_border_apply(C, op)) { + if (gesture_box_apply(C, op)) { gesture_modal_end(C, op); return OPERATOR_FINISHED; } @@ -270,7 +270,7 @@ int WM_gesture_border_modal(bContext *C, wmOperator *op, const wmEvent *event) return OPERATOR_RUNNING_MODAL; } -void WM_gesture_border_cancel(bContext *C, wmOperator *op) +void WM_gesture_box_cancel(bContext *C, wmOperator *op) { gesture_modal_end(C, op); } @@ -427,7 +427,7 @@ int WM_gesture_circle_modal(bContext *C, wmOperator *op, const wmEvent *event) #if 0 /* Allow view navigation??? */ /* note, this gives issues: - * 1) other modal ops run on top (border select), + * 1) other modal ops run on top (box select), * 2) middlemouse is used now 3) tablet/trackpad? */ else { return OPERATOR_PASS_THROUGH; diff --git a/source/blender/windowmanager/intern/wm_operator_props.c b/source/blender/windowmanager/intern/wm_operator_props.c index 3cc03562bdb..0c3750baa4c 100644 --- a/source/blender/windowmanager/intern/wm_operator_props.c +++ b/source/blender/windowmanager/intern/wm_operator_props.c @@ -229,9 +229,9 @@ void WM_operator_properties_border_to_rctf(struct wmOperator *op, rctf *rect) } /** - * Use with #WM_gesture_border_invoke + * Use with #WM_gesture_box_invoke */ -void WM_operator_properties_gesture_border_ex(wmOperatorType *ot, bool deselect, bool extend) +void WM_operator_properties_gesture_box_ex(wmOperatorType *ot, bool deselect, bool extend) { PropertyRNA *prop; @@ -247,13 +247,13 @@ void WM_operator_properties_gesture_border_ex(wmOperatorType *ot, bool deselect, } } -void WM_operator_properties_gesture_border_select(wmOperatorType *ot) +void WM_operator_properties_gesture_box_select(wmOperatorType *ot) { - WM_operator_properties_gesture_border_ex(ot, true, true); + WM_operator_properties_gesture_box_ex(ot, true, true); } -void WM_operator_properties_gesture_border(wmOperatorType *ot) +void WM_operator_properties_gesture_box(wmOperatorType *ot) { - WM_operator_properties_gesture_border_ex(ot, false, false); + WM_operator_properties_gesture_box_ex(ot, false, false); } void WM_operator_properties_select_operation(wmOperatorType *ot) @@ -270,7 +270,7 @@ void WM_operator_properties_select_operation(wmOperatorType *ot) RNA_def_property_flag(prop, PROP_SKIP_SAVE); } -void WM_operator_properties_gesture_border_zoom(wmOperatorType *ot) +void WM_operator_properties_gesture_box_zoom(wmOperatorType *ot) { WM_operator_properties_border(ot); diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index 21822c7c7f2..0b5fd186e7a 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -3273,8 +3273,8 @@ static void gesture_straightline_modal_keymap(wmKeyConfig *keyconf) } -/* borderselect-like modal operators */ -static void gesture_border_modal_keymap(wmKeyConfig *keyconf) +/* box_select-like modal operators */ +static void gesture_box_modal_keymap(wmKeyConfig *keyconf) { static const EnumPropertyItem modal_items[] = { {GESTURE_MODAL_CANCEL, "CANCEL", 0, "Cancel", ""}, @@ -3284,12 +3284,12 @@ static void gesture_border_modal_keymap(wmKeyConfig *keyconf) {0, NULL, 0, NULL, NULL} }; - wmKeyMap *keymap = WM_modalkeymap_get(keyconf, "Gesture Border"); + wmKeyMap *keymap = WM_modalkeymap_get(keyconf, "Gesture Box"); /* this function is called for each spacetype, only needs to add map once */ if (keymap && keymap->modal_items) return; - keymap = WM_modalkeymap_add(keyconf, "Gesture Border", modal_items); + keymap = WM_modalkeymap_add(keyconf, "Gesture Box", modal_items); /* items for modal map */ WM_modalkeymap_add_item(keymap, ESCKEY, KM_PRESS, KM_ANY, 0, GESTURE_MODAL_CANCEL); @@ -3310,33 +3310,33 @@ static void gesture_border_modal_keymap(wmKeyConfig *keyconf) WM_modalkeymap_add_item(keymap, MIDDLEMOUSE, KM_RELEASE, 0, 0, GESTURE_MODAL_DESELECT); /* assign map to operators */ - WM_modalkeymap_assign(keymap, "ACTION_OT_select_border"); - WM_modalkeymap_assign(keymap, "ANIM_OT_channels_select_border"); + WM_modalkeymap_assign(keymap, "ACTION_OT_select_box"); + WM_modalkeymap_assign(keymap, "ANIM_OT_channels_select_box"); WM_modalkeymap_assign(keymap, "ANIM_OT_previewrange_set"); - WM_modalkeymap_assign(keymap, "INFO_OT_select_border"); - WM_modalkeymap_assign(keymap, "FILE_OT_select_border"); - WM_modalkeymap_assign(keymap, "GRAPH_OT_select_border"); - WM_modalkeymap_assign(keymap, "MARKER_OT_select_border"); - WM_modalkeymap_assign(keymap, "NLA_OT_select_border"); - WM_modalkeymap_assign(keymap, "NODE_OT_select_border"); + WM_modalkeymap_assign(keymap, "INFO_OT_select_box"); + WM_modalkeymap_assign(keymap, "FILE_OT_select_box"); + WM_modalkeymap_assign(keymap, "GRAPH_OT_select_box"); + WM_modalkeymap_assign(keymap, "MARKER_OT_select_box"); + WM_modalkeymap_assign(keymap, "NLA_OT_select_box"); + WM_modalkeymap_assign(keymap, "NODE_OT_select_box"); WM_modalkeymap_assign(keymap, "NODE_OT_viewer_border"); WM_modalkeymap_assign(keymap, "PAINT_OT_hide_show"); - WM_modalkeymap_assign(keymap, "OUTLINER_OT_select_border"); -// WM_modalkeymap_assign(keymap, "SCREEN_OT_border_select"); // template - WM_modalkeymap_assign(keymap, "SEQUENCER_OT_select_border"); + WM_modalkeymap_assign(keymap, "OUTLINER_OT_select_box"); +// WM_modalkeymap_assign(keymap, "SCREEN_OT_box_select"); // template + WM_modalkeymap_assign(keymap, "SEQUENCER_OT_select_box"); WM_modalkeymap_assign(keymap, "SEQUENCER_OT_view_ghost_border"); - WM_modalkeymap_assign(keymap, "UV_OT_select_border"); - WM_modalkeymap_assign(keymap, "CLIP_OT_select_border"); - WM_modalkeymap_assign(keymap, "CLIP_OT_graph_select_border"); - WM_modalkeymap_assign(keymap, "MASK_OT_select_border"); + WM_modalkeymap_assign(keymap, "UV_OT_select_box"); + WM_modalkeymap_assign(keymap, "CLIP_OT_select_box"); + WM_modalkeymap_assign(keymap, "CLIP_OT_graph_select_box"); + WM_modalkeymap_assign(keymap, "MASK_OT_select_box"); WM_modalkeymap_assign(keymap, "VIEW2D_OT_zoom_border"); WM_modalkeymap_assign(keymap, "VIEW3D_OT_clip_border"); WM_modalkeymap_assign(keymap, "VIEW3D_OT_render_border"); - WM_modalkeymap_assign(keymap, "VIEW3D_OT_select_border"); + WM_modalkeymap_assign(keymap, "VIEW3D_OT_select_box"); WM_modalkeymap_assign(keymap, "VIEW3D_OT_zoom_border"); /* XXX TODO: zoom border should perhaps map rightmouse to zoom out instead of in+cancel */ WM_modalkeymap_assign(keymap, "IMAGE_OT_render_border"); WM_modalkeymap_assign(keymap, "IMAGE_OT_view_zoom_border"); - WM_modalkeymap_assign(keymap, "GPENCIL_OT_select_border"); + WM_modalkeymap_assign(keymap, "GPENCIL_OT_select_box"); } /* zoom to border modal operators */ @@ -3509,7 +3509,7 @@ void wm_window_keymap(wmKeyConfig *keyconf) wm_gizmos_keymap(keyconf); gesture_circle_modal_keymap(keyconf); - gesture_border_modal_keymap(keyconf); + gesture_box_modal_keymap(keyconf); gesture_zoom_border_modal_keymap(keyconf); gesture_straightline_modal_keymap(keyconf); } diff --git a/source/blender/windowmanager/intern/wm_toolsystem.c b/source/blender/windowmanager/intern/wm_toolsystem.c index ecbcc31c56f..3a112ac0597 100644 --- a/source/blender/windowmanager/intern/wm_toolsystem.c +++ b/source/blender/windowmanager/intern/wm_toolsystem.c @@ -560,7 +560,7 @@ static const char *toolsystem_default_tool(const bToolKey *tkey) default: /* FIXME(campbell): disable for now since this means we can't lasso select by default. */ #if 0 - return "Select Border"; + return "Select Box"; #endif break; } diff --git a/source/blender/windowmanager/wm_event_types.h b/source/blender/windowmanager/wm_event_types.h index 904ac2b89b3..cfb43bf43ed 100644 --- a/source/blender/windowmanager/wm_event_types.h +++ b/source/blender/windowmanager/wm_event_types.h @@ -448,7 +448,7 @@ enum { GESTURE_MODAL_CIRCLE_ADD = 6, /* circle sel: larger brush */ GESTURE_MODAL_CIRCLE_SUB = 7, /* circle sel: smaller brush */ - GESTURE_MODAL_BEGIN = 8, /* border select/straight line, activate, use release to detect which button */ + GESTURE_MODAL_BEGIN = 8, /* box select/straight line, activate, use release to detect which button */ /* Uses 'zoom_out' operator property. */ GESTURE_MODAL_IN = 9, -- cgit v1.2.3