From 3017d88aec7f3f44ba9db930920ac2a51aef750d Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 12 Mar 2019 10:59:57 +1100 Subject: Cleanup: rename specials -> context_menu In keeping with convention to match code & UI naming. - No user visible changes. - Include 'menu' in the name since context is an overloaded term. - While a few of these are panels, from a user perspective they are still context menus. --- .../keyconfig/keymap_data/blender_default.py | 42 ++++++++--------- .../startup/bl_ui/properties_data_armature.py | 6 +-- .../startup/bl_ui/properties_data_gpencil.py | 6 +-- .../scripts/startup/bl_ui/properties_data_mesh.py | 12 ++--- .../scripts/startup/bl_ui/properties_freestyle.py | 6 +-- .../bl_ui/properties_grease_pencil_common.py | 2 +- .../scripts/startup/bl_ui/properties_material.py | 6 +-- .../startup/bl_ui/properties_material_gpencil.py | 4 +- release/scripts/startup/bl_ui/properties_object.py | 6 +-- .../scripts/startup/bl_ui/properties_particle.py | 8 ++-- .../scripts/startup/bl_ui/properties_texture.py | 4 +- release/scripts/startup/bl_ui/space_clip.py | 16 +++---- release/scripts/startup/bl_ui/space_dopesheet.py | 8 ++-- release/scripts/startup/bl_ui/space_filebrowser.py | 6 +-- release/scripts/startup/bl_ui/space_graph.py | 8 ++-- release/scripts/startup/bl_ui/space_image.py | 4 +- release/scripts/startup/bl_ui/space_node.py | 10 ++--- release/scripts/startup/bl_ui/space_topbar.py | 10 ++--- release/scripts/startup/bl_ui/space_view3d.py | 52 +++++++++++----------- 19 files changed, 108 insertions(+), 108 deletions(-) (limited to 'release/scripts') diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py index 474200c5754..ccbfc5bb25c 100644 --- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py +++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py @@ -347,9 +347,9 @@ def km_window(params): # New shortcuts items.extend([ ("wm.doc_view_manual_ui_context", {"type": 'F1', "value": 'PRESS'}, None), - op_menu("TOPBAR_MT_file_specials", {"type": 'F2', "value": 'PRESS'}), + op_menu("TOPBAR_MT_file_context_menu", {"type": 'F2', "value": 'PRESS'}), ("wm.search_menu", {"type": 'F3', "value": 'PRESS'}, None), - op_menu("TOPBAR_MT_window_specials", {"type": 'F4', "value": 'PRESS'}), + op_menu("TOPBAR_MT_window_context_menu", {"type": 'F4', "value": 'PRESS'}), ]) if params.spacebar_action == 'TOOL': @@ -785,7 +785,7 @@ def km_uv_editor(params): {"properties": [("data_path", 'tool_settings.use_snap')]}), ("wm.context_menu_enum", {"type": 'TAB', "value": 'PRESS', "shift": True, "ctrl": True}, {"properties": [("data_path", 'tool_settings.snap_uv_element')]}), - op_menu("IMAGE_MT_uvs_specials", params.context_menu_event), + op_menu("IMAGE_MT_uvs_context_menu", params.context_menu_event), ]) # 3D cursor @@ -1383,7 +1383,7 @@ def km_graph_editor(params): ("graph.bake", {"type": 'C', "value": 'PRESS', "alt": True}, None), op_menu("GRAPH_MT_delete", {"type": 'X', "value": 'PRESS'}), op_menu("GRAPH_MT_delete", {"type": 'DEL', "value": 'PRESS'}), - op_menu("GRAPH_MT_specials", params.context_menu_event), + op_menu("GRAPH_MT_context_menu", params.context_menu_event), ("graph.duplicate_move", {"type": 'D', "value": 'PRESS', "shift": True}, None), ("graph.keyframe_insert", {"type": 'I', "value": 'PRESS'}, None), ("graph.click_insert", {"type": params.action_mouse, "value": 'CLICK', "ctrl": True}, @@ -1595,7 +1595,7 @@ def km_node_editor(params): {"properties": [("factor", 1.2)]}), ("node.backimage_fit", {"type": 'HOME', "value": 'PRESS', "alt": True}, None), ("node.backimage_sample", {"type": params.action_mouse, "value": 'PRESS', "alt": True}, None), - op_menu("NODE_MT_specials", params.context_menu_event), + op_menu("NODE_MT_context_menu", params.context_menu_event), ("node.link_make", {"type": 'F', "value": 'PRESS'}, {"properties": [("replace", False)]}), ("node.link_make", {"type": 'F', "value": 'PRESS', "shift": True}, @@ -1899,7 +1899,7 @@ def km_dopesheet(params): ("action.interpolation_type", {"type": 'T', "value": 'PRESS'}, None), ("action.extrapolation_type", {"type": 'E', "value": 'PRESS', "shift": True}, None), ("action.keyframe_type", {"type": 'R', "value": 'PRESS'}, None), - op_menu("DOPESHEET_MT_specials", params.context_menu_event), + op_menu("DOPESHEET_MT_context_menu", params.context_menu_event), ("action.sample", {"type": 'O', "value": 'PRESS', "shift": True, "alt": True}, None), op_menu("DOPESHEET_MT_delete", {"type": 'X', "value": 'PRESS'}), op_menu("DOPESHEET_MT_delete", {"type": 'DEL', "value": 'PRESS'}), @@ -2598,7 +2598,7 @@ def km_clip_editor(params): ("clip.keyframe_insert", {"type": 'I', "value": 'PRESS'}, None), ("clip.keyframe_delete", {"type": 'I', "value": 'PRESS', "alt": True}, None), ("clip.join_tracks", {"type": 'J', "value": 'PRESS', "ctrl": True}, None), - op_menu("CLIP_MT_tracking_specials", params.context_menu_event), + op_menu("CLIP_MT_tracking_context_menu", params.context_menu_event), ("wm.context_toggle", {"type": 'L', "value": 'PRESS'}, {"properties": [("data_path", 'space_data.lock_selection')]}), ("wm.context_toggle", {"type": 'D', "value": 'PRESS', "alt": True}, @@ -2841,7 +2841,7 @@ def km_animation_channels(params): ("anim.channels_group", {"type": 'G', "value": 'PRESS', "ctrl": True}, None), ("anim.channels_ungroup", {"type": 'G', "value": 'PRESS', "ctrl": True, "alt": True}, None), # Menus. - op_menu("DOPESHEET_MT_channel_specials", params.context_menu_event), + op_menu("DOPESHEET_MT_channel_context_menu", params.context_menu_event), ]) return keymap @@ -2963,7 +2963,7 @@ def km_grease_pencil_stroke_edit_mode(params): ("gpencil.active_frames_delete_all", {"type": 'X', "value": 'PRESS', "shift": True}, None), ("gpencil.active_frames_delete_all", {"type": 'DEL', "value": 'PRESS', "shift": True}, None), # Context menu - op_menu("VIEW3D_MT_gpencil_edit_specials", params.context_menu_event), + op_menu("VIEW3D_MT_gpencil_edit_context_menu", params.context_menu_event), # Separate op_menu("GPENCIL_MT_separate", {"type": 'P', "value": 'PRESS'}), # Split and joint strokes @@ -3047,7 +3047,7 @@ def km_grease_pencil_stroke_paint_mode(params): ("wm.radial_control", {"type": 'F', "value": 'PRESS'}, {"properties": [("data_path_primary", 'tool_settings.gpencil_paint.brush.size')]}), # Draw context menu - op_panel("VIEW3D_PT_gpencil_draw_specials", params.context_menu_event), + op_panel("VIEW3D_PT_gpencil_draw_context_menu", params.context_menu_event), # Draw delete menu op_menu("GPENCIL_MT_gpencil_draw_delete", {"type": 'X', "value": 'PRESS'}), ]) @@ -3187,7 +3187,7 @@ def km_grease_pencil_stroke_sculpt_mode(params): ("wm.radial_control", {"type": 'F', "value": 'PRESS'}, {"properties": [("data_path_primary", 'tool_settings.gpencil_sculpt.brush.size')]}), # Context menu - op_panel("VIEW3D_PT_gpencil_sculpt_specials", params.context_menu_event), + op_panel("VIEW3D_PT_gpencil_sculpt_context_menu", params.context_menu_event), # Display *_grease_pencil_display(), ]) @@ -3333,7 +3333,7 @@ def km_pose(params): ("pose.push", {"type": 'E', "value": 'PRESS', "ctrl": True}, None), ("pose.relax", {"type": 'E', "value": 'PRESS', "alt": True}, None), ("pose.breakdown", {"type": 'E', "value": 'PRESS', "shift": True}, None), - op_menu("VIEW3D_MT_pose_specials", params.context_menu_event), + op_menu("VIEW3D_MT_pose_context_menu", params.context_menu_event), op_menu("VIEW3D_MT_pose_propagate", {"type": 'P', "value": 'PRESS', "alt": True}), ]) @@ -3404,7 +3404,7 @@ def km_object_mode(params): ("collection.objects_remove_all", {"type": 'G', "value": 'PRESS', "shift": True, "ctrl": True, "alt": True}, None), ("collection.objects_add_active", {"type": 'G', "value": 'PRESS', "shift": True, "ctrl": True}, None), ("collection.objects_remove_active", {"type": 'G', "value": 'PRESS', "shift": True, "alt": True}, None), - op_menu("VIEW3D_MT_object_specials", params.context_menu_event), + op_menu("VIEW3D_MT_object_context_menu", params.context_menu_event), *_template_items_object_subdivision_set(), ("object.move_to_collection", {"type": 'M', "value": 'PRESS'}, None), ("object.link_to_collection", {"type": 'M', "value": 'PRESS', "shift": True}, None), @@ -3511,7 +3511,7 @@ def km_curve(params): {"properties": [("unselected", True)]}), ("curve.normals_make_consistent", {"type": 'N', "value": 'PRESS', "ctrl" if params.legacy else "shift": True}, None), ("object.vertex_parent_set", {"type": 'P', "value": 'PRESS', "ctrl": True}, None), - op_menu("VIEW3D_MT_edit_curve_specials", params.context_menu_event), + op_menu("VIEW3D_MT_edit_curve_context_menu", params.context_menu_event), op_menu("VIEW3D_MT_hook", {"type": 'H', "value": 'PRESS', "ctrl": True}), *_template_items_proportional_editing(connected=True), ]) @@ -3609,7 +3609,7 @@ def km_image_paint(params): op_menu("VIEW3D_MT_angle_control", {"type": 'R', "value": 'PRESS'}), ("wm.context_menu_enum", {"type": 'E', "value": 'PRESS'}, {"properties": [("data_path", 'tool_settings.image_paint.brush.stroke_method')]}), - op_panel("VIEW3D_PT_paint_texture_specials", params.context_menu_event), + op_panel("VIEW3D_PT_paint_texture_context_menu", params.context_menu_event), ]) return keymap @@ -3652,7 +3652,7 @@ def km_vertex_paint(params): op_menu("VIEW3D_MT_angle_control", {"type": 'R', "value": 'PRESS'}), ("wm.context_menu_enum", {"type": 'E', "value": 'PRESS'}, {"properties": [("data_path", 'tool_settings.vertex_paint.brush.stroke_method')]}), - op_panel("VIEW3D_PT_paint_vertex_specials", params.context_menu_event), + op_panel("VIEW3D_PT_paint_vertex_context_menu", params.context_menu_event), ]) return keymap @@ -3690,7 +3690,7 @@ def km_weight_paint(params): {"properties": [("data_path", 'weight_paint_object.data.use_paint_mask_vertex')]}), ("wm.context_toggle", {"type": 'S', "value": 'PRESS', "shift": True}, {"properties": [("data_path", 'tool_settings.weight_paint.brush.use_smooth_stroke')]}), - op_panel("VIEW3D_PT_paint_weight_specials", params.context_menu_event), + op_panel("VIEW3D_PT_paint_weight_context_menu", params.context_menu_event), ]) if params.select_mouse == 'LEFTMOUSE': @@ -3790,7 +3790,7 @@ def km_sculpt(params): ("wm.context_toggle", {"type": 'S', "value": 'PRESS', "shift": True}, {"properties": [("data_path", 'tool_settings.sculpt.brush.use_smooth_stroke')]}), op_menu("VIEW3D_MT_angle_control", {"type": 'R', "value": 'PRESS'}), - op_panel("VIEW3D_PT_sculpt_specials", params.context_menu_event), + op_panel("VIEW3D_PT_sculpt_context_menu", params.context_menu_event), ]) return keymap @@ -3892,7 +3892,7 @@ def km_mesh(params): {"properties": [("use_occlude_geometry", True), ("only_selected", False)]}), ("object.vertex_parent_set", {"type": 'P', "value": 'PRESS', "ctrl": True}, None), # Menus. - op_menu("VIEW3D_MT_edit_mesh_specials", params.context_menu_event), + op_menu("VIEW3D_MT_edit_mesh_context_menu", params.context_menu_event), op_menu("VIEW3D_MT_edit_mesh_faces", {"type": 'F', "value": 'PRESS', "ctrl": True}), op_menu("VIEW3D_MT_edit_mesh_edges", {"type": 'E', "value": 'PRESS', "ctrl": True}), op_menu("VIEW3D_MT_edit_mesh_vertices", {"type": 'V', "value": 'PRESS', "ctrl": True}), @@ -4007,7 +4007,7 @@ def km_armature(params): ("transform.transform", {"type": 'R', "value": 'PRESS', "ctrl": True}, {"properties": [("mode", 'BONE_ROLL')]}), # Menus. - op_menu("VIEW3D_MT_armature_specials", params.context_menu_event), + op_menu("VIEW3D_MT_armature_context_menu", params.context_menu_event), ]) return keymap @@ -4092,7 +4092,7 @@ def km_particle(params): {"properties": [("data_path_primary", 'tool_settings.particle_edit.brush.size')]}), ("wm.radial_control", {"type": 'F', "value": 'PRESS', "shift": True}, {"properties": [("data_path_primary", 'tool_settings.particle_edit.brush.strength')]}), - op_menu("VIEW3D_MT_particle_specials", params.context_menu_event), + op_menu("VIEW3D_MT_particle_context_menu", params.context_menu_event), ("particle.weight_set", {"type": 'K', "value": 'PRESS', "shift": True}, None), *_template_items_proportional_editing(connected=False), ]) diff --git a/release/scripts/startup/bl_ui/properties_data_armature.py b/release/scripts/startup/bl_ui/properties_data_armature.py index 032c3922d5d..4f639aa4bc9 100644 --- a/release/scripts/startup/bl_ui/properties_data_armature.py +++ b/release/scripts/startup/bl_ui/properties_data_armature.py @@ -89,7 +89,7 @@ class DATA_PT_display(ArmatureButtonsPanel, Panel): flow.prop(arm, "use_deform_delay", text="Delay Refresh") -class DATA_MT_bone_group_specials(Menu): +class DATA_MT_bone_group_context_menu(Menu): bl_label = "Bone Group Specials" def draw(self, context): @@ -124,7 +124,7 @@ class DATA_PT_bone_groups(ArmatureButtonsPanel, Panel): col.active = (ob.proxy is None) col.operator("pose.group_add", icon='ADD', text="") col.operator("pose.group_remove", icon='REMOVE', text="") - col.menu("DATA_MT_bone_group_specials", icon='DOWNARROW_HLT', text="") + col.menu("DATA_MT_bone_group_context_menu", icon='DOWNARROW_HLT', text="") if group: col.separator() col.operator("pose.group_move", icon='TRIA_UP', text="").direction = 'UP' @@ -317,7 +317,7 @@ class DATA_PT_custom_props_arm(ArmatureButtonsPanel, PropertyPanel, Panel): classes = ( DATA_PT_context_arm, DATA_PT_skeleton, - DATA_MT_bone_group_specials, + DATA_MT_bone_group_context_menu, DATA_PT_bone_groups, DATA_PT_pose_library, DATA_PT_motion_paths, diff --git a/release/scripts/startup/bl_ui/properties_data_gpencil.py b/release/scripts/startup/bl_ui/properties_data_gpencil.py index c6626b555fb..0a4a17eda82 100644 --- a/release/scripts/startup/bl_ui/properties_data_gpencil.py +++ b/release/scripts/startup/bl_ui/properties_data_gpencil.py @@ -80,7 +80,7 @@ class DATA_PT_context_gpencil(DataButtonsPanel, Panel): layout.template_ID(space, "pin_id") -class GPENCIL_MT_layer_specials(Menu): +class GPENCIL_MT_layer_context_menu(Menu): bl_label = "Layer" def draw(self, context): @@ -154,7 +154,7 @@ class DATA_PT_gpencil_layers(DataButtonsPanel, Panel): sub.operator("gpencil.layer_remove", icon='REMOVE', text="") if gpl: - sub.menu("GPENCIL_MT_layer_specials", icon='DOWNARROW_HLT', text="") + sub.menu("GPENCIL_MT_layer_context_menu", icon='DOWNARROW_HLT', text="") if len(gpd.layers) > 1: col.separator() @@ -461,7 +461,7 @@ classes = ( GPENCIL_UL_vgroups, - GPENCIL_MT_layer_specials, + GPENCIL_MT_layer_context_menu, GPENCIL_MT_gpencil_vertex_group, ) diff --git a/release/scripts/startup/bl_ui/properties_data_mesh.py b/release/scripts/startup/bl_ui/properties_data_mesh.py index 435217feae6..eacf027c491 100644 --- a/release/scripts/startup/bl_ui/properties_data_mesh.py +++ b/release/scripts/startup/bl_ui/properties_data_mesh.py @@ -22,7 +22,7 @@ from bpy.types import Menu, Panel, UIList from rna_prop_ui import PropertyPanel -class MESH_MT_vertex_group_specials(Menu): +class MESH_MT_vertex_group_context_menu(Menu): bl_label = "Vertex Group Specials" def draw(self, context): @@ -48,7 +48,7 @@ class MESH_MT_vertex_group_specials(Menu): layout.operator("object.vertex_group_lock", text="Lock Invert All").action = 'INVERT' -class MESH_MT_shape_key_specials(Menu): +class MESH_MT_shape_key_context_menu(Menu): bl_label = "Shape Key Specials" def draw(self, context): @@ -256,7 +256,7 @@ class DATA_PT_vertex_groups(MeshButtonsPanel, Panel): col.separator() - col.menu("MESH_MT_vertex_group_specials", icon='DOWNARROW_HLT', text="") + col.menu("MESH_MT_vertex_group_context_menu", icon='DOWNARROW_HLT', text="") if group: col.separator() @@ -360,7 +360,7 @@ class DATA_PT_shape_keys(MeshButtonsPanel, Panel): col.separator() - col.menu("MESH_MT_shape_key_specials", icon='DOWNARROW_HLT', text="") + col.menu("MESH_MT_shape_key_context_menu", icon='DOWNARROW_HLT', text="") if kb: col.separator() @@ -490,8 +490,8 @@ class DATA_PT_custom_props_mesh(MeshButtonsPanel, PropertyPanel, Panel): classes = ( - MESH_MT_vertex_group_specials, - MESH_MT_shape_key_specials, + MESH_MT_vertex_group_context_menu, + MESH_MT_shape_key_context_menu, MESH_UL_vgroups, MESH_UL_fmaps, MESH_UL_shape_keys, diff --git a/release/scripts/startup/bl_ui/properties_freestyle.py b/release/scripts/startup/bl_ui/properties_freestyle.py index c67ea2d4b8b..19795cd4da2 100644 --- a/release/scripts/startup/bl_ui/properties_freestyle.py +++ b/release/scripts/startup/bl_ui/properties_freestyle.py @@ -100,7 +100,7 @@ class VIEWLAYER_UL_linesets(UIList): layout.label(text="", icon_value=icon) -class RENDER_MT_lineset_specials(Menu): +class RENDER_MT_lineset_context_menu(Menu): bl_label = "Lineset Specials" def draw(self, context): @@ -195,7 +195,7 @@ class VIEWLAYER_PT_freestyle_lineset(ViewLayerFreestyleEditorButtonsPanel, Panel sub = row.column(align=True) sub.operator("scene.freestyle_lineset_add", icon='ADD', text="") sub.operator("scene.freestyle_lineset_remove", icon='REMOVE', text="") - sub.menu("RENDER_MT_lineset_specials", icon='DOWNARROW_HLT', text="") + sub.menu("RENDER_MT_lineset_context_menu", icon='DOWNARROW_HLT', text="") if lineset: sub.separator() sub.separator() @@ -828,7 +828,7 @@ class MATERIAL_PT_freestyle_line(MaterialFreestyleButtonsPanel, Panel): classes = ( RENDER_PT_freestyle, VIEWLAYER_UL_linesets, - RENDER_MT_lineset_specials, + RENDER_MT_lineset_context_menu, VIEWLAYER_PT_freestyle, VIEWLAYER_PT_freestyle_lineset, VIEWLAYER_PT_freestyle_linestyle, 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 9d2d6e927e9..6b52ab5cad2 100644 --- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py +++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py @@ -857,7 +857,7 @@ class GreasePencilMaterialsPanel: col.operator("object.material_slot_add", icon='ADD', text="") col.operator("object.material_slot_remove", icon='REMOVE', text="") - col.menu("GPENCIL_MT_color_specials", icon='DOWNARROW_HLT', text="") + col.menu("GPENCIL_MT_color_context_menu", icon='DOWNARROW_HLT', text="") if is_sortable: col.separator() diff --git a/release/scripts/startup/bl_ui/properties_material.py b/release/scripts/startup/bl_ui/properties_material.py index b05955e3598..4871d9f6f87 100644 --- a/release/scripts/startup/bl_ui/properties_material.py +++ b/release/scripts/startup/bl_ui/properties_material.py @@ -24,7 +24,7 @@ from bpy.app.translations import pgettext_iface as iface_ from bpy_extras.node_utils import find_node_input -class MATERIAL_MT_specials(Menu): +class MATERIAL_MT_context_menu(Menu): bl_label = "Material Specials" def draw(self, context): @@ -119,7 +119,7 @@ class EEVEE_MATERIAL_PT_context_material(MaterialButtonsPanel, Panel): col.separator() - col.menu("MATERIAL_MT_specials", icon='DOWNARROW_HLT', text="") + col.menu("MATERIAL_MT_context_menu", icon='DOWNARROW_HLT', text="") if is_sortable: col.separator() @@ -258,7 +258,7 @@ class MATERIAL_PT_viewport(MaterialButtonsPanel, Panel): classes = ( - MATERIAL_MT_specials, + MATERIAL_MT_context_menu, MATERIAL_UL_matslots, MATERIAL_PT_preview, EEVEE_MATERIAL_PT_context_material, diff --git a/release/scripts/startup/bl_ui/properties_material_gpencil.py b/release/scripts/startup/bl_ui/properties_material_gpencil.py index 22fa8dee65b..c60d2676021 100644 --- a/release/scripts/startup/bl_ui/properties_material_gpencil.py +++ b/release/scripts/startup/bl_ui/properties_material_gpencil.py @@ -27,7 +27,7 @@ from .properties_grease_pencil_common import ( ) -class GPENCIL_MT_color_specials(Menu): +class GPENCIL_MT_color_context_menu(Menu): bl_label = "Layer" def draw(self, context): @@ -264,7 +264,7 @@ class MATERIAL_PT_gpencil_material_presets(PresetMenu): classes = ( GPENCIL_UL_matslots, - GPENCIL_MT_color_specials, + GPENCIL_MT_color_context_menu, MATERIAL_PT_gpencil_slots, MATERIAL_PT_gpencil_preview, MATERIAL_PT_gpencil_material_presets, diff --git a/release/scripts/startup/bl_ui/properties_object.py b/release/scripts/startup/bl_ui/properties_object.py index 6897d47b20e..f6e5380591a 100644 --- a/release/scripts/startup/bl_ui/properties_object.py +++ b/release/scripts/startup/bl_ui/properties_object.py @@ -158,7 +158,7 @@ class OBJECT_PT_relations(ObjectButtonsPanel, Panel): col.prop(ob, "pass_index") -class COLLECTION_MT_specials(Menu): +class COLLECTION_MT_context_menu(Menu): bl_label = "Collection Specials" def draw(self, context): @@ -199,7 +199,7 @@ class OBJECT_PT_collections(ObjectButtonsPanel, Panel): row = col.box().row() row.prop(collection, "name", text="") row.operator("object.collection_remove", text="", icon='X', emboss=False) - row.menu("COLLECTION_MT_specials", icon='DOWNARROW_HLT', text="") + row.menu("COLLECTION_MT_context_menu", icon='DOWNARROW_HLT', text="") row = col.box().row() row.prop(collection, "instance_offset", text="") @@ -390,7 +390,7 @@ classes = ( OBJECT_PT_transform, OBJECT_PT_delta_transform, OBJECT_PT_relations, - COLLECTION_MT_specials, + COLLECTION_MT_context_menu, OBJECT_PT_collections, OBJECT_PT_instancing, OBJECT_PT_instancing_size, diff --git a/release/scripts/startup/bl_ui/properties_particle.py b/release/scripts/startup/bl_ui/properties_particle.py index 4f774d63940..7d0f6de7b1b 100644 --- a/release/scripts/startup/bl_ui/properties_particle.py +++ b/release/scripts/startup/bl_ui/properties_particle.py @@ -65,7 +65,7 @@ def particle_get_settings(context): return None -class PARTICLE_MT_specials(Menu): +class PARTICLE_MT_context_menu(Menu): bl_label = "Particle Specials" COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_EEVEE', 'BLENDER_WORKBENCH'} @@ -179,7 +179,7 @@ class PARTICLE_PT_context_particles(ParticleButtonsPanel, Panel): col.separator() - col.menu("PARTICLE_MT_specials", icon='DOWNARROW_HLT', text="") + col.menu("PARTICLE_MT_context_menu", icon='DOWNARROW_HLT', text="") if psys is None: part = particle_get_settings(context) @@ -2107,7 +2107,7 @@ class PARTICLE_PT_textures(ParticleButtonsPanel, Panel): col = row.column(align=True) col.operator("texture.slot_move", text="", icon='TRIA_UP').type = 'UP' col.operator("texture.slot_move", text="", icon='TRIA_DOWN').type = 'DOWN' - col.menu("TEXTURE_MT_specials", icon='DOWNARROW_HLT', text="") + col.menu("TEXTURE_MT_context_menu", icon='DOWNARROW_HLT', text="") if not part.active_texture: layout.template_ID(part, "active_texture", new="texture.new") @@ -2152,7 +2152,7 @@ class PARTICLE_PT_custom_props(ParticleButtonsPanel, PropertyPanel, Panel): classes = ( - PARTICLE_MT_specials, + PARTICLE_MT_context_menu, PARTICLE_PT_hair_dynamics_presets, PARTICLE_UL_particle_systems, PARTICLE_PT_context_particles, diff --git a/release/scripts/startup/bl_ui/properties_texture.py b/release/scripts/startup/bl_ui/properties_texture.py index 1761cec8106..58ba9ddb9b8 100644 --- a/release/scripts/startup/bl_ui/properties_texture.py +++ b/release/scripts/startup/bl_ui/properties_texture.py @@ -35,7 +35,7 @@ from rna_prop_ui import PropertyPanel from .properties_paint_common import brush_texture_settings -class TEXTURE_MT_specials(Menu): +class TEXTURE_MT_context_menu(Menu): bl_label = "Texture Specials" COMPAT_ENGINES = {'BLENDER_RENDER'} @@ -913,7 +913,7 @@ class TEXTURE_PT_custom_props(TextureButtonsPanel, PropertyPanel, Panel): classes = ( - TEXTURE_MT_specials, + TEXTURE_MT_context_menu, TEXTURE_UL_texslots, TEXTURE_PT_preview, TEXTURE_PT_context, diff --git a/release/scripts/startup/bl_ui/space_clip.py b/release/scripts/startup/bl_ui/space_clip.py index 5ec80a59f51..58955722aaa 100644 --- a/release/scripts/startup/bl_ui/space_clip.py +++ b/release/scripts/startup/bl_ui/space_clip.py @@ -1008,7 +1008,7 @@ class CLIP_PT_stabilization(CLIP_PT_reconstruction_panel, Panel): sub.operator("clip.stabilize_2d_add", icon='ADD', text="") sub.operator("clip.stabilize_2d_remove", icon='REMOVE', text="") - sub.menu('CLIP_MT_stabilize_2d_specials', text="", + sub.menu('CLIP_MT_stabilize_2d_context_menu', text="", icon='DOWNARROW_HLT') # Usually we don't hide things from iterface, but here every pixel of @@ -1025,7 +1025,7 @@ class CLIP_PT_stabilization(CLIP_PT_reconstruction_panel, Panel): sub.operator("clip.stabilize_2d_rotation_add", icon='ADD', text="") sub.operator("clip.stabilize_2d_rotation_remove", icon='REMOVE', text="") - sub.menu('CLIP_MT_stabilize_2d_rotation_specials', text="", + sub.menu('CLIP_MT_stabilize_2d_rotation_context_menu', text="", icon='DOWNARROW_HLT') col = layout.column() @@ -1430,7 +1430,7 @@ class CLIP_MT_select_grouped(Menu): layout.operator_enum("clip.select_grouped", "group") -class CLIP_MT_tracking_specials(Menu): +class CLIP_MT_tracking_context_menu(Menu): bl_label = "Specials" @classmethod @@ -1484,7 +1484,7 @@ class CLIP_PT_tracking_settings_presets(PresetMenu): preset_add_operator = "clip.tracking_settings_preset_add" -class CLIP_MT_stabilize_2d_specials(Menu): +class CLIP_MT_stabilize_2d_context_menu(Menu): bl_label = "Translation Track Specials" def draw(self, context): @@ -1493,7 +1493,7 @@ class CLIP_MT_stabilize_2d_specials(Menu): layout.operator("clip.stabilize_2d_select") -class CLIP_MT_stabilize_2d_rotation_specials(Menu): +class CLIP_MT_stabilize_2d_rotation_context_menu(Menu): bl_label = "Rotation Track Specials" def draw(self, context): @@ -1563,12 +1563,12 @@ classes = ( CLIP_MT_track_transform, CLIP_MT_select, CLIP_MT_select_grouped, - CLIP_MT_tracking_specials, + CLIP_MT_tracking_context_menu, CLIP_PT_camera_presets, CLIP_PT_track_color_presets, CLIP_PT_tracking_settings_presets, - CLIP_MT_stabilize_2d_specials, - CLIP_MT_stabilize_2d_rotation_specials, + CLIP_MT_stabilize_2d_context_menu, + CLIP_MT_stabilize_2d_rotation_context_menu, CLIP_MT_pivot_pie, ) diff --git a/release/scripts/startup/bl_ui/space_dopesheet.py b/release/scripts/startup/bl_ui/space_dopesheet.py index 4816bb6361d..69a835b757a 100644 --- a/release/scripts/startup/bl_ui/space_dopesheet.py +++ b/release/scripts/startup/bl_ui/space_dopesheet.py @@ -575,7 +575,7 @@ class DOPESHEET_MT_delete(Menu): layout.operator("action.clean", text="Clean Channels").channels = True -class DOPESHEET_MT_specials(Menu): +class DOPESHEET_MT_context_menu(Menu): bl_label = "Dope Sheet Context Menu" def draw(self, context): @@ -603,7 +603,7 @@ class DOPESHEET_MT_specials(Menu): layout.operator_menu_enum("action.snap", "type", text="Snap") -class DOPESHEET_MT_channel_specials(Menu): +class DOPESHEET_MT_channel_context_menu(Menu): bl_label = "Dope Sheet Channel Context Menu" def draw(self, context): @@ -661,8 +661,8 @@ classes = ( DOPESHEET_MT_gpencil_channel, DOPESHEET_MT_gpencil_frame, DOPESHEET_MT_delete, - DOPESHEET_MT_specials, - DOPESHEET_MT_channel_specials, + DOPESHEET_MT_context_menu, + DOPESHEET_MT_channel_context_menu, DOPESHEET_MT_snap_pie, DOPESHEET_PT_filters, ) diff --git a/release/scripts/startup/bl_ui/space_filebrowser.py b/release/scripts/startup/bl_ui/space_filebrowser.py index 2eacae81057..fba7933b9cb 100644 --- a/release/scripts/startup/bl_ui/space_filebrowser.py +++ b/release/scripts/startup/bl_ui/space_filebrowser.py @@ -153,7 +153,7 @@ class FILEBROWSER_PT_system_bookmarks(Panel): space, "system_bookmarks_active", item_dyntip_propname="path", rows=1, maxrows=10) -class FILEBROWSER_MT_bookmarks_specials(Menu): +class FILEBROWSER_MT_bookmarks_context_menu(Menu): bl_label = "Bookmarks Specials" def draw(self, context): @@ -185,7 +185,7 @@ class FILEBROWSER_PT_bookmarks(Panel): col = row.column(align=True) col.operator("file.bookmark_add", icon='ADD', text="") col.operator("file.bookmark_delete", icon='REMOVE', text="") - col.menu("FILEBROWSER_MT_bookmarks_specials", icon='DOWNARROW_HLT', text="") + col.menu("FILEBROWSER_MT_bookmarks_context_menu", icon='DOWNARROW_HLT', text="") if num_rows > 1: col.separator() @@ -263,7 +263,7 @@ classes = ( FILEBROWSER_UL_dir, FILEBROWSER_PT_system_folders, FILEBROWSER_PT_system_bookmarks, - FILEBROWSER_MT_bookmarks_specials, + FILEBROWSER_MT_bookmarks_context_menu, FILEBROWSER_PT_bookmarks, FILEBROWSER_PT_recent_folders, FILEBROWSER_PT_advanced_filter, diff --git a/release/scripts/startup/bl_ui/space_graph.py b/release/scripts/startup/bl_ui/space_graph.py index 006232ec071..b12cde67599 100644 --- a/release/scripts/startup/bl_ui/space_graph.py +++ b/release/scripts/startup/bl_ui/space_graph.py @@ -324,7 +324,7 @@ class GRAPH_MT_delete(Menu): layout.operator("graph.clean", text="Clean Channels").channels = True -class GRAPH_MT_specials(Menu): +class GRAPH_MT_context_menu(Menu): bl_label = "F-Curve Context Menu" def draw(self, context): @@ -379,7 +379,7 @@ class GRAPH_MT_snap_pie(Menu): pie.operator("graph.snap", text="Flatten Handles").type = 'HORIZONTAL' -class GRAPH_MT_channel_specials(Menu): +class GRAPH_MT_channel_context_menu(Menu): bl_label = "F-Curve Channel Context Menu" def draw(self, context): @@ -430,8 +430,8 @@ classes = ( GRAPH_MT_key, GRAPH_MT_key_transform, GRAPH_MT_delete, - GRAPH_MT_specials, - GRAPH_MT_channel_specials, + GRAPH_MT_context_menu, + GRAPH_MT_channel_context_menu, GRAPH_MT_pivot_pie, GRAPH_MT_snap_pie, GRAPH_PT_filters, diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py index 8ce20b9ea3d..ac0e28f90cc 100644 --- a/release/scripts/startup/bl_ui/space_image.py +++ b/release/scripts/startup/bl_ui/space_image.py @@ -438,7 +438,7 @@ class IMAGE_MT_uvs_select_mode(Menu): props.data_path = "tool_settings.uv_select_mode" -class IMAGE_MT_uvs_specials(Menu): +class IMAGE_MT_uvs_context_menu(Menu): bl_label = "UV Context Menu" def draw(self, context): @@ -1333,7 +1333,7 @@ classes = ( IMAGE_MT_uvs_mirror, IMAGE_MT_uvs_weldalign, IMAGE_MT_uvs_select_mode, - IMAGE_MT_uvs_specials, + IMAGE_MT_uvs_context_menu, IMAGE_MT_pivot_pie, IMAGE_MT_uvs_snap_pie, IMAGE_HT_header, diff --git a/release/scripts/startup/bl_ui/space_node.py b/release/scripts/startup/bl_ui/space_node.py index 9ba496b0a44..ca809a07d92 100644 --- a/release/scripts/startup/bl_ui/space_node.py +++ b/release/scripts/startup/bl_ui/space_node.py @@ -312,7 +312,7 @@ class NODE_PT_node_color_presets(PresetMenu): preset_add_operator = "node.node_color_preset_add" -class NODE_MT_node_color_specials(Menu): +class NODE_MT_node_color_context_menu(Menu): bl_label = "Node Color Specials" def draw(self, context): @@ -321,7 +321,7 @@ class NODE_MT_node_color_specials(Menu): layout.operator("node.node_copy_color", icon='COPY_ID') -class NODE_MT_specials(Menu): +class NODE_MT_context_menu(Menu): bl_label = "Node Context Menu" def draw(self, context): @@ -418,7 +418,7 @@ class NODE_PT_active_node_color(Panel): row = layout.row() row.prop(node, "color", text="") - row.menu("NODE_MT_node_color_specials", text="", icon='DOWNARROW_HLT') + row.menu("NODE_MT_node_color_context_menu", text="", icon='DOWNARROW_HLT') class NODE_PT_active_node_properties(Panel): @@ -623,8 +623,8 @@ classes = ( NODE_MT_select, NODE_MT_node, NODE_PT_node_color_presets, - NODE_MT_node_color_specials, - NODE_MT_specials, + NODE_MT_node_color_context_menu, + NODE_MT_context_menu, NODE_PT_active_node_generic, NODE_PT_active_node_color, NODE_PT_active_node_properties, diff --git a/release/scripts/startup/bl_ui/space_topbar.py b/release/scripts/startup/bl_ui/space_topbar.py index 44f16e428c4..135982130b0 100644 --- a/release/scripts/startup/bl_ui/space_topbar.py +++ b/release/scripts/startup/bl_ui/space_topbar.py @@ -527,7 +527,7 @@ class TOPBAR_PT_gpencil_layers(Panel): gpl = context.active_gpencil_layer if gpl: - sub.menu("GPENCIL_MT_layer_specials", icon='DOWNARROW_HLT', text="") + sub.menu("GPENCIL_MT_layer_context_menu", icon='DOWNARROW_HLT', text="") if len(gpd.layers) > 1: col.separator() @@ -930,7 +930,7 @@ class TOPBAR_MT_help(Menu): layout.operator("wm.splash", icon='BLENDER') -class TOPBAR_MT_file_specials(Menu): +class TOPBAR_MT_file_context_menu(Menu): bl_label = "File Context Menu" def draw(self, context): @@ -951,7 +951,7 @@ class TOPBAR_MT_file_specials(Menu): layout.menu("TOPBAR_MT_file_export", icon='EXPORT') -class TOPBAR_MT_window_specials(Menu): +class TOPBAR_MT_window_context_menu(Menu): bl_label = "Window Context Menu" def draw(self, context): @@ -1043,8 +1043,8 @@ class TOPBAR_PT_gpencil_primitive(Panel): classes = ( TOPBAR_HT_upper_bar, TOPBAR_HT_lower_bar, - TOPBAR_MT_file_specials, - TOPBAR_MT_window_specials, + TOPBAR_MT_file_context_menu, + TOPBAR_MT_window_context_menu, TOPBAR_MT_workspace_menu, TOPBAR_MT_editor_menus, TOPBAR_MT_file, diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index c66620fe69d..d9ddfb7833d 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -1767,7 +1767,7 @@ class VIEW3D_MT_object_clear(Menu): layout.operator("object.origin_clear", text="Origin") -class VIEW3D_MT_object_specials(Menu): +class VIEW3D_MT_object_context_menu(Menu): bl_label = "Object Context Menu" def draw(self, context): @@ -2468,7 +2468,7 @@ class VIEW3D_MT_particle(Menu): layout.operator("particle.delete") -class VIEW3D_MT_particle_specials(Menu): +class VIEW3D_MT_particle_context_menu(Menu): bl_label = "Particle Context Menu" def draw(self, context): @@ -2729,7 +2729,7 @@ class VIEW3D_MT_pose_apply(Menu): props.process_bones = True -class VIEW3D_MT_pose_specials(Menu): +class VIEW3D_MT_pose_context_menu(Menu): bl_label = "Pose Context Menu" def draw(self, context): @@ -2865,7 +2865,7 @@ class VIEW3D_MT_edit_mesh(Menu): layout.menu("VIEW3D_MT_edit_mesh_delete") -class VIEW3D_MT_edit_mesh_specials(Menu): +class VIEW3D_MT_edit_mesh_context_menu(Menu): bl_label = "" def draw(self, context): @@ -3559,7 +3559,7 @@ class VIEW3D_MT_edit_curve_clean(Menu): layout.operator("curve.decimate") -class VIEW3D_MT_edit_curve_specials(Menu): +class VIEW3D_MT_edit_curve_context_menu(Menu): bl_label = "Curve Context Menu" def draw(self, context): @@ -3807,7 +3807,7 @@ class VIEW3D_MT_edit_armature(Menu): layout.menu("VIEW3D_MT_edit_armature_delete") -class VIEW3D_MT_armature_specials(Menu): +class VIEW3D_MT_armature_context_menu(Menu): bl_label = "Armature Context Menu" def draw(self, context): @@ -5616,7 +5616,7 @@ class VIEW3D_PT_gpencil_multi_frame(Panel): layout.template_curve_mapping(settings, "multiframe_falloff_curve", brush=True) -class VIEW3D_MT_gpencil_edit_specials(Menu): +class VIEW3D_MT_gpencil_edit_context_menu(Menu): bl_label = "Edit Context Menu" def draw(self, context): @@ -5672,7 +5672,7 @@ class VIEW3D_MT_gpencil_edit_specials(Menu): layout.menu("VIEW3D_MT_edit_gpencil_delete") -class VIEW3D_PT_gpencil_sculpt_specials(Panel): +class VIEW3D_PT_gpencil_sculpt_context_menu(Panel): bl_space_type = 'VIEW_3D' bl_region_type = 'WINDOW' bl_label = "Sculpt Context Menu" @@ -5704,7 +5704,7 @@ class VIEW3D_PT_gpencil_sculpt_specials(Panel): layout.operator("gpencil.active_frames_delete_all", text="Delete All Active Layers", icon='REMOVE') -class VIEW3D_PT_gpencil_draw_specials(Panel): +class VIEW3D_PT_gpencil_draw_context_menu(Panel): bl_space_type = 'VIEW_3D' bl_region_type = 'WINDOW' bl_label = "Draw Context Menu" @@ -5737,7 +5737,7 @@ class VIEW3D_PT_gpencil_draw_specials(Panel): layout.operator("gpencil.active_frames_delete_all", text="Delete All Active Layers", icon='REMOVE') -class VIEW3D_PT_paint_vertex_specials(Panel): +class VIEW3D_PT_paint_vertex_context_menu(Panel): # Only for popover, these are dummy values. bl_space_type = 'VIEW_3D' bl_region_type = 'WINDOW' @@ -5762,7 +5762,7 @@ class VIEW3D_PT_paint_vertex_specials(Panel): layout.prop(brush, "strength") -class VIEW3D_PT_paint_texture_specials(Panel): +class VIEW3D_PT_paint_texture_context_menu(Panel): # Only for popover, these are dummy values. bl_space_type = 'VIEW_3D' bl_region_type = 'WINDOW' @@ -5787,7 +5787,7 @@ class VIEW3D_PT_paint_texture_specials(Panel): layout.prop(brush, "strength") -class VIEW3D_PT_paint_weight_specials(Panel): +class VIEW3D_PT_paint_weight_context_menu(Panel): # Only for popover, these are dummy values. bl_space_type = 'VIEW_3D' bl_region_type = 'WINDOW' @@ -5817,7 +5817,7 @@ class VIEW3D_PT_paint_weight_specials(Panel): layout.prop(brush, "strength") -class VIEW3D_PT_sculpt_specials(Panel): +class VIEW3D_PT_sculpt_context_menu(Panel): # Only for popover, these are dummy values. bl_space_type = 'VIEW_3D' bl_region_type = 'WINDOW' @@ -5909,7 +5909,7 @@ classes = ( VIEW3D_MT_object_animation, VIEW3D_MT_object_rigid_body, VIEW3D_MT_object_clear, - VIEW3D_MT_object_specials, + VIEW3D_MT_object_context_menu, VIEW3D_MT_object_shading, VIEW3D_MT_object_apply, VIEW3D_MT_object_relations, @@ -5930,7 +5930,7 @@ classes = ( VIEW3D_MT_sculpt, VIEW3D_MT_hide_mask, VIEW3D_MT_particle, - VIEW3D_MT_particle_specials, + VIEW3D_MT_particle_context_menu, VIEW3D_MT_particle_showhide, VIEW3D_MT_pose, VIEW3D_MT_pose_transform, @@ -5943,11 +5943,11 @@ classes = ( VIEW3D_MT_pose_constraints, VIEW3D_MT_pose_showhide, VIEW3D_MT_pose_apply, - VIEW3D_MT_pose_specials, + VIEW3D_MT_pose_context_menu, VIEW3D_MT_bone_options_toggle, VIEW3D_MT_bone_options_enable, VIEW3D_MT_bone_options_disable, - VIEW3D_MT_edit_mesh_specials, + VIEW3D_MT_edit_mesh_context_menu, VIEW3D_MT_edit_mesh_select_mode, VIEW3D_MT_edit_mesh_select_linked, VIEW3D_MT_edit_mesh_select_loops, @@ -5972,12 +5972,12 @@ classes = ( VIEW3D_MT_gpencil_simplify, VIEW3D_MT_gpencil_copy_layer, VIEW3D_MT_gpencil_autoweights, - VIEW3D_MT_gpencil_edit_specials, + VIEW3D_MT_gpencil_edit_context_menu, VIEW3D_MT_edit_curve, VIEW3D_MT_edit_curve_ctrlpoints, VIEW3D_MT_edit_curve_segments, VIEW3D_MT_edit_curve_clean, - VIEW3D_MT_edit_curve_specials, + VIEW3D_MT_edit_curve_context_menu, VIEW3D_MT_edit_curve_delete, VIEW3D_MT_edit_curve_showhide, VIEW3D_MT_edit_surface, @@ -5987,7 +5987,7 @@ classes = ( VIEW3D_MT_edit_meta_showhide, VIEW3D_MT_edit_lattice, VIEW3D_MT_edit_armature, - VIEW3D_MT_armature_specials, + VIEW3D_MT_armature_context_menu, VIEW3D_MT_edit_armature_parent, VIEW3D_MT_edit_armature_roll, VIEW3D_MT_edit_armature_names, @@ -6042,12 +6042,12 @@ classes = ( VIEW3D_PT_transform_orientations, VIEW3D_PT_overlay_gpencil_options, VIEW3D_PT_context_properties, - VIEW3D_PT_paint_vertex_specials, - VIEW3D_PT_paint_texture_specials, - VIEW3D_PT_paint_weight_specials, - VIEW3D_PT_gpencil_sculpt_specials, - VIEW3D_PT_gpencil_draw_specials, - VIEW3D_PT_sculpt_specials, + VIEW3D_PT_paint_vertex_context_menu, + VIEW3D_PT_paint_texture_context_menu, + VIEW3D_PT_paint_weight_context_menu, + VIEW3D_PT_gpencil_sculpt_context_menu, + VIEW3D_PT_gpencil_draw_context_menu, + VIEW3D_PT_sculpt_context_menu, TOPBAR_PT_gpencil_materials, TOPBAR_PT_annotation_layers, ) -- cgit v1.2.3