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 /release/scripts | |
parent | 50cb8013ebf8e421a16428756dd869ab844b41f6 (diff) |
UI: rename Border Select -> Box Select
See: T56648
Diffstat (limited to 'release/scripts')
-rw-r--r-- | release/scripts/modules/bpy_extras/keyconfig_utils.py | 2 | ||||
-rw-r--r-- | release/scripts/presets/keyconfig/3dsmax.py | 56 | ||||
-rw-r--r-- | release/scripts/presets/keyconfig/blender_27x.py | 52 | ||||
-rw-r--r-- | release/scripts/presets/keyconfig/maya.py | 54 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/properties_grease_pencil_common.py | 4 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/properties_mask_common.py | 2 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_clip.py | 2 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_dopesheet.py | 4 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_graph.py | 6 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_image.py | 4 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_nla.py | 4 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_node.py | 2 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_toolsystem_toolbar.py | 40 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_view3d.py | 26 |
14 files changed, 129 insertions, 129 deletions
diff --git a/release/scripts/modules/bpy_extras/keyconfig_utils.py b/release/scripts/modules/bpy_extras/keyconfig_utils.py index 3da67ed2461..3caf45a72af 100644 --- a/release/scripts/modules/bpy_extras/keyconfig_utils.py +++ b/release/scripts/modules/bpy_extras/keyconfig_utils.py @@ -194,7 +194,7 @@ _km_hierarchy = [ ('View3D Gesture Circle', 'EMPTY', 'WINDOW', []), ('Gesture Straight Line', 'EMPTY', 'WINDOW', []), ('Gesture Zoom Border', 'EMPTY', 'WINDOW', []), - ('Gesture Border', 'EMPTY', 'WINDOW', []), + ('Gesture Box', 'EMPTY', 'WINDOW', []), ('Standard Modal Map', 'EMPTY', 'WINDOW', []), ('Transform Modal Map', 'EMPTY', 'WINDOW', []), diff --git a/release/scripts/presets/keyconfig/3dsmax.py b/release/scripts/presets/keyconfig/3dsmax.py index fa5d40b1868..3024a5638f2 100644 --- a/release/scripts/presets/keyconfig/3dsmax.py +++ b/release/scripts/presets/keyconfig/3dsmax.py @@ -124,7 +124,7 @@ kmi.properties.camera = True kmi = km.keymap_items.new('marker.select', 'SELECTMOUSE', 'PRESS', shift=True, ctrl=True) kmi.properties.extend = True kmi.properties.camera = True -kmi = km.keymap_items.new('marker.select_border', 'B', 'PRESS') +kmi = km.keymap_items.new('marker.select_box', 'B', 'PRESS') kmi = km.keymap_items.new('marker.select_all', 'A', 'PRESS', ctrl=True) kmi = km.keymap_items.new('marker.delete', 'X', 'PRESS') kmi = km.keymap_items.new('marker.rename', 'M', 'PRESS', ctrl=True) @@ -147,7 +147,7 @@ kmi.properties.recursive = True kmi = km.keymap_items.new('outliner.item_activate', 'LEFTMOUSE', 'CLICK', shift=True, ctrl=True) kmi.properties.extend = True kmi.properties.recursive = True -kmi = km.keymap_items.new('outliner.select_border', 'B', 'PRESS') +kmi = km.keymap_items.new('outliner.select_box', 'B', 'PRESS') kmi = km.keymap_items.new('outliner.item_openclose', 'RET', 'PRESS') kmi.properties.all = False kmi = km.keymap_items.new('outliner.item_openclose', 'RET', 'PRESS', shift=True) @@ -202,7 +202,7 @@ kmi = km.keymap_items.new('paint.vert_select_all', 'A', 'PRESS', ctrl=True) kmi.properties.action = 'SELECT' kmi = km.keymap_items.new('paint.vert_select_all', 'I', 'PRESS', ctrl=True) kmi.properties.action = 'INVERT' -kmi = km.keymap_items.new('view3d.select_border', 'B', 'PRESS') +kmi = km.keymap_items.new('view3d.select_box', 'B', 'PRESS') kmi = km.keymap_items.new('view3d.select_lasso', 'EVT_TWEAK_A', 'ANY', ctrl=True) kmi.properties.deselect = False kmi = km.keymap_items.new('view3d.select_lasso', 'EVT_TWEAK_A', 'ANY', shift=True, ctrl=True) @@ -648,7 +648,7 @@ kmi.properties.toggle = True kmi.properties.center = True kmi.properties.enumerate = True kmi.properties.object = False -kmi = km.keymap_items.new('view3d.select_border', 'EVT_TWEAK_L', 'ANY') +kmi = km.keymap_items.new('view3d.select_box', 'EVT_TWEAK_L', 'ANY') kmi.properties.extend = False kmi = km.keymap_items.new('view3d.select_lasso', 'EVT_TWEAK_A', 'ANY', ctrl=True) kmi.properties.deselect = False @@ -719,7 +719,7 @@ kmi = km.keymap_items.new('wm.context_toggle_enum', 'A', 'PRESS') kmi.properties.data_path = 'tool_settings.snap_element' kmi.properties.value_1 = 'VERTEX' kmi.properties.value_2 = 'INCREMENT' -kmi = km.keymap_items.new('view3d.select_border', 'EVT_TWEAK_L', 'ANY', ctrl=True) +kmi = km.keymap_items.new('view3d.select_box', 'EVT_TWEAK_L', 'ANY', ctrl=True) kmi = km.keymap_items.new('wm.context_toggle', 'G', 'PRESS') kmi.properties.data_path = 'space_data.overlay.show_floor' @@ -736,8 +736,8 @@ kmi = km.keymap_items.new('anim.channels_rename', 'LEFTMOUSE', 'PRESS', ctrl=Tru kmi = km.keymap_items.new('anim.channels_select_all_toggle', 'A', 'PRESS', ctrl=True) kmi = km.keymap_items.new('anim.channels_select_all_toggle', 'I', 'PRESS', ctrl=True) kmi.properties.invert = True -kmi = km.keymap_items.new('anim.channels_select_border', 'B', 'PRESS') -kmi = km.keymap_items.new('anim.channels_select_border', 'EVT_TWEAK_L', 'ANY') +kmi = km.keymap_items.new('anim.channels_select_box', 'B', 'PRESS') +kmi = km.keymap_items.new('anim.channels_select_box', 'EVT_TWEAK_L', 'ANY') kmi = km.keymap_items.new('anim.channels_delete', 'X', 'PRESS') kmi = km.keymap_items.new('anim.channels_delete', 'DEL', 'PRESS') kmi = km.keymap_items.new('anim.channels_setting_toggle', 'W', 'PRESS', shift=True) @@ -776,9 +776,9 @@ kmi.properties.extend = False kmi = km.keymap_items.new('uv.select_loop', 'SELECTMOUSE', 'PRESS', shift=True, alt=True) kmi.properties.extend = True kmi = km.keymap_items.new('uv.select_split', 'Y', 'PRESS') -kmi = km.keymap_items.new('uv.select_border', 'B', 'PRESS') +kmi = km.keymap_items.new('uv.select_box', 'B', 'PRESS') kmi.properties.pinned = False -kmi = km.keymap_items.new('uv.select_border', 'B', 'PRESS', shift=True) +kmi = km.keymap_items.new('uv.select_box', 'B', 'PRESS', shift=True) kmi.properties.pinned = True kmi = km.keymap_items.new('uv.circle_select', 'C', 'PRESS') kmi = km.keymap_items.new('uv.select_lasso', 'EVT_TWEAK_A', 'ANY', ctrl=True) @@ -866,7 +866,7 @@ kmi = km.keymap_items.new('mask.select_linked_pick', 'L', 'PRESS') kmi.properties.deselect = False kmi = km.keymap_items.new('mask.select_linked_pick', 'L', 'PRESS', shift=True) kmi.properties.deselect = True -kmi = km.keymap_items.new('mask.select_border', 'B', 'PRESS') +kmi = km.keymap_items.new('mask.select_box', 'B', 'PRESS') kmi = km.keymap_items.new('mask.select_circle', 'C', 'PRESS') kmi = km.keymap_items.new('mask.select_lasso', 'EVT_TWEAK_A', 'ANY', ctrl=True, alt=True) kmi.properties.deselect = False @@ -941,16 +941,16 @@ kmi = km.keymap_items.new('graph.select_all_toggle', 'A', 'PRESS', ctrl=True) kmi.properties.invert = False kmi = km.keymap_items.new('graph.select_all_toggle', 'I', 'PRESS', ctrl=True) kmi.properties.invert = True -kmi = km.keymap_items.new('graph.select_border', 'B', 'PRESS') +kmi = km.keymap_items.new('graph.select_box', 'B', 'PRESS') kmi.properties.axis_range = False kmi.properties.include_handles = False -kmi = km.keymap_items.new('graph.select_border', 'B', 'PRESS', alt=True) +kmi = km.keymap_items.new('graph.select_box', 'B', 'PRESS', alt=True) kmi.properties.axis_range = True kmi.properties.include_handles = False -kmi = km.keymap_items.new('graph.select_border', 'B', 'PRESS', ctrl=True) +kmi = km.keymap_items.new('graph.select_box', 'B', 'PRESS', ctrl=True) kmi.properties.axis_range = False kmi.properties.include_handles = True -kmi = km.keymap_items.new('graph.select_border', 'B', 'PRESS', ctrl=True, alt=True) +kmi = km.keymap_items.new('graph.select_box', 'B', 'PRESS', ctrl=True, alt=True) kmi.properties.axis_range = True kmi.properties.include_handles = True kmi = km.keymap_items.new('graph.select_column', 'K', 'PRESS') @@ -1030,7 +1030,7 @@ kmi = km.keymap_items.new('node.select', 'ACTIONMOUSE', 'PRESS', shift=True, ctr kmi.properties.extend = True kmi = km.keymap_items.new('node.select', 'SELECTMOUSE', 'PRESS', shift=True, ctrl=True, alt=True) kmi.properties.extend = True -kmi = km.keymap_items.new('node.select_border', 'EVT_TWEAK_S', 'ANY') +kmi = km.keymap_items.new('node.select_box', 'EVT_TWEAK_S', 'ANY') kmi.properties.tweak = True kmi = km.keymap_items.new('node.select_lasso', 'EVT_TWEAK_A', 'ANY', ctrl=True, alt=True) kmi.properties.deselect = False @@ -1066,7 +1066,7 @@ kmi = km.keymap_items.new('node.preview_toggle', 'H', 'PRESS', shift=True) kmi = km.keymap_items.new('node.hide_socket_toggle', 'H', 'PRESS', ctrl=True) kmi = km.keymap_items.new('node.view_all', 'HOME', 'PRESS') kmi = km.keymap_items.new('node.view_selected', 'NUMPAD_PERIOD', 'PRESS') -kmi = km.keymap_items.new('node.select_border', 'B', 'PRESS') +kmi = km.keymap_items.new('node.select_box', 'B', 'PRESS') kmi.properties.tweak = False kmi = km.keymap_items.new('node.delete', 'X', 'PRESS') kmi = km.keymap_items.new('node.delete', 'DEL', 'PRESS') @@ -1125,7 +1125,7 @@ km = kc.keymaps.new('Info', space_type='INFO', region_type='WINDOW', modal=False kmi = km.keymap_items.new('info.select_pick', 'SELECTMOUSE', 'PRESS') kmi = km.keymap_items.new('info.select_all_toggle', 'A', 'PRESS', ctrl=True) -kmi = km.keymap_items.new('info.select_border', 'B', 'PRESS') +kmi = km.keymap_items.new('info.select_box', 'B', 'PRESS') kmi = km.keymap_items.new('info.report_replay', 'R', 'PRESS') kmi = km.keymap_items.new('info.report_delete', 'X', 'PRESS') kmi = km.keymap_items.new('info.report_delete', 'DEL', 'PRESS') @@ -1153,8 +1153,8 @@ kmi.properties.fill = True kmi.properties.open = False kmi = km.keymap_items.new('file.select_all_toggle', 'A', 'PRESS', ctrl=True) kmi = km.keymap_items.new('file.refresh', 'NUMPAD_PERIOD', 'PRESS') -kmi = km.keymap_items.new('file.select_border', 'B', 'PRESS') -kmi = km.keymap_items.new('file.select_border', 'EVT_TWEAK_L', 'ANY') +kmi = km.keymap_items.new('file.select_box', 'B', 'PRESS') +kmi = km.keymap_items.new('file.select_box', 'EVT_TWEAK_L', 'ANY') kmi = km.keymap_items.new('file.rename', 'LEFTMOUSE', 'PRESS', ctrl=True) kmi = km.keymap_items.new('file.highlight', 'MOUSEMOVE', 'ANY', any=True) kmi = km.keymap_items.new('file.filenum', 'NUMPAD_PLUS', 'PRESS') @@ -1201,9 +1201,9 @@ kmi = km.keymap_items.new('action.select_all_toggle', 'A', 'PRESS', ctrl=True) kmi.properties.invert = False kmi = km.keymap_items.new('action.select_all_toggle', 'I', 'PRESS', ctrl=True) kmi.properties.invert = True -kmi = km.keymap_items.new('action.select_border', 'B', 'PRESS') +kmi = km.keymap_items.new('action.select_box', 'B', 'PRESS') kmi.properties.axis_range = False -kmi = km.keymap_items.new('action.select_border', 'B', 'PRESS', alt=True) +kmi = km.keymap_items.new('action.select_box', 'B', 'PRESS', alt=True) kmi.properties.axis_range = True kmi = km.keymap_items.new('action.select_column', 'K', 'PRESS') kmi.properties.mode = 'KEYS' @@ -1271,9 +1271,9 @@ kmi = km.keymap_items.new('nla.select_all_toggle', 'A', 'PRESS', ctrl=True) kmi.properties.invert = False kmi = km.keymap_items.new('nla.select_all_toggle', 'I', 'PRESS', ctrl=True) kmi.properties.invert = True -kmi = km.keymap_items.new('nla.select_border', 'B', 'PRESS') +kmi = km.keymap_items.new('nla.select_box', 'B', 'PRESS') kmi.properties.axis_range = False -kmi = km.keymap_items.new('nla.select_border', 'B', 'PRESS', alt=True) +kmi = km.keymap_items.new('nla.select_box', 'B', 'PRESS', alt=True) kmi.properties.axis_range = True kmi = km.keymap_items.new('nla.view_all', 'HOME', 'PRESS') kmi = km.keymap_items.new('nla.view_selected', 'NUMPAD_PERIOD', 'PRESS') @@ -1424,7 +1424,7 @@ kmi.properties.extend = False kmi = km.keymap_items.new('sequencer.select_linked_pick', 'L', 'PRESS', shift=True) kmi.properties.extend = True kmi = km.keymap_items.new('sequencer.select_linked', 'L', 'PRESS', ctrl=True) -kmi = km.keymap_items.new('sequencer.select_border', 'B', 'PRESS') +kmi = km.keymap_items.new('sequencer.select_box', 'B', 'PRESS') kmi = km.keymap_items.new('sequencer.select_grouped', 'G', 'PRESS', shift=True) kmi = km.keymap_items.new('wm.call_menu', 'A', 'PRESS', shift=True) kmi.properties.name = 'SEQUENCER_MT_add' @@ -1496,7 +1496,7 @@ kmi = km.keymap_items.new('clip.select_all', 'A', 'PRESS', ctrl=True) kmi.properties.action = 'TOGGLE' kmi = km.keymap_items.new('clip.select_all', 'I', 'PRESS', ctrl=True) kmi.properties.action = 'INVERT' -kmi = km.keymap_items.new('clip.select_border', 'B', 'PRESS') +kmi = km.keymap_items.new('clip.select_box', 'B', 'PRESS') kmi = km.keymap_items.new('clip.select_circle', 'C', 'PRESS') kmi = km.keymap_items.new('wm.call_menu', 'G', 'PRESS', shift=True) kmi.properties.name = 'CLIP_MT_select_grouped' @@ -1558,7 +1558,7 @@ kmi = km.keymap_items.new('clip.graph_select_all_markers', 'A', 'PRESS', ctrl=Tr kmi.properties.action = 'TOGGLE' kmi = km.keymap_items.new('clip.graph_select_all_markers', 'I', 'PRESS', ctrl=True) kmi.properties.action = 'INVERT' -kmi = km.keymap_items.new('clip.graph_select_border', 'B', 'PRESS') +kmi = km.keymap_items.new('clip.graph_select_box', 'B', 'PRESS') kmi = km.keymap_items.new('clip.graph_delete_curve', 'DEL', 'PRESS') kmi = km.keymap_items.new('clip.graph_delete_curve', 'X', 'PRESS') kmi = km.keymap_items.new('clip.graph_delete_knot', 'DEL', 'PRESS', shift=True) @@ -2422,8 +2422,8 @@ kmi = km.keymap_items.new_modal('ADD', 'WHEELDOWNMOUSE', 'PRESS') kmi = km.keymap_items.new_modal('ADD', 'NUMPAD_PLUS', 'PRESS') kmi = km.keymap_items.new_modal('SIZE', 'TRACKPADPAN', 'ANY') -# Map Gesture Border -km = kc.keymaps.new('Gesture Border', space_type='EMPTY', region_type='WINDOW', modal=True) +# Map Gesture Box +km = kc.keymaps.new('Gesture Box', space_type='EMPTY', region_type='WINDOW', modal=True) kmi = km.keymap_items.new_modal('CANCEL', 'ESC', 'PRESS', any=True) kmi = km.keymap_items.new_modal('CANCEL', 'RIGHTMOUSE', 'PRESS', any=True) diff --git a/release/scripts/presets/keyconfig/blender_27x.py b/release/scripts/presets/keyconfig/blender_27x.py index cf736e1a5a5..6fb0df832ca 100644 --- a/release/scripts/presets/keyconfig/blender_27x.py +++ b/release/scripts/presets/keyconfig/blender_27x.py @@ -454,7 +454,7 @@ keyconfig_data = \ {"items": [("info.select_pick", {"type": 'SELECTMOUSE', "value": 'PRESS'}, None), ("info.select_all_toggle", {"type": 'A', "value": 'PRESS'}, None), - ("info.select_border", {"type": 'B', "value": 'PRESS'}, None), + ("info.select_box", {"type": 'B', "value": 'PRESS'}, None), ("info.report_replay", {"type": 'R', "value": 'PRESS'}, None), ("info.report_delete", {"type": 'X', "value": 'PRESS'}, None), ("info.report_delete", {"type": 'DEL', "value": 'PRESS'}, None), @@ -499,7 +499,7 @@ keyconfig_data = \ ], }, ), - ("outliner.select_border", {"type": 'B', "value": 'PRESS'}, None), + ("outliner.select_box", {"type": 'B', "value": 'PRESS'}, None), ("outliner.item_openclose", {"type": 'RET', "value": 'PRESS'}, {"properties": @@ -702,7 +702,7 @@ keyconfig_data = \ }, ), ("gpencil.select_circle", {"type": 'C', "value": 'PRESS'}, None), - ("gpencil.select_border", {"type": 'B', "value": 'PRESS'}, None), + ("gpencil.select_box", {"type": 'B', "value": 'PRESS'}, None), ("gpencil.select_lasso", {"type": 'EVT_TWEAK_A', "value": 'ANY', "ctrl": True}, {"properties": @@ -994,7 +994,7 @@ keyconfig_data = \ ], }, ), - ("view3d.select_border", {"type": 'B', "value": 'PRESS'}, None), + ("view3d.select_box", {"type": 'B', "value": 'PRESS'}, None), ("view3d.select_lasso", {"type": 'EVT_TWEAK_A', "value": 'ANY', "ctrl": True}, {"properties": @@ -4732,7 +4732,7 @@ keyconfig_data = \ ], }, ), - ("view3d.select_border", {"type": 'B', "value": 'PRESS'}, None), + ("view3d.select_box", {"type": 'B', "value": 'PRESS'}, None), ("view3d.select_lasso", {"type": 'EVT_TWEAK_A', "value": 'ANY', "ctrl": True}, {"properties": @@ -5023,8 +5023,8 @@ keyconfig_data = \ ], }, ), - ("anim.channels_select_border", {"type": 'B', "value": 'PRESS'}, None), - ("anim.channels_select_border", {"type": 'EVT_TWEAK_L', "value": 'ANY'}, None), + ("anim.channels_select_box", {"type": 'B', "value": 'PRESS'}, None), + ("anim.channels_select_box", {"type": 'EVT_TWEAK_L', "value": 'ANY'}, None), ("anim.channels_delete", {"type": 'X', "value": 'PRESS'}, None), ("anim.channels_delete", {"type": 'DEL', "value": 'PRESS'}, None), ("anim.channels_setting_toggle", {"type": 'W', "value": 'PRESS', "shift": True}, None), @@ -5120,14 +5120,14 @@ keyconfig_data = \ }, ), ("uv.select_split", {"type": 'Y', "value": 'PRESS'}, None), - ("uv.select_border", + ("uv.select_box", {"type": 'B', "value": 'PRESS'}, {"properties": [("pinned", False), ], }, ), - ("uv.select_border", + ("uv.select_box", {"type": 'B', "value": 'PRESS', "ctrl": True}, {"properties": [("pinned", True), @@ -5474,7 +5474,7 @@ keyconfig_data = \ ], }, ), - ("mask.select_border", {"type": 'B', "value": 'PRESS'}, None), + ("mask.select_box", {"type": 'B', "value": 'PRESS'}, None), ("mask.select_circle", {"type": 'C', "value": 'PRESS'}, None), ("mask.select_lasso", {"type": 'EVT_TWEAK_A', "value": 'ANY', "ctrl": True, "alt": True}, @@ -5571,7 +5571,7 @@ keyconfig_data = \ ], }, ), - ("marker.select_border", {"type": 'B', "value": 'PRESS'}, None), + ("marker.select_box", {"type": 'B', "value": 'PRESS'}, None), ("marker.select_all", {"type": 'A', "value": 'PRESS'}, None), ("marker.delete", {"type": 'X', "value": 'PRESS'}, None), ("marker.delete", {"type": 'DEL', "value": 'PRESS'}, None), @@ -5716,7 +5716,7 @@ keyconfig_data = \ ], }, ), - ("graph.select_border", + ("graph.select_box", {"type": 'B', "value": 'PRESS'}, {"properties": [("axis_range", False), @@ -5724,7 +5724,7 @@ keyconfig_data = \ ], }, ), - ("graph.select_border", + ("graph.select_box", {"type": 'B', "value": 'PRESS', "alt": True}, {"properties": [("axis_range", True), @@ -5732,7 +5732,7 @@ keyconfig_data = \ ], }, ), - ("graph.select_border", + ("graph.select_box", {"type": 'B', "value": 'PRESS', "ctrl": True}, {"properties": [("axis_range", False), @@ -5740,7 +5740,7 @@ keyconfig_data = \ ], }, ), - ("graph.select_border", + ("graph.select_box", {"type": 'B', "value": 'PRESS', "ctrl": True, "alt": True}, {"properties": [("axis_range", True), @@ -6259,7 +6259,7 @@ keyconfig_data = \ ], }, ), - ("node.select_border", + ("node.select_box", {"type": 'EVT_TWEAK_S', "value": 'ANY'}, {"properties": [("tweak", True), @@ -6349,7 +6349,7 @@ keyconfig_data = \ ("node.view_all", {"type": 'HOME', "value": 'PRESS'}, None), ("node.view_all", {"type": 'NDOF_BUTTON_FIT', "value": 'PRESS'}, None), ("node.view_selected", {"type": 'NUMPAD_PERIOD', "value": 'PRESS'}, None), - ("node.select_border", + ("node.select_box", {"type": 'B', "value": 'PRESS'}, {"properties": [("tweak", False), @@ -6649,8 +6649,8 @@ keyconfig_data = \ ("file.previous", {"type": 'BUTTON4MOUSE', "value": 'CLICK'}, None), ("file.next", {"type": 'BUTTON5MOUSE', "value": 'CLICK'}, None), ("file.select_all_toggle", {"type": 'A', "value": 'PRESS'}, None), - ("file.select_border", {"type": 'B', "value": 'PRESS'}, None), - ("file.select_border", {"type": 'EVT_TWEAK_L', "value": 'ANY'}, None), + ("file.select_box", {"type": 'B', "value": 'PRESS'}, None), + ("file.select_box", {"type": 'EVT_TWEAK_L', "value": 'ANY'}, None), ("file.rename", {"type": 'LEFTMOUSE', "value": 'PRESS', "ctrl": True}, None), ("file.highlight", {"type": 'MOUSEMOVE', "value": 'ANY', "any": True}, None), ("file.filenum", @@ -6856,14 +6856,14 @@ keyconfig_data = \ ], }, ), - ("action.select_border", + ("action.select_box", {"type": 'B', "value": 'PRESS'}, {"properties": [("axis_range", False), ], }, ), - ("action.select_border", + ("action.select_box", {"type": 'B', "value": 'PRESS', "alt": True}, {"properties": [("axis_range", True), @@ -7126,14 +7126,14 @@ keyconfig_data = \ ], }, ), - ("nla.select_border", + ("nla.select_box", {"type": 'B', "value": 'PRESS'}, {"properties": [("axis_range", False), ], }, ), - ("nla.select_border", + ("nla.select_box", {"type": 'B', "value": 'PRESS', "alt": True}, {"properties": [("axis_range", True), @@ -7857,7 +7857,7 @@ keyconfig_data = \ }, ), ("sequencer.select_linked", {"type": 'L', "value": 'PRESS', "ctrl": True}, None), - ("sequencer.select_border", {"type": 'B', "value": 'PRESS'}, None), + ("sequencer.select_box", {"type": 'B', "value": 'PRESS'}, None), ("sequencer.select_grouped", {"type": 'G', "value": 'PRESS', "shift": True}, None), ("wm.call_menu", {"type": 'A', "value": 'PRESS', "shift": True}, @@ -8291,7 +8291,7 @@ keyconfig_data = \ ], }, ), - ("clip.select_border", {"type": 'B', "value": 'PRESS'}, None), + ("clip.select_box", {"type": 'B', "value": 'PRESS'}, None), ("clip.select_circle", {"type": 'C', "value": 'PRESS'}, None), ("wm.call_menu", {"type": 'G', "value": 'PRESS', "shift": True}, @@ -8493,7 +8493,7 @@ keyconfig_data = \ ], }, ), - ("clip.graph_select_border", {"type": 'B', "value": 'PRESS'}, None), + ("clip.graph_select_box", {"type": 'B', "value": 'PRESS'}, None), ("clip.graph_delete_curve", {"type": 'DEL', "value": 'PRESS'}, None), ("clip.graph_delete_curve", {"type": 'X', "value": 'PRESS'}, None), ("clip.graph_delete_knot", {"type": 'DEL', "value": 'PRESS', "shift": True}, None), diff --git a/release/scripts/presets/keyconfig/maya.py b/release/scripts/presets/keyconfig/maya.py index 676ccb8bec3..60e58d6324a 100644 --- a/release/scripts/presets/keyconfig/maya.py +++ b/release/scripts/presets/keyconfig/maya.py @@ -194,9 +194,9 @@ kmi.properties.camera = True kmi = km.keymap_items.new('marker.select', 'SELECTMOUSE', 'PRESS', shift=True, ctrl=True) kmi.properties.extend = True kmi.properties.camera = True -kmi = km.keymap_items.new('marker.select_border', 'EVT_TWEAK_S', 'ANY') +kmi = km.keymap_items.new('marker.select_box', 'EVT_TWEAK_S', 'ANY') kmi.properties.extend = False -kmi = km.keymap_items.new('marker.select_border', 'EVT_TWEAK_S', 'ANY', any=True) +kmi = km.keymap_items.new('marker.select_box', 'EVT_TWEAK_S', 'ANY', any=True) kmi = km.keymap_items.new('marker.select_all', 'A', 'PRESS', ctrl=True) kmi = km.keymap_items.new('marker.delete', 'BACK_SPACE', 'PRESS') kmi = km.keymap_items.new('marker.rename', 'M', 'PRESS', ctrl=True) @@ -227,7 +227,7 @@ kmi = km.keymap_items.new('outliner.item_activate', 'LEFTMOUSE', 'CLICK') kmi.properties.extend = False kmi = km.keymap_items.new('outliner.item_activate', 'LEFTMOUSE', 'CLICK', shift=True) kmi.properties.extend = True -kmi = km.keymap_items.new('outliner.select_border', 'EVT_TWEAK_S', 'ANY', any=True) +kmi = km.keymap_items.new('outliner.select_box', 'EVT_TWEAK_S', 'ANY', any=True) kmi = km.keymap_items.new('outliner.item_openclose', 'RET', 'PRESS') kmi.properties.all = False kmi = km.keymap_items.new('outliner.item_openclose', 'RET', 'PRESS', shift=True) @@ -1049,9 +1049,9 @@ kmi.properties.enumerate = True kmi.properties.toggle = False kmi.properties.deselect = False kmi.properties.object = False -kmi = km.keymap_items.new('view3d.select_border', 'EVT_TWEAK_S', 'ANY') +kmi = km.keymap_items.new('view3d.select_box', 'EVT_TWEAK_S', 'ANY') kmi.properties.extend = False -kmi = km.keymap_items.new('view3d.select_border', 'EVT_TWEAK_S', 'ANY', any=True) +kmi = km.keymap_items.new('view3d.select_box', 'EVT_TWEAK_S', 'ANY', any=True) kmi = km.keymap_items.new('view3d.select_lasso', 'EVT_TWEAK_M', 'ANY') kmi.properties.extend = False kmi = km.keymap_items.new('view3d.select_lasso', 'EVT_TWEAK_M', 'ANY', ctrl=True) @@ -1104,9 +1104,9 @@ kmi = km.keymap_items.new('anim.channels_rename', 'LEFTMOUSE', 'PRESS', ctrl=Tru kmi = km.keymap_items.new('anim.channels_select_all_toggle', 'A', 'PRESS', ctrl=True) kmi = km.keymap_items.new('anim.channels_select_all_toggle', 'I', 'PRESS', ctrl=True) kmi.properties.invert = True -kmi = km.keymap_items.new('anim.channels_select_border', 'EVT_TWEAK_S', 'ANY') +kmi = km.keymap_items.new('anim.channels_select_box', 'EVT_TWEAK_S', 'ANY') kmi.properties.extend = False -kmi = km.keymap_items.new('anim.channels_select_border', 'EVT_TWEAK_S', 'ANY', any=True) +kmi = km.keymap_items.new('anim.channels_select_box', 'EVT_TWEAK_S', 'ANY', any=True) kmi = km.keymap_items.new('anim.channels_delete', 'BACK_SPACE', 'PRESS') kmi = km.keymap_items.new('anim.channels_delete', 'DEL', 'PRESS') kmi = km.keymap_items.new('anim.channels_setting_toggle', 'W', 'PRESS', shift=True) @@ -1142,10 +1142,10 @@ kmi = km.keymap_items.new('uv.select_loop', 'LEFTMOUSE', 'PRESS', ctrl=True, alt kmi.properties.extend = False kmi = km.keymap_items.new('uv.select_loop', 'LEFTMOUSE', 'PRESS', shift=True, ctrl=True, alt=True) kmi.properties.extend = True -kmi = km.keymap_items.new('uv.select_border', 'EVT_TWEAK_S', 'ANY') +kmi = km.keymap_items.new('uv.select_box', 'EVT_TWEAK_S', 'ANY') kmi.properties.extend = False kmi.properties.pinned = False -kmi = km.keymap_items.new('uv.select_border', 'EVT_TWEAK_S', 'ANY', any=True) +kmi = km.keymap_items.new('uv.select_box', 'EVT_TWEAK_S', 'ANY', any=True) kmi.properties.pinned = False kmi = km.keymap_items.new('uv.circle_select', 'Q', 'PRESS', shift=True) kmi = km.keymap_items.new('uv.select_linked', 'L', 'PRESS', ctrl=True) @@ -1239,8 +1239,8 @@ kmi = km.keymap_items.new_modal('ADD', 'WHEELDOWNMOUSE', 'PRESS') kmi = km.keymap_items.new_modal('ADD', 'NUMPAD_PLUS', 'PRESS') kmi = km.keymap_items.new_modal('SIZE', 'TRACKPADPAN', 'ANY') -# Map Gesture Border -km = kc.keymaps.new('Gesture Border', space_type='EMPTY', region_type='WINDOW', modal=True) +# Map Gesture Box +km = kc.keymaps.new('Gesture Box', space_type='EMPTY', region_type='WINDOW', modal=True) kmi = km.keymap_items.new_modal('CANCEL', 'ESC', 'PRESS', any=True) kmi = km.keymap_items.new_modal('CANCEL', 'RIGHTMOUSE', 'PRESS', any=True) @@ -1338,11 +1338,11 @@ kmi = km.keymap_items.new('graph.select_all_toggle', 'A', 'PRESS', ctrl=True) kmi.properties.invert = False kmi = km.keymap_items.new('graph.select_all_toggle', 'I', 'PRESS', ctrl=True) kmi.properties.invert = True -kmi = km.keymap_items.new('graph.select_border', 'EVT_TWEAK_S', 'ANY') +kmi = km.keymap_items.new('graph.select_box', 'EVT_TWEAK_S', 'ANY') kmi.properties.extend = False kmi.properties.axis_range = False kmi.properties.include_handles = False -kmi = km.keymap_items.new('graph.select_border', 'EVT_TWEAK_S', 'ANY', any=True) +kmi = km.keymap_items.new('graph.select_box', 'EVT_TWEAK_S', 'ANY', any=True) kmi.properties.axis_range = False kmi.properties.include_handles = False kmi = km.keymap_items.new('graph.select_more', 'PERIOD', 'PRESS', shift=True) @@ -1442,10 +1442,10 @@ kmi = km.keymap_items.new('node.select', 'SELECTMOUSE', 'PRESS') kmi.properties.extend = False kmi = km.keymap_items.new('node.select', 'SELECTMOUSE', 'PRESS', shift=True) kmi.properties.extend = True -kmi = km.keymap_items.new('node.select_border', 'EVT_TWEAK_S', 'ANY') +kmi = km.keymap_items.new('node.select_box', 'EVT_TWEAK_S', 'ANY') kmi.properties.extend = False kmi.properties.tweak = True -kmi = km.keymap_items.new('node.select_border', 'EVT_TWEAK_S', 'ANY', any=True) +kmi = km.keymap_items.new('node.select_box', 'EVT_TWEAK_S', 'ANY', any=True) kmi.properties.tweak = True kmi = km.keymap_items.new('node.link', 'LEFTMOUSE', 'PRESS') kmi = km.keymap_items.new('node.resize', 'LEFTMOUSE', 'PRESS') @@ -1510,9 +1510,9 @@ kmi.properties.extend = True kmi.properties.fill = True kmi = km.keymap_items.new('file.select_all_toggle', 'A', 'PRESS', ctrl=True) kmi = km.keymap_items.new('file.refresh', 'F', 'PRESS') -kmi = km.keymap_items.new('file.select_border', 'EVT_TWEAK_S', 'ANY') +kmi = km.keymap_items.new('file.select_box', 'EVT_TWEAK_S', 'ANY') kmi.properties.extend = False -kmi = km.keymap_items.new('file.select_border', 'EVT_TWEAK_S', 'ANY', any=True) +kmi = km.keymap_items.new('file.select_box', 'EVT_TWEAK_S', 'ANY', any=True) kmi = km.keymap_items.new('file.rename', 'LEFTMOUSE', 'PRESS', ctrl=True) kmi = km.keymap_items.new('file.highlight', 'MOUSEMOVE', 'ANY', any=True) kmi = km.keymap_items.new('file.filenum', 'NUMPAD_PLUS', 'PRESS') @@ -1553,10 +1553,10 @@ kmi = km.keymap_items.new('action.select_all_toggle', 'A', 'PRESS', ctrl=True) kmi.properties.invert = False kmi = km.keymap_items.new('action.select_all_toggle', 'I', 'PRESS', ctrl=True) kmi.properties.invert = True -kmi = km.keymap_items.new('action.select_border', 'EVT_TWEAK_S', 'ANY') +kmi = km.keymap_items.new('action.select_box', 'EVT_TWEAK_S', 'ANY') kmi.properties.extend = False kmi.properties.axis_range = False -kmi = km.keymap_items.new('action.select_border', 'EVT_TWEAK_S', 'ANY', any=True) +kmi = km.keymap_items.new('action.select_box', 'EVT_TWEAK_S', 'ANY', any=True) kmi.properties.axis_range = False kmi = km.keymap_items.new('action.select_more', 'PERIOD', 'PRESS', shift=True) kmi = km.keymap_items.new('action.select_less', 'COMMA', 'PRESS', shift=True) @@ -1628,10 +1628,10 @@ kmi = km.keymap_items.new('nla.select_all_toggle', 'A', 'PRESS', ctrl=True) kmi.properties.invert = False kmi = km.keymap_items.new('nla.select_all_toggle', 'I', 'PRESS', ctrl=True) kmi.properties.invert = True -kmi = km.keymap_items.new('nla.select_border', 'EVT_TWEAK_S', 'ANY') +kmi = km.keymap_items.new('nla.select_box', 'EVT_TWEAK_S', 'ANY') kmi.properties.extend = False kmi.properties.axis_range = False -kmi = km.keymap_items.new('nla.select_border', 'EVT_TWEAK_S', 'ANY', any=True) +kmi = km.keymap_items.new('nla.select_box', 'EVT_TWEAK_S', 'ANY', any=True) kmi.properties.axis_range = False kmi = km.keymap_items.new('nla.view_all', 'A', 'PRESS') kmi = km.keymap_items.new('nla.view_selected', 'F', 'PRESS') @@ -1767,9 +1767,9 @@ kmi.properties.extend = False kmi = km.keymap_items.new('sequencer.select_linked_pick', 'L', 'PRESS', shift=True) kmi.properties.extend = True kmi = km.keymap_items.new('sequencer.select_linked', 'L', 'PRESS', ctrl=True) -kmi = km.keymap_items.new('sequencer.select_border', 'EVT_TWEAK_S', 'ANY') +kmi = km.keymap_items.new('sequencer.select_box', 'EVT_TWEAK_S', 'ANY') kmi.properties.extend = False -kmi = km.keymap_items.new('sequencer.select_border', 'EVT_TWEAK_S', 'ANY', any=True) +kmi = km.keymap_items.new('sequencer.select_box', 'EVT_TWEAK_S', 'ANY', any=True) kmi = km.keymap_items.new('sequencer.select_grouped', 'G', 'PRESS', shift=True) kmi = km.keymap_items.new('wm.call_menu', 'A', 'PRESS', shift=True) kmi.properties.name = 'SEQUENCER_MT_add' @@ -1831,9 +1831,9 @@ kmi = km.keymap_items.new('clip.select_all', 'A', 'PRESS', ctrl=True) kmi.properties.action = 'TOGGLE' kmi = km.keymap_items.new('clip.select_all', 'I', 'PRESS', ctrl=True) kmi.properties.action = 'INVERT' -kmi = km.keymap_items.new('clip.select_border', 'EVT_TWEAK_S', 'ANY') +kmi = km.keymap_items.new('clip.select_box', 'EVT_TWEAK_S', 'ANY') kmi.properties.extend = False -kmi = km.keymap_items.new('clip.select_border', 'EVT_TWEAK_S', 'ANY', any=True) +kmi = km.keymap_items.new('clip.select_box', 'EVT_TWEAK_S', 'ANY', any=True) kmi = km.keymap_items.new('clip.select_circle', 'Q', 'PRESS', shift=True) kmi = km.keymap_items.new('wm.call_menu', 'G', 'PRESS', shift=True) kmi.properties.name = 'CLIP_MT_select_grouped' @@ -1890,9 +1890,9 @@ kmi = km.keymap_items.new('clip.graph_select_all_markers', 'A', 'PRESS') kmi.properties.action = 'TOGGLE' kmi = km.keymap_items.new('clip.graph_select_all_markers', 'I', 'PRESS', ctrl=True) kmi.properties.action = 'INVERT' -kmi = km.keymap_items.new('clip.graph_select_border', 'EVT_TWEAK_S', 'ANY') +kmi = km.keymap_items.new('clip.graph_select_box', 'EVT_TWEAK_S', 'ANY') kmi.properties.extend = False -kmi = km.keymap_items.new('clip.graph_select_border', 'EVT_TWEAK_S', 'ANY', any=True) +kmi = km.keymap_items.new('clip.graph_select_box', 'EVT_TWEAK_S', 'ANY', any=True) kmi = km.keymap_items.new('clip.graph_delete_curve', 'DEL', 'PRESS') kmi = km.keymap_items.new('clip.graph_delete_curve', 'BACK_SPACE', 'PRESS') kmi = km.keymap_items.new('clip.graph_delete_knot', 'DEL', 'PRESS', shift=True) diff --git a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py index 9d8693e5e38..765c4091d14 100644 --- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py +++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py @@ -168,7 +168,7 @@ class GreasePencilStrokeEditPanel: layout.label(text="Select:") col = layout.column(align=True) col.operator("gpencil.select_all", text="Select All") - col.operator("gpencil.select_border") + col.operator("gpencil.select_box") col.operator("gpencil.select_circle") layout.separator() @@ -420,7 +420,7 @@ class GPENCIL_MT_pie_tool_palette(Menu): # NE - Select (Modal) col = pie.column() - col.operator("gpencil.select_border", text="Border Select", icon='BORDER_RECT') + col.operator("gpencil.select_box", text="Box Select", icon='BORDER_RECT') col.operator("gpencil.select_circle", text="Circle Select", icon='META_EMPTY') col.operator("gpencil.select_lasso", text="Lasso Select", icon='BORDER_LASSO') col.operator("gpencil.select_alternate", text="Alternate Select", icon='BORDER_LASSO') diff --git a/release/scripts/startup/bl_ui/properties_mask_common.py b/release/scripts/startup/bl_ui/properties_mask_common.py index bd657280e4e..51f3c7d4a4a 100644 --- a/release/scripts/startup/bl_ui/properties_mask_common.py +++ b/release/scripts/startup/bl_ui/properties_mask_common.py @@ -391,7 +391,7 @@ class MASK_MT_select(Menu): layout.separator() - layout.operator("mask.select_border") + layout.operator("mask.select_box") layout.operator("mask.select_circle") layout.separator() diff --git a/release/scripts/startup/bl_ui/space_clip.py b/release/scripts/startup/bl_ui/space_clip.py index 1aa6cece0a8..86615f2651d 100644 --- a/release/scripts/startup/bl_ui/space_clip.py +++ b/release/scripts/startup/bl_ui/space_clip.py @@ -1411,7 +1411,7 @@ class CLIP_MT_select(Menu): def draw(self, context): layout = self.layout - layout.operator("clip.select_border") + layout.operator("clip.select_box") layout.operator("clip.select_circle") layout.separator() diff --git a/release/scripts/startup/bl_ui/space_dopesheet.py b/release/scripts/startup/bl_ui/space_dopesheet.py index ca0dd2911f5..54160dbc3fe 100644 --- a/release/scripts/startup/bl_ui/space_dopesheet.py +++ b/release/scripts/startup/bl_ui/space_dopesheet.py @@ -369,8 +369,8 @@ class DOPESHEET_MT_select(Menu): layout.operator("action.select_all", text="Invert").action = 'INVERT' layout.separator() - layout.operator("action.select_border").axis_range = False - layout.operator("action.select_border", text="Border Axis Range").axis_range = True + layout.operator("action.select_box").axis_range = False + layout.operator("action.select_box", text="Border Axis Range").axis_range = True layout.operator("action.select_circle") diff --git a/release/scripts/startup/bl_ui/space_graph.py b/release/scripts/startup/bl_ui/space_graph.py index 78da2215be0..f97969d3b43 100644 --- a/release/scripts/startup/bl_ui/space_graph.py +++ b/release/scripts/startup/bl_ui/space_graph.py @@ -169,13 +169,13 @@ class GRAPH_MT_select(Menu): layout.separator() - props = layout.operator("graph.select_border") + props = layout.operator("graph.select_box") props.axis_range = False props.include_handles = False - props = layout.operator("graph.select_border", text="Border Axis Range") + props = layout.operator("graph.select_box", text="Border Axis Range") props.axis_range = True props.include_handles = False - props = layout.operator("graph.select_border", text="Border (Include Handles)") + props = layout.operator("graph.select_box", text="Border (Include Handles)") props.axis_range = False props.include_handles = True diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py index 8fe5761cc33..cf6db15e3a2 100644 --- a/release/scripts/startup/bl_ui/space_image.py +++ b/release/scripts/startup/bl_ui/space_image.py @@ -157,8 +157,8 @@ class IMAGE_MT_select(Menu): layout.separator() - layout.operator("uv.select_border").pinned = False - layout.operator("uv.select_border", text="Border Select Pinned").pinned = True + layout.operator("uv.select_box").pinned = False + layout.operator("uv.select_box", text="Box Select Pinned").pinned = True layout.operator("uv.circle_select") layout.separator() diff --git a/release/scripts/startup/bl_ui/space_nla.py b/release/scripts/startup/bl_ui/space_nla.py index 38b6aef99ac..a3179097046 100644 --- a/release/scripts/startup/bl_ui/space_nla.py +++ b/release/scripts/startup/bl_ui/space_nla.py @@ -129,8 +129,8 @@ class NLA_MT_select(Menu): layout.operator("nla.select_all", text="Invert").action = 'INVERT' layout.separator() - layout.operator("nla.select_border").axis_range = False - layout.operator("nla.select_border", text="Border Axis Range").axis_range = True + layout.operator("nla.select_box").axis_range = False + layout.operator("nla.select_box", text="Border Axis Range").axis_range = True layout.separator() props = layout.operator("nla.select_leftright", text="Before Current Frame") diff --git a/release/scripts/startup/bl_ui/space_node.py b/release/scripts/startup/bl_ui/space_node.py index 4dff94019ab..c2d0ce82a6e 100644 --- a/release/scripts/startup/bl_ui/space_node.py +++ b/release/scripts/startup/bl_ui/space_node.py @@ -235,7 +235,7 @@ class NODE_MT_select(Menu): def draw(self, context): layout = self.layout - layout.operator("node.select_border").tweak = False + layout.operator("node.select_box").tweak = False layout.operator("node.select_circle") layout.separator() diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py index 8007fba9f63..b7dc8335a7b 100644 --- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py +++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py @@ -377,17 +377,17 @@ class _defs_view3d_select: @ToolDef.from_fn def border(): def draw_settings(context, layout, tool): - props = tool.operator_properties("view3d.select_border") + props = tool.operator_properties("view3d.select_box") layout.prop(props, "mode", expand=True) return dict( - text="Select Border", - icon="ops.generic.select_border", + text="Select Box", + icon="ops.generic.select_box", widget=None, keymap=( - ("view3d.select_border", + ("view3d.select_box", dict(mode='ADD'), dict(type='EVT_TWEAK_A', value='ANY')), - ("view3d.select_border", + ("view3d.select_box", dict(mode='SUB'), dict(type='EVT_TWEAK_A', value='ANY', ctrl=True)), ), @@ -1045,7 +1045,7 @@ class _defs_sculpt: @ToolDef.from_fn def hide_border(): return dict( - text="Border Hide", + text="Box Hide", icon="ops.sculpt.border_hide", widget=None, keymap=( @@ -1058,12 +1058,12 @@ class _defs_sculpt: @ToolDef.from_fn def mask_border(): return dict( - text="Border Mask", + text="Box Mask", icon="ops.sculpt.border_mask", widget=None, keymap=( - ("view3d.select_border", dict(mode='ADD'), dict(type='EVT_TWEAK_A', value='ANY')), - ("view3d.select_border", dict(mode='SUB'), dict(type='EVT_TWEAK_A', value='ANY', ctrl=True)), + ("view3d.select_box", dict(mode='ADD'), dict(type='EVT_TWEAK_A', value='ANY')), + ("view3d.select_box", dict(mode='SUB'), dict(type='EVT_TWEAK_A', value='ANY', ctrl=True)), ), ) @@ -1228,17 +1228,17 @@ class _defs_image_uv_select: @ToolDef.from_fn def border(): def draw_settings(context, layout, tool): - props = tool.operator_properties("uv.select_border") + props = tool.operator_properties("uv.select_box") layout.prop(props, "deselect") return dict( - text="Select Border", - icon="ops.generic.select_border", + text="Select Box", + icon="ops.generic.select_box", widget=None, keymap=( - ("uv.select_border", + ("uv.select_box", dict(), dict(type='EVT_TWEAK_A', value='ANY')), - ("uv.select_border", + ("uv.select_box", dict(deselect=True), dict(type='EVT_TWEAK_A', value='ANY', ctrl=True)), ), @@ -1385,13 +1385,13 @@ class _defs_gpencil_edit: ) @ToolDef.from_fn - def border_select(): + def box_select(): return dict( - text="Select Border", - icon="ops.generic.select_border", + text="Select Box", + icon="ops.generic.select_box", widget=None, keymap=( - ("gpencil.select_border", + ("gpencil.select_box", dict(), dict(type='EVT_TWEAK_A', value='ANY')), ), @@ -1838,7 +1838,7 @@ class VIEW3D_PT_tools_active(ToolSelectPanelHelper, Panel): _tools_gpencil_select = ( ( - _defs_gpencil_edit.border_select, + _defs_gpencil_edit.box_select, _defs_gpencil_edit.circle_select, _defs_gpencil_edit.lasso_select, ), @@ -1999,7 +1999,7 @@ class VIEW3D_PT_tools_active(ToolSelectPanelHelper, Panel): ], 'GPENCIL_EDIT': [ _defs_view3d_generic.cursor, - _defs_gpencil_edit.border_select, + _defs_gpencil_edit.box_select, _defs_gpencil_edit.circle_select, _defs_gpencil_edit.lasso_select, None, diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index 71f095642eb..81ac6628735 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -813,7 +813,7 @@ class VIEW3D_MT_select_object(Menu): layout.separator() - layout.operator("view3d.select_border") + layout.operator("view3d.select_box") layout.operator("view3d.select_circle") layout.separator() @@ -873,7 +873,7 @@ class VIEW3D_MT_select_pose(Menu): layout.separator() - layout.operator("view3d.select_border") + layout.operator("view3d.select_box") layout.operator("view3d.select_circle") layout.separator() @@ -907,7 +907,7 @@ class VIEW3D_MT_select_particle(Menu): layout.separator() - layout.operator("view3d.select_border") + layout.operator("view3d.select_box") layout.operator("view3d.select_circle") layout.separator() @@ -1013,7 +1013,7 @@ class VIEW3D_MT_select_edit_mesh(Menu): layout.separator() - layout.operator("view3d.select_border") + layout.operator("view3d.select_box") layout.operator("view3d.select_circle") layout.separator() @@ -1066,7 +1066,7 @@ class VIEW3D_MT_select_edit_curve(Menu): layout.separator() - layout.operator("view3d.select_border") + layout.operator("view3d.select_box") layout.operator("view3d.select_circle") layout.separator() @@ -1101,7 +1101,7 @@ class VIEW3D_MT_select_edit_surface(Menu): layout.separator() - layout.operator("view3d.select_border") + layout.operator("view3d.select_box") layout.operator("view3d.select_circle") layout.separator() @@ -1154,7 +1154,7 @@ class VIEW3D_MT_select_edit_metaball(Menu): layout.separator() - layout.operator("view3d.select_border") + layout.operator("view3d.select_box") layout.operator("view3d.select_circle") layout.separator() @@ -1178,7 +1178,7 @@ class VIEW3D_MT_select_edit_lattice(Menu): layout.separator() - layout.operator("view3d.select_border") + layout.operator("view3d.select_box") layout.operator("view3d.select_circle") layout.separator() @@ -1203,7 +1203,7 @@ class VIEW3D_MT_select_edit_armature(Menu): layout.separator() - layout.operator("view3d.select_border") + layout.operator("view3d.select_box") layout.operator("view3d.select_circle") layout.separator() @@ -1251,7 +1251,7 @@ class VIEW3D_MT_select_gpencil(Menu): layout.separator() - layout.operator("gpencil.select_border") + layout.operator("gpencil.select_box") layout.operator("gpencil.select_circle") layout.separator() @@ -1283,7 +1283,7 @@ class VIEW3D_MT_select_paint_mask(Menu): layout.separator() - layout.operator("view3d.select_border") + layout.operator("view3d.select_box") layout.operator("view3d.select_circle") layout.separator() @@ -1303,7 +1303,7 @@ class VIEW3D_MT_select_paint_mask_vertex(Menu): layout.separator() - layout.operator("view3d.select_border") + layout.operator("view3d.select_box") layout.operator("view3d.select_circle") layout.separator() @@ -2310,7 +2310,7 @@ class VIEW3D_MT_hide_mask(Menu): props.mode = 'VALUE' props.value = 0 - props = layout.operator("view3d.select_border", text="Box Mask") + props = layout.operator("view3d.select_box", text="Box Mask") props = layout.operator("paint.mask_lasso_gesture", text="Lasso Mask") |