From 05fc31f27f41f1dc0a874d00d38d9bbdea99139b Mon Sep 17 00:00:00 2001 From: Pablo Vazquez Date: Mon, 25 Sep 2023 16:25:55 +0200 Subject: [PATCH] UI: Remove redundant "Context Menu" in menu titles Context menus are a type of menu, like header menus, there is no need to mention the type as part of the name since it is implied by context. Pull Request: https://projects.blender.org/blender/blender/pulls/112662 --- scripts/startup/bl_ui/space_console.py | 2 +- scripts/startup/bl_ui/space_dopesheet.py | 4 +- scripts/startup/bl_ui/space_filebrowser.py | 4 +- scripts/startup/bl_ui/space_graph.py | 4 +- scripts/startup/bl_ui/space_image.py | 4 +- scripts/startup/bl_ui/space_info.py | 2 +- scripts/startup/bl_ui/space_nla.py | 4 +- scripts/startup/bl_ui/space_node.py | 2 +- scripts/startup/bl_ui/space_outliner.py | 2 +- scripts/startup/bl_ui/space_sequencer.py | 4 +- scripts/startup/bl_ui/space_topbar.py | 2 +- scripts/startup/bl_ui/space_view3d.py | 42 ++++++++++----------- source/blender/editors/screen/screen_ops.cc | 2 +- 13 files changed, 39 insertions(+), 39 deletions(-) diff --git a/scripts/startup/bl_ui/space_console.py b/scripts/startup/bl_ui/space_console.py index f334314d72e..3a18838ff1b 100644 --- a/scripts/startup/bl_ui/space_console.py +++ b/scripts/startup/bl_ui/space_console.py @@ -112,7 +112,7 @@ class CONSOLE_MT_console(Menu): class CONSOLE_MT_context_menu(Menu): - bl_label = "Console Context Menu" + bl_label = "Console" def draw(self, _context): layout = self.layout diff --git a/scripts/startup/bl_ui/space_dopesheet.py b/scripts/startup/bl_ui/space_dopesheet.py index cfbc75304e2..bc240c2d9cf 100644 --- a/scripts/startup/bl_ui/space_dopesheet.py +++ b/scripts/startup/bl_ui/space_dopesheet.py @@ -690,7 +690,7 @@ class DOPESHEET_MT_delete(Menu): class DOPESHEET_MT_context_menu(Menu): - bl_label = "Dope Sheet Context Menu" + bl_label = "Dope Sheet" def draw(self, context): layout = self.layout @@ -733,7 +733,7 @@ class DOPESHEET_MT_context_menu(Menu): class DOPESHEET_MT_channel_context_menu(Menu): - bl_label = "Dope Sheet Channel Context Menu" + bl_label = "Dope Sheet Channel" def draw(self, context): layout = self.layout diff --git a/scripts/startup/bl_ui/space_filebrowser.py b/scripts/startup/bl_ui/space_filebrowser.py index b9fed5b5c76..5dc3ab4e73a 100644 --- a/scripts/startup/bl_ui/space_filebrowser.py +++ b/scripts/startup/bl_ui/space_filebrowser.py @@ -538,7 +538,7 @@ class FILEBROWSER_MT_select(FileBrowserMenu, Menu): class FILEBROWSER_MT_context_menu(FileBrowserMenu, Menu): - bl_label = "Files Context Menu" + bl_label = "Files" def draw(self, context): layout = self.layout @@ -827,7 +827,7 @@ class ASSETBROWSER_UL_metadata_tags(UIList): class ASSETBROWSER_MT_context_menu(AssetBrowserMenu, Menu): - bl_label = "Assets Context Menu" + bl_label = "Assets" def draw(self, context): layout = self.layout diff --git a/scripts/startup/bl_ui/space_graph.py b/scripts/startup/bl_ui/space_graph.py index fa3cf5a6dd6..9d360dfdec8 100644 --- a/scripts/startup/bl_ui/space_graph.py +++ b/scripts/startup/bl_ui/space_graph.py @@ -441,7 +441,7 @@ class GRAPH_MT_delete(Menu): class GRAPH_MT_context_menu(Menu): - bl_label = "F-Curve Context Menu" + bl_label = "F-Curve" def draw(self, _context): layout = self.layout @@ -501,7 +501,7 @@ class GRAPH_MT_snap_pie(Menu): class GRAPH_MT_channel_context_menu(Menu): - bl_label = "F-Curve Channel Context Menu" + bl_label = "F-Curve Channel" def draw(self, context): layout = self.layout diff --git a/scripts/startup/bl_ui/space_image.py b/scripts/startup/bl_ui/space_image.py index a6bc32ef687..e2482580a0a 100644 --- a/scripts/startup/bl_ui/space_image.py +++ b/scripts/startup/bl_ui/space_image.py @@ -509,7 +509,7 @@ class IMAGE_MT_uvs_select_mode(Menu): class IMAGE_MT_uvs_context_menu(Menu): - bl_label = "UV Context Menu" + bl_label = "UV" def draw(self, context): layout = self.layout @@ -905,7 +905,7 @@ class IMAGE_MT_editor_menus(Menu): class IMAGE_MT_mask_context_menu(Menu): - bl_label = "Mask Context Menu" + bl_label = "Mask" @classmethod def poll(cls, context): diff --git a/scripts/startup/bl_ui/space_info.py b/scripts/startup/bl_ui/space_info.py index 5fbd9eea3ea..8fcd097be9f 100644 --- a/scripts/startup/bl_ui/space_info.py +++ b/scripts/startup/bl_ui/space_info.py @@ -92,7 +92,7 @@ class INFO_MT_area(Menu): class INFO_MT_context_menu(Menu): - bl_label = "Info Context Menu" + bl_label = "Info" def draw(self, _context): layout = self.layout diff --git a/scripts/startup/bl_ui/space_nla.py b/scripts/startup/bl_ui/space_nla.py index 938149c59d3..e503af362a4 100644 --- a/scripts/startup/bl_ui/space_nla.py +++ b/scripts/startup/bl_ui/space_nla.py @@ -304,7 +304,7 @@ class NLA_MT_view_pie(Menu): class NLA_MT_context_menu(Menu): - bl_label = "NLA Context Menu" + bl_label = "NLA" def draw(self, context): layout = self.layout @@ -348,7 +348,7 @@ class NLA_MT_context_menu(Menu): class NLA_MT_channel_context_menu(Menu): - bl_label = "NLA Channel Context Menu" + bl_label = "NLA Channel" def draw(self, _context): layout = self.layout diff --git a/scripts/startup/bl_ui/space_node.py b/scripts/startup/bl_ui/space_node.py index 9e687fb918d..c8206aeac10 100644 --- a/scripts/startup/bl_ui/space_node.py +++ b/scripts/startup/bl_ui/space_node.py @@ -561,7 +561,7 @@ class NODE_MT_context_menu_select_menu(Menu): class NODE_MT_context_menu(Menu): - bl_label = "Node Context Menu" + bl_label = "Node" def draw(self, context): snode = context.space_data diff --git a/scripts/startup/bl_ui/space_outliner.py b/scripts/startup/bl_ui/space_outliner.py index 3b75628aa09..5be3a370f2a 100644 --- a/scripts/startup/bl_ui/space_outliner.py +++ b/scripts/startup/bl_ui/space_outliner.py @@ -100,7 +100,7 @@ class OUTLINER_MT_editor_menus(Menu): class OUTLINER_MT_context_menu(Menu): - bl_label = "Outliner Context Menu" + bl_label = "Outliner" @staticmethod def draw_common_operators(layout): diff --git a/scripts/startup/bl_ui/space_sequencer.py b/scripts/startup/bl_ui/space_sequencer.py index 7d6dbcc221c..162dff9f7e9 100644 --- a/scripts/startup/bl_ui/space_sequencer.py +++ b/scripts/startup/bl_ui/space_sequencer.py @@ -1060,7 +1060,7 @@ class SEQUENCER_MT_image_apply(Menu): class SEQUENCER_MT_context_menu(Menu): - bl_label = "Sequencer Context Menu" + bl_label = "Sequencer" def draw(self, context): layout = self.layout @@ -1162,7 +1162,7 @@ class SEQUENCER_MT_context_menu(Menu): class SEQUENCER_MT_preview_context_menu(Menu): - bl_label = "Sequencer Preview Context Menu" + bl_label = "Sequencer Preview" def draw(self, context): layout = self.layout diff --git a/scripts/startup/bl_ui/space_topbar.py b/scripts/startup/bl_ui/space_topbar.py index f008416e3d8..eaf99658e09 100644 --- a/scripts/startup/bl_ui/space_topbar.py +++ b/scripts/startup/bl_ui/space_topbar.py @@ -718,7 +718,7 @@ class TOPBAR_MT_help(Menu): class TOPBAR_MT_file_context_menu(Menu): - bl_label = "File Context Menu" + bl_label = "File" def draw(self, _context): layout = self.layout diff --git a/scripts/startup/bl_ui/space_view3d.py b/scripts/startup/bl_ui/space_view3d.py index 242af09d93e..65f5bad9043 100644 --- a/scripts/startup/bl_ui/space_view3d.py +++ b/scripts/startup/bl_ui/space_view3d.py @@ -1976,7 +1976,7 @@ class VIEW3D_MT_select_edit_metaball(Menu): class VIEW3D_MT_edit_lattice_context_menu(Menu): - bl_label = "Lattice Context Menu" + bl_label = "Lattice" def draw(self, _context): layout = self.layout @@ -2343,7 +2343,7 @@ class VIEW3D_MT_surface_add(Menu): class VIEW3D_MT_edit_metaball_context_menu(Menu): - bl_label = "Metaball Context Menu" + bl_label = "Metaball" def draw(self, _context): layout = self.layout @@ -2730,7 +2730,7 @@ class VIEW3D_MT_object_clear(Menu): class VIEW3D_MT_object_context_menu(Menu): - bl_label = "Object Context Menu" + bl_label = "Object" def draw(self, context): layout = self.layout @@ -3795,7 +3795,7 @@ class VIEW3D_MT_particle(Menu): class VIEW3D_MT_particle_context_menu(Menu): - bl_label = "Particle Context Menu" + bl_label = "Particle" def draw(self, context): layout = self.layout @@ -4079,7 +4079,7 @@ class VIEW3D_MT_pose_apply(Menu): class VIEW3D_MT_pose_context_menu(Menu): - bl_label = "Pose Context Menu" + bl_label = "Pose" def draw(self, _context): layout = self.layout @@ -4272,7 +4272,7 @@ class VIEW3D_MT_edit_mesh_context_menu(Menu): if is_vert_mode: col = row.column(align=True) - col.label(text="Vertex Context Menu", icon='VERTEXSEL') + col.label(text="Vertex", icon='VERTEXSEL') col.separator() # Additive Operators @@ -4323,7 +4323,7 @@ class VIEW3D_MT_edit_mesh_context_menu(Menu): if is_edge_mode: col = row.column(align=True) - col.label(text="Edge Context Menu", icon='EDGESEL') + col.label(text="Edge", icon='EDGESEL') col.separator() # Additive Operators @@ -4397,7 +4397,7 @@ class VIEW3D_MT_edit_mesh_context_menu(Menu): col = row.column(align=True) - col.label(text="Face Context Menu", icon='FACESEL') + col.label(text="Face", icon='FACESEL') col.separator() # Additive Operators @@ -5034,7 +5034,7 @@ class VIEW3D_MT_edit_curve_clean(Menu): class VIEW3D_MT_edit_curve_context_menu(Menu): - bl_label = "Curve Context Menu" + bl_label = "Curve" def draw(self, _context): # TODO(campbell): match mesh vertex menu. @@ -5217,7 +5217,7 @@ class VIEW3D_MT_edit_font(Menu): class VIEW3D_MT_edit_font_context_menu(Menu): - bl_label = "Text Context Menu" + bl_label = "Text" def draw(self, _context): layout = self.layout @@ -5352,7 +5352,7 @@ class VIEW3D_MT_edit_armature(Menu): class VIEW3D_MT_armature_context_menu(Menu): - bl_label = "Armature Context Menu" + bl_label = "Armature" def draw(self, context): layout = self.layout @@ -7813,7 +7813,7 @@ class VIEW3D_MT_gpencil_edit_context_menu(Menu): if is_point_mode or is_segment_mode: col = row.column(align=True) - col.label(text="Point Context Menu", icon='GP_SELECT_POINTS') + col.label(text="Point", icon='GP_SELECT_POINTS') col.separator() # Additive Operators @@ -7864,7 +7864,7 @@ class VIEW3D_MT_gpencil_edit_context_menu(Menu): if is_stroke_mode: col = row.column(align=True) - col.label(text="Stroke Context Menu", icon='GP_SELECT_STROKES') + col.label(text="Stroke", icon='GP_SELECT_STROKES') col.separator() # Main Strokes Operators @@ -7964,7 +7964,7 @@ class VIEW3D_PT_gpencil_sculpt_automasking(Panel): class VIEW3D_PT_gpencil_sculpt_context_menu(Panel): bl_space_type = 'VIEW_3D' bl_region_type = 'WINDOW' - bl_label = "Sculpt Context Menu" + bl_label = "Sculpt" bl_ui_units_x = 12 def draw(self, context): @@ -7984,7 +7984,7 @@ class VIEW3D_PT_gpencil_sculpt_context_menu(Panel): class VIEW3D_PT_gpencil_weight_context_menu(Panel): bl_space_type = 'VIEW_3D' bl_region_type = 'WINDOW' - bl_label = "Weight Paint Context Menu" + bl_label = "Weight Paint" bl_ui_units_x = 12 def draw(self, context): @@ -8003,7 +8003,7 @@ class VIEW3D_PT_gpencil_weight_context_menu(Panel): class VIEW3D_PT_gpencil_draw_context_menu(Panel): bl_space_type = 'VIEW_3D' bl_region_type = 'WINDOW' - bl_label = "Draw Context Menu" + bl_label = "Draw" bl_ui_units_x = 12 def draw(self, context): @@ -8041,7 +8041,7 @@ class VIEW3D_PT_gpencil_draw_context_menu(Panel): class VIEW3D_PT_gpencil_vertex_context_menu(Panel): bl_space_type = 'VIEW_3D' bl_region_type = 'WINDOW' - bl_label = "Vertex Paint Context Menu" + bl_label = "Vertex Paint" bl_ui_units_x = 12 def draw(self, context): @@ -8080,7 +8080,7 @@ class VIEW3D_PT_paint_vertex_context_menu(Panel): # Only for popover, these are dummy values. bl_space_type = 'VIEW_3D' bl_region_type = 'WINDOW' - bl_label = "Vertex Paint Context Menu" + bl_label = "Vertex Paint" def draw(self, context): layout = self.layout @@ -8118,7 +8118,7 @@ class VIEW3D_PT_paint_texture_context_menu(Panel): # Only for popover, these are dummy values. bl_space_type = 'VIEW_3D' bl_region_type = 'WINDOW' - bl_label = "Texture Paint Context Menu" + bl_label = "Texture Paint" def draw(self, context): layout = self.layout @@ -8157,7 +8157,7 @@ class VIEW3D_PT_paint_weight_context_menu(Panel): # Only for popover, these are dummy values. bl_space_type = 'VIEW_3D' bl_region_type = 'WINDOW' - bl_label = "Weights Context Menu" + bl_label = "Weights" def draw(self, context): layout = self.layout @@ -8267,7 +8267,7 @@ class VIEW3D_PT_sculpt_context_menu(Panel): # Only for popover, these are dummy values. bl_space_type = 'VIEW_3D' bl_region_type = 'WINDOW' - bl_label = "Sculpt Context Menu" + bl_label = "Sculpt" def draw(self, context): layout = self.layout diff --git a/source/blender/editors/screen/screen_ops.cc b/source/blender/editors/screen/screen_ops.cc index 51b46fbb3f2..13b062ba644 100644 --- a/source/blender/editors/screen/screen_ops.cc +++ b/source/blender/editors/screen/screen_ops.cc @@ -4511,7 +4511,7 @@ static int screen_context_menu_invoke(bContext *C, wmOperator * /*op*/, const wm static void SCREEN_OT_region_context_menu(wmOperatorType *ot) { /* identifiers */ - ot->name = "Region Context Menu"; + ot->name = "Region"; ot->description = "Display region context menu"; ot->idname = "SCREEN_OT_region_context_menu";